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

oldaplib/ontologies/admin-testing.trig

@@ -1,12 +1,14 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix schema: <http://schema.org/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @prefix oldap: <http://oldap.org/base#> .
 @prefix : <http://oldap.org/base#> .
 
 @prefix hyha: <http://hyperhamlet.unibas.ch/> .
+@prefix britnet: <http://www.salsah.org/version/2.0/SwissBritNet#> .
 
 :admin {
 
@@ -95,3 +97,22 @@
     <<<https://orcid.org/0000-0002-7403-9595> :inProject <http://www.salsah.org/version/2.0/SwissBritNet>>> :hasAdminPermission :ADMIN_RESOURCES .
 
 }
+
+hyha:shacl {
+   hyha:shapes schema:version "0.1.0"^^xsd:string .
+}
+
+hyha:onto {
+        hyha:ontology rdf:type owl:Ontology ;
+            owl:versionInfo "0.1.0"^^xsd:string .
+}
+
+britnet:shacl {
+   britnet:shapes schema:version "0.1.0"^^xsd:string .
+}
+
+britnet:onto {
+        britnet:ontology rdf:type owl:Ontology ;
+            owl:versionInfo "0.1.0"^^xsd:string .
+}
+

oldaplib/ontologies/admin.trig

@@ -191,5 +191,4 @@
         :inProject :HyperHamlet ;
         :hasPermissions :GenericView ;
         :isActive false .
-
 }

oldaplib/ontologies/shared.trig

@@ -14,6 +14,20 @@
 shared:shacl {
     shared:shapes schema:version "0.1.0"^^xsd:string .
 
+    ###########################################################################
+    # Shared properties
+    ###########################################################################
+    :commentStringShape a sh:PropertyShape ;
+        sh:path :commentString ;
+        oldap:statementProperty true ;
+        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 ;
+        sh:name "Simple comment"@en ;
+        sh:description "A simple comment as a string"@en ;
+        sh:datatype xsd:string .
+
     ###########################################################################
     # Chronology Date definitions
     ###########################################################################
@@ -176,7 +190,18 @@ shared:onto {
         owl:versionInfo "0.1.0"^^xsd:string .
 
     ###############################################################################
-    # Properties used for :Project
+    # Generic comment property
+    ###############################################################################
+
+    :commentString rdf:type rdf:Property, owl:DatatypeProperty ;
+        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:range xsd:string .
+
+    ###############################################################################
+    # Properties used for :ChronologyObject
     ###############################################################################
 
     oldap:startJDC rdf:type owl:DatatypeProperty ;
@@ -358,6 +383,5 @@ shared:onto {
                     owl:onDataRange xsd:string ;
                 ] .
 
-
 }
 

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)
@@ -521,13 +521,10 @@ class DataModel(Model):
             # create empty data model -> update -> add resource without property -> add property -> update
             # _prop_changeset is not empoty after update... ERROR!!!!!!!!!!!!!!!!!!!!!
             try:
-                if resclassiri == 'test:Book':
-                    pass
                 resclass = ResourceClass.read(con, project, Xsd_QName(resclassiri, validate=False), sa_props=sa_props, ignore_cache=ignore_cache)
+                resclasses.append(resclass)
             except OldapError as er:
                 print(f'Error reading resource class {resclassiri}: {er}')
-
-            resclasses.append(resclass)
         instance = cls(project=project, con=con, propclasses=propclasses, resclasses=resclasses, extontos=extontos)
         for qname in instance.get_extontos():
             instance[qname].set_notifier(instance.notifier, qname)

oldaplib/src/propertyclass.py

@@ -200,7 +200,7 @@ class PropertyClass(Model, Notify):
                  _externalOntology: bool | Xsd_boolean = False,
                  _internal: Xsd_QName | None = None,  # DO NOT USE!! Only for serialization!
                  _force_external: bool | None = None,  # DO NOT USE!! Only for serialization!
