oldaplib 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

oldaplib/src/hasproperty.py

@@ -206,7 +206,8 @@ class HasProperty(Model, Notify):
         return HasPropertyData(minCount=self._attributes.get(HasPropertyAttr.MIN_COUNT, None),
                                maxCount=self._attributes.get(HasPropertyAttr.MAX_COUNT, None),
                                order=self._attributes.get(HasPropertyAttr.ORDER, None),
-                               group=self._attributes.get(HasPropertyAttr.GROUP, None))
+                               group=self._attributes.get(HasPropertyAttr.GROUP, None),
+                               editor=self._attributes.get(HasPropertyAttr.EDITOR, None))
 
     def clear_changeset(self) -> None:
         if hasattr(self._prop, 'clear_changeset'):
@@ -225,14 +226,17 @@ class HasProperty(Model, Notify):
     def create_shacl(self, indent: int = 0, indent_inc: int = 4) -> str:
         blank = ''
         sparql = ''
-        if self._attributes.get(HasPropertyAttr.MIN_COUNT, None) is not None:
-            sparql += f' ;\n{blank:{indent * indent_inc}}sh:minCount {self._attributes[HasPropertyAttr.MIN_COUNT].toRdf}'
-        if self._attributes.get(HasPropertyAttr.MAX_COUNT, None) is not None:
-            sparql += f' ;\n{blank:{indent * indent_inc}}sh:maxCount {self._attributes[HasPropertyAttr.MAX_COUNT].toRdf}'
-        if self._attributes.get(HasPropertyAttr.ORDER, None) is not None:
-            sparql += f' ;\n{blank:{indent * indent_inc}}sh:order {self._attributes[HasPropertyAttr.ORDER].toRdf}'
-        if self._attributes.get(HasPropertyAttr.GROUP, None) is not None:
-            sparql += f' ;\n{blank:{indent * indent_inc}}sh:group {self._attributes[HasPropertyAttr.GROUP].toRdf}'
+        for attr, val in self._attributes.items():
+            sparql += f' ;\n{blank:{indent * indent_inc}}{attr.value} {val.toRdf} ;\n'
+
+        # if self._attributes.get(HasPropertyAttr.MIN_COUNT, None) is not None:
+        #     sparql += f' ;\n{blank:{indent * indent_inc}}sh:minCount {self._attributes[HasPropertyAttr.MIN_COUNT].toRdf}'
+        # if self._attributes.get(HasPropertyAttr.MAX_COUNT, None) is not None:
+        #     sparql += f' ;\n{blank:{indent * indent_inc}}sh:maxCount {self._attributes[HasPropertyAttr.MAX_COUNT].toRdf}'
+        # if self._attributes.get(HasPropertyAttr.ORDER, None) is not None:
+        #     sparql += f' ;\n{blank:{indent * indent_inc}}sh:order {self._attributes[HasPropertyAttr.ORDER].toRdf}'
+        # if self._attributes.get(HasPropertyAttr.GROUP, None) is not None:
+        #     sparql += f' ;\n{blank:{indent * indent_inc}}sh:group {self._attributes[HasPropertyAttr.GROUP].toRdf}'
         return sparql
 
     def create_owl(self, indent: int = 0, indent_inc: int = 4) -> str:

oldaplib/src/helpers/context.py

@@ -49,6 +49,7 @@ class ContextSingleton(type):
             #Xsd_NCName('dc'): NamespaceIRI('http://purl.org/dc/elements/1.1/'),
             Xsd_NCName('dcterms'): NamespaceIRI('http://purl.org/dc/terms/'),
             Xsd_NCName('dcmitype'): NamespaceIRI('http://purl.org/dc/dcmitype/'),
+            Xsd_NCName('dash'): NamespaceIRI('http://datashapes.org/dash#'),
             #Xsd_NCName('foaf'): NamespaceIRI('http://xmlns.com/foaf/0.1/'),
             Xsd_NCName('oldap'): NamespaceIRI('http://oldap.org/base#'),
             Xsd_NCName('shared'): NamespaceIRI('http://oldap.org/shared#')
@@ -65,6 +66,7 @@ class ContextSingleton(type):
             #NamespaceIRI('http://purl.org/dc/elements/1.1/'): Xsd_NCName('dc'),
             NamespaceIRI('http://purl.org/dc/terms/'): Xsd_NCName('dcterms'),
             NamespaceIRI('http://purl.org/dc/dcmitype/'): Xsd_NCName('dcmitype'),
+            NamespaceIRI('http://datashapes.org/dash#'): Xsd_NCName('dash'),
             #NamespaceIRI('http://xmlns.com/foaf/0.1/'): Xsd_NCName('foaf'),
             NamespaceIRI('http://oldap.org/base#'): Xsd_NCName('oldap'),
             NamespaceIRI('http://oldap.org/shared#'): Xsd_NCName('shared'),

