pyLodStorage 0.4.0__tar.gz → 0.4.2__tar.gz

{pylodstorage-0.4.0/pylodstorage.egg-info → pylodstorage-0.4.2}/PKG-INFO

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

{pylodstorage-0.4.0 → pylodstorage-0.4.2}/lodstorage/trulytabular.py

@@ -80,11 +80,12 @@ class WikidataProperty():
                 valuesClause+=f'   "{propertyLabel}"@{lang}\n'
             query=f"""# get the properties for the given labels
 {WikidataItem.getPrefixes(["rdf","rdfs","wikibase"])}
-SELECT ?property ?propertyLabel WHERE {{
+SELECT ?property ?propertyLabel ?wbType WHERE {{
   VALUES ?propertyLabel {{
 {valuesClause}
   }}
   ?property rdf:type wikibase:Property;rdfs:label ?propertyLabel.
+  ?property wikibase:propertyType  ?wbType.
   FILTER(LANG(?propertyLabel) = "{lang}")
 }}"""
             cls.addPropertiesForQuery(wdProperties,sparql,query)
@@ -109,11 +110,12 @@ SELECT ?property ?propertyLabel WHERE {{
             query=f"""
 # get the property for the given property Ids
 {WikidataItem.getPrefixes(["rdf","rdfs","wd","wikibase"])}
-SELECT ?property ?propertyLabel WHERE {{
+SELECT ?property ?propertyLabel ?wbType WHERE {{
   VALUES ?property {{
 {valuesClause}
   }}
   ?property rdf:type wikibase:Property;rdfs:label ?propertyLabel.
+  ?property wikibase:propertyType  ?wbType.
   FILTER(LANG(?propertyLabel) = "{lang}")
 }}""" 
             cls.addPropertiesForQuery(wdProperties,sparql,query)
@@ -135,6 +137,7 @@ SELECT ?property ?propertyLabel WHERE {{
             pid=re.sub(r"http://www.wikidata.org/entity/(.*)",r"\1",url)
             prop=WikidataProperty(pid)
             prop.plabel=record["propertyLabel"]
+            prop.wbtype=record["wbType"]
             prop.url=url
             wdProperties[prop.plabel]=prop
             prop.varname=Variable.validVarName(prop.plabel)
@@ -456,6 +459,8 @@ SELECT ?{item.varname} ?{item.varname}Label"""
                             sparqlQuery+=f"\n  ({aggregateFunc} ({distinct}?{wdProp.varname}{aggregateParam}) AS ?{wdProp.varname}_{aggregate})"
                         elif aggregate=="label":
                             sparqlQuery+=f"\n  ?{wdProp.varname}Label"
+                        elif aggregate=="ignore":
+                            sparqlQuery+=f"\n  ?{wdProp.varname}"    
         sparqlQuery+=f"""
 WHERE {{
   # instanceof {item.qid}:{item.qlabel}
@@ -522,7 +527,7 @@ WHERE {{
         sparqlQuery=f"""# get the most frequently used properties for
 # {itemText}
 {WikidataItem.getPrefixes()}
-SELECT ?prop ?propLabel ?count WHERE {{
+SELECT ?prop ?propLabel ?wbType ?count WHERE {{
   {{"""
         if self.endpointConf.database=="qlever":
             sparqlQuery+=f"""
@@ -549,6 +554,7 @@ SELECT ?prop ?propLabel ?count WHERE {{
   }}"""
         sparqlQuery+=f"""
   ?prop rdfs:label ?propLabel.
+  ?prop wikibase:propertyType ?wbType.
   FILTER(LANG(?propLabel) = "{self.lang}").{minCountFilter}  
 }}
 ORDER BY DESC (?count)

{pylodstorage-0.4.0 → pylodstorage-0.4.2}/lodstorage/version.py

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

{pylodstorage-0.4.0 → pylodstorage-0.4.2/pylodstorage.egg-info}/PKG-INFO

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