oldaplib 0.3.19__tar.gz → 0.3.21__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.3.19
+Version: 0.3.21
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler
@@ -9,7 +9,6 @@ Requires-Python: >=3.12,<4.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: bcrypt (==5.0.0)
 Requires-Dist: bump2version (>=1.0.1,<2.0.0)
 Requires-Dist: cloudpickle (>=3.1.1,<4.0.0)

{oldaplib-0.3.19 → oldaplib-0.3.21}/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-0.3.19 → oldaplib-0.3.21}/oldaplib/ontologies/admin.trig

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

{oldaplib-0.3.19 → oldaplib-0.3.21}/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-0.3.19 → oldaplib-0.3.21}/oldaplib/src/datamodel.py

@@ -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-0.3.19 → oldaplib-0.3.21}/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-0.3.21/oldaplib/src/version.py

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

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

@@ -373,7 +373,8 @@ 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"),
+            Xsd_QName("shared:commentString")
         })
         self.assertEqual(set(model.get_resclasses()), {
             Xsd_QName("oldap:Project"),

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oldaplib"
-version = "0.3.19"
+version = "0.3.21"
 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.19/oldaplib/src/version.py

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