pyLodStorage 0.2.1__tar.gz → 0.2.3__tar.gz

{pylodstorage-0.2.1 → pylodstorage-0.2.3}/PKG-INFO

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

{pylodstorage-0.2.1 → pylodstorage-0.2.3}/lodstorage/querymain.py

@@ -15,17 +15,22 @@ import requests
 import sys
 import traceback
 import os
+
 from argparse import ArgumentParser
 from argparse import RawDescriptionHelpFormatter
-from lodstorage.query import QueryManager, QueryResultDocumentation, EndpointManager, Format, ValueFormatter
+
+from lodstorage.csv import CSV
+from lodstorage.query import QueryManager, EndpointManager, Format, ValueFormatter
 from lodstorage.sparql import SPARQL
 from lodstorage.sql import SQLDB
-from lodstorage.csv import CSV
+from lodstorage.xml import Lod2Xml
+
 
 class QueryMain:
     '''
     Commandline handler
     '''
+    
     @classmethod
     def main(cls,args):
         '''
@@ -99,6 +104,13 @@ class QueryMain:
                 print (docstr)
             elif args.format in [Format.json]:
                 print(json.dumps(qlod))
+            elif args.format in [Format.xml]:
+                lod2xml=Lod2Xml(qlod)
+                xml=lod2xml.asXml()
+                print(xml)
+                
+            else:
+                raise Exception(f"format {args.format} not supported yet") 
 
     @staticmethod
     def rawQuery(endpoint, query, resultFormat, mimeType):

{pylodstorage-0.2.1 → pylodstorage-0.2.3}/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.1 → pylodstorage-0.2.3}/lodstorage/trulytabular.py

@@ -262,6 +262,7 @@ class TrulyTabular(object):
             endpoint=TrulyTabular.endpoint
         self.endpoint=endpoint
         self.sparql=SPARQL(endpoint,method=method)
+        self.sparql.debug=self.debug
         self.where=f"\n  {where}" if where is not None else ""
         self.lang=lang
         self.item=WikidataItem(itemQid,sparql=self.sparql,lang=lang)
@@ -323,13 +324,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.1 → pylodstorage-0.2.3}/lodstorage/version.py

@@ -9,6 +9,6 @@ class Version(object):
     Version handling for pyLoDStorage
     '''
     name="pylodstorage"
-    version='0.2.1'
+    version='0.2.3'
     date = '2020-09-10'
-    updated = '2022-03-27'
+    updated = '2022-06-20'

pylodstorage-0.2.3/lodstorage/xml.py

@@ -0,0 +1,49 @@
+'''
+Created on 2022-06-20
+
+see  
+    https://github.com/tyleradams/json-toolkit
+    https://stackoverflow.com/questions/36021526/converting-an-array-dict-to-xml-in-python
+
+@author: tyleradams
+@author: wf
+'''
+from dicttoxml import dicttoxml
+from xml.dom.minidom import parseString
+
+
+class Lod2Xml():
+    '''
+    convert a list of dicts to XML
+    '''
+    
+    def __init__(self,lod,root:str="root",node_name:callable=(lambda x:'node')):
+        '''
+        construct me with the given list of dicts
+        
+        Args:
+            lod(list): the list of dicts to convert to XML
+            root(str): the name of the root nod
+            item_name(func): the function to use to calculate node names
+        '''
+        self.lod=lod
+        self.root=root
+        self.item_name=node_name
+        
+        
+    def asXml(self,pretty:bool=True):
+        ''' 
+        convert result to XML
+        
+        Args:
+            pretty(bool): if True pretty print the result
+            
+        '''
+        xml=dicttoxml(self.lod, custom_root=self.root,item_func=self.item_name, attr_type=False)
+        if pretty:
+            dom=parseString(xml)
+            prettyXml=dom.toprettyxml()
+        else:
+            prettyXml=xml    
+        return prettyXml
+        

{pylodstorage-0.2.1 → pylodstorage-0.2.3}/pylodstorage.egg-info/PKG-INFO

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

{pylodstorage-0.2.1 → pylodstorage-0.2.3}/pylodstorage.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ lodstorage/tabulateCounter.py
 lodstorage/trulytabular.py
 lodstorage/uml.py
 lodstorage/version.py
+lodstorage/xml.py
 lodstorage/yamlablemixin.py
 pylodstorage.egg-info/PKG-INFO
 pylodstorage.egg-info/SOURCES.txt

{pylodstorage-0.2.1 → pylodstorage-0.2.3}/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.
             }

{pylodstorage-0.2.1 → pylodstorage-0.2.3}/sampledata/wikidata.yaml

@@ -79,3 +79,47 @@
             }
         }
         ORDER BY(?playerLabel)
+'Top200HumanSettlementClasses':
+    title: top 200 human settlement classes https://www.wikidata.org/wiki/Q486972
+    description: based on wdtaxonomy Q486972 -c -d -m = using https://www.npmjs.com/package/wikidata-taxonomy
+    formats:
+        - item:wikidata
+    sparql: |
+      # relevant human settlement classes in wikidata
+      # based on wdtaxonomy Q486972 -c -d -m = -s
+      # WF 2021-08-25
+      SELECT ?item ?itemLabel ?itemDescription ?instances ?sites  WITH {
+          SELECT DISTINCT ?item { ?item wdt:P279* wd:Q486972 }
+        } AS %items WHERE {
+          INCLUDE %items .
+          {
+            SELECT ?item (count(distinct ?element) as ?instances) {
+              INCLUDE %items.
+              OPTIONAL { ?element wdt:P31 ?item }
+            } GROUP BY ?item
+          }
+          {
+            SELECT ?item (count(distinct ?site) as ?sites) {
+              INCLUDE %items.
+              OPTIONAL { ?site schema:about ?item }
+            } GROUP BY ?item
+          }
+          SERVICE wikibase:label {
+            bd:serviceParam wikibase:language "en"
+          }
+
+          FILTER(?instances>700)
+        } ORDER BY DESC (?instances)
+      LIMIT 200
+'AcademicConferenceItemLabel':
+  sparql: |
+      # get the label for the given item
+      SELECT ?itemLabel
+      WHERE
+      {
+        VALUES (?item) {
+          (wd:Q2020153)
+        }
+        ?item rdfs:label ?itemLabel.
+        filter (lang(?itemLabel) = "en").
+      }