bug fixes

Author: apdavison

validation_service_api/validation_service/data_models.py

@@ -1042,9 +1042,9 @@ class ValidationTestSummary(BaseModel):
     score_type: ScoreType = None
 
     @classmethod
-    def from_kg_query(cls, item, client):
+    def from_kg_query(cls, item, user_client, service_client=None):
         item.pop("@context")
-        item["id"] = client.uuid_from_uri(item["uri"])
+        item["id"] = user_client.uuid_from_uri(item["uri"])
         space = item.get("project_id", None)  # what the query calls "project_id" is really the space
         if space:
             item["project_id"] = project_id_from_space(space)

validation_service_api/validation_service/resources/results.py

@@ -64,15 +64,15 @@ def _query_results(filters, kg_user_client, data_model, query_label, from_index,
             for filter in filters:
                 response = kg_client.query(query, filter,
                                            from_index=0, size=100000, scope="any",
-                                           use_stored_query=True)
+                                           id_key="uri", use_stored_query=True)
                 for item in response.data:
                     items[item["uri"]] = item
                 if len(items) >= size + from_index:
                     break
 
         test_results = [
             data_model.from_kg_query(item, kg_user_client, kg_service_client)
-            for item in items.values()[from_index:from_index + size]
+            for item in list(items.values())[from_index:from_index + size]
         ]
 
     if user.is_anonymous: