oldaplib 0.3.21__py3-none-any.whl → 0.3.22__py3-none-any.whl

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/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.21"
+__version__ = "0.3.22"

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.dist-info → oldaplib-0.3.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.3.21
+Version: 0.3.22
 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.dist-info → oldaplib-0.3.22.dist-info}/RECORD

@@ -10,7 +10,7 @@ oldaplib/ontologies/standard/.gitsave,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 oldaplib/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/cachesingleton.py,sha256=WGhuFER-mTnOJmwaN17fXPAg7zn7GJBm-XadShNUBBk,3687
 oldaplib/src/connection.py,sha256=LJMJO65QhSbheIEBnOCphRyAD1STwkO8zfNcYPcKwP8,29016
-oldaplib/src/datamodel.py,sha256=KqDwjpbD-ULHw4QWUXXAYpsdAcrtpaQ8HZFv8X6wS2w,35078
+oldaplib/src/datamodel.py,sha256=GJiWSvfH6VYos4mpxOxj2eoMM1kTNZkhf2ITWGM86Cc,35016
 oldaplib/src/dtypes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/dtypes/bnode.py,sha256=7Swl77PJlzahov7d7ijJExmoVsTkR5JFOvFQf1jDmEg,1555
 oldaplib/src/dtypes/languagein.py,sha256=6h3VrTH8IcTN6mvnWuGvzDoKX_Jh6h9w3wWrLuAWfVc,8593
@@ -70,7 +70,7 @@ oldaplib/src/propertyclass.py,sha256=OuzCSCRp8Qfz-PolmoH7FARfTEvWJd42ghLgvPsgT78
 oldaplib/src/resourceclass.py,sha256=I6m93JhfCh4XAUFgmb6v0fD798DfU7-ImTKrUJk4g-o,102098
 oldaplib/src/user.py,sha256=Z4GXPRkaHXx3glUpPXQdFqYMxQPOuqayDwkTAE5RGjU,48820
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=M9CMkiHBo7maD9Ys1tqzYrH_OFS9QezElZ6MdHOSuMM,22
+oldaplib/src/version.py,sha256=4taJJaGNydi5cJmoZOKzj0v5QfTSj0KJZiAHh1J83MQ,22
 oldaplib/src/xsd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/xsd/floatingpoint.py,sha256=rDReKqh0mXyc4F5wslgTUxbeGf3-PGERyughj5_62YI,8852
 oldaplib/src/xsd/iri.py,sha256=w1Dr0z-REi7yPe3GPGnyzGrLVMvLY03kEeK-AmZ9sxw,8383
@@ -119,7 +119,7 @@ oldaplib/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/test/test_cache.py,sha256=6TGukPUruuj5BsZaPGZdIx9L7v39qB9jIKZkg_GkbW4,702
 oldaplib/test/test_connection.py,sha256=y_t0v9jbo1BFsDlAjei2ckG0iVnLNc4ShlIRxe8GMvg,13386
 oldaplib/test/test_context.py,sha256=atESRnIStobqkydjpVnmpHrcmf6QD9rgEwAZCsHlnXI,4757
-oldaplib/test/test_datamodel.py,sha256=WbtA76PayzUXoWtsVVYsDa1yP5yPILxyycviXH8c9hw,59071
+oldaplib/test/test_datamodel.py,sha256=mzDMN3X_o6_iLdBJANre41nRlj_C4bq61HKFZuvfk3w,59025
 oldaplib/test/test_dtypes.py,sha256=ifXWUc6ExAKGukyM1ziku7Xd9eehg4J7HZy9B63-aPo,8601
 oldaplib/test/test_externalontologies.py,sha256=eExlaKUTsbm1dou_By4_T_qL0iuH5L96v3sjpTYYLWQ,7844
 oldaplib/test/test_hasproperty.py,sha256=r991g8kBTfv1CGs9Hf0fli-AUp7Ob7rOHWYD74h4fjM,11572
@@ -158,6 +158,6 @@ oldaplib/testdata/source_type.yaml,sha256=dSihKikw3O-IlGf6anj5KWMoBYLaweLVF1Zojm
 oldaplib/testdata/test_move_left_of_toL.yaml,sha256=2m1OSQrQFlsCQxeJrjzBAO74LMprNDo_HuyrYGsOeXI,787
 oldaplib/testdata/testlist.yaml,sha256=AT11nXEG81Sfyb-tr1gQV0H_dZBrOCcFuHf7YtL8P2g,1994
 oldaplib/testit.http,sha256=qW7mnr6aNLXFG6lQdLgyhXILOPN6qc5iFVZclLyVvkY,303
-oldaplib-0.3.21.dist-info/METADATA,sha256=KU9qMOmWxkBLV66oysnqbYkRg6kVUN8szL69rz7FAXk,3010
-oldaplib-0.3.21.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.3.21.dist-info/RECORD,,
+oldaplib-0.3.22.dist-info/METADATA,sha256=5hrFKoin1P63-sfNf5-kDGfQc1sSSYBhhosn0INEUIU,3010
+oldaplib-0.3.22.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.3.22.dist-info/RECORD,,