oldaplib 0.4.0__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/objectfactory.py

@@ -127,6 +127,7 @@ class ResourceInstance:
                         # we have an attachedToRole property given in the constructor...
                         #
                         value = kwargs[str(prop_iri)] if kwargs.get(str(prop_iri)) else kwargs[prop_iri.fragment]
+                        value = {Xsd_QName(role): dperm if isinstance(dperm, DataPermission) else DataPermission.from_string(dperm) for role, dperm in value.items()}
                         if not isinstance(value, dict):
                             raise OldapErrorValue(f'{self.name}: Property {prop_iri} with attachedToRole must be a dict')
                         self._attached_roles = ObservableDict(value, on_change=self.__attachedToRole_cb)

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/user.py

@@ -892,49 +892,55 @@ class User(Model):
             # oldap:hasDefaultDataPermission has changed!
             #
             rdfstar = False
-            sparql = f'{blank:{indent * indent_inc}}# RDF*Star <<.. oldap:hasRole ...>> oldap:hasDefaultDataPermission ...\n'
-            sparql += f'{blank:{indent * indent_inc}}WITH oldap:admin\n'
+            sparql = ''
+            if removed or changed:
+                sparql += f'{blank:{indent * indent_inc}}# RDF*Star DELETE: <<.. oldap:hasRole ...>> oldap:hasDefaultDataPermission ...\n'
+                sparql += f'{blank:{indent * indent_inc}}DELETE DATA {{\n'
+                sparql += f'{blank:{(indent + 1) * indent_inc}}GRAPH oldap:admin {{\n'
+                rdfstar = True
             if removed:
                 tmp = [role for role, dperm in removed.items() if dperm] # check if we have roles with dterm not None
                 if tmp:
-                    sparql += f'{blank:{indent * indent_inc}}DELETE {{\n'
                     for role, dperm in removed.items():
                         if dperm:
-                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<?user oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {dperm} .\n'
-                    sparql += f'{blank:{indent * indent_inc}}}}\n'
-                    rdfstar = True
+                            sparql += f'{blank:{(indent + 2) * indent_inc}}<<{self.userIri.toRdf} oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {dperm.toRdf} .\n'
             if changed:  # remove RDF*Star triples of the roles that have changed
                 tmp = [role for role, dperm in changed.items() if dperm['old']]
                 if tmp:
-                    sparql += f'{blank:{indent * indent_inc}}DELETE {{\n'
                     for role, changes in changed.items():
                         if changes['old']:
-                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<?user oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {changes["old"]} .\n'
-                    sparql += f'{blank:{indent * indent_inc}}}}\n'
-                    rdfstar = True
+                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<{self.userIri.toRdf} oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {changes["old"].toRdf} .\n'
+
+            if rdfstar:
+                sparql += f'{blank:{(indent + 1) * indent_inc}}}}\n'
+                sparql += f'{blank:{indent * indent_inc}}}}\n'
+            if added or changed:
+                if rdfstar:
+                    sparql += f'{blank:{indent * indent_inc}};\n'
+                sparql += f'{blank:{indent * indent_inc}}# RDF*Star INSERT: <<.. oldap:hasRole ...>> oldap:hasDefaultDataPermission ...\n'
+                sparql += f'{blank:{indent * indent_inc}}INSERT DATA {{\n'
+                sparql += f'{blank:{(indent + 1) * indent_inc}}GRAPH oldap:admin {{\n'
+                rdfstar = True
+            else:
+                rdfstar = False
             if added:
                 tmp = [role for role, dperm in added.items() if dperm]  # check if we have roles with dterm not None
                 if tmp:
-                    sparql += f'{blank:{indent * indent_inc}}INSERT {{\n'
                     for role, dperm in added.items():
                         if dperm:
-                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<?user oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {dperm} .\n'
-                    sparql += f'{blank:{indent * indent_inc}}}}\n'
+                            sparql += f'{blank:{(indent + 2) * indent_inc}}<<{self.userIri.toRdf} oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {dperm.toRdf} .\n'
                     rdfstar = True
             if changed:  # add the RDF*Star triples of the roles that have changed
                 tmp = [role for role, dperm in changed.items() if dperm['new']]
                 if tmp:
-                    sparql += f'{blank:{indent * indent_inc}}INSERT {{\n'
                     for role, changes in changed.items():
                         if changes['new']:
-                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<?user oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {changes["new"]} .\n'
-                    sparql += f'{blank:{indent * indent_inc}}}}\n'
+                            sparql += f'{blank:{(indent + 1) * indent_inc}}<<{self.userIri.toRdf} oldap:hasRole {role.toRdf}>> oldap:hasDefaultDataPermission {changes["new"].toRdf} .\n'
                     rdfstar = True
-            sparql += f'{blank:{indent * indent_inc}}WHERE {{\n'
-            sparql += f'{blank:{(indent + 1) * indent_inc}}BIND({self.userIri.toRdf} as ?user)\n'
-            sparql += f'{blank:{(indent + 1) * indent_inc}}?user a oldap:User .\n'
-            sparql += f'{blank:{indent * indent_inc}}}}'
             if rdfstar:
+                sparql += f'{blank:{(indent + 1) * indent_inc}}}}\n'
+                sparql += f'{blank:{indent * indent_inc}}}}\n'
+            if sparql:
                 sparql_list.append(sparql)
 
             #
@@ -1115,6 +1121,7 @@ class User(Model):
             self.set_modified_by_iri(Xsd_QName('oldap:admin'), self.userIri, self.modified, timestamp)
             modtime = self.get_modified_by_iri(Xsd_QName('oldap:admin'), self.userIri)
         except OldapError:
+            print(sparql)
             self._con.transaction_abort()
             raise
         if timestamp != modtime:

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.4.0"
+__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/test_user.py

@@ -699,6 +699,7 @@ class TestUser(unittest.TestCase):
                                                          AdminPermission.ADMIN_CREATE}},
                     hasRole={Iri('oldap:Unknown'): DataPermission.DATA_RESTRICTED})
         user.create()
+
         user2 = User.read(con=self._connection, userId="edison", ignore_cache=True)
         user2.userId = "aedison"
         user2.familyName = "Edison et al."

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.0.dist-info → oldaplib-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.4.0
+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