pyLodStorage 0.1.32__tar.gz → 0.2.0__tar.gz

{pylodstorage-0.1.32 → pylodstorage-0.2.0}/PKG-INFO

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

{pylodstorage-0.1.32 → pylodstorage-0.2.0}/lodstorage/trulytabular.py

@@ -8,7 +8,6 @@ from lodstorage.query import Query,QueryManager,YamlPath
 import os
 import re
 
-
 class WikidataProperty():
     '''
     a WikidataProperty
@@ -393,9 +392,57 @@ ORDER BY DESC(?count)"""
         add a statistics Column
         '''
         m[col]=value
-        m[f"{col}%"]=float(f"{value/total*100:.1f}")
+        m[f"{col}%"]=float(f"{value/total*100:.1f}") 
+        
+    def genWdPropertyStatistic(self,wdProperty:WikidataProperty,itemCount:int,withQuery=True)->dict:
+        '''
+        generate a property Statistics Row for the given wikidata Property
+        
+        Args:
+            wdProperty(WikidataProperty): the property to get the statistics for
+            itemCount(int): the total number of items to check
+            withQuery(bool): if true include the sparql query
+            
+        Returns:
+            dict: a statistics row
+        '''
+        ntlod=self.noneTabular(wdProperty)
+        statsRow={"property":wdProperty.pLabel}
+        total=0
+        nttotal=0
+        maxCount=0
+        for record in ntlod:
+            f=record["frequency"]
+            count=record["count"]
+            #statsRow[f"f{count}"]=f
+            if count>1:
+                nttotal+=f
+            else:
+                statsRow["1"]=f
+            if count>maxCount:
+                maxCount=count     
+            total+=f
+        statsRow["max"]=maxCount
+        if withQuery:
+            statsRow["queryf"]=self.noneTabularQuery(wdProperty).query
+            statsRow["queryex"]=self.noneTabularQuery(wdProperty,asFrequency=False).query
+        self.addStatsColWithPercent(statsRow,"total",total,itemCount)
+        self.addStatsColWithPercent(statsRow,"non tabular",nttotal,total)
+        return statsRow
+        
+    def genPropertyStatistics(self):
+        '''
+        generate the property Statistics
+        
+        Returns:
+            generator: a generator of statistic dict rows
+        '''
+        itemCount=self.count()
+        for wdProperty in self.properties.values():
+            statsRow=self.genWdPropertyStatistic(wdProperty, itemCount)
+            yield statsRow
     
-    def getPropertyStatics(self):
+    def getPropertyStatistics(self):
         '''
         get the property Statistics
         '''
@@ -406,25 +453,7 @@ ORDER BY DESC(?count)"""
             "total%": 100.0
         }]
         for wdProperty in self.properties.values():
-            ntlod=self.noneTabular(wdProperty)
-            statsRow={"property":wdProperty.pLabel}
-            total=0
-            nttotal=0
-            maxCount=0
-            for record in ntlod:
-                f=record["frequency"]
-                count=record["count"]
-                #statsRow[f"f{count}"]=f
-                if count>1:
-                    nttotal+=f
-                else:
-                    statsRow["1"]=f
-                if count>maxCount:
-                    maxCount=count     
-                total+=f
-            statsRow["max"]=maxCount
-            self.addStatsColWithPercent(statsRow,"total",total,itemCount)
-            self.addStatsColWithPercent(statsRow,"non tabular",nttotal,total)
+            statsRow=self.genWdPropertyStatistic(wdProperty, itemCount)
             lod.append(statsRow)
         return lod
     

{pylodstorage-0.1.32 → pylodstorage-0.2.0}/lodstorage/version.py

@@ -8,7 +8,7 @@ class Version(object):
     '''
     Version handling for pyLoDStorage
     '''
-    name="pyLodStorage"
-    version='0.1.32'
+    name="pylodstorage"
+    version='0.2.0'
     date = '2020-09-10'
-    updated = '2022-03-23'
+    updated = '2022-03-24'

{pylodstorage-0.1.32 → pylodstorage-0.2.0}/pylodstorage.egg-info/PKG-INFO

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

{pylodstorage-0.1.32 → pylodstorage-0.2.0}/pylodstorage.egg-info/requires.txt

@@ -3,4 +3,5 @@ PyYAML
 pandas
 jsonpickle
 tabulate
+pygments
 pylatexenc~=2.10

{pylodstorage-0.1.32 → pylodstorage-0.2.0}/setup.py

@@ -11,7 +11,7 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
 setup(
-    name='pylodstorage',
+    name=Version.name,
     version=Version.version,
 
     packages=['lodstorage','sampledata'],
@@ -37,6 +37,7 @@ setup(
           'pandas',
           'jsonpickle',
           'tabulate',
+          'pygments',
           'pylatexenc~=2.10'
     ],
     classifiers=[