Reorganise repo

RDFLib · Feb 13, 2024 · 17b12dc · 17b12dc
1 parent 4f52e8d
commit 17b12dc
Show file tree

Hide file tree

Showing 59 changed files with 1,017 additions and 1,591 deletions.
diff --git a/prez/app.py b/prez/app.py
@@ -46,7 +46,7 @@
 )
 from prez.services.generate_profiles import create_profiles_graph
 from prez.services.prez_logging import setup_logger
-from prez.sparql.methods import RemoteSparqlRepo, PyoxigraphRepo, OxrdflibRepo
+from prez.repositories import RemoteSparqlRepo, PyoxigraphRepo, OxrdflibRepo
 
 app = FastAPI(
     exception_handlers={

diff --git a/prez/dependencies.py b/prez/dependencies.py
@@ -15,7 +15,7 @@
     endpoints_graph_cache,
 )
 from prez.config import settings
-from prez.sparql.methods import PyoxigraphRepo, RemoteSparqlRepo, OxrdflibRepo
+from prez.repositories import PyoxigraphRepo, RemoteSparqlRepo, OxrdflibRepo
 from rdframe import CQLParser
 
 

diff --git a/prez/models/profiles_and_mediatypes.py b/prez/models/profiles_and_mediatypes.py
@@ -6,7 +6,7 @@
 
 from prez.services.generate_profiles import get_profiles_and_mediatypes
 from prez.services.connegp_service import get_requested_profile_and_mediatype
-from prez.sparql.methods import Repo
+from prez.repositories import Repo
 
 PREZ = Namespace("https://prez.dev/")
 

diff --git a/prez/reference_data/endpoints/cql_endpoints.ttl b/prez/reference_data/endpoints/cql_endpoints.ttl
@@ -15,26 +15,3 @@ endpoint:get a ont:ListingEndpoint ;
     shext:offset 0 ;
 .
 
-endpoint:queryables a ont:ListingEndpoint ;
-    sh:rule [ sh:subject "?focus_node" ;
-          sh:predicate <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ;
-          sh:object <https://prez.dev/Queryable> ] ;
-    ont:deliversClasses prez:QueryablesList ;
-    sh:target [ sh:select """SELECT DISTINCT ?focus_node
-             WHERE {
-             ?s a ?class ;
-                  ?focus_node ?o .
-              VALUES ?class {
-              dcat:Catalog
-              dcat:Dataset
-              dcat:Resource
-              skos:ConceptScheme
-              skos:Collection
-              skos:Concept
-              geo:FeatureCollection
-              geo:Feature
-              }
-                    }""" ] ;
-    shext:limit 100 ;
-    shext:offset 0 ;
-.
diff --git a/prez/reference_data/endpoints/endpoint_metadata.ttl b/prez/reference_data/endpoints/endpoint_metadata.ttl
@@ -43,3 +43,8 @@ ogce:item-object
     a ont:ObjectEndpoint ;
     ont:relevantShapes ex:Feature , ex:ConceptSchemeConcept , ex:CollectionConcept , ex:Resource ;
 .
+
+ogce:cql-queryables
+    a ont:ListingEndpoint ;
+    ont:relevantShapes ex:queryables ;
+.
diff --git a/prez/reference_data/endpoints/endpoint_node_selection_shapes.ttl b/prez/reference_data/endpoints/endpoint_node_selection_shapes.ttl
@@ -7,6 +7,7 @@
 @prefix prof: <http://www.w3.org/ns/dx/prof/> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix shext: <http://example.com/shacl-extension#> .
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 
 ex:TopLevelCatalogs
@@ -84,4 +85,29 @@ ex:Profiles
     a sh:NodeShape ;
     ont:hierarchyLevel 1 ;
     sh:targetClass prof:Profile ;
+.
+
+ex:queryables a sh:NodeShape ;
+    ont:hierarchyLevel 1 ;
+    sh:rule [ sh:subject "?focus_node" ;
+          sh:predicate <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ;
+          sh:object <https://prez.dev/Queryable> ] ;
+    ont:deliversClasses prez:QueryablesList ;
+    sh:target [ sh:select """SELECT DISTINCT ?focus_node
+             WHERE {
+             ?s a ?class ;
+                  ?focus_node ?o .
+              VALUES ?class {
+              dcat:Catalog
+              dcat:Dataset
+              dcat:Resource
+              skos:ConceptScheme
+              skos:Collection
+              skos:Concept
+              geo:FeatureCollection
+              geo:Feature
+              }
+                    }""" ] ;
+    shext:limit 100 ;
+    shext:offset 0 ;
 .
diff --git a/prez/reference_data/endpoints/ogc_catprez_endpoints.ttl.old b/prez/reference_data/endpoints/ogc_catprez_endpoints.ttl.old
diff --git a/prez/reference_data/endpoints/ogc_spaceprez_endpoints.ttl.old b/prez/reference_data/endpoints/ogc_spaceprez_endpoints.ttl.old
diff --git a/prez/reference_data/endpoints/ogc_vocprez_endpoints.ttl.old b/prez/reference_data/endpoints/ogc_vocprez_endpoints.ttl.old