oldaplib 0.3.9__py3-none-any.whl → 0.3.10__py3-none-any.whl

oldaplib/src/objectfactory.py

@@ -443,33 +443,24 @@ class ResourceInstance:
 
     def get_data_permission(self, context: Context, permission: DataPermission) -> bool:
         permission_query = context.sparql_context
-        # language=sparql
         permission_query += f'''
-        SELECT (COUNT(?permset) as ?numOfPermsets)
-        FROM oldap:onto
-        FROM shared:onto
-        FROM {self._graph}:onto
-        FROM NAMED oldap:admin
-        FROM NAMED {self._graph}:data
-        WHERE {{
-            BIND({self._iri.toRdf} as ?iri)
+        ASK {{
             GRAPH {self._graph}:data {{
-                ?iri oldap:grantsPermission ?permset .
+                {self._iri.toRdf} oldap:grantsPermission ?permset .
             }}
-            BIND({self._con.userIri.toRdf} as ?user)
             GRAPH oldap:admin {{
-                ?user oldap:hasPermissions ?permset .
+                {self._con.userIri.toRdf} oldap:hasPermissions ?permset .
                 ?permset oldap:givesPermission ?DataPermission .
                 ?DataPermission oldap:permissionValue ?permval .
             }}
             FILTER(?permval >= {permission.numeric.toRdf})
         }}'''
+
         if self._con.in_transaction():
-            jsonobj = self._con.transaction_query(permission_query)
+            result = self._con.transaction_query(permission_query)
         else:
-            jsonobj = self._con.query(permission_query)
-        res = QueryProcessor(context, jsonobj)
-        return res[0]['numOfPermsets'] > 0
+            result = self._con.query(permission_query)
+        return result['boolean']
 
     def create(self, indent: int = 0, indent_inc: int = 4) -> str:
         result, message = self.check_for_permissions(AdminPermission.ADMIN_CREATE)
@@ -707,12 +698,13 @@ class ResourceInstance:
 
         context = Context(name=self._con.context_name)
         inuse = context.sparql_context