oldaplib/src/helpers/serializer.py

@@ -53,8 +53,8 @@ class _Serializer:
         if isinstance(obj, UUID):
             return {self._key: 'UUID', '__value__': str(obj)}
         if isinstance(obj, Enum):
-            if hasattr(obj, '_value'):
-                # It's a "complex" enum....
+            if hasattr(obj, '_value') and hasattr(obj, 'numeric'):
+                # It's a "complex" enum like DataPermission
                 return {self._key: obj.__class__.__name__, '__value__': [obj.value, obj.numeric]}
             else:
                 return {self._key: obj.__class__.__name__, '__value__': obj.value}
@@ -95,7 +95,8 @@ class _Serializer:
                 # for bytes datatype
                 #
                 return b85decode(d['__value__'].encode(encoding='UTF-8'))
-            if type(self._classes[classname]) == type(Enum):
+            #if type(self._classes[classname]) == type(Enum):
+            if isinstance(self._classes[classname], type) and issubclass(self._classes[classname], Enum):
                 #
                 # for Enums and subclasses
                 #

oldaplib/src/model.py

@@ -218,7 +218,8 @@ class Model:
                 if self._changeset.get(attr) is None:
                     self._changeset[attr] = AttributeChange(deepcopy(self._attributes[attr]), Action.REPLACE)
         if value is None:
-            del self._attributes[attr]
+            if self._attributes.get(attr) is not None:
+                del self._attributes[attr]
         else:
             if not isinstance(value, attr.datatype):
                 self._attributes[attr] = attr.datatype(value, validate=True)

oldaplib/src/propertyclass.py

@@ -71,6 +71,7 @@ class HasPropertyData:
     maxCount: Xsd_integer | None = None
     order: Xsd_decimal | None = None
     group: Xsd_QName | None = None
+    editor: Xsd_QName | None = None
 
     def create_shacl(self, indent: int = 0, indent_inc: int = 4):
         blank = ''
@@ -83,6 +84,8 @@ class HasPropertyData:
             sparql += f' ;\n{blank:{indent * indent_inc}}sh:order {self.order.toRdf}'
         if self.group is not None:
             sparql += f' ;\n{blank:{indent * indent_inc}}sh:group {self.group.toRdf}'
+        if self.editor is not None:
+            sparql += f' ;\n{blank:{indent * indent_inc}}dash:editor {self.editor.toRdf}'
         return sparql
 
     def create_owl(self, indent: int = 0, indent_inc: int = 4):
@@ -800,6 +803,7 @@ class PropertyClass(Model, Notify):
         maxCount: Xsd_integer | None = None
         order: Xsd_decimal | None = None
         group: Xsd_QName | None = None
+        editor: Xsd_QName | None = None
         nodeKind: Xsd_QName | None = None
         propkeys = {Xsd_QName(x.value) for x in PropClassAttr}
         for key, val in attributes.items():
@@ -863,6 +867,8 @@ class PropertyClass(Model, Notify):
                 order = val
             elif key == 'sh:group':
                 group = val
+            elif key == 'dash:editor':
+                editor = val
             elif key in propkeys:
                 attr = PropClassAttr.from_value(key)
                 if not attr.in_shacl:
@@ -879,7 +885,8 @@ class PropertyClass(Model, Notify):
                                    minCount=minCount,
                                    maxCount=maxCount,
                                    order=order,
-                                   group=group)
+                                   group=group,
+                                   editor=editor)
 
         if self._attributes.get(PropClassAttr.CLASS) is not None:
             self._attributes[PropClassAttr.TYPE].add(OwlPropertyType.OwlObjectProperty)
@@ -897,7 +904,7 @@ class PropertyClass(Model, Notify):
         self.update_notifier()
 
         self.__from_triplestore = True
-        return HasPropertyData(refprop, minCount, maxCount, order, group)
+        return HasPropertyData(refprop, minCount, maxCount, order, group, editor)
 
     def read_owl(self) -> None:
         if self._externalOntology:

oldaplib/src/resourceclass.py

@@ -942,7 +942,8 @@ class ResourceClass(Model, Notify):
                                             minCount=attributes.get(Xsd_QName('sh:minCount')),
                                             maxCount=attributes.get(Xsd_QName('sh:maxCount')),
                                             order=attributes.get(Xsd_QName('sh:order')),
-                                            group=attributes.get(Xsd_QName('sh:group'))))
+                                            group=attributes.get(Xsd_QName('sh:group')),
+                                            editor=attributes.get(Xsd_QName('dash:editor'))))
             else:
                 prop = PropertyClass(con=con, project=project)
                 haspropdata = prop.parse_shacl(attributes=attributes)
