pyLodStorage 0.4.2__tar.gz → 0.4.3__tar.gz

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

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

{pylodstorage-0.4.2 → pylodstorage-0.4.3}/lodstorage/query.py

@@ -530,7 +530,7 @@ class QueryManager(object):
     @staticmethod
     def getQueries(queriesPath=None):
         '''
-        get the queries for thee given queries Path
+        get the queries for the given queries Path
         '''
         queriesPaths=YamlPath.getPaths("queries.yaml", queriesPath)
         queries={}

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

@@ -4,6 +4,8 @@ Created on 2022-04-14
 @author: wf
 '''
 import datetime
+from typing import Union
+
 from lodstorage.sparql import SPARQL
 from lodstorage.query import Query,QueryManager,YamlPath,Endpoint
 from lodstorage.version import Version
@@ -459,7 +461,7 @@ 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":
+                        elif aggregate=="ignore" and not "label" in genList:
                             sparqlQuery+=f"\n  ?{wdProp.varname}"    
         sparqlQuery+=f"""
 WHERE {{
@@ -622,12 +624,20 @@ ORDER BY DESC(?count)"""
         qlod=self.sparql.queryAsListOfDicts(query.query)
         return qlod
     
-    def addStatsColWithPercent(self,m,col,value,total): 
+    def addStatsColWithPercent(self, m:dict, col:str, value:Union[int, float], total:Union[int, float]):
         '''
         add a statistics Column
+        Args:
+            m(dict):
+            col(str): name of the column
+            value: value
+            total: total value
         '''
         m[col]=value
-        m[f"{col}%"]=float(f"{value/total*100:.1f}") 
+        if total > 0:
+            m[f"{col}%"]=float(f"{value/total*100:.1f}")
+        else:
+            m[f"{col}%"] = None
         
     def genWdPropertyStatistic(self,wdProperty:WikidataProperty,itemCount:int,withQuery=True)->dict:
         '''

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

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

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

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