oldaplib 0.3.21__tar.gz → 0.3.23__tar.gz

{oldaplib-0.3.21 → oldaplib-0.3.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.3.21
+Version: 0.3.23
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler

{oldaplib-0.3.21 → oldaplib-0.3.23}/oldaplib/src/datamodel.py

@@ -474,14 +474,14 @@ class DataModel(Model):
         #
         query = cls.__context.sparql_context
         query += f"""
-        SELECT ?prop ?graph
+        SELECT ?prop
         WHERE {{
-	        GRAPH ?graph {{
-		        ?prop a sh:PropertyShape
-	        }}
-            FILTER (?graph = {cls.__graph}:shacl || ?graph = shared:shacl)
+            GRAPH {cls.__graph}:shacl {{
+                ?prop a sh:PropertyShape
+            }}
         }}
         """
+
         jsonobj = con.query(query)
         res = QueryProcessor(context=cls.__context, query_result=jsonobj)
         #
@@ -489,7 +489,7 @@ class DataModel(Model):
         #
         propclasses: list[PropertyClass] = []
         for r in res:
-            projectid = r['graph'].prefix
+            projectid = cls.__graph
             propnameshacl = str(r['prop'])
             propclassiri = propnameshacl.removesuffix("Shape")
             propclass = PropertyClass.read(con, projectid, Xsd_QName(propclassiri, validate=False), ignore_cache=ignore_cache)

{oldaplib-0.3.21 → oldaplib-0.3.23}/oldaplib/src/resourceclass.py

@@ -671,11 +671,26 @@ class ResourceClass(Model, Notify):
         """
         context = Context(name=self._con.context_name)
         query = context.sparql_context
+        # query += f"""
+        # ASK {{
+        #     GRAPH {self._project.projectShortName}:data {{
+        #         ?resinstance rdf:type {self._owlclass_iri} .
+        #         FILTER(?resinstance != {self._owlclass_iri}Shape)
+        #     }}
+        # }}
+        # """
         query += f"""
         ASK {{
-            GRAPH {self._project.projectShortName}:data {{
-                ?resinstance rdf:type {self._owlclass_iri} .
-                FILTER(?resinstance != {self._owlclass_iri}Shape)
+            {{
+                GRAPH {self._project.projectShortName}:data {{
+                    ?resinstance rdf:type {self._owlclass_iri} .
+                }}
+            }}
+            UNION
+            {{
+                GRAPH {self._project.projectShortName}:onto {{
+                    ?subclass rdfs:subClassOf+ {self._owlclass_iri} .
+                }}
             }}
         }}
         """

oldaplib-0.3.23/oldaplib/src/version.py

@@ -0,0 +1 @@
+__version__ = "0.3.23"

{oldaplib-0.3.21 → oldaplib-0.3.23}/oldaplib/test/test_datamodel.py

@@ -374,7 +374,6 @@ class TestDataModel(unittest.TestCase):
             Xsd_QName("oldap:hasAdminPermission"),
             Xsd_QName("oldap:statementProperty"),
             Xsd_QName("oldap:namespaceIri"),
-            Xsd_QName("shared:commentString")
         })
         self.assertEqual(set(model.get_resclasses()), {
             Xsd_QName("oldap:Project"),

{oldaplib-0.3.21 → oldaplib-0.3.23}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oldaplib"
-version = "0.3.21"
+version = "0.3.23"
 description = "Open Media Access Server Library (Linked Open Data middleware/RESTApi)"
 authors = ["Lukas Rosenthaler <lukas.rosenthaler@unibas.ch>"]
 license = "GNU Affero General Public License version 3"

oldaplib-0.3.21/oldaplib/src/version.py

@@ -1 +0,0 @@
-__version__ = "0.3.21"