@@ -957,7 +958,8 @@ class ResourceClass(Model, Notify):
                                                 minCount=haspropdata.minCount,
                                                 maxCount=haspropdata.maxCount,
                                                 order=haspropdata.order,
-                                                group=haspropdata.group))
+                                                group=haspropdata.group,
+                                                editor=haspropdata.editor))
                 else:
                     #
                     # Case C, external property
@@ -971,7 +973,8 @@ class ResourceClass(Model, Notify):
                                                 minCount=haspropdata.minCount,
                                                 maxCount=haspropdata.maxCount,
                                                 order=haspropdata.order,
-                                                group=haspropdata.group))
+                                                group=haspropdata.group,
+                                                editor=haspropdata.editor))
         return proplist
 
     def __read_owl(self) -> None:
@@ -1178,7 +1181,7 @@ class ResourceClass(Model, Notify):
 
         for iri, hp in self._properties.items():
             if hp.type == PropType.STANDALONE:
-                if hp.minCount or hp.maxCount or hp.order or hp.group:
+                if hp.minCount or hp.maxCount or hp.order or hp.group or hp.editor:
                     sparql += f' ;\n{blank:{(indent + 2) * indent_inc}}sh:property {iri}Shape, ['
                     sparql += f'\n{blank:{(indent + 3) * indent_inc}}sh:path {iri.toRdf}'
                     sparql += hp.create_shacl(indent=2)

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.4.1"
+__version__ = "0.4.2"

oldaplib/test/test_context.py

@@ -80,6 +80,7 @@ PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX schema: <http://schema.org/>
 PREFIX dcterms: <http://purl.org/dc/terms/>
 PREFIX dcmitype: <http://purl.org/dc/dcmitype/>
+PREFIX dash: <http://datashapes.org/dash#>
 PREFIX oldap: <http://oldap.org/base#>
 PREFIX shared: <http://oldap.org/shared#>
 PREFIX test: <http://www.test.org/gaga#>
@@ -99,6 +100,7 @@ PREFIX test: <http://www.test.org/gaga#>
 @prefix schema: <http://schema.org/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @prefix dcmitype: <http://purl.org/dc/dcmitype/> .
+@prefix dash: <http://datashapes.org/dash#> .
 @prefix oldap: <http://oldap.org/base#> .
 @prefix shared: <http://oldap.org/shared#> .
 @prefix test: <http://www.test.org/gaga#> .

oldaplib/test/test_datamodel.py

@@ -1105,7 +1105,7 @@ class TestDataModel(unittest.TestCase):
                        resclasses=[page, book, person])
         dm.write_as_trig('gaga.trig')
 
-    unittest.skip('Only during development....')
+    @unittest.skip('Only during development....')
     def test_cache(self):
         project_root = find_project_root(__file__)
         self._connection.clear_graph(Xsd_QName('test:shacl'))
@@ -1123,3 +1123,25 @@ class TestDataModel(unittest.TestCase):
 
         pass
 
+    @unittest.skip('Only during development....')
+    def test_datamodel_read_fasnacht(self):
+        connection = Connection(userId="rosenth",
+                                     credentials="RioGrande",
+                                     context_name="DEFAULT")
+
+        fasnacht = Project.read(connection, "fasnacht")
+
+        model = DataModel.read(connection, fasnacht, ignore_cache=True)
+        print(model)
+
+    @unittest.skip('Only during development....')
+    def test_datamodel_read_shared(self):
+        connection = Connection(userId="rosenth",
+                                     credentials="RioGrande",
+                                     context_name="DEFAULT")
+
+
+        model = DataModel.read(connection, 'oldap')
+        model = DataModel.read(connection, 'shared')
+        print(model.get_propclasses())
+

oldaplib/test/test_hasproperty.py

@@ -60,15 +60,28 @@ class TestHasProperty(unittest.TestCase):
         #cls._connection.clear_graph(QName('test:onto'))
         pass
 
