17917760715

Committed 22 Sep 2025 02:01PM UTC coverage: 13.566% (+0.04%) from 13.525%

Build # 17917760715

Build Type

push

github

Committed by

tkuhn

Commit Message

fix: Re-add get-members/owners queries, still needed for legacy projects

Run Details

435 of 4046 branches covered (10.75%)

Branch coverage included in aggregate %.

1117 of 7394 relevant lines covered (15.11%)

0.67 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

84.31

src/main/java/com/knowledgepixels/nanodash/QueryApiAccess.java

package com.knowledgepixels.nanodash;

import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

import org.apache.commons.lang3.tuple.Pair;
import org.eclipse.rdf4j.model.IRI;
import org.nanopub.extra.services.APINotReachableException;
import org.nanopub.extra.services.ApiResponse;
import org.nanopub.extra.services.FailedApiCallException;
import org.nanopub.extra.services.NotEnoughAPIInstancesException;
import org.nanopub.extra.services.QueryAccess;
import org.nanopub.extra.services.QueryRef;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * Utility class for accessing and managing API queries.
 * Provides methods to retrieve query results, manage query IDs, and fetch the latest versions of nanopublications.
 */
public class QueryApiAccess {

    private QueryApiAccess() {
    }  // no instances allowed

    private static ConcurrentMap<String, String> queryIds = new ConcurrentHashMap<>();
    private static final Logger logger = LoggerFactory.getLogger(QueryApiAccess.class);

    private static ConcurrentMap<String, Pair<Long, String>> latestVersionMap = new ConcurrentHashMap<>();

    private static final String queryIriPattern = "^(.*[^A-Za-z0-9-_])(RA[A-Za-z0-9-_]{43})[/#]([^/#]+)$";

    static {
        // TODO Load this dynamically somehow at some point:
        load("RAe-oA5eSmkCXCALZ99-0k4imnlI74KPqURfhHOmnzo6A/get-latest-nanopubs-from-pubkeys");
        load("RAuy4N1h4vZ1wgBUMvTiWw2y_Y0_5oFYRTwdq-xj2qqNM/get-latest-nanopubs-from-userid");
        load("RAiCBvPL2hRGzI8g5L68O-C9yEXryC_vG35GdEm5jtH_s/get-user-stats-from-pubkeys");  // Deactivated for now...
        load("RA3U23LL3xbNwsu92fAqsKb0kagOud4f9TlRQq3evNJck/get-user-stats-from-userid");  // Deactivated for now...
        load("RAcNvmEiUNUb2a7O4fwRvy2x2BCN640AC880fTzFworr8/get-top-creators-last30d");
        load("RAr27GmRUKQmvPbfmB34N9l9lX-xYK7nQhvOMbQCk3byI/get-latest-users");
        load("RAYNg6rfvXIVvJY2u8oS0EEjxnVvimLLVZG1rOar_nWIY/get-most-recent-nanopubs");
        load("RAPGhXDRzeGu-Qk0AkjleEtxMxqAvJ-dZn7985gzAbyhs/get-publisher-version");
        load("RAvL7pe2ppsfq4mVWTdJjssYGsjrmliNd_sZO2ytLvg1Y/get-most-used-templates-last30d");
        load("RANn4Mu8r8bqJA9KJMGXTQAEGAEvtNKGFsuhRIC6BRIOo/get-latest-nanopubs-by-type");
        load("RAiRsB2YywxjsBMkVRTREJBooXhf2ZOHoUs5lxciEl37I/get-latest-version-of-np");
        load("RA0aZxyh_I0rCJyBepXOWC2tGdI5YYHORFCC-qBR8xHZA/get-all-user-intros");
        load("RA-tlMmQA7iT2wR2aS3PlONrepX7vdXbkzeWluea7AECg/get-suggested-templates-to-get-started");
        load("RActSoHqt-TlpCOldqLb9skfMioVxHzCZUYaNEM06FTsY/get-type-overview-last-12-months");
        load("RAn3agwsH2yk-8132RJApGYxdPSHHCXDAIYiCaSBBo6tg/get-approved-nanopubs");
        load("RAz1ogtMxSTKSOYwHAfD5M3Y-vd1vd46OZta_vvbqh8kY/find-uri-references");
        load("RAE35dYJQlpnqim7VeKuu07E9I1LQUZpkdYQR4RvU3KMU/get-nanopubs-by-type");
        load("RALZXWg5lZoJoQ0VHL5mpDgNxYpqU6FoDLWGp4rs8A6b8/get-introducing-nanopub");
        load("RAWruhiSmyzgZhVRs8QY8YQPAgHzTfl7anxII1de-yaCs/fulltext-search-on-labels");
        load("RAyMrQ89RECTi9gZK5q7gjL1wKTiP8StkLy0NIkkCiyew/find-things");
        load("RAjt1H9rCSr6A9VGzlhye00zPdH69JdGc3kd_2VjDmzVg/get-instances");
        load("RAH06iUwnvj_pRARY15ayJAY5tuJau3rCvHhPPhe49fVI/get-classes-for-thing");
        load("RAJStXEm1wZcg34ZLPqe00VPSzIVCwC2rrxdj_JR8v5DY/find-referencing-nanopubs");  // not yet used...
        load("RAtftxAXJubB4rlm9fOvvHNVIkXvWQLC6Ag_MiV7HL0ow/get-labels-for-thing");  // not yet used...
        load("RARtWHRzNY5hh31X2VB5eOCJAdp9Cjv4CakA0Idqz69MI/get-templates-with-uri");
        load("RAIn9NTsWE0qrpKiK3nOmZRXVzwv0qnfbm7dR_CUnp4aA/get-newer-versions-of-np");
        load("RAQqjXQYlxYQeI4Y3UQy9OrD5Jx1E3PJ8KwKKQlWbiYSw/get-queries");
        load("RAzXDzCHoZmJITgYYquLwDDkSyNf3eKKQz9NfQPYB1cyE/get-latest-thing-nanopub");
        load("RAnpimW7SPwaum2fefdS6_jpzYxcTRGjE-pmgNTL_BBJU/get-projects");
        load("RApiw7Z0NeP3RaLiqX6Q7Ml5CfEWbt-PysUbMNljuiLJw/get-owners");
        load("RASyFJyADTtG-l_Qe3a5PE_e2yUJR-PydXfkZjjrBuV7U/get-members");
        load("RAlPzIqHJsPt33WuPNBIyPDr8KC7htHO9UYvSuYOfTjwo/get-spaces");
        load("RAJmZoM0xCGE8OL6EgmQBOd1M58ggNkwZ0IUqHOAPRfvE/get-parts");
        load("RA6bgrU3Ezfg5VAiLru0BFYHaSj6vZU6jJTscxNl8Wqvc/get-assertion-templates");
        load("RA4bt3MQRnEPC2nSsdbCJc74wT-e1w68dSCpYVyvG0274/get-provenance-templates");
        load("RAMcdiJpvvk8424AJIH1jsDUQVcPYOLRw0DNnZt_ND_LQ/get-pubinfo-templates");
        load("RAOpebLWcp0G6D9U8ZhfYGOkz-kObkytDsM6rCQlIi_j0/get-admins");
        load("RA_Xf7mfC2PAohGYktJEXjkbzxPhkfX4DE1bQKFqkxrRg/get-space-members");
        load("RAbq1a1FwRFAZPDde3Sy4GqNUQ2TmaKOWLydJPOyCKc0w/get-filtered-nanopub-list");
        load("RA_F6C2DtlL4EXSF2vzU1KLVUiRLjPAM-r1Wy32JIeSYI/get-pinned-templates");
        load("RAH5jJUo8ukFkPP1xghveSNPze3pmSK69zri5PPM6HEbg/get-pinned-queries");
        load("RAmRZR_izFZiIcpaWdRVTKAB57QGuvgVUCM0XmAkNYjLo/get-space-member-roles");
    }

    /**
     * Loads a query ID into the queryIds map.
     *
     * @param queryId The query ID to load.
     */
    static void load(String queryId) {
        queryIds.put(queryId.substring(46), queryId);
    }

