pyLodStorage 0.4.4__tar.gz → 0.4.6__tar.gz

{pylodstorage-0.4.4/pylodstorage.egg-info → pylodstorage-0.4.6}/PKG-INFO

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

{pylodstorage-0.4.4 → pylodstorage-0.4.6}/lodstorage/trulytabular.py

@@ -323,7 +323,7 @@ class TrulyTabular(object):
     checks "how tabular" a query based on a list of properties of an itemclass is
     '''
 
-    def __init__(self, itemQid, propertyLabels:list=[],propertyIds:list=[],where:str=None,endpointConf=None,lang="en",debug=False):
+    def __init__(self, itemQid, propertyLabels:list=[],propertyIds:list=[],subclassPredicate="wdt:P31",where:str=None,endpointConf=None,lang="en",debug=False):
         '''
         Constructor
         
@@ -331,6 +331,7 @@ class TrulyTabular(object):
             itemQid(str): wikidata id of the type to analyze 
             propertyLabels(list): a list of labels of properties to be considered
             propertyIds(list): a list of ids of properties to be considered
+            subclassPredicate(str): the subclass Predicate to use
             where(str): extra where clause for instance selection (if any)
             endpoint(str): the url of the SPARQL endpoint to be used
         '''
@@ -341,6 +342,7 @@ class TrulyTabular(object):
         self.endpointConf=endpointConf
         self.sparql=SPARQL(endpointConf.endpoint,method=self.endpointConf.method)
         self.sparql.debug=self.debug
+        self.subclassPredicate=subclassPredicate
         self.where=f"\n  {where}" if where is not None else ""
         self.lang=lang
         self.item=WikidataItem(itemQid,sparql=self.sparql,lang=lang)
@@ -369,7 +371,7 @@ SELECT (COUNT (DISTINCT ?item) AS ?count)
 WHERE
 {{
   # instance of {self.item.qlabel}
-  ?item wdt:P31 wd:{self.item.qid}.{self.where}
+  ?item {self.subclassPredicate} wd:{self.item.qid}.{self.where}
 }}"""
         try:
             count=self.sparql.getValue(query, "count")
@@ -471,7 +473,7 @@ SELECT ?{item.itemVarname} ?{item.labelVarname}"""
         sparqlQuery+=f"""
 WHERE {{
   # instanceof {item.qid}:{item.qlabel}
-  ?{item.itemVarname} wdt:P31 wd:{item.qid}.
+  ?{item.itemVarname} {self.subclassPredicate} wd:{item.qid}.
   # label
   ?{item.itemVarname} rdfs:label ?{item.labelVarname}.  
   FILTER (LANG(?{item.labelVarname}) = "{lang}").
@@ -525,7 +527,7 @@ WHERE {{
             whereClause(str): an extra WhereClause to use
         '''
         if whereClause is None:
-            whereClause=f"?item wdt:P31 wd:{self.itemQid}";
+            whereClause=f"?item {self.subclassPredicate} wd:{self.itemQid}";
             if self.endpointConf.database!="qlever":
                 whereClause+=";?p ?id"
         whereClause+="."  
@@ -589,7 +591,7 @@ ORDER BY DESC (?count)
 WHERE
 {{
   # instance of {self.item.qlabel}
-  ?item wdt:P31 wd:{self.itemQid}.{self.where}
+  ?item {self.subclassPredicate} wd:{self.itemQid}.{self.where}
   ?item rdfs:label ?itemLabel.
   FILTER (LANG(?itemLabel) = "{self.lang}").
   # {propertyLabel}
@@ -641,7 +643,7 @@ ORDER BY DESC(?count)"""
             total: total value
         '''
         m[col]=value
-        if total > 0:
+        if total is not None and total > 0:
             m[f"{col}%"]=float(f"{value/total*100:.1f}")
         else:
             m[f"{col}%"] = None

{pylodstorage-0.4.4 → pylodstorage-0.4.6}/lodstorage/version.py

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

{pylodstorage-0.4.4 → pylodstorage-0.4.6/pylodstorage.egg-info}/PKG-INFO

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