-    def test_creation(self):
+    def test_creation_A(self):
         p1 = PropertyClass(con=self._connection,
                            project=self._project,
                            property_class_iri=Xsd_QName('test:hasprop_test_A'),
                            datatype=XsdDatatypes.string,
                            name=LangString(["HasPropTest A"]))
         hasproperties: list[HasProperty] = [
-            HasProperty(con=self._connection, project=self._project, prop=p1, minCount=1, maxCount=1, group=Xsd_QName('test:group'), order=1),
-            HasProperty(con=self._connection, project=self._project, prop=Xsd_QName("test:comment"), maxCount=1, group=Xsd_QName('test:group'), order=2),
+            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")),
+            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")),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,
@@ -87,21 +100,26 @@ 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.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"))
 
-    def test_modification_replace(self):
+    def test_creation_B(self):
         p1 = PropertyClass(con=self._connection,
-                           project=self._project,
-                           property_class_iri=Xsd_QName('test:hasprop_test_B'),
-                           datatype=XsdDatatypes.string,
-                           name=LangString(["HasPropTest B"]))
+                       project=self._project,
+                       property_class_iri=Xsd_QName('test:hasprop_test_B'),
+                       datatype=XsdDatatypes.string,
+                       name=LangString(["HasPropTest B"]))
         hasproperties: list[HasProperty] = [
-            HasProperty(con=self._connection, project=self._project, prop=p1, minCount=1, maxCount=1, group=Xsd_QName('test:group'), order=1),
-            HasProperty(con=self._connection, project=self._project, prop=Xsd_QName("test:comment"), maxCount=1, group=Xsd_QName('test:group'), order=2),
+            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")),
+            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")),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,
@@ -119,10 +137,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: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.update()
         r1 = ResourceClass.read(con=self._connection,
@@ -131,10 +151,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(Xsd_integer(2), r1[Xsd_QName('test:comment')].maxCount)
         self.assertEqual(Xsd_decimal(1), r1[Xsd_QName('test:comment')].order)
-        self.assertEqual(Xsd_QName('test:groupB'), r1[Xsd_QName('test:comment')].group)
+        self.assertEqual(Xsd_QName("dash:TextAreaEditor"), r1[Xsd_QName('test:comment')].editor)
 
     def test_modification_add(self):
         p1 = PropertyClass(con=self._connection,
@@ -143,8 +164,17 @@ class TestHasProperty(unittest.TestCase):
                            datatype=XsdDatatypes.string,
                            name=LangString(["HasPropTest C"]))
         hasproperties: list[HasProperty] = [
-            HasProperty(con=self._connection, project=self._project, prop=p1, minCount=1, order=1),
-            HasProperty(con=self._connection, project=self._project, prop=Xsd_QName("test:comment"), maxCount=1, group=Xsd_QName('test:group')),
+            HasProperty(con=self._connection,
+                        project=self._project,
+                        prop=p1,
+                        minCount=1,
+                        order=1,
+                        editor=Xsd_QName("dash:TextAreaEditor")),
+            HasProperty(con=self._connection,
+                        project=self._project,
+                        prop=Xsd_QName("test:comment"),
+                        maxCount=1,
+                        group=Xsd_QName('test:group')),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,
@@ -160,17 +190,22 @@ class TestHasProperty(unittest.TestCase):
                                 project=self._project,
                                 owl_class_iri=Xsd_QName("test:HasPropertyTest_C"))
         r1[Xsd_QName('test:hasprop_test_C')].maxCount = Xsd_integer(10)
-        #r1[Xsd_QName('test:hasprop_test_C')].group = Xsd_QName('test:group')
-        #r1[Xsd_QName("test:comment")].minCount = Xsd_integer(1)
-        #r1[Xsd_QName("test:comment")].order = Xsd_decimal(1)
+        r1[Xsd_QName('test:hasprop_test_C')].group = Xsd_QName('test:group')
+        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.update()
         r1 = ResourceClass.read(con=self._connection,
                                 project=self._project,
                                 owl_class_iri=Xsd_QName("test:HasPropertyTest_C"))
         self.assertEqual(Xsd_integer(10), r1[Xsd_QName('test:hasprop_test_C')].maxCount)
-        #self.assertEqual(Xsd_QName('test:group'), r1[Xsd_QName('test:hasprop_test_C')].group)
-        #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('test:group'), r1[Xsd_QName('test:hasprop_test_C')].group)
+        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)
 
     def test_modification_delete(self):
         p1 = PropertyClass(con=self._connection,
@@ -179,8 +214,12 @@ class TestHasProperty(unittest.TestCase):
                            datatype=XsdDatatypes.string,
                            name=LangString(["HasPropTest D"]))
         hasproperties: list[HasProperty] = [
-            HasProperty(con=self._connection, project=self._project, prop=p1, minCount=1, maxCount=1, group=Xsd_QName('test:group'), order=1),
-            HasProperty(con=self._connection, project=self._project, prop=Xsd_QName("test:comment"), maxCount=1, group=Xsd_QName('test:group'), order=2),
+            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")),
+            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")),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,
@@ -197,9 +236,11 @@ class TestHasProperty(unittest.TestCase):
                                 owl_class_iri=Xsd_QName("test:HasPropertyTest_D"))
         del r1[Xsd_QName('test:hasprop_test_D')].maxCount
         del r1[Xsd_QName('test:hasprop_test_D')].order
+        del r1[Xsd_QName('test:hasprop_test_D')].editor
         del r1[Xsd_QName('test:comment')].maxCount
         del r1[Xsd_QName('test:comment')].group
         del r1[Xsd_QName('test:comment')].order
+        del r1[Xsd_QName('test:comment')].editor
         r1.update()
 
         r1 = ResourceClass.read(con=self._connection,
@@ -207,9 +248,11 @@ class TestHasProperty(unittest.TestCase):
                                 owl_class_iri=Xsd_QName("test:HasPropertyTest_D"))
         self.assertIsNone(r1[Xsd_QName('test:hasprop_test_D')].maxCount)
         self.assertIsNone(r1[Xsd_QName('test:hasprop_test_D')].order)
+        self.assertIsNone(r1[Xsd_QName('test:hasprop_test_D')].editor)
         self.assertIsNone(r1[Xsd_QName('test:comment')].maxCount)
         self.assertIsNone(r1[Xsd_QName('test:comment')].group)
         self.assertIsNone(r1[Xsd_QName('test:comment')].order)
+        self.assertIsNone(r1[Xsd_QName('test:comment')].editor)
 
 
 

oldaplib/test/test_objectfactory.py

@@ -480,6 +480,28 @@ class TestObjectFactory(unittest.TestCase):
 
         bb.delete()
 
+    def test_read_D(self):
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        SetterTester = factory.createObjectInstance('SetterTester')
+        b = SetterTester(stringSetter="This is a test string",
+                         langStringSetter=["C'est un string de test@fr", "Dies ist eine Testzeichenkette@de"],
+                         decimalSetter=Xsd_decimal(3.14),
+                         integerSetter={20200, 30300},
+                         attachedToRole={Xsd_QName('oldap:Unknown'): DataPermission.DATA_VIEW})
+        b.create()
+        bb = SetterTester.read(con=self._connection, iri=b.iri)
+        self.assertEqual(bb.name, "test:SetterTester")
+        self.assertEqual(bb.stringSetter, {Xsd_string("This is a test string")})
+        print(type(bb.langStringSetter).__name__)
+        print(bb.langStringSetter)
+        # self.assertEqual(bb.author, {Iri("test:TuomasHolopainen")})
+        # jsonobj = bb.toJsonObject()
+        # self.assertEqual(jsonobj['test:author'], ['test:TuomasHolopainen'])
+        # self.assertEqual(jsonobj['test:pubDate'], ['2001-01-01'])
+        # self.assertEqual(jsonobj['test:title'], ['The Life and Times of Scrooge'])
+
+        bb.delete()
+
     def test_value_setter(self):
         factory = ResourceInstanceFactory(con=self._connection, project='test')
         SetterTester = factory.createObjectInstance('SetterTester')

oldaplib/test/xxxx_fasnacht.py

@@ -0,0 +1,32 @@
+from pprint import pprint
+
+from oldaplib.src.connection import Connection
+import unittest
+
+from oldaplib.src.datamodel import DataModel
+from oldaplib.src.project import Project
+
+class TestDataModel(unittest.TestCase):
+
+    #@unittest.skip('Work in progress')
+    def test_fasnacht(self):
+        connection = Connection(userId="rosenth",
+                                     credentials="RioGrande",
+                                     context_name="DEFAULT")
+
+        dm = DataModel.read(connection, "fasnacht", ignore_cache=False)
+        pass
+
+    def test_datamodel_read_shared(self):
+        connection = Connection(userId="rosenth",
+                                     credentials="RioGrande",
+                                     context_name="DEFAULT")
+
+        model = DataModel.read(connection, 'shared')
+        pp = model.get_propclasses()
+        for p in pp:
+            print(model[p])
+        model = DataModel.read(connection, 'shared', ignore_cache=True)
+        pp = model.get_propclasses()
+        for p in pp:
+            print(model[p])

{oldaplib-0.4.1.dist-info → oldaplib-0.4.2.dist-info}/METADATA

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

@@ -7,9 +7,13 @@ oldaplib/ontologies/oldap.trig,sha256=OEcjBUiTdE3SuUA0Z3F20azI8abeK1OIpKqcQo1pjv
 oldaplib/ontologies/oldap.ttl,sha256=qdA0uiSjzVhkc1d5IN2y5ioK1QMzwl-TTnn3M_D1Kh8,29446
 oldaplib/ontologies/shared.trig,sha256=8BMbhsqmnGAFUotc1bGc6morWhJqU0pCGy9TlkiEKIY,27550
 oldaplib/ontologies/standard/.gitsave,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+oldaplib/ontologies/standard/dcterms.ttl,sha256=E99AEHLdcBW_nXUWLz5ByBOAdTBLe5zBqh6cFtuXZ5c,47834
+oldaplib/ontologies/standard/schemaorg.ttl,sha256=bTInwDfzT-haiShF2B9ojXmlSVAM4mn-zTPhOetLpWo,1067667
+oldaplib/ontologies/standard/skos.ttl,sha256=mHQeXYTHK4q-potUn_YNKfKfS9ZJXBE8SYhP3T7OKbM,16144
+oldaplib/ontologies/standard/skos.xml,sha256=55YzuNBWSBbO6KmfXJrPmg5vxyV8cgms1oTsrVOondY,28966
 oldaplib/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/cachesingleton.py,sha256=WGhuFER-mTnOJmwaN17fXPAg7zn7GJBm-XadShNUBBk,3687
-oldaplib/src/connection.py,sha256=jPTx_PZTo64N_3y4RGCf66mkJweIpmhgCpr1HQtAGBY,27601
+oldaplib/src/connection.py,sha256=E_Y_KpVDGfSi6PCAZVIyVhBOUTy6_5AieP1heRPPYJA,27620
 oldaplib/src/datamodel.py,sha256=Fn9IkU-niOFq7Ih1km9BPHHnCd_klEqU3-6uMGwPKZY,35343
 oldaplib/src/dtypes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/dtypes/bnode.py,sha256=7Swl77PJlzahov7d7ijJExmoVsTkR5JFOvFQf1jDmEg,1555
@@ -17,18 +21,19 @@ 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=Lc7OnMMl9vjXj0SuL0l30iEjwC3oWDv_C8PFeTavDGc,3006
+oldaplib/src/enums/attributeclass.py,sha256=CSXeL0QlLKxbk27vkPmLuFY4QjuUi5xsO9ncOUM3qds,3437
 oldaplib/src/enums/datapermissions.py,sha256=MiaVHXzNDKTGnZJ9pvs-IgQotyV4wA3X484s2RVMOvs,4104
 oldaplib/src/enums/externalontologyattr.py,sha256=H7SrWrhe1Dkz_t1OFCWZVh3_14lJDltYGh3dOFr1Z6w,807
-oldaplib/src/enums/haspropertyattr.py,sha256=Pwi-520nxue3s1fku9x4FNFBOOKSbYVI9MTVGD5jaeU,726
+oldaplib/src/enums/haspropertyattr.py,sha256=x9z2b59aFhV3gx8IVz-743dAQ_wfMTzZuN1IqnLwpBM,831
 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
 oldaplib/src/enums/owlpropertytype.py,sha256=R7DaCV4vtkGeuDhslN3q7719J1sLKUL-x0o91Te7Qk8,989
-oldaplib/src/enums/projectattr.py,sha256=A_iayrT3Sd1L_guhHtCKSlUaVf9JqikRXqML-GHkJ3o,1173
+oldaplib/src/enums/projectattr.py,sha256=mHtwxqd535cFy5Er3Qsm-clZrzHlfzUppxu5tZq_YlM,1240
 oldaplib/src/enums/propertyclassattr.py,sha256=-F5Pjqj1AAnCrC01en-gGD4M-QoIYbi5QAWL0jQmNVQ,4263
 oldaplib/src/enums/resourceclassattr.py,sha256=g8tc5JDr4wLCteBNnhHMVE4cRZOhlSQqs-qFnRB3_N0,709
 oldaplib/src/enums/roleattr.py,sha256=g4zvVfT6lO_9kKaLpDo9ko_Aw2dzwf9UN64o74_Ln1c,733
@@ -37,11 +42,11 @@ oldaplib/src/enums/userattr.py,sha256=cMMsuwf5JbEVwl2QHgA0mBU0FUkUzRttBtw8zKCI_6
 oldaplib/src/enums/xsd_datatypes.py,sha256=TGpy2TEaYfmCsSCClSyK76ixNP_hR7nEdJvCT6l-Txk,6253
 oldaplib/src/externalontology.py,sha256=VaQvVlq5muzmQ466c1gKrldXn9Wx_WfOR7pUCjw_cYw,23888
 oldaplib/src/globalconfig.py,sha256=zAJmAMQnojbhj8SZFUaPj7DIHN5g3wUwQQhWPMxjDUg,1306
-oldaplib/src/hasproperty.py,sha256=w2rNuhqyWdJYAXnGROFLZUyafCpznPv-h_XuQSFWbqs,17235
+oldaplib/src/hasproperty.py,sha256=mHrsClBQ477EcYgPNRp5q_GwQwYmLyhDekVD9XsyJOk,17480
 oldaplib/src/helpers/Notify.py,sha256=9zzO93F4V4lj-xF6b3hpRg1QkI4TR_GYEh3ptsohlfQ,2008
 oldaplib/src/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/helpers/attributechange.py,sha256=aQ5Q9s6U3bVd1WSNQcBpkr5UQVxeP4z_uz0K5_31ZVc,256
-oldaplib/src/helpers/context.py,sha256=HyI7GG3D67xdurBYGqd0Uyzy8yFuBXjaVwf1dykBzbo,11766
+oldaplib/src/helpers/context.py,sha256=qWv0E_MQKzXYLIt3thd65jfgvPjNL-KQ7RzYirhtYxs,11920
 oldaplib/src/helpers/convert2datatype.py,sha256=jLhcOBfsGQVwYjzvQBUbFrFWoIquS44kU81aJ5BhMaA,6447
 oldaplib/src/helpers/irincname.py,sha256=XZoV6eEsWVssvhQE9w1TD0cYDX1EYQnhN8PiU9gjvng,2473
 oldaplib/src/helpers/json_encoder.py,sha256=c78h9uf58zfLaK8X7S1KCK4otY3iEltGnPBy_5ryiCk,2135
@@ -53,24 +58,24 @@ oldaplib/src/helpers/oldaperror.py,sha256=2gKgV8FYiEjbcox1KN1PlOIPY4KclxVTnCIOQ6
 oldaplib/src/helpers/query_processor.py,sha256=1RJnQ9u6BS58xK0PcTbffzF2W-_K42kw37Vbh2HO5sA,10369
 oldaplib/src/helpers/semantic_version.py,sha256=HLFQO2CPVDz_GKZaFCjR5q_G-aSLQ2XYohCA2tCU9go,3218
 oldaplib/src/helpers/serializeableset.py,sha256=1AWMWm_iEiFu8M2ZdOK_fXE6TyNGLDp6rp1HKryYv-Y,382
-oldaplib/src/helpers/serializer.py,sha256=4nqOuKcdlYVVjWKQumNXmdEPwsiAI9VrolxMqe1z9Q0,5602
+oldaplib/src/helpers/serializer.py,sha256=quaIwTrQ4-2rDFqpvUYSSIuK3uRyBi03qWIFjqQ0iks,5753
 oldaplib/src/helpers/singletonmeta.py,sha256=bz_c5LFcRxxYirL9EDaFrWlc5WhAzR2uz9krHp53INE,429
 oldaplib/src/helpers/tools.py,sha256=sNbiOLucTGNFzZmiWwPLFOb80VTXQH0Zd9uCGubhzAk,12721
 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=VACR3T6zJYFaE5J1PFFdP0OSwhbu4sahoLMWg6_L_rE,19267
+oldaplib/src/model.py,sha256=wgvXaR2GVHk4hJxoL6rigFHwjPYEukBOjtf1Jmo-m9A,19326
 oldaplib/src/objectfactory.py,sha256=3xzXXVRBLernA-JD3NHZ2-FLaywWI6opWIaJfLGv2uk,85975
 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
 oldaplib/src/oldaplogging.py,sha256=IDSOylms9OSTInYPC4Y2QrTTEzRL0T5I2QssCevOhTU,1242
 oldaplib/src/project.py,sha256=ic0cIYYcPk--7XsfbymuGkFbiUFmFJqNgjTWY2Rws7Q,35266
-oldaplib/src/propertyclass.py,sha256=ez_AyaX_UMIFgSW0msmhOtxXdSB6__pyxVID7Mi6OxU,97241
-oldaplib/src/resourceclass.py,sha256=E_CT3MKgFyLUtvtrUtRU7sV5s0TPwxEb6l74PsnbgrI,103724
+oldaplib/src/propertyclass.py,sha256=6PP7dp64UIk4EjoMp4VgRKyFwTP27Aj28SNsTJ5NCuI,97569
+oldaplib/src/resourceclass.py,sha256=zJNWNY1TfhGs-A2HNa1DO0KAajps_1jMQsoEkUsr7P0,103980
 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=IfrBKs_W4usv6LOPMiFXYlA5wFjjr8eb0zFW3FWiUtM,21
+oldaplib/src/version.py,sha256=Y-I6FXKes4hB39WcBm3HZ1OCtCWiErPB6YZ-YSgexuE,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
@@ -115,19 +120,18 @@ oldaplib/src/xsd/xsd_unsignedbyte.py,sha256=Nro864cBM_Su7dwY_UXvGBwItsqy9jwuZffy
 oldaplib/src/xsd/xsd_unsignedint.py,sha256=q4qN706kocmMoQemg1ayig3tM26emvK8crFphZPZzqs,1041
 oldaplib/src/xsd/xsd_unsignedlong.py,sha256=5fGH8_SAV1x6b0YGiIR44ZlJXjUiCUW6XHhCWbGgcVA,1008
 oldaplib/src/xsd/xsd_unsignedshort.py,sha256=M1E8SDR33rPJ0jUpRkzcDCcJYg17YfVbaItTuJeEibc,1013
-oldaplib/test/XXX_test_fasnacht.py,sha256=BH_0osp1LpyXNWjU_OPXvpT7RyF9aeYMrPIa1JiQKiA,573
 oldaplib/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/test/test_cache.py,sha256=6TGukPUruuj5BsZaPGZdIx9L7v39qB9jIKZkg_GkbW4,702
 oldaplib/test/test_connection.py,sha256=wM2AWcwcNcd1_W857by_QKmdnEabsOcjOec-8JrfHdc,13339
-oldaplib/test/test_context.py,sha256=3tjZ8r4ieePs3CTqKxWVMynWBo_bpna_VYYRsthRH7w,4888
-oldaplib/test/test_datamodel.py,sha256=HIeXv-nOStEVg9S3J3z5sKP58PRfo5IRIPAUY-54K84,59089
+oldaplib/test/test_context.py,sha256=0qCTOOS6lKjjlZXRxXOoWeix5HnvgwcmKzOF17Fou6M,4977
+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=jVagmFXjfEfdbfzkD_KZjjNIVoSr06feWlO9I4NuT90,11525
+oldaplib/test/test_hasproperty.py,sha256=cU9t7uBaMxtIVbpk3UyGjPyIzQKDSS2PzqGHIINYZRw,13515
 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
-oldaplib/test/test_objectfactory.py,sha256=YQvx4SHJLCv70Dz7qo7W0XiXyuECT8tts4QWaZSLw_A,47094
+oldaplib/test/test_objectfactory.py,sha256=QJ4di0qJ48tVC3wPELSGMt4KoYb7wPpyk2BS-Efb2PY,48317
 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=jMM3HiSFs7YcS2ltEvot6637EhK-fMV0W5DSUlFdTRI,20098
@@ -140,6 +144,7 @@ oldaplib/test/test_role.py,sha256=mr4uNkamfb8T8ehyMf2dfPCXmxe7lvZPdhE-hdB_QN4,19
 oldaplib/test/test_semantic_version.py,sha256=OSJYHWDpKBqk-HsxJ2nFpSr14a4OEZTFCogzEni8mcE,3392
 oldaplib/test/test_user.py,sha256=S34Y36xz6zgmVkVZf8tg_LkFbw3XkstunjmpjvOa7Fw,76600
 oldaplib/test/test_xsd_datatypes.py,sha256=Ey2RMMs9a3cNlFe4PHTGcLl5MRlkPBxJTid1NLSe-yg,67959
+oldaplib/test/xxxx_fasnacht.py,sha256=F1m4SpamgsSNvoZkT-_k0EesSBy62Pb9IRjvpaXoyew,1061
 oldaplib/testdata/Gender.yaml,sha256=54ohJWToiuO2rMOUJ85JOsZf2TSrIuPLarHriXa6Lww,235
 oldaplib/testdata/collections_type.yaml,sha256=03MNQVUoLlq7A1OOtSvACeRs32VfP5eS8av-mPLGoEI,2737
 oldaplib/testdata/connection_test.trig,sha256=LFTGLEae7SaTU67rwvgvg_epi09O7oPZwfarvBVbhho,23078
@@ -159,6 +164,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.1.dist-info/METADATA,sha256=Lg8EVleImQ28gOXy0FCGdbeqV4GQLAA-_g_yoXlKtfg,3009
-oldaplib-0.4.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.4.1.dist-info/RECORD,,
+oldaplib-0.4.2.dist-info/METADATA,sha256=8sOUpxHNqa4-ldp3AtofTxcuXhIaChtz8HN5NfC-nmM,3009
+oldaplib-0.4.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.4.2.dist-info/RECORD,,

oldaplib/test/XXX_test_fasnacht.py

@@ -1,17 +0,0 @@
-from oldaplib.src.connection import Connection
-import unittest
-
-from oldaplib.src.datamodel import DataModel
-from oldaplib.src.project import Project
-
-class TestDataModel(unittest.TestCase):
-
-    # @unittest.skip('Work in progress')
-    def test_fasnacht(self):
-        connection = Connection(userId="rosenth",
-                                     credentials="RioGrande",
-                                     context_name="DEFAULT")
-
-        project = Project.read(connection, "fasnacht")
-        dm = DataModel.read(connection, project, ignore_cache=False)
-        pass