    /**
     * Forces the retrieval of an API response for a given query name and parameters.
     * Retries until a valid response is received.
     *
     * @param queryName The name of the query.
     * @param params    The parameters for the query.
     * @return The API response.
     */
    public static ApiResponse forcedGet(QueryRef queryRef) {
        while (true) {
            ApiResponse resp = null;
            try {
                resp = QueryApiAccess.get(queryRef);
            } catch (Exception ex) {
                // TODO We should be more specific about which exceptions we catch here
                //      and generally improve this, as this could hang forever.
                logger.error("Error while forcing API get for query {}", queryRef, ex);
            }
            if (resp != null) return resp;
            try {
                Thread.sleep(100);
            } catch (InterruptedException ex) {
                logger.error("Interrupted while forcing API get for query {}", queryRef, ex);
            }
        }
    }

    /**
     * Retrieves an API response for a given query reference.
     *
     * @param queryRef The query reference
     * @return The API response.
     * @throws org.nanopub.extra.services.FailedApiCallException If the API call fails.
     */
    public static ApiResponse get(QueryRef queryRef) throws FailedApiCallException, APINotReachableException, NotEnoughAPIInstancesException {
        if (queryRef.getName().matches("^RA[A-Za-z0-9-_]{43}/.*$")) {
            // All good
        } else if (queryIds.containsKey(queryRef.getName())) {
            queryRef = new QueryRef(queryIds.get(queryRef.getName()), queryRef.getParams());
        } else {
            throw new IllegalArgumentException("Query name not known: " + queryRef.getName());
        }
        return QueryAccess.get(queryRef);
    }

    /**
     * Retrieves the latest version ID of a given nanopublication.
     *
     * @param nanopubId The ID of the nanopublication.
     * @return The latest version ID.
     */
    public static String getLatestVersionId(String nanopubId) {
        long currentTime = System.currentTimeMillis();
        if (!latestVersionMap.containsKey(nanopubId) || currentTime - latestVersionMap.get(nanopubId).getLeft() > 1000 * 60) {
            // Re-fetch if existing value is older than 1 minute
            try {
                ApiResponse r = get(new QueryRef("get-latest-version-of-np", "np", nanopubId));
                if (r.getData().size() != 1) return nanopubId;
                String l = r.getData().get(0).get("latest");
                latestVersionMap.put(nanopubId, Pair.of(currentTime, l));
            } catch (Exception ex) {
                logger.error("Error while getting latest version of nanopub '{}'", nanopubId, ex);
                return nanopubId;
            }
        }
        return latestVersionMap.get(nanopubId).getRight();
    }

    /**
     * Extracts the query ID from a given query IRI.
     *
     * @param queryIri The query IRI.
     * @return The query ID, or null if the IRI is invalid.
     */
    public static String getQueryId(IRI queryIri) {
        if (queryIri == null) return null;
        if (!queryIri.stringValue().matches(queryIriPattern)) return null;
        return queryIri.stringValue().replaceFirst(queryIriPattern, "$2/$3");
    }

    /**
     * Retrieves the query ID for a given query name.
     *
     * @param queryName The name of the query.
     * @return The query ID, or null if the query name is unknown.
     */
    public static String getQueryId(String queryName) {
        return queryIds.get(queryName);
    }

    /**
     * Extracts the query name from a given query IRI.
     *
     * @param queryIri The query IRI.
     * @return The query name, or null if the IRI is invalid.
     */
    public static String getQueryName(IRI queryIri) {
        if (queryIri == null) return null;
        if (!queryIri.stringValue().matches(queryIriPattern)) return null;
        return queryIri.stringValue().replaceFirst(queryIriPattern, "$3");
    }

}

