oldaplib 0.4.3__py3-none-any.whl → 0.4.5__py3-none-any.whl

oldaplib/src/enums/{XXXeditor.py → editor.py}

@@ -1,3 +1,4 @@
+import json
 from enum import Enum, unique, EnumMeta
 
 from oldaplib.src.helpers.serializer import serializer
@@ -72,7 +73,3 @@ class Editor(Enum, metaclass=_ValidateEnumMeta):
     def _as_dict(self):
         return {"value": self.value }
 
-
-if __name__ == "__main__":
-    print(Editor(value="dash:TextFieldWithLangEditor"))
-

oldaplib/src/enums/haspropertyattr.py

@@ -1,6 +1,7 @@
 from enum import unique
 
 from oldaplib.src.enums.attributeclass import AttributeClass, Target
+from oldaplib.src.enums.editor import Editor
 from oldaplib.src.xsd.iri import Iri
 from oldaplib.src.xsd.xsd_decimal import Xsd_decimal
 from oldaplib.src.xsd.xsd_integer import Xsd_integer
@@ -16,5 +17,5 @@ class HasPropertyAttr(AttributeClass):
     MAX_COUNT = ('sh:maxCount', False, False, Xsd_integer)
     ORDER = ('sh:order', False, False, Xsd_decimal, Target.SHACL)
     GROUP = ('sh:group', False, False, Xsd_QName, Target.SHACL)
-    EDITOR = ('dash:editor', False, False, Xsd_QName, Target.SHACL)
+    EDITOR = ('dash:editor', False, False, Editor, Target.SHACL)
 

oldaplib/src/objectfactory.py

@@ -1,5 +1,6 @@
 import re
 import textwrap
+from pprint import pprint
 
 import jwt
 
@@ -1073,7 +1074,7 @@ class ResourceInstance:
                     continue
                 if not data.get(r['predicate'].as_qname):
                     data[r['predicate'].as_qname] = []
-                data[str(r['predicate'].as_qname)].append(str(r['value']))
+                data[str(r['predicate'].as_qname)].append(r['value'])
             else:
                 raise OldapErrorInconsistency(f"Expected QName as predicate, got {r['predicate']}")
         if not data.get('rdf:type'):

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.4.3"
+__version__ = "0.4.5"

oldaplib/src/xsd/iri.py

@@ -246,6 +246,10 @@ class Iri(Xsd):
         parts = self.__value.split(':')
         return parts[1]
 
+    @property
+    def value(self) -> str:
+        return self.__value
+
 
 if __name__ == '__main__':
     #iri = Iri("oldap:HyperHamlet\".}\nSELECT * WHERE{?s ?p ?s})#")

oldaplib/test/test_hasproperty.py

@@ -4,6 +4,7 @@ from time import sleep
 
 from oldaplib.src.connection import Connection
 from oldaplib.src.dtypes.namespaceiri import NamespaceIRI
+from oldaplib.src.enums.editor import Editor
 from oldaplib.src.enums.xsd_datatypes import XsdDatatypes
 from oldaplib.src.hasproperty import HasProperty
 from oldaplib.src.helpers.context import Context
@@ -74,14 +75,14 @@ class TestHasProperty(unittest.TestCase):
                         maxCount=1,
                         group=Xsd_QName('test:group'),
                         order=1,
-                        editor=Xsd_QName("dash:TextAreaEditor")),
+                        editor=Editor.TEXT_AREA),
             HasProperty(con=self._connection,
                         project=self._project,
                         prop=Xsd_QName("test:comment"),
                         maxCount=1,
                         group=Xsd_QName('test:group'),
                         order=2,
-                        editor=Xsd_QName("dash:TextFieldEditor")),
+                        editor=Editor.TEXT_FIELD),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,
@@ -100,13 +101,13 @@ class TestHasProperty(unittest.TestCase):
         self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].maxCount, Xsd_integer(1))
         self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].order, Xsd_decimal(1))
         self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].group, Xsd_QName('test:group'))
