pyLodStorage 0.2.0__tar.gz → 0.2.2__tar.gz

{pylodstorage-0.2.0 → pylodstorage-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.2.0
+Version: 0.2.2
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl

{pylodstorage-0.2.0 → pylodstorage-0.2.2}/lodstorage/sql.py

@@ -173,9 +173,9 @@ class SQLDB(object):
             msg="%s\nfailed:%s%s" % (insertCmd,str(ex),debugInfo)
             raise Exception(msg)
         
-    def query(self,sqlQuery,params=None):
+    def queryGen(self,sqlQuery,params=None):
         '''
-        run the given sqlQuery and return a list of Dicts
+        run the given sqlQuery a a generator for dicts
         
         Args:
             
@@ -183,7 +183,7 @@ class SQLDB(object):
             params(tuple): the query params, if any
                 
         Returns:
-            list: a list of Dicts
+            a generator of dicts
         '''
         if self.debug:
             print(sqlQuery)
@@ -196,17 +196,32 @@ class SQLDB(object):
         else:
             query = cur.execute(sqlQuery)
         colname = [ d[0] for d in query.description ]
-        resultList=[]
         try:
             # loop over all rows
             for row in query:
                 record=dict(zip(colname, row))
-                resultList.append(record)
+                yield record
         except Exception as ex:
             msg=str(ex)
             self.logError(msg)
             pass
         cur.close()
+        
+    def query(self,sqlQuery,params=None):
+        '''
+        run the given sqlQuery and return a list of Dicts
+        
+        Args:
+            
+            sqlQuery(string): the SQL query to be executed
+            params(tuple): the query params, if any
+                
+        Returns:
+            list: a list of Dicts
+        '''
+        resultList=[]
+        for record in self.queryGen(sqlQuery, params):
+            resultList.append(record)
         return resultList
         
     def queryAll(self,entityInfo,fixDates=True):

{pylodstorage-0.2.0 → pylodstorage-0.2.2}/lodstorage/trulytabular.py

@@ -323,13 +323,20 @@ WHERE
                 return qm
         return None
     
-    def mostFrequentPropertiesQuery(self):
+    def mostFrequentPropertiesQuery(self,whereClause:str=None):
         '''
         get the most frequently used properties
+        
+        Args:
+            whereClause(str): an extra WhereClause to use
         '''
         query=self.queryManager.queriesByName["mostFrequentProperties"]
+        if whereClause is None:
+            whereClause=f"?item wdt:P31 wd:{self.itemQid};";
+        else:
+            whereClause+=";"
         query.title=f"most frequently used properties for {self.asText(long=True)}"
-        query.query=query.query % (self.item.asText(long=True),self.itemQid,self.lang)
+        query.query=query.query % (self.item.asText(long=True),whereClause,self.lang)
         return query
     
     def noneTabularQuery(self,wdProperty:WikidataProperty,asFrequency:bool=True):

{pylodstorage-0.2.0 → pylodstorage-0.2.2}/lodstorage/version.py

@@ -9,6 +9,6 @@ class Version(object):
     Version handling for pyLoDStorage
     '''
     name="pylodstorage"
-    version='0.2.0'
+    version='0.2.2'
     date = '2020-09-10'
-    updated = '2022-03-24'
+    updated = '2022-04-11'

{pylodstorage-0.2.0 → pylodstorage-0.2.2}/pylodstorage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pylodstorage
-Version: 0.2.0
+Version: 0.2.2
 Summary: python List of Dict (Table) Storage library
 Home-page: https://github.com/WolfgangFahl/pyLodStorage
 Author: Wolfgang Fahl

{pylodstorage-0.2.0 → pylodstorage-0.2.2}/sampledata/endpoints.yaml

@@ -109,4 +109,40 @@
     PREFIX wdtn: <http://www.wikidata.org/prop/direct-normalized/>
     PREFIX wdv: <http://www.wikidata.org/value/>
     PREFIX wikibase: <http://wikiba.se/ontology#>
-    PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+    PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+'wikidata-openlinksw':
+    lang: sparql
+    endpoint: https://wikidata.demo.openlinksw.com/sparql
+    prefixes: |
+      PREFIX bd: <http://www.bigdata.com/rdf#>
+      PREFIX cc: <http://creativecommons.org/ns#>
+      PREFIX dct: <http://purl.org/dc/terms/>
+      PREFIX geo: <http://www.opengis.net/ont/geosparql#>
+      PREFIX ontolex: <http://www.w3.org/ns/lemon/ontolex#>
+      PREFIX owl: <http://www.w3.org/2002/07/owl#>
+      PREFIX p: <http://www.wikidata.org/prop/>
+      PREFIX pq: <http://www.wikidata.org/prop/qualifier/>
+      PREFIX pqn: <http://www.wikidata.org/prop/qualifier/value-normalized/>
+      PREFIX pqv: <http://www.wikidata.org/prop/qualifier/value/>
+      PREFIX pr: <http://www.wikidata.org/prop/reference/>
+      PREFIX prn: <http://www.wikidata.org/prop/reference/value-normalized/>
+      PREFIX prov: <http://www.w3.org/ns/prov#>
+      PREFIX prv: <http://www.
+      wikidata.org/prop/reference/value/>
+      PREFIX ps: <http://www.wikidata.org/prop/statement/>
+      PREFIX psn: <http://www.wikidata.org/prop/statement/value-normalized/>
+      PREFIX psv: <http://www.wikidata.org/prop/statement/value/>
+      PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+      PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+      PREFIX schema: <http://schema.org/>
+      PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+      PREFIX wd: <http://www.wikidata.org/entity/>
+      PREFIX wdata: <http://www.wikidata.org/wiki/Special:EntityData/>
+      PREFIX wdno: <http://www.wikidata.org/prop/novalue/>
+      PREFIX wdref: <http://www.wikidata.org/reference/>
+      PREFIX wds: <http://www.wikidata.org/entity/statement/>
+      PREFIX wdt: <http://www.wikidata.org/prop/direct/>
+      PREFIX wdtn: <http://www.wikidata.org/prop/direct-normalized/>
+      PREFIX wdv: <http://www.wikidata.org/value/>
+      PREFIX wikibase: <http://wikiba.se/ontology#>
+      PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>

{pylodstorage-0.2.0 → pylodstorage-0.2.2}/sampledata/queries.yaml

@@ -87,8 +87,9 @@
           # president
           ?president wdt:P39 wd:Q11696.
           # nickname
-          ?president wdt:P1449 ?nickName
-          SERVICE wikibase:label { bd:serviceParam wikibase:language "en". }
+          ?president wdt:P1449 ?nickName.
+          ?president rdfs:label ?presidentLabel.
+          FILTER (LANG(?presidentLabel)="en")
         } GROUP BY ?president ?presidentLabel
     title: Nick names of US Presidents
     tryItUrl: https://query.wikidata.org

{pylodstorage-0.2.0 → pylodstorage-0.2.2}/sampledata/trulytabular.yaml

@@ -10,7 +10,7 @@
           {
             SELECT ?prop (COUNT(DISTINCT ?item) AS ?count) WHERE {
               hint:Query hint:optimizer "None".
-              ?item wdt:P31 wd:%s;
+              %s
                 ?p ?id.
               ?prop wikibase:directClaim ?p.
             }