1	package com.knowledgepixels.nanodash;
2
3	import java.util.concurrent.ConcurrentHashMap;
4	import java.util.concurrent.ConcurrentMap;
5
6	import org.apache.commons.lang3.tuple.Pair;
7	import org.eclipse.rdf4j.model.IRI;
8	import org.nanopub.extra.services.APINotReachableException;
9	import org.nanopub.extra.services.ApiResponse;
10	import org.nanopub.extra.services.FailedApiCallException;
11	import org.nanopub.extra.services.NotEnoughAPIInstancesException;
12	import org.nanopub.extra.services.QueryAccess;
13	import org.nanopub.extra.services.QueryRef;
14	import org.slf4j.Logger;
15	import org.slf4j.LoggerFactory;
16
17	/**
18	* Utility class for accessing and managing API queries.
19	* Provides methods to retrieve query results, manage query IDs, and fetch the latest versions of nanopublications.
20	*/
21	public class QueryApiAccess {
22
23	private QueryApiAccess() {
24	} // no instances allowed
25
26	private static ConcurrentMap<String, String> queryIds = new ConcurrentHashMap<>();	4✔
27	private static final Logger logger = LoggerFactory.getLogger(QueryApiAccess.class);	3✔
28
29	private static ConcurrentMap<String, Pair<Long, String>> latestVersionMap = new ConcurrentHashMap<>();	4✔
30
31	private static final String queryIriPattern = "^(.*[^A-Za-z0-9-_])(RA[A-Za-z0-9-_]{43})[/#]([^/#]+)$";
32
33	static {
34	// TODO Load this dynamically somehow at some point:
35	load("RAe-oA5eSmkCXCALZ99-0k4imnlI74KPqURfhHOmnzo6A/get-latest-nanopubs-from-pubkeys");	2✔
36	load("RAuy4N1h4vZ1wgBUMvTiWw2y_Y0_5oFYRTwdq-xj2qqNM/get-latest-nanopubs-from-userid");	2✔
37	load("RAiCBvPL2hRGzI8g5L68O-C9yEXryC_vG35GdEm5jtH_s/get-user-stats-from-pubkeys"); // Deactivated for now...	2✔
38	load("RA3U23LL3xbNwsu92fAqsKb0kagOud4f9TlRQq3evNJck/get-user-stats-from-userid"); // Deactivated for now...	2✔
39	load("RAcNvmEiUNUb2a7O4fwRvy2x2BCN640AC880fTzFworr8/get-top-creators-last30d");	2✔
40	load("RAr27GmRUKQmvPbfmB34N9l9lX-xYK7nQhvOMbQCk3byI/get-latest-users");	2✔
41	load("RAYNg6rfvXIVvJY2u8oS0EEjxnVvimLLVZG1rOar_nWIY/get-most-recent-nanopubs");	2✔
42	load("RAPGhXDRzeGu-Qk0AkjleEtxMxqAvJ-dZn7985gzAbyhs/get-publisher-version");	2✔
43	load("RAvL7pe2ppsfq4mVWTdJjssYGsjrmliNd_sZO2ytLvg1Y/get-most-used-templates-last30d");	2✔
44	load("RANn4Mu8r8bqJA9KJMGXTQAEGAEvtNKGFsuhRIC6BRIOo/get-latest-nanopubs-by-type");	2✔
45	load("RAiRsB2YywxjsBMkVRTREJBooXhf2ZOHoUs5lxciEl37I/get-latest-version-of-np");	2✔
46	load("RA0aZxyh_I0rCJyBepXOWC2tGdI5YYHORFCC-qBR8xHZA/get-all-user-intros");	2✔
47	load("RA-tlMmQA7iT2wR2aS3PlONrepX7vdXbkzeWluea7AECg/get-suggested-templates-to-get-started");	2✔
48	load("RActSoHqt-TlpCOldqLb9skfMioVxHzCZUYaNEM06FTsY/get-type-overview-last-12-months");	2✔
49	load("RAn3agwsH2yk-8132RJApGYxdPSHHCXDAIYiCaSBBo6tg/get-approved-nanopubs");	2✔
50	load("RAz1ogtMxSTKSOYwHAfD5M3Y-vd1vd46OZta_vvbqh8kY/find-uri-references");	2✔
51	load("RAE35dYJQlpnqim7VeKuu07E9I1LQUZpkdYQR4RvU3KMU/get-nanopubs-by-type");	2✔
52	load("RALZXWg5lZoJoQ0VHL5mpDgNxYpqU6FoDLWGp4rs8A6b8/get-introducing-nanopub");	2✔
53	load("RAWruhiSmyzgZhVRs8QY8YQPAgHzTfl7anxII1de-yaCs/fulltext-search-on-labels");	2✔
54	load("RAyMrQ89RECTi9gZK5q7gjL1wKTiP8StkLy0NIkkCiyew/find-things");	2✔
55	load("RAjt1H9rCSr6A9VGzlhye00zPdH69JdGc3kd_2VjDmzVg/get-instances");	2✔
56	load("RAH06iUwnvj_pRARY15ayJAY5tuJau3rCvHhPPhe49fVI/get-classes-for-thing");	2✔
57	load("RAJStXEm1wZcg34ZLPqe00VPSzIVCwC2rrxdj_JR8v5DY/find-referencing-nanopubs"); // not yet used...	2✔
58	load("RAtftxAXJubB4rlm9fOvvHNVIkXvWQLC6Ag_MiV7HL0ow/get-labels-for-thing"); // not yet used...	2✔
59	load("RARtWHRzNY5hh31X2VB5eOCJAdp9Cjv4CakA0Idqz69MI/get-templates-with-uri");	2✔
60	load("RAIn9NTsWE0qrpKiK3nOmZRXVzwv0qnfbm7dR_CUnp4aA/get-newer-versions-of-np");	2✔
61	load("RAQqjXQYlxYQeI4Y3UQy9OrD5Jx1E3PJ8KwKKQlWbiYSw/get-queries");	2✔
62	load("RAzXDzCHoZmJITgYYquLwDDkSyNf3eKKQz9NfQPYB1cyE/get-latest-thing-nanopub");	2✔
63	load("RAnpimW7SPwaum2fefdS6_jpzYxcTRGjE-pmgNTL_BBJU/get-projects");	2✔
64	load("RApiw7Z0NeP3RaLiqX6Q7Ml5CfEWbt-PysUbMNljuiLJw/get-owners");	2✔
65	load("RASyFJyADTtG-l_Qe3a5PE_e2yUJR-PydXfkZjjrBuV7U/get-members");	2✔
66	load("RAlPzIqHJsPt33WuPNBIyPDr8KC7htHO9UYvSuYOfTjwo/get-spaces");	2✔
67	load("RAJmZoM0xCGE8OL6EgmQBOd1M58ggNkwZ0IUqHOAPRfvE/get-parts");	2✔
68	load("RA6bgrU3Ezfg5VAiLru0BFYHaSj6vZU6jJTscxNl8Wqvc/get-assertion-templates");	2✔
69	load("RA4bt3MQRnEPC2nSsdbCJc74wT-e1w68dSCpYVyvG0274/get-provenance-templates");	2✔
70	load("RAMcdiJpvvk8424AJIH1jsDUQVcPYOLRw0DNnZt_ND_LQ/get-pubinfo-templates");	2✔
71	load("RAOpebLWcp0G6D9U8ZhfYGOkz-kObkytDsM6rCQlIi_j0/get-admins");	2✔
72	load("RA_Xf7mfC2PAohGYktJEXjkbzxPhkfX4DE1bQKFqkxrRg/get-space-members");	2✔
73	load("RAbq1a1FwRFAZPDde3Sy4GqNUQ2TmaKOWLydJPOyCKc0w/get-filtered-nanopub-list");	2✔
74	load("RA_F6C2DtlL4EXSF2vzU1KLVUiRLjPAM-r1Wy32JIeSYI/get-pinned-templates");	2✔
75	load("RAH5jJUo8ukFkPP1xghveSNPze3pmSK69zri5PPM6HEbg/get-pinned-queries");	2✔
76	load("RAmRZR_izFZiIcpaWdRVTKAB57QGuvgVUCM0XmAkNYjLo/get-space-member-roles");	2✔
77	}	1✔
78
79	/**
80	* Loads a query ID into the queryIds map.
81	*
82	* @param queryId The query ID to load.
83	*/
84	static void load(String queryId) {
85	queryIds.put(queryId.substring(46), queryId);	7✔
86	}	1✔
87
88	/**
89	* Forces the retrieval of an API response for a given query name and parameters.
90	* Retries until a valid response is received.
91	*
92	* @param queryName The name of the query.
93	* @param params The parameters for the query.
94	* @return The API response.
95	*/
96	public static ApiResponse forcedGet(QueryRef queryRef) {
97	while (true) {
98	ApiResponse resp = null;	2✔
99	try {
100	resp = QueryApiAccess.get(queryRef);	3✔
101	} catch (Exception ex) {	1✔
102	// TODO We should be more specific about which exceptions we catch here
103	// and generally improve this, as this could hang forever.
104	logger.error("Error while forcing API get for query {}", queryRef, ex);	5✔
105	}	1✔
106	if (resp != null) return resp;	4✔
107	try {
108	Thread.sleep(100);	2✔
109	} catch (InterruptedException ex) {	×
110	logger.error("Interrupted while forcing API get for query {}", queryRef, ex);	×
111	}	1✔
112	}	1✔
113	}
114
115	/**
116	* Retrieves an API response for a given query reference.
117	*
118	* @param queryRef The query reference
119	* @return The API response.
120	* @throws org.nanopub.extra.services.FailedApiCallException If the API call fails.
121	*/
122	public static ApiResponse get(QueryRef queryRef) throws FailedApiCallException, APINotReachableException, NotEnoughAPIInstancesException {
123	if (queryRef.getName().matches("^RA[A-Za-z0-9-_]{43}/.*$")) {	6✔
124	// All good
125	} else if (queryIds.containsKey(queryRef.getName())) {	5✔
126	queryRef = new QueryRef(queryIds.get(queryRef.getName()), queryRef.getParams());	12✔
127	} else {
128	throw new IllegalArgumentException("Query name not known: " + queryRef.getName());	7✔
129	}
130	return QueryAccess.get(queryRef);	3✔
131	}
132
133	/**
134	* Retrieves the latest version ID of a given nanopublication.
135	*
136	* @param nanopubId The ID of the nanopublication.
137	* @return The latest version ID.
138	*/
139	public static String getLatestVersionId(String nanopubId) {
140	long currentTime = System.currentTimeMillis();	2✔
141	if (!latestVersionMap.containsKey(nanopubId) \|\| currentTime - latestVersionMap.get(nanopubId).getLeft() > 1000 * 60) {	4!
142	// Re-fetch if existing value is older than 1 minute
143	try {
144	ApiResponse r = get(new QueryRef("get-latest-version-of-np", "np", nanopubId));	8✔
145	if (r.getData().size() != 1) return nanopubId;	5!
146	String l = r.getData().get(0).get("latest");	8✔
147	latestVersionMap.put(nanopubId, Pair.of(currentTime, l));	8✔
148	} catch (Exception ex) {	×
149	logger.error("Error while getting latest version of nanopub '{}'", nanopubId, ex);	×
150	return nanopubId;	×
151	}	1✔
152	}
153	return latestVersionMap.get(nanopubId).getRight();	7✔
154	}
155
156	/**
157	* Extracts the query ID from a given query IRI.
158	*
159	* @param queryIri The query IRI.
160	* @return The query ID, or null if the IRI is invalid.
161	*/
162	public static String getQueryId(IRI queryIri) {
163	if (queryIri == null) return null;	×
164	if (!queryIri.stringValue().matches(queryIriPattern)) return null;	×
165	return queryIri.stringValue().replaceFirst(queryIriPattern, "$2/$3");	×
166	}
167
168	/**
169	* Retrieves the query ID for a given query name.
170	*
171	* @param queryName The name of the query.
172	* @return The query ID, or null if the query name is unknown.
173	*/
174	public static String getQueryId(String queryName) {
175	return queryIds.get(queryName);	5✔
176	}
177
178	/**
179	* Extracts the query name from a given query IRI.
180	*
181	* @param queryIri The query IRI.
182	* @return The query name, or null if the IRI is invalid.
183	*/
184	public static String getQueryName(IRI queryIri) {
185	if (queryIri == null) return null;	4✔
186	if (!queryIri.stringValue().matches(queryIriPattern)) return null;	7✔
187	return queryIri.stringValue().replaceFirst(queryIriPattern, "$3");	6✔
188	}
189
190	}

knowledgepixels / nanodash / 17917760715

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous