pyLodStorage 0.2.13__tar.gz → 0.2.14__tar.gz

{pylodstorage-0.2.13/pylodstorage.egg-info → pylodstorage-0.2.14}/PKG-INFO

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

{pylodstorage-0.2.13 → pylodstorage-0.2.14}/lodstorage/query.py

@@ -336,7 +336,7 @@ class Query(object):
             str: the "try it!" url for the given query
         '''
         # https://stackoverflow.com/a/9345102/1497139
-        quoted=urllib.parse.quote(self.query)
+        quoted=urllib.parse.quote(str(self.query))
         quoted=f"#{quoted}"
         url=f"{baseurl}/{quoted}"
         return url

{pylodstorage-0.2.13 → pylodstorage-0.2.14}/lodstorage/trulytabular.py

@@ -21,6 +21,8 @@ class Variable:
         convert the given potential variable name string to a valid  
         variable name
         
+        see https://stackoverflow.com/a/3305731/1497139
+        
         Args:
             varStr(str): the string to convert
             
@@ -367,15 +369,14 @@ WHERE
         return None
     
     
-    
     def generateSparqlQuery(self,lang:str='en',naive:bool=True)->str:
         '''
         generate a SPARQL Query
         '''
         item=self.item
         script=Path(__file__).name
-        sparqlQuery=f"""
-# truly tabular query for 
+        naiveText="naive" if naive else "aggregate"
+        sparqlQuery=f"""# truly tabular {naiveText} query for 
 # {item.qid}:{item.qlabel}
 # generated by {script} on {self.isodate}
 PREFIX wd: <http://www.wikidata.org/entity/>
@@ -383,7 +384,10 @@ PREFIX wdt: <http://www.wikidata.org/prop/direct/>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 SELECT ?{item.varname} ?{item.varname}Label"""
         for wdProp in self.properties.values():
-            sparqlQuery+=f"\n  ?{wdProp.varname}"
+            if naive:
+                sparqlQuery+=f"\n  ?{wdProp.varname}"
+            else:
+                sparqlQuery+=f"\n  (SAMPLE (?{wdProp.varname}) AS ?{wdProp.varname})"
         sparqlQuery+=f"""
 WHERE {{
   # instanceof {item.qid}:{item.qlabel}
@@ -392,13 +396,15 @@ WHERE {{
   ?{item.varname} rdfs:label ?{item.varname}Label  
   FILTER (LANG(?{item.varname}Label) = "{lang}").
 """
-        if naive:
-            for wdProp in self.properties.values():
+        for wdProp in self.properties.values():
                 sparqlQuery+=f"""  # {wdProp}
   OPTIONAL {{ ?{item.varname} wdt:{wdProp.pid} ?{wdProp.varname}. }}
 """                
-            pass
+        # close where Clause
         sparqlQuery+="""}\n"""
+        # optionally add Aggregate
+        if not naive:
+            sparqlQuery+=f"GROUP BY ?{item.varname} ?{item.varname}Label"
         return sparqlQuery
     
     def mostFrequentPropertiesQuery(self,whereClause:str=None):

{pylodstorage-0.2.13 → pylodstorage-0.2.14}/lodstorage/version.py

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

{pylodstorage-0.2.13 → pylodstorage-0.2.14/pylodstorage.egg-info}/PKG-INFO

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