pyLodStorage 0.4.6__tar.gz → 0.4.8__tar.gz

{pylodstorage-0.4.6/pylodstorage.egg-info → pylodstorage-0.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.4.6
+Version: 0.4.8
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl
@@ -10,7 +10,6 @@ License: Apache License
 Project-URL: Documentation, http://wiki.bitplan.com/index.php/PyLoDStorage
 Project-URL: Code, https://github.com/WolfgangFahl/pyLoDStorage/blob/master/lodstorage/sql.py
 Project-URL: Issue tracker, https://github.com/WolfgangFahl/pyLodStorage/issues
-Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
@@ -69,5 +68,3 @@ see [test cases](https://github.com/WolfgangFahl/pyLoDStorage/tree/master/tests)
 ### Authors
 * [Wolfgang Fahl](http://www.bitplan.com/Wolfgang_Fahl)
 * [Tim Holzheim](https://www.semantic-mediawiki.org/wiki/Tim_Holzheim)
-
-

{pylodstorage-0.4.6 → pylodstorage-0.4.8}/lodstorage/sparql.py

@@ -3,8 +3,9 @@ Created on 2020-08-14
 
 @author: wf
 '''
+from typing import Union
 from SPARQLWrapper import SPARQLWrapper2
-from SPARQLWrapper.Wrapper import POSTDIRECTLY, POST
+from SPARQLWrapper.Wrapper import POSTDIRECTLY, POST, BASIC, DIGEST
 from lodstorage.lod import LOD
 import datetime
 import time
@@ -46,8 +47,19 @@ class SPARQL(object):
         self.sparql=SPARQLWrapper2(url)
         self.method=method
         self.sparql.agent=agent
+
+    def addAuthentication(self, username:str, password:str, method: Union[BASIC, DIGEST] = BASIC):
+        """
+        Add Http Authentication credentials to the sparql wrapper
+        Args:
+            username: name of the user
+            password: password of the user
+            method: HTTP Authentication method
+        """
+        self.sparql.setHTTPAuth(method)
+        self.sparql.setCredentials(username, password)
         
-    def rawQuery(self,queryString,method='POST'):
+    def rawQuery(self,queryString,method=POST):
         '''
         query with the given query string
         

{pylodstorage-0.4.6 → pylodstorage-0.4.8}/lodstorage/sql.py

@@ -124,7 +124,7 @@ class SQLDB(object):
                 debugInfo="\nrecord #%d" % index
         return debugInfo
                
-    def store(self,listOfRecords,entityInfo,executeMany=False,fixNone=False):
+    def store(self,listOfRecords,entityInfo,executeMany=False,fixNone=False,replace=False):
         '''
         store the given list of records based on the given entityInfo
         
@@ -134,8 +134,9 @@ class SQLDB(object):
            entityInfo(EntityInfo): the meta data to be used for storing
            executeMany(bool): if True the insert command is done with many/all records at once
            fixNone(bool): if True make sure empty columns in the listOfDict are filled with "None" values
+           replace(bool): if True allow replace for insert 
         '''
-        insertCmd=entityInfo.insertCmd
+        insertCmd=entityInfo.getInsertCmd(replace=replace)
         record=None
         index=0
         try:
@@ -507,12 +508,15 @@ class EntityInfo(object):
             print (ddlCmd)    
         return ddlCmd
         
-    def getInsertCmd(self):
+    def getInsertCmd(self,replace:bool=False)->str:
         '''
         get the INSERT command for this entityInfo
         
+        Args:
+             replace(bool): if True allow replace for insert 
+        
         Returns:
-            the INSERT INTO SQL command for his entityInfo e.g.
+            str: the INSERT INTO SQL command for his entityInfo e.g.
                  
         Example:   
       
@@ -523,7 +527,8 @@ class EntityInfo(object):
         '''
         columns =','.join(self.typeMap.keys())
         placeholders=':'+',:'.join(self.typeMap.keys())
-        insertCmd="INSERT INTO %s (%s) values (%s)" % (self.name, columns,placeholders)
+        replaceClause=" OR REPLACE" if replace else ""
+        insertCmd=f"INSERT{replaceClause} INTO {self.name} ({columns}) values ({placeholders})"
         if self.debug:
             print(insertCmd)
         return insertCmd

{pylodstorage-0.4.6 → pylodstorage-0.4.8}/lodstorage/version.py

@@ -9,7 +9,7 @@ class Version(object):
     Version handling for pyLoDStorage
     '''
     name="pylodstorage"
-    version='0.4.6'
+    version='0.4.8'
     date = '2020-09-10'
-    updated = '2022-08-07'
+    updated = '2022-12-18'
     description='python List of Dict (Table) Storage library'

{pylodstorage-0.4.6 → pylodstorage-0.4.8/pylodstorage.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.4.6
+Version: 0.4.8
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl
@@ -10,7 +10,6 @@ License: Apache License
 Project-URL: Documentation, http://wiki.bitplan.com/index.php/PyLoDStorage
 Project-URL: Code, https://github.com/WolfgangFahl/pyLoDStorage/blob/master/lodstorage/sql.py
 Project-URL: Issue tracker, https://github.com/WolfgangFahl/pyLodStorage/issues
-Platform: UNKNOWN
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
@@ -69,5 +68,3 @@ see [test cases](https://github.com/WolfgangFahl/pyLoDStorage/tree/master/tests)
 ### Authors
 * [Wolfgang Fahl](http://www.bitplan.com/Wolfgang_Fahl)
 * [Tim Holzheim](https://www.semantic-mediawiki.org/wiki/Tim_Holzheim)
-
-

{pylodstorage-0.4.6 → pylodstorage-0.4.8}/pylodstorage.egg-info/entry_points.txt

@@ -2,4 +2,3 @@
 lodquery = lodstorage.querymain:main
 sparqlquery = lodstorage.querymain:mainSPARQL
 sqlquery = lodstorage.querymain:mainSQL
-

{pylodstorage-0.4.6 → pylodstorage-0.4.8}/sampledata/queries.yaml

@@ -2,6 +2,22 @@
 # Sample Queries for pyLodStorage library
 #
 # WF 2020-08-22
+'classHistogramm':
+  sparql: |
+    SELECT ?c (COUNT(?c) AS ?count)
+    WHERE {
+      ?subject a ?c
+    }
+    GROUP BY ?c
+    HAVING (?count >100)
+    ORDER BY DESC(?count)
+'propertyHistogramm':
+  sparql: |
+    SELECT ?property (COUNT(?property) AS ?propTotal)
+    WHERE { ?s ?property ?o . }
+    GROUP BY ?property
+    HAVING (?propTotal >1000)
+    ORDER BY DESC(?propTotal)
 'Predicate usage':
     sparql: |
         SELECT ?p (count(?p) as ?numberOfPredicates)