mustrd 0.2.7a0__py3-none-any.whl → 0.3.1a0__py3-none-any.whl

mustrd/README.md

@@ -27,3 +27,5 @@ As the project is actually built from the requirements.txt file at the project r
 
 `poetry export -f requirements.txt --without-hashes > requirements.txt`
 
+We also recommend pairing MustRD with the VS Code plugin [faubulous.mentor](https://marketplace.visualstudio.com/items?itemName=faubulous.mentor) to enhance your development experience and streamline working with SPARQL and RDF specifications.
+

mustrd/anzo_utils.py

@@ -31,16 +31,18 @@ from requests import Response, HTTPError, RequestException
 from bs4 import BeautifulSoup
 import logging
 
+logger = logging.getLogger()
+
 
 def query_azg(anzo_config: dict, query: str,
               format: str = "json", is_update: bool = False,
               data_layers: List[str] = None):
     params = {
-        'skipCache': True,
+        'skipCache': 'true',
         'format': format,
         'datasourceURI': anzo_config['gqe_uri'],
-        'default-graph-uri': data_layers,
-        'named-graph-uri': data_layers
+        'using-graph-uri' if is_update else 'default-graph-uri': data_layers,
+        'using-named-graph-uri' if is_update else 'named-graph-uri': data_layers
     }
     url = f"{anzo_config['url']}/sparql"
     return send_anzo_query(anzo_config, url=url, params=params, query=query, is_update=is_update)
@@ -52,7 +54,7 @@ def query_graphmart(anzo_config: dict,
                     format: str = "json",
                     data_layers: List[str] = None):
     params = {
-        'skipCache': True,
+        'skipCache': 'true',
         'format': format,
         'default-graph-uri': data_layers,
         'named-graph-uri': data_layers
@@ -87,7 +89,8 @@ def manage_anzo_response(response: Response) -> str:
 
 def send_anzo_query(anzo_config, url, params, query, is_update=False):
     headers = {"Content-Type": f"application/sparql-{'update' if is_update else 'query' }"}
-    return manage_anzo_response(requests.post(url=url, params=params, data=query,
+    logger.debug(f"send_anzo_query {url=} {query=} {is_update=}")
+    return manage_anzo_response(requests.post(url=url, params=params, data=query.encode('utf-8'),
                                               auth=(anzo_config['username'], anzo_config['password']),
                                               headers=headers, verify=False))
 

mustrd/logger_setup.py

@@ -35,6 +35,7 @@ def setup_logger(name: str) -> logging.Logger:
     log = logging.getLogger(name)
     log.setLevel(LOG_LEVEL)
     
+
     stderr_handler = logging.StreamHandler(sys.stderr)
     stderr_handler.setLevel(logging.ERROR)
     log.addHandler(stderr_handler)
@@ -50,3 +51,5 @@ def setup_logger(name: str) -> logging.Logger:
 def flush():
     logging.shutdown()
     sys.stdout.flush()
+
+logging.getLogger("edn_format").setLevel(logging.WARNING)

mustrd/model/mustrdShapes.ttl

@@ -140,10 +140,20 @@ must:OrderedTableDatasetShape
 must:FileDatasetShape
     a              sh:NodeShape ;
     sh:targetClass must:FileDataset ;
-    sh:property    [ sh:path     must:file ;
-                     sh:datatype xsd:string ;
-                     sh:minCount 1 ;
-                     sh:maxCount 1 ; ] .
+    sh:or (
+		[
+			sh:path must:file ;
+            sh:datatype xsd:string ;
+			sh:maxCount 1 ;
+		]
+		[
+			sh:path must:fileurl ;
+            sh:nodeKind sh:IRI ;
+			sh:minCount 1 ;
+			sh:maxCount 1 ;
+		]
+	)
+     .
 
 must:StatementShape
     a              sh:NodeShape ;
@@ -249,5 +259,14 @@ must:AnzoGraphmartQueryDrivenTemplatedStepSparqlSourceShape
                      sh:minCount    1 ;
                      sh:maxCount    1 ; ]  .
 
-
-
+must:SpadeEdnGroupSourceShape
+    a              sh:NodeShape ;
+    sh:targetClass must:SpadeEdnGroupSource ;
+    sh:property    [ sh:path     must:fileurl ;
+                     sh:message "A SpadeEdnGroupSource must have a fileurl property pointing to the spade.edn config." ;
+                     sh:minCount 1 ;
+                     sh:maxCount 1 ; ] ;
+    sh:property    [ sh:path     must:groupId ;
+                     sh:message "A SpadeEdnGroupSource must have a groupId property referencing the group in the EDN file." ;
+                     sh:minCount 1 ;
+                     sh:maxCount 1 ; ] .

mustrd/model/ontology.ttl

@@ -146,7 +146,7 @@ sh:order rdf:type owl:DatatypeProperty ;
 
 ###  https://mustrd.com/model/file
 :file rdf:type owl:DatatypeProperty ;
-      rdfs:comment "Relative or absolute path to local file" ;
+      rdfs:comment "Relative or absolute path to local file as a string, or a file:// url" ;
       rdfs:label "file" .
 
 
@@ -158,7 +158,6 @@ sh:order rdf:type owl:DatatypeProperty ;
 
 ###  https://mustrd.com/model/fileurl
 :fileurl rdf:type owl:DatatypeProperty ;
-         rdfs:domain :FileSparqlSource ;
          rdfs:comment "a full or relatively qualified file:// url. Relative to what? We haven't thought that through, yet." ;
          rdfs:isDefinedBy : ;
          rdfs:label "fileUrl" .
@@ -461,6 +460,11 @@ sh:order rdf:type owl:DatatypeProperty ;
                          rdfs:isDefinedBy : ;
                          rdfs:label "AnzoGraphmartQueryDrivenTemplatedStepSparqlSource" .
 
+### https://mustrd.com/model/SpadeEdnGroupSource
+:SpadeEdnGroupSource rdf:type owl:Class ;
+    rdfs:subClassOf :SparqlSource ;
+    rdfs:comment "Allows reference to a spade.edn file, and a specific groupid (think Anzo layer), within that" ; 
+    rdfs:label "SpadeEdnGroupSource" .
 
 ###  https://mustrd.com/model/Then
 :Then rdf:type owl:Class ;