-        inuse = f'''
-        SELECT (COUNT(?res) as ?nres)
-        WHERE {{
-            ?res ?prop {self._iri.toRdf} .
+        inuse += f"""
+        ASK {{
+            GRAPH ?g {{
+                ?res ?prop {self._iri.toRdf} .
+            }}
         }}
-        '''
+        """
 
         context = Context(name=self._con.context_name)
         sparql = context.sparql_context
@@ -730,9 +722,8 @@ class ResourceInstance:
                 self._con.transaction_abort()
                 raise OldapErrorNoPermission(f'No permission to update resource "{self._iri}"')
         try:
-            jsonobj = self._con.transaction_query(inuse)
-            res = QueryProcessor(context, jsonobj)
-            if res[0]['nres'] > 0:
+            result = self._con.transaction_query(inuse)
+            if result['boolean']:
                 raise OldapErrorInUse(f'Resource "{self._iri}" is in use and cannot be deleted.')
         except OldapError:
             self._con.transaction_abort()
@@ -791,9 +782,6 @@ class ResourceInstanceFactory:
 
         self._datamodel = DataModel.read(con=self._con, project=self._project, ignore_cache=True)
 
-        #self._oldap_project = Project.read(self._con, "oldap")
-        #self._oldap_datamodel = DataModel.read(con=self._con, project=self._oldap_project)
-
     def createObjectInstance(self, name: Xsd_NCName | str) -> Type:  ## ToDo: Get name automatically from IRI
         classiri = Xsd_QName(self._project.projectShortName, name)
         resclass = self._datamodel.get(classiri)
@@ -849,7 +837,6 @@ class ResourceInstanceFactory:
             raise OldapErrorNotFound(f'Resource with iri <{iri}> not found.')
         return data
 
-
     def read(self, iri: Iri | str) -> ResourceInstance:
         if not isinstance(iri, Iri):
             iri = Iri(iri, validate=True)
@@ -901,9 +888,18 @@ class ResourceInstanceFactory:
         Instance = self.createObjectInstance(objtype)
         return Instance(iri=iri, **kwargs)
 
-    def search_fulltext(self, s: str, count_only: bool = False, limit: int = 100, offset: int = 0) -> int | dict[Iri, dict[str, Xsd]]:
-        graph = self._project.projectShortName
-        context = Context(name=self._con.context_name)
+    @staticmethod
+    def search_fulltext(con: IConnection,
+                        projectShortName: Xsd_NCName | str,
+                        s: str,
+                        count_only: bool = False,
+                        limit: int = 100,
+                        offset: int = 0) -> int | dict[Iri, dict[str, Xsd]]:
+        if not isinstance(projectShortName, Xsd_NCName):
+            graph = Xsd_NCName(projectShortName)
+        else:
+            graph = projectShortName
+        context = Context(name=con.context_name)
         sparql = context.sparql_context
         if (count_only):
             sparql += "SELECT (COUNT(DISTINCT ?s) as ?numResult)"
@@ -920,7 +916,7 @@ class ResourceInstanceFactory:
                 (datatype(?o) = xsd:string || datatype(?o) = rdf:langString || lang(?o) != ""))
             FILTER(CONTAINS(LCASE(STR(?o)), "{s}"))  # case-insensitive substring match
             GRAPH oldap:admin {{
-    	        {self._con.userIri.toRdf} oldap:hasPermissions ?permset .
+    	        {con.userIri.toRdf} oldap:hasPermissions ?permset .
     	        ?permset oldap:givesPermission ?DataPermission .
     	        ?DataPermission oldap:permissionValue ?permval .
             }}
@@ -929,21 +925,31 @@ class ResourceInstanceFactory:
         '''
         if not count_only:
             sparql += f'LIMIT {limit} OFFSET {offset}'
-        jsonres = self._con.query(sparql)
+        try:
+            jsonres = con.query(sparql)
+        except OldapError:
+            print(sparql)
+            raise
         res = QueryProcessor(context, jsonres)
         if count_only:
-            if isinstance(res[0]['numResult'], Xsd_integer):
-                tmp = cast(Xsd_integer, res[0]['numResult'])
-                return int(tmp)
-            else:
-                raise OldapErrorInconsistency(f'Expected integer as value, got "{res[0]["numResult"]}"')
+            return res[0]['numResult']
         else:
-            result: dict[Iri, dict[str, Xsd]] = {}
-            for r in res:
-                iri = cast(Iri, r['s'])
-                resclass = cast(Iri, r['t'])
-                result[iri] = {'resclass': resclass, 'property': r['p'], 'value': r['o']}
-            return result
+            return {Iri(r['s']): {r['p']: r['o']} for r in res}
+        # jsonres = con.query(sparql)
+        # res = QueryProcessor(context, jsonres)
+        # if count_only:
+        #     if isinstance(res[0]['numResult'], Xsd_integer):
+        #         tmp = cast(Xsd_integer, res[0]['numResult'])
+        #         return int(tmp)
+        #     else:
+        #         raise OldapErrorInconsistency(f'Expected integer as value, got "{res[0]["numResult"]}"')
+        # else:
+        #     result: dict[Iri, dict[str, Xsd]] = {}
+        #     for r in res:
+        #         iri = cast(Iri, r['s'])
+        #         resclass = cast(Iri, r['t'])
+        #         result[iri] = {'resclass': resclass, 'property': r['p'], 'value': r['o']}
+        #     return result
 
 
 

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.9"
+__version__ = "0.3.10"

oldaplib/test/test_objectfactory.py

@@ -645,7 +645,9 @@ class TestObjectFactory(unittest.TestCase):
                      pubDate="1995-09-27",
                      grantsPermission=Iri('oldap:GenericView'))
             b.create()
-        res = factory.search_fulltext('tales')
+        res = ResourceInstanceFactory.search_fulltext(con=self._connection,
+                                                      projectShortName='test',
+                                                      s='tales')
 
         for x, y in res.items():
             print(x, y)

{oldaplib-0.3.9.dist-info → oldaplib-0.3.10.dist-info}/METADATA

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

{oldaplib-0.3.9.dist-info → oldaplib-0.3.10.dist-info}/RECORD

@@ -59,7 +59,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=2KuhHPj8DNveFRBeImrRfxlCOYhBK-mcxXYUp6s--j8,10672
 oldaplib/src/model.py,sha256=VACR3T6zJYFaE5J1PFFdP0OSwhbu4sahoLMWg6_L_rE,19267
-oldaplib/src/objectfactory.py,sha256=JaIDrdOiprLxhJkgCnrUtcp9UdKcHrHPQBG8cBWqvrg,47027
+oldaplib/src/objectfactory.py,sha256=RIKm45-fApX1--fW_G5NzDzdnoCbW08e4Sb2fgufViI,47088
 oldaplib/src/oldaplist.py,sha256=sGAvEEJukRCjM70G0NFaR-L9YPleQTOtdWGExj3oYL8,42933
 oldaplib/src/oldaplist_helpers.py,sha256=1Gur0nS1PCKb9iUtCKPUFDOYjw6vvAwYpe-G3DdxlEc,14213
 oldaplib/src/oldaplistnode.py,sha256=NnC2juEGTtEkDO6OlB9PjSw_zTF-wSsRUgEk-6VV9DA,87344
@@ -70,7 +70,7 @@ oldaplib/src/propertyclass.py,sha256=pnaDsmyGKQnJaaOHXA0XyLcp4zn1b1vC9sLbjXls4lM
 oldaplib/src/resourceclass.py,sha256=EIxyd7Z_w59wDxWLXCaLvhhvh5SjLEUWb8gqmZz8LLM,102046
 oldaplib/src/user.py,sha256=Z4GXPRkaHXx3glUpPXQdFqYMxQPOuqayDwkTAE5RGjU,48820
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=7YeBgSVj8ydF7tymPSFdq22NONiQoBjKL1iwcxp4TJo,21
+oldaplib/src/version.py,sha256=88sMV1NYWroy2-572uHnugaP-FYZbIQpcERC-gtfC5s,22
 oldaplib/src/xsd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/xsd/floatingpoint.py,sha256=rDReKqh0mXyc4F5wslgTUxbeGf3-PGERyughj5_62YI,8852
 oldaplib/src/xsd/iri.py,sha256=w1Dr0z-REi7yPe3GPGnyzGrLVMvLY03kEeK-AmZ9sxw,8383
@@ -126,7 +126,7 @@ oldaplib/test/test_hasproperty.py,sha256=r991g8kBTfv1CGs9Hf0fli-AUp7Ob7rOHWYD74h
 oldaplib/test/test_in_project.py,sha256=DYT-guwRQ9crnfEt7cQZxoEMxThin7QeymNce3jaZx4,7779
 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=IrU714mcpI2rterqauYA0XC_wKZdQSNrLAosCvrYo7M,34440
+oldaplib/test/test_objectfactory.py,sha256=J9EIu7Ln-G-vzNhvFGKw-mnhXug1EVWs_20petgPoB4,34613
 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=9wo3tEOHt5bIuXyvSSyTzjhtdKrQHiiAA6EfVBuq4wI,20114
@@ -157,6 +157,6 @@ oldaplib/testdata/source_type.yaml,sha256=dSihKikw3O-IlGf6anj5KWMoBYLaweLVF1Zojm
 oldaplib/testdata/test_move_left_of_toL.yaml,sha256=2m1OSQrQFlsCQxeJrjzBAO74LMprNDo_HuyrYGsOeXI,787
 oldaplib/testdata/testlist.yaml,sha256=AT11nXEG81Sfyb-tr1gQV0H_dZBrOCcFuHf7YtL8P2g,1994
 oldaplib/testit.http,sha256=qW7mnr6aNLXFG6lQdLgyhXILOPN6qc5iFVZclLyVvkY,303
-oldaplib-0.3.9.dist-info/METADATA,sha256=ncha961sACYOwWBsWQKJAqOQBNl06LMs-FwdLm7neA8,2854
-oldaplib-0.3.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-oldaplib-0.3.9.dist-info/RECORD,,
+oldaplib-0.3.10.dist-info/METADATA,sha256=l6lpn1epR1VxIa_BuW-Tu3DMD4GkMjw08gxRW4RUepk,2855
+oldaplib-0.3.10.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+oldaplib-0.3.10.dist-info/RECORD,,