-        self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].editor, Xsd_QName("dash:TextAreaEditor"))
+        self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].editor, Editor.TEXT_AREA)
 
         self.assertIsNone(r1[Xsd_QName("test:comment")].minCount)
         self.assertEqual(r1[Xsd_QName("test:comment")].maxCount, Xsd_integer(1))
         self.assertEqual(r1[Xsd_QName("test:comment")].order, Xsd_decimal(2))
         self.assertEqual(r1[Xsd_QName("test:comment")].group, Xsd_QName('test:group'))
-        self.assertEqual(r1[Xsd_QName('test:comment')].editor, Xsd_QName("dash:TextFieldEditor"))
+        self.assertEqual(r1[Xsd_QName('test:comment')].editor, Editor.TEXT_FIELD)
 
     def test_creation_B(self):
         p1 = PropertyClass(con=self._connection,
@@ -117,9 +118,9 @@ class TestHasProperty(unittest.TestCase):
         hasproperties: list[HasProperty] = [
             HasProperty(con=self._connection, project=self._project, prop=p1,
                         minCount=1, maxCount=1, group=Xsd_QName('test:group'),
-                        order=1, editor=Xsd_QName("dash:TextAreaEditor")),
+                        order=1, editor=Editor.TEXT_AREA),
             HasProperty(con=self._connection, project=self._project, prop=Xsd_QName("test:comment"),
-                        maxCount=1, group=Xsd_QName('test:group'), order=2, editor=Xsd_QName("dash:TextFieldEditor")),
+                        maxCount=1, group=Xsd_QName('test:group'), order=2, editor=Editor.TEXT_FIELD),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,
@@ -137,12 +138,12 @@ class TestHasProperty(unittest.TestCase):
         r1[Xsd_QName('test:hasprop_test_B')].maxCount = Xsd_integer(2)
         r1[Xsd_QName('test:hasprop_test_B')].order = Xsd_decimal(2)
         r1[Xsd_QName('test:hasprop_test_B')].group = Xsd_QName('test:groupB')
-        r1[Xsd_QName('test:hasprop_test_B')].editor = Xsd_QName("dash:TextFieldEditor")
+        r1[Xsd_QName('test:hasprop_test_B')].editor = Editor.TEXT_FIELD
 
         r1[Xsd_QName('test:comment')].maxCount = Xsd_integer(2)
         r1[Xsd_QName('test:comment')].order = Xsd_decimal(1)
         r1[Xsd_QName('test:comment')].group = Xsd_QName('test:groupB')
