oldaplib 0.3.5__py3-none-any.whl → 0.3.7__py3-none-any.whl

oldaplib/src/enums/externalontologyattr.py

@@ -15,7 +15,7 @@ class ExternalOntologyAttr(AttributeClass):
     (QName, mandatory, immutable, datatype)
     """
     # order: (QName, mandatory, immutable, datatype)
-    PREFIX = ('oldap:prefix', True, False, Xsd_NCName)
+    PREFIX = ('oldap:prefix', True, True, Xsd_NCName)
     NAMESPACE_IRI = ('oldap:namespaceIri', True, True, NamespaceIRI)
     LABEL = ('rdfs:label', False, False, LangString)
     COMMENT = ('rdfs:comment', False, False, LangString)

oldaplib/src/objectfactory.py

@@ -144,7 +144,9 @@ class ResourceInstance:
                             self.validate_value(self._values[prop_iri], hasprop.prop)
 
         def process_superclasses(superclass: dict[Xsd_QName, ResourceClass]):
-           for sc_iri, sc in superclass.items():
+            for sc_iri, sc in superclass.items():
+                if not sc:
+                    continue
                 if sc.superclass:
                     process_superclasses(sc.superclass)
                 if sc.owl_class_iri == Xsd_QName("oldap:Thing", validate=False):
@@ -506,11 +508,6 @@ class ResourceInstance:
         sparql = context.sparql_context
         sparql += f'''
 SELECT ?predicate ?value
-FROM oldap:onto
-FROM shared:onto
-FROM {graph}:onto
-FROM NAMED oldap:admin
-FROM NAMED {graph}:data
 WHERE {{
 	BIND({iri.toRdf} as ?iri)
     GRAPH {graph}:data {{
@@ -789,6 +786,47 @@ class ResourceInstanceFactory:
             'properties': resclass.properties,
             'superclass': resclass.superclass})
 
+    @staticmethod
+    def read_data(con: IConnection, projectShortName: Xsd_NCName | str, iri: Iri | str) -> dict[Xsd_QName, Any]:
+        if not isinstance(iri, Iri):
+            iri = Iri(iri, validate=True)
+        if not isinstance(projectShortName, Xsd_NCName):
+            graph = Xsd_NCName(projectShortName)
+        else:
+            graph = projectShortName
+
+        context = Context(name=con.context_name)
+        sparql = context.sparql_context
+        sparql += f'''
+        SELECT ?predicate ?value
+        WHERE {{
+            GRAPH {graph}:data {{
+                {iri.toRdf} ?predicate ?value .
+                {iri.toRdf} oldap:grantsPermission ?permset .
+            }}
+            GRAPH oldap:admin {{
+            	{con.userIri.toRdf} oldap:hasPermissions ?permset .
+            	?permset oldap:givesPermission ?DataPermission .
+            	?DataPermission oldap:permissionValue ?permval .
+            }}
+            FILTER(?permval >= {DataPermission.DATA_VIEW.numeric.toRdf})
+        }}
+        '''
+        jsonres = con.query(sparql)
+        res = QueryProcessor(context, jsonres)
+        data = {}
+        for r in res:
+            if r['predicate'].is_qname:
+                if not data.get(r['predicate'].as_qname):
+                    data[r['predicate'].as_qname] = []
+                data[str(r['predicate'].as_qname)].append(str(r['value']))
+            else:
+                raise OldapErrorInconsistency(f"Expected QName as predicate, got {r['predicate']}")
+        if not data.get('rdf:type'):
+            raise OldapErrorNotFound(f'Resource with iri <{iri}> not found.')
+        return data
+
+
     def read(self, iri: Iri | str) -> ResourceInstance:
         if not isinstance(iri, Iri):
             iri = Iri(iri, validate=True)
@@ -797,11 +835,6 @@ class ResourceInstanceFactory:
         sparql = context.sparql_context
         sparql += f'''
         SELECT ?predicate ?value
-        FROM oldap:onto
-        FROM shared:onto
-        FROM {graph}:onto
-        FROM NAMED oldap:admin
-        FROM NAMED {graph}:data
         WHERE {{
         	BIND({iri.toRdf} as ?iri)
             GRAPH {graph}:data {{

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.5"
+__version__ = "0.3.7"

oldaplib/test/test_datamodel.py

@@ -622,10 +622,10 @@ class TestDataModel(unittest.TestCase):
     def test_datamodel_extonto_add(self):
         model = DataModel.read(self._connection, self._project, ignore_cache=True)
         eo = ExternalOntology(con=self._connection,
-                             projectShortName=self._project.projectShortName,
-                             prefix='testonto',
-                             namespaceIri='http://www.example.org/ns/testonto#',
-                             label=LangString("Test ontology@en", "Test ontology@de"))
+                              projectShortName=self._project.projectShortName,
+                              prefix='testonto',
+                              namespaceIri='http://www.example.org/ns/testonto#',
+                              label=LangString("Test ontology@en", "Test ontology@de"))
         model[Xsd_QName('test:testonto')] = eo
         model.update()
         model = DataModel.read(self._connection, self._project, ignore_cache=True)

oldaplib/test/test_objectfactory.py

@@ -6,6 +6,8 @@ from pathlib import Path
 from pprint import pprint
 from time import sleep
 
+from oldaplib.src.cachesingleton import CacheSingletonRedis
+from oldaplib.src.datamodel import DataModel
 from oldaplib.src.objectfactory import ResourceInstanceFactory
 from oldaplib.src.connection import Connection
 from oldaplib.src.enums.action import Action
@@ -129,6 +131,8 @@ class TestObjectFactory(unittest.TestCase):
                     isActive=True)
         user.create()
         cls._tuser = User.read(cls._connection, "factorytestuser")
+        cache = CacheSingletonRedis()
+        cache.clear()
 
 
     @classmethod
@@ -337,7 +341,28 @@ class TestObjectFactory(unittest.TestCase):
                  grantsPermission=Iri('oldap:GenericView'))
         b.create()
 
+    def test_constructor_D(self):
+        dm = DataModel.read(con=self._connection, project='test')
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        Cat = factory.createObjectInstance('Cat')
+
+        mycat = Cat(name="Fluffy", subName="Fluffy the Cat")
+        mycat.create()
+
     def test_read_A(self):
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        Book = factory.createObjectInstance('Book')
+        b = Book(title="The Life and Times of Scrooge",
+                 author="test:TuomasHolopainen",
+                 pubDate="2001-01-01",
+                 grantsPermission=Iri('oldap:GenericView'))
+        b.create()
+        data = factory.read_data(con=self._connection, iri=b.iri, projectShortName='test')
+        self.assertEqual(data['rdf:type'], ['test:Book'])
+        self.assertEqual(data['test:title'], ['The Life and Times of Scrooge'])
+        self.assertEqual(data['test:author'], ['test:TuomasHolopainen'])
+
+    def test_read_B(self):
         factory = ResourceInstanceFactory(con=self._connection, project='test')
         Book = factory.createObjectInstance('Book')
         b = Book(title="The Life and Times of Scrooge",
@@ -354,6 +379,7 @@ class TestObjectFactory(unittest.TestCase):
         self.assertEqual(jsonobj['test:pubDate'], ['2001-01-01'])
         self.assertEqual(jsonobj['test:title'], ['The Life and Times of Scrooge'])
 
+
     def test_value_setter(self):
         factory = ResourceInstanceFactory(con=self._connection, project='test')
         SetterTester = factory.createObjectInstance('SetterTester')

oldaplib/testdata/objectfactory_test.trig

@@ -30,6 +30,46 @@ test:shacl {
 
     test:shapes schema:version "0.1.0"^^xsd:string .
 
+    test:MammalShape a sh:NodeShape ;
+        sh:targetClass test:Mammal ;
+        dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+        sh:node oldap:ThingShape ;
+        sh:property [
+            sh:path rdf:type ;
+        ],
+        [
+            sh:path test:name ;
+            sh:datatype xsd:string ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+       ] .
+
+    test:CatShape a sh:NodeShape ;
+        sh:targetClass test:Cat ;
+        dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+        sh:node oldap:ThingShape, test:MammalShape ;
+        sh:property [
+            sh:path rdf:type ;
+        ],
+        [
+            sh:path test:subName ;
+            sh:datatype xsd:string ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        ] .
+
+
+
     test:PersonShape a sh:NodeShape ;
         sh:targetClass test:Person ;
         dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
@@ -776,6 +816,46 @@ test:onto {
     test:ontology owl:type owl:Ontology ;
     owl:versionInfo "0.1.0"^^xsd:string .
 
+    test:Mammal rdf:type owl:Class ;
+        dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+        rdfs:subClassOf oldap:Thing ,
+            [
+                rdf:type owl:Restriction ;
+                owl:onProperty test:name ;
+                owl:onDataRange xsd:string ;
+            ] .
+
+    test:Cat rdf:type owl:Class ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
+        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
+        rdfs:subClassOf oldap:Thing, test:Mammal,
+            [
+                rdf:type owl:Restriction ;
+                owl:onProperty test:subName ;
+                owl:onDataRange xsd:string ;
+            ] .
+
+    test:name rdf:type owl:DatatypeProperty ;
+        rdfs:domain test:Mammal ;
+        rdfs:range xsd:string ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime .
+
+    test:subName rdf:type owl:DatatypeProperty ;
+        rdfs:domain test:Cat ;
+        rdfs:range xsd:string ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime .
+
     test:Person rdf:type owl:Class ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;

{oldaplib-0.3.5.dist-info → oldaplib-0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oldaplib
-Version: 0.3.5
+Version: 0.3.7
 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.5.dist-info → oldaplib-0.3.7.dist-info}/RECORD

@@ -22,7 +22,7 @@ oldaplib/src/enums/action.py,sha256=aL7XXmoZ63_L2TTR37vqHpPPf5H_kYiPunNyiSDN28U,
 oldaplib/src/enums/adminpermissions.py,sha256=v8Rc83NPSG_s7830-I7CbmKIhOioN2YkSH1xhWMKXdU,1998
 oldaplib/src/enums/attributeclass.py,sha256=Lc7OnMMl9vjXj0SuL0l30iEjwC3oWDv_C8PFeTavDGc,3006
 oldaplib/src/enums/datapermissions.py,sha256=0KiDjrPeSpGDAui8Z74sFBdDm64stzcMJx_dVEa2-bo,3437
-oldaplib/src/enums/externalontologyattr.py,sha256=U5vlEQwOkf80mHbztBXicpsWSOCNcHzhoRFJlPnwj-E,808
+oldaplib/src/enums/externalontologyattr.py,sha256=H7SrWrhe1Dkz_t1OFCWZVh3_14lJDltYGh3dOFr1Z6w,807
 oldaplib/src/enums/haspropertyattr.py,sha256=ZncedtYDNAP0kaPE_nsbzb7EdAt32wMXTPxWBBwwvy4,748
 oldaplib/src/enums/language.py,sha256=OfQsFpIBj8lGBbZEqVCR_1F-bimPM48vqBl4EKBgggY,4623
 oldaplib/src/enums/oldaplistattr.py,sha256=xuOU3oP35-PFFmlI-jlN28yqdk5lp_OzScKCC1O4IDI,620
@@ -59,7 +59,7 @@ oldaplib/src/helpers/tools.py,sha256=sNbiOLucTGNFzZmiWwPLFOb80VTXQH0Zd9uCGubhzAk
 oldaplib/src/iconnection.py,sha256=XlOc2Kh4tK_UOHydLQwlWjUFLUze-Aq_vEZpf9KS1-s,3677
 oldaplib/src/in_project.py,sha256=2KuhHPj8DNveFRBeImrRfxlCOYhBK-mcxXYUp6s--j8,10672
 oldaplib/src/model.py,sha256=kUdrwa0BBco-HWWQbG3_Tpkwar6GLbdNfkcWbvze30M,19218
-oldaplib/src/objectfactory.py,sha256=yXfQ7ijdqRw_zhwczbWfBumkre5qqZEkPWpeblSCFaE,45053
+oldaplib/src/objectfactory.py,sha256=a2afDGUlh52xGaP5V2Po9Sr6om4DXiRdhsJ0IT9IPjA,46502
 oldaplib/src/oldaplist.py,sha256=sGAvEEJukRCjM70G0NFaR-L9YPleQTOtdWGExj3oYL8,42933
 oldaplib/src/oldaplist_helpers.py,sha256=1Gur0nS1PCKb9iUtCKPUFDOYjw6vvAwYpe-G3DdxlEc,14213
 oldaplib/src/oldaplistnode.py,sha256=NnC2juEGTtEkDO6OlB9PjSw_zTF-wSsRUgEk-6VV9DA,87344
@@ -70,7 +70,7 @@ oldaplib/src/propertyclass.py,sha256=pnaDsmyGKQnJaaOHXA0XyLcp4zn1b1vC9sLbjXls4lM
 oldaplib/src/resourceclass.py,sha256=EIxyd7Z_w59wDxWLXCaLvhhvh5SjLEUWb8gqmZz8LLM,102046
 oldaplib/src/user.py,sha256=Z4GXPRkaHXx3glUpPXQdFqYMxQPOuqayDwkTAE5RGjU,48820
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=7Mpk_ZUorFUStSKEAk4F5dnB7uCLNFviloAVMVv5V-8,21
+oldaplib/src/version.py,sha256=Jl3PXrkK7-Eox4dKIMxhOA7uVtSB0CC7qOf4NAQqa_s,21
 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,14 +119,14 @@ 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=rft84E-mnkUQGNMF2N8aIB4tdkdNezEHPodUZf5xqrM,59020
+oldaplib/test/test_datamodel.py,sha256=4s9ijonHaMLbL32Rz6JBflyxxG0TizPNbOpFLhp5FGg,59024
 oldaplib/test/test_dtypes.py,sha256=ifXWUc6ExAKGukyM1ziku7Xd9eehg4J7HZy9B63-aPo,8601
 oldaplib/test/test_externalontologies.py,sha256=YA7zK5_feN1-YlLe72W1MoMGZ56Dv4_-Tx2BdJ7N50s,7787
 oldaplib/test/test_hasproperty.py,sha256=r991g8kBTfv1CGs9Hf0fli-AUp7Ob7rOHWYD74h4fjM,11572
 oldaplib/test/test_in_project.py,sha256=DYT-guwRQ9crnfEt7cQZxoEMxThin7QeymNce3jaZx4,7779
 oldaplib/test/test_langstring.py,sha256=37BeKiQzj63G-SyS_paK_SEG7ulRbGrE89Mz40UB_bE,15146
 oldaplib/test/test_language_in.py,sha256=ELqHO-YIsZSCPF3E3rWde4J7rERL7En7sV_pzQ00zgs,8826
-oldaplib/test/test_objectfactory.py,sha256=rZi1vMWqxrYiYn53jx84XiQQKYdoK4BUPvYEKo3xSfk,30776
+oldaplib/test/test_objectfactory.py,sha256=gMhZ18jeuM5lv_zeamDKhk9xoPrVi_uXyOaYjuS4Tgg,31943
 oldaplib/test/test_observable_dict.py,sha256=GxD0sM0nsVfVRBu92SFGkJ6--YXq4ibBWI4IpjZZzDU,1396
 oldaplib/test/test_observable_set.py,sha256=JWZSoAsr8XIEBXPVgSVJjQQEEc8uSAme5IrFYLYVVXw,6313
 oldaplib/test/test_oldaplist.py,sha256=9wo3tEOHt5bIuXyvSSyTzjhtdKrQHiiAA6EfVBuq4wI,20114
@@ -149,7 +149,7 @@ oldaplib/testdata/institution_or_building_type.yaml,sha256=SA2rsQwoAdyn6eSIJU1il
 oldaplib/testdata/language.yaml,sha256=YaQA77d7QyOydqNylR5RSb-0A6h9pLM4mgadJSrYC3A,451
 oldaplib/testdata/location_type.yaml,sha256=amlhYNDc9qLv_if6urtAtBTnEXrVrb6_aulE180GYkc,1323
 oldaplib/testdata/means_of_transportation.yaml,sha256=WOqtSHlw8gCK54d5hmibCWyL_H1DRtBBpUdFNwIUBJo,788
-oldaplib/testdata/objectfactory_test.trig,sha256=R0E_dk0NFUlokE18aeI6aTIyeM6hcqvZ0L-yck1Zc9s,75243
+oldaplib/testdata/objectfactory_test.trig,sha256=KpZfLZaK8oVAzdx4xGGFCCp6tzdR8XhOw11LfBC5wII,78733
 oldaplib/testdata/playground_list.yaml,sha256=EypG4WQoq9emI10Hj-DrKjplgxr1MrQBPc0ppV_rHQQ,1620
 oldaplib/testdata/role.yaml,sha256=CLI9f2HD_ulYw67DqWntaMLWH0CGWz1cfNkvxcnK6XQ,691
 oldaplib/testdata/source_type-1.yaml,sha256=Khow4rD8oZgBAbUex4T-nKBTrx0bAseMhTShS7-MgGw,921
@@ -157,6 +157,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.5.dist-info/METADATA,sha256=YpXOxS-1xvQQpvMl_REtdkSbsizXGNcE3zhylyTrj2s,2854
-oldaplib-0.3.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-oldaplib-0.3.5.dist-info/RECORD,,
+oldaplib-0.3.7.dist-info/METADATA,sha256=sTq_7C3AnzAxZj55_5f1XmG1_70eXUeJQKhKm4gnglY,2854
+oldaplib-0.3.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+oldaplib-0.3.7.dist-info/RECORD,,