pyLodStorage 0.3.2__tar.gz → 0.3.4__tar.gz

{pylodstorage-0.3.2/pylodstorage.egg-info → pylodstorage-0.3.4}/PKG-INFO

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

{pylodstorage-0.3.2 → pylodstorage-0.3.4}/lodstorage/query.py

@@ -579,6 +579,7 @@ class Endpoint(JSONAble):
                 "name": "wikidata",
                 "lang": "sparql",
                 "endpoint": "https://query.wikidata.org/sparql",
+                "website": "https://query.wikidata.org/",
                 "method": "POST",
                 "prefixes": "PREFIX bd: <http://www.bigdata.com/rdf#>\nPREFIX cc: <http://creativecommons.org/ns#>"
             }

{pylodstorage-0.3.2 → pylodstorage-0.3.4}/lodstorage/trulytabular.py

@@ -442,7 +442,15 @@ WHERE {{
         sparqlQuery+="""}\n"""
         # optionally add Aggregate
         if not naive:
-            sparqlQuery+=f"GROUP BY ?{item.varname} ?{item.varname}Label"
+            sparqlQuery+=f"""GROUP BY
+  ?{item.varname} 
+  ?{item.varname}Label
+"""
+            for wdProp in self.properties.values():
+                if wdProp.pid in genMap:
+                    genList=genMap[wdProp.pid]
+                    if "label" in genList:
+                        sparqlQuery+=f"\n  ?{wdProp.varname}Label"
             havingCount=0
             havingDelim="   "
             for wdProp in self.properties.values():
@@ -453,7 +461,7 @@ WHERE {{
                         if havingCount==1:
                             sparqlQuery+=f"\nHAVING ("
                             
-                        sparqlQuery+=f"\n  {havingDelim}COUNT(?{wdProp.varname})=1"
+                        sparqlQuery+=f"\n  {havingDelim}COUNT(?{wdProp.varname})<=1"
                         havingDelim="&& "
             if havingCount>0:
                 sparqlQuery+=f"\n)"

{pylodstorage-0.3.2 → pylodstorage-0.3.4}/lodstorage/version.py

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

{pylodstorage-0.3.2 → pylodstorage-0.3.4/pylodstorage.egg-info}/PKG-INFO

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

{pylodstorage-0.3.2 → pylodstorage-0.3.4}/sampledata/endpoints.yaml

@@ -3,6 +3,7 @@
 'wikidata':
   lang: sparql
   endpoint: https://query.wikidata.org/sparql
+  website: https://query.wikidata.org/
   method: POST
   prefixes: |
     PREFIX bd: <http://www.bigdata.com/rdf#>
@@ -41,6 +42,7 @@
   lang: sparql
   method: GET
   endpoint: https://qlever.cs.uni-freiburg.de/api/wikidata
+  website: https://qlever.cs.uni-freiburg.de/wikidata
   prefixes: |
     PREFIX bd: <http://www.bigdata.com/rdf#>
     PREFIX cc: <http://creativecommons.org/ns#>
@@ -78,6 +80,7 @@
   lang: sparql
   method: GET
   endpoint: https://qlever.cs.uni-freiburg.de/api/wikidata-proxy
+  website: https://qlever.cs.uni-freiburg.de/wikidata
   prefixes: |
     PREFIX bd: <http://www.bigdata.com/rdf#>
     PREFIX cc: <http://creativecommons.org/ns#>
@@ -113,6 +116,7 @@
 'wikidata-openlinksw':
     lang: sparql
     endpoint: https://wikidata.demo.openlinksw.com/sparql
+    website: https://wikidata.demo.openlinksw.com/sparql
     prefixes: |
       PREFIX bd: <http://www.bigdata.com/rdf#>
       PREFIX cc: <http://creativecommons.org/ns#>