-        r1[Xsd_QName('test:comment')].editor = Xsd_QName("dash:TextAreaEditor")
+        r1[Xsd_QName('test:comment')].editor = Editor.TEXT_AREA
 
         r1.update()
         r1 = ResourceClass.read(con=self._connection,
@@ -151,11 +152,11 @@ class TestHasProperty(unittest.TestCase):
         self.assertEqual(Xsd_integer(2), r1[Xsd_QName('test:hasprop_test_B')].maxCount)
         self.assertEqual(Xsd_decimal(2), r1[Xsd_QName('test:hasprop_test_B')].order)
         self.assertEqual(Xsd_QName('test:groupB'), r1[Xsd_QName('test:hasprop_test_B')].group)
-        self.assertEqual(Xsd_QName("dash:TextFieldEditor"), r1[Xsd_QName('test:hasprop_test_B')].editor)
+        self.assertEqual(Editor.TEXT_FIELD, r1[Xsd_QName('test:hasprop_test_B')].editor)
 
         self.assertEqual(Xsd_integer(2), r1[Xsd_QName('test:comment')].maxCount)
         self.assertEqual(Xsd_decimal(1), r1[Xsd_QName('test:comment')].order)
-        self.assertEqual(Xsd_QName("dash:TextAreaEditor"), r1[Xsd_QName('test:comment')].editor)
+        self.assertEqual(Editor.TEXT_AREA, r1[Xsd_QName('test:comment')].editor)
 
     def test_modification_add(self):
         p1 = PropertyClass(con=self._connection,
@@ -169,7 +170,7 @@ class TestHasProperty(unittest.TestCase):
                         prop=p1,
                         minCount=1,
                         order=1,
-                        editor=Xsd_QName("dash:TextAreaEditor")),
+                        editor=Editor.TEXT_AREA),
             HasProperty(con=self._connection,
                         project=self._project,
                         prop=Xsd_QName("test:comment"),
@@ -194,7 +195,7 @@ class TestHasProperty(unittest.TestCase):
         r1[Xsd_QName('test:hasprop_test_C')].editor = None
         r1[Xsd_QName("test:comment")].minCount = Xsd_integer(1)
         r1[Xsd_QName("test:comment")].order = Xsd_decimal(1)
-        r1[Xsd_QName("test:comment")].editor = Xsd_QName("dash:TextFieldEditor")
+        r1[Xsd_QName("test:comment")].editor = Editor.TEXT_FIELD
 
         r1.update()
         r1 = ResourceClass.read(con=self._connection,
@@ -205,7 +206,7 @@ class TestHasProperty(unittest.TestCase):
         self.assertIsNone(r1[Xsd_QName('test:hasprop_test_C')].editor)
         self.assertEqual(Xsd_integer(1), r1[Xsd_QName("test:comment")].minCount)
         self.assertEqual(Xsd_decimal(1), r1[Xsd_QName("test:comment")].order)
-        self.assertEqual(Xsd_QName("dash:TextFieldEditor"), r1[Xsd_QName("test:comment")].editor)
+        self.assertEqual(Editor.TEXT_FIELD, r1[Xsd_QName("test:comment")].editor)
 
     def test_modification_delete(self):
         p1 = PropertyClass(con=self._connection,
@@ -216,10 +217,10 @@ class TestHasProperty(unittest.TestCase):
         hasproperties: list[HasProperty] = [
             HasProperty(con=self._connection, project=self._project, prop=p1,
                         minCount=1, maxCount=1, group=Xsd_QName('test:group'), order=1,
-                        editor=Xsd_QName("dash:TextFieldEditor")),
+                        editor=Editor.TEXT_FIELD),
             HasProperty(con=self._connection, project=self._project, prop=Xsd_QName("test:comment"),
                         maxCount=1, group=Xsd_QName('test:group'), order=2,
-                        editor=Xsd_QName("dash:TextAreaEditor")),
+                        editor=Editor.TEXT_AREA),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,

{oldaplib-0.4.3.dist-info → oldaplib-0.4.5.dist-info}/METADATA

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

{oldaplib-0.4.3.dist-info → oldaplib-0.4.5.dist-info}/RECORD

@@ -2,7 +2,6 @@ oldaplib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/ontologies/admin-testing.trig,sha256=w2I3Fk7J9MAPfRmDunFL-4dyyvsmiwderUid18uZjaA,8763
 oldaplib/ontologies/admin.trig,sha256=0pEGowW5Zjt7_Pp_Cuf_LxHixbGfkjADnbMYBHBDsoo,6759
 oldaplib/ontologies/example.trig,sha256=MdRrFBZZ1L6aUDiT6aX4cnXiy-RoZHczF3Exn7aBSmU,1518
-oldaplib/ontologies/gaga.trigs,sha256=4SIOyCwHXE4u2AGHWNM9rElqEkGvPQk6rZ8TAWFRPqI,544
 oldaplib/ontologies/oldap.trig,sha256=OEcjBUiTdE3SuUA0Z3F20azI8abeK1OIpKqcQo1pjvw,63764
 oldaplib/ontologies/oldap.ttl,sha256=qdA0uiSjzVhkc1d5IN2y5ioK1QMzwl-TTnn3M_D1Kh8,29446
 oldaplib/ontologies/shared.trig,sha256=8BMbhsqmnGAFUotc1bGc6morWhJqU0pCGy9TlkiEKIY,27550
@@ -21,14 +20,14 @@ oldaplib/src/dtypes/languagein.py,sha256=6h3VrTH8IcTN6mvnWuGvzDoKX_Jh6h9w3wWrLuA
 oldaplib/src/dtypes/namespaceiri.py,sha256=kbLuqS-OzWCelGkGMUP0IN43LibrTDfn4s7cm8p73Ro,2797
 oldaplib/src/dtypes/rdfset.py,sha256=1RNbjQuUknaEfj84o-AsXEJvEWs3OI6QSKe4p6aDXqc,7782
 oldaplib/src/dtypes/xsdset.py,sha256=oMFSY7JGBf0CYneoHL3OtnFIeEPaULN3FdUW7u15_I4,4256
-oldaplib/src/enums/XXXeditor.py,sha256=Jh4_fEKkQjm-eCbZk8eP_DOQZVwwyrXy0UyNr6s-id0,2236
 oldaplib/src/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/enums/action.py,sha256=aL7XXmoZ63_L2TTR37vqHpPPf5H_kYiPunNyiSDN28U,828
 oldaplib/src/enums/adminpermissions.py,sha256=nn76g2E8TIhkiVbZ64LGt81NuPwFXIDRISKBV6l9dyM,1969
 oldaplib/src/enums/attributeclass.py,sha256=CSXeL0QlLKxbk27vkPmLuFY4QjuUi5xsO9ncOUM3qds,3437
 oldaplib/src/enums/datapermissions.py,sha256=MiaVHXzNDKTGnZJ9pvs-IgQotyV4wA3X484s2RVMOvs,4104
+oldaplib/src/enums/editor.py,sha256=sb7jMh7eC4pq3fEGK2ufZKwcUD84wnzGLXoRrhjp6Ro,2163
 oldaplib/src/enums/externalontologyattr.py,sha256=H7SrWrhe1Dkz_t1OFCWZVh3_14lJDltYGh3dOFr1Z6w,807
-oldaplib/src/enums/haspropertyattr.py,sha256=x9z2b59aFhV3gx8IVz-743dAQ_wfMTzZuN1IqnLwpBM,831
+oldaplib/src/enums/haspropertyattr.py,sha256=i_KiPY9cUi8QHdYHjwPLmEMPIiJDFV8jBdT-JVFiZxA,873
 oldaplib/src/enums/language.py,sha256=OfQsFpIBj8lGBbZEqVCR_1F-bimPM48vqBl4EKBgggY,4623
 oldaplib/src/enums/oldaplistattr.py,sha256=xuOU3oP35-PFFmlI-jlN28yqdk5lp_OzScKCC1O4IDI,620
 oldaplib/src/enums/oldaplistnodeattr.py,sha256=qokSxE-0FLyWNipjjY3gZJC2bBEt1qS1Z2SFg-gb0kc,722
@@ -64,7 +63,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=ZnfeOFwpdPh1oyC2mAGH8DnSD9afxYtvsh7_GrfGVgQ,10663
 oldaplib/src/model.py,sha256=wgvXaR2GVHk4hJxoL6rigFHwjPYEukBOjtf1Jmo-m9A,19326
-oldaplib/src/objectfactory.py,sha256=F8QcxKdgvtrmnRcgnSwHICQYkX13HeScF7ErBzOnug4,85841
+oldaplib/src/objectfactory.py,sha256=4pPzsbbjnmtAobMH4ZIazwFZVzCuOd8MZWCZ2lZgOz8,85862
 oldaplib/src/oldaplist.py,sha256=s5afrHtUnvDfMUFoZTt-jMxlBlmK2c0tLeTMp0KiIfg,43077
 oldaplib/src/oldaplist_helpers.py,sha256=D_X7KdFjPNlX-OwR04D6onxhFucrGo8052WuJPRjLkA,14213
 oldaplib/src/oldaplistnode.py,sha256=NnC2juEGTtEkDO6OlB9PjSw_zTF-wSsRUgEk-6VV9DA,87344
@@ -75,10 +74,10 @@ oldaplib/src/resourceclass.py,sha256=zJNWNY1TfhGs-A2HNa1DO0KAajps_1jMQsoEkUsr7P0
 oldaplib/src/role.py,sha256=AWtZx80OVERT2xbKeuP8g32VSXkm4MVlzeUWd9nh6mQ,30741
 oldaplib/src/user.py,sha256=iTJzSvR0xfc3FFkoKG-q5LptkWB_PGpRGpG-L3271z8,55833
 oldaplib/src/userdataclass.py,sha256=4kWktau9XSv5alfEVuOvikfxnSSUSKT8cw77TWdMhQM,13921
-oldaplib/src/version.py,sha256=-0DFAS3GW84dLmJEuzbtUA7qvIf_cBb4LhqSg0oFfeI,21
+oldaplib/src/version.py,sha256=LHFUavV7Y99A-kKkHFv_mfCPFBihywzHsYRHNSa6xBs,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
+oldaplib/src/xsd/iri.py,sha256=VrM1rgs-DKEuYLI8SUBp7QWMEZbxzxoUcvFKKfqY7mA,8454
 oldaplib/src/xsd/xsd.py,sha256=KiAIhqE7y5s7rPZWxA8eP-1Spf_saFOndNznaWOKSbM,1550
 oldaplib/src/xsd/xsd_anyuri.py,sha256=tsZfOpIlsomQubywMmXzgoX-LvtQ7hBdfP7TrGpW7Xk,6244
 oldaplib/src/xsd/xsd_base64binary.py,sha256=beHouGagNdqTxH7MHh03YKuErlHx4qSjmBrKdGB6sTU,3930
@@ -127,7 +126,7 @@ oldaplib/test/test_context.py,sha256=0qCTOOS6lKjjlZXRxXOoWeix5HnvgwcmKzOF17Fou6M
 oldaplib/test/test_datamodel.py,sha256=AHClO0KyYFGI44OBO5wA21GOQDXL8NrVsE3skhojrUo,59921
 oldaplib/test/test_dtypes.py,sha256=ifXWUc6ExAKGukyM1ziku7Xd9eehg4J7HZy9B63-aPo,8601
 oldaplib/test/test_externalontologies.py,sha256=WUPjTbklMmrM4OucPXOChyNmwFD9qdYVKkZyo0WHlP0,7797
-oldaplib/test/test_hasproperty.py,sha256=cU9t7uBaMxtIVbpk3UyGjPyIzQKDSS2PzqGHIINYZRw,13515
+oldaplib/test/test_hasproperty.py,sha256=_cc-wH_b4c_GIDOLQxirbAS7486KC19YSUxzykf7QTw,13320
 oldaplib/test/test_in_project.py,sha256=OV5csuPwxcctmOM2HsB_ITmXXASRcH9-A2GlWW5foa4,7580
 oldaplib/test/test_langstring.py,sha256=37BeKiQzj63G-SyS_paK_SEG7ulRbGrE89Mz40UB_bE,15146
 oldaplib/test/test_language_in.py,sha256=ELqHO-YIsZSCPF3E3rWde4J7rERL7En7sV_pzQ00zgs,8826
@@ -164,6 +163,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.4.3.dist-info/METADATA,sha256=K5sUH-ivSkbjm9EI2IjPFsUygs_gBmRxjfEbVIWvFQ8,3035
-oldaplib-0.4.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.4.3.dist-info/RECORD,,
+oldaplib-0.4.5.dist-info/METADATA,sha256=VLeo79-yIMMJG2qmHv-s4uBvZrNntcNPYXp_RAkpLvQ,3035
+oldaplib-0.4.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.4.5.dist-info/RECORD,,

oldaplib/ontologies/gaga.trigs

@@ -1,23 +0,0 @@
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix o: <http://www.ooo.org/ns#> .
-
-@prefix : <https://gaga.com/> .
-
-:test {
-    :Unknown o:hasName "Unknown" .
-
-    :UserA o:hasName "UserA" ;
-        o:hasRole :Unknown .
-
-    :InstanceA o:hasName "InstanceA" ;
-        o:attachedToRole :Unknown .
-
-    <<:InstanceA o:attachedToRole :Unknown>> o:hasDataPermission 2 .
-
-}
-
-