-                 _from_triplestore: bool = False,
+                 _from_triplestore: bool = False,  # DO NOT USE!! Only for serialization!
                  validate: bool = False,
                  **kwargs):
         """
@@ -255,7 +255,6 @@ class PropertyClass(Model, Notify):
                        validate=validate)
         Notify.__init__(self, notifier, notify_data)
 
-        #self.__statementProperty = _statementProperty if isinstance(_statementProperty, Xsd_boolean) else Xsd_boolean(_statementProperty, validate=True)
         self._externalOntology = _externalOntology if isinstance(_externalOntology, Xsd_boolean) else Xsd_boolean(_externalOntology, validate=True)
         if self._externalOntology:
             self._force_external = True
@@ -382,7 +381,7 @@ class PropertyClass(Model, Notify):
             **({'_internal': self._internal} if self._internal else {}),
             **({'_force_external': self._force_external} if self._force_external else {}),
             **({'_externalOntology': self._externalOntology} if self._externalOntology else {}),
-            **({'__statementProperty': self.__statementProperty} if self.__statementProperty else {}),
+            #**({'__statementProperty': self.__statementProperty} if self.__statementProperty else {}),
             '_from_triplestore': self.__from_triplestore,
         }
 

oldaplib/src/version.py

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

oldaplib/test/test_datamodel.py

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

{oldaplib-0.3.20.dist-info → oldaplib-0.3.22.dist-info}/METADATA

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

@@ -1,16 +1,16 @@
 oldaplib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/apps/load_list.py,sha256=Dr0oLPUMoJkAD55_flAt6y8hjx_ci7uuOQzYBUOr8Sc,1840
-oldaplib/ontologies/admin-testing.trig,sha256=OpVt8QUXphWGtDflaUxqp5QUJ65VxujuXXHC_BlBe7U,5206
-oldaplib/ontologies/admin.trig,sha256=S53TALvsBvbkV_Put4bUlwk8ZcD-Fj-K6LlsKkiuB98,8964
+oldaplib/ontologies/admin-testing.trig,sha256=O1_WateUvdouG0zEdnNG0BWkIIMdoTGaTqb1wAD8njs,5694
+oldaplib/ontologies/admin.trig,sha256=ByxFYdI9rh-RhLnSpkdZHMMWgXCSTi2YMJc1QgBHFhE,8963
 oldaplib/ontologies/example.trig,sha256=MdRrFBZZ1L6aUDiT6aX4cnXiy-RoZHczF3Exn7aBSmU,1518
 oldaplib/ontologies/oldap.trig,sha256=i2XanqKlhWSIdD17fLu5g0Luq2GORQCcyIfLn9Kummk,60241
 oldaplib/ontologies/oldap.ttl,sha256=qdA0uiSjzVhkc1d5IN2y5ioK1QMzwl-TTnn3M_D1Kh8,29446
-oldaplib/ontologies/shared.trig,sha256=BPocpJFbHIEq1XEd1P3yjMg7q-vSYyIVDCa97RILuMI,18045
+oldaplib/ontologies/shared.trig,sha256=p9UE8mT8Ye8JKyZpfjH65VDJM8ho5jGXkX-jA5IS9sI,19329
 oldaplib/ontologies/standard/.gitsave,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=HXur6vCFW4WGsQ8sKxVK0uz2I742_8xm1nVDJ8JNviY,35147
+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
@@ -66,11 +66,11 @@ oldaplib/src/oldaplistnode.py,sha256=NnC2juEGTtEkDO6OlB9PjSw_zTF-wSsRUgEk-6VV9DA
 oldaplib/src/oldaplogging.py,sha256=IDSOylms9OSTInYPC4Y2QrTTEzRL0T5I2QssCevOhTU,1242
 oldaplib/src/permissionset.py,sha256=bzzVuZ7O_yVMujziwo32GEJIZYGG3g5gTds4HjLmGtU,31874
 oldaplib/src/project.py,sha256=DNwViRg19zkE1F0zuWqQFK008uTVehVAu7xNbyessig,34207
-oldaplib/src/propertyclass.py,sha256=y82BQDTGKzLGJSENNBb3LD8BTZmSdGRoYNEeUlV4628,97326
+oldaplib/src/propertyclass.py,sha256=OuzCSCRp8Qfz-PolmoH7FARfTEvWJd42ghLgvPsgT78,97213
 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=uAkobnetgdGdqCULNC7XUYGJPjMNHvADSXk8oSo_jpY,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=4s9ijonHaMLbL32Rz6JBflyxxG0TizPNbOpFLhp5FGg,59024
+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.20.dist-info/METADATA,sha256=E6OjLAX0Alyi2IVi0EAr2_ODmkKoh9IaxWL9AMO8gwU,3010
-oldaplib-0.3.20.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.3.20.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,,