pyLodStorage 0.2.9__tar.gz → 0.2.10__tar.gz

{pylodstorage-0.2.9/pylodstorage.egg-info → pylodstorage-0.2.10}/PKG-INFO

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

{pylodstorage-0.2.9 → pylodstorage-0.2.10}/lodstorage/sparql.py

@@ -22,7 +22,7 @@ class SPARQL(object):
     :ivar sparql: the SPARQLWrapper2 instance to be used
     :ivar method(str): the HTTP method to be used 'POST' or 'GET'
     '''
-    def __init__(self,url,mode='query', debug=False, typedLiterals=False,  profile=False, agent='PyLodStorage',method='POST'):
+    def __init__(self,url,mode='query', debug=False, isFuseki=False,typedLiterals=False,  profile=False, agent='PyLodStorage',method='POST'):
         '''
         Constructor a SPARQL wrapper
         
@@ -35,7 +35,10 @@ class SPARQL(object):
             agent(string): the User agent to use
             method(string): the HTTP method to be used 'POST' or 'GET'
         '''
-        self.url="url%s" % (mode)
+        if isFuseki:
+            self.url=f"{url}/{mode}"
+        else:
+            self.url=url
         self.mode=mode
         self.debug=debug
         self.typedLiterals=typedLiterals

{pylodstorage-0.2.9 → pylodstorage-0.2.10}/lodstorage/trulytabular.py

@@ -6,6 +6,7 @@ Created on 2022-04-14
 from lodstorage.sparql import SPARQL
 from lodstorage.query import Query,QueryManager,YamlPath
 import os
+import textwrap
 import re
 
 class WikidataProperty():
@@ -140,15 +141,15 @@ class WikidataItem:
             self.qlabel,self.description=WikidataItem.getLabelAndDescription(sparql, self.qid, self.lang)
     
     def __str__(self):
-                
         return self.asText(long=False)
     
-    def asText(self,long:bool=True):
+    def asText(self,long:bool=True,wrapAt:int=0):
         '''
         returns my content as a text representation
         
         Args:
             long(bool): True if a long format including url is wished
+            wrapAt(int): wrap long lines at the given width (if >0)
             
         Returns:
             str: a text representation of my content
@@ -157,9 +158,12 @@ class WikidataItem:
         if hasattr(self, "qlabel"):
             text=f"{self.qlabel} ({self.qid})"  
         if hasattr(self,"description"):
-            text+=f":{self.description}"
+            desc=self.description
+            if wrapAt>0:
+                desc=textwrap.fill(desc,width=wrapAt)
+            text+=f"☞{desc}"
         if long:
-            text+=f"-> https://www.wikidata.org/wiki/{self.qid}"
+            text+=f"→ https://www.wikidata.org/wiki/{self.qid}"
         return text
     
     @classmethod
@@ -269,7 +273,7 @@ class TrulyTabular(object):
         self.queryManager=TrulyTabular.getQueryManager(debug=self.debug)
         self.properties=WikidataProperty.getPropertiesByIds(self.sparql,propertyIds,lang)
         self.properties.update(WikidataProperty.getPropertiesByLabels(self.sparql, propertyLabels, lang))
-    
+        self.error=None
         
     def __str__(self):
         '''
@@ -282,8 +286,9 @@ class TrulyTabular(object):
         '''
         get my count
         '''
-        query=f"""# Count all items with the given 
-# type {self.item.asText(long=True)}
+        itemText=self.getItemText()
+        query=f"""# Count all items with the given type
+# {itemText}
 PREFIX wd: <http://www.wikidata.org/entity/>
 PREFIX wdt: <http://www.wikidata.org/prop/direct/>
 SELECT (COUNT (DISTINCT ?item) AS ?count)
@@ -295,6 +300,7 @@ WHERE
         try:
             count=self.sparql.getValue(query, "count")
         except Exception as ex:
+            self.error=ex
             count=None
             
         return count
@@ -312,6 +318,12 @@ WHERE
         text=self.item.asText(long)
         return text
     
+    def getItemText(self):
+        # leads to 405 Method not allowed in SPARQLWrapper under certain circumstances
+        # itemText=self.asText(long=True)
+        itemText=self.itemQid
+        return itemText
+    
     @classmethod
     def getQueryManager(cls,lang='sparql',name="trulytabular",debug=False):
         '''
@@ -340,9 +352,10 @@ WHERE
         if whereClause is None:
             whereClause=f"?item wdt:P31 wd:{self.itemQid};";
         else:
-            whereClause+=";"
-        query.title=f"most frequently used properties for {self.asText(long=True)}"
-        query.query=query.query % (self.item.asText(long=True),whereClause,self.lang)
+            whereClause+=";"     
+        itemText=self.getItemText()
+        query.title=f"most frequently used properties for {self.item.asText(long=True)}"
+        query.query=query.query % (itemText,whereClause,self.lang)
         return query
     
     def noneTabularQuery(self,wdProperty:WikidataProperty,asFrequency:bool=True):
@@ -384,7 +397,9 @@ ORDER BY DESC (?frequency)"""
             sparql=f"""{sparql}
 HAVING (COUNT (?value) > 1)
 ORDER BY DESC(?count)"""
-        query=Query(query=sparql,name=f"NonTabular {self.item.qlabel}/{propertyLabel}:{freqDesc}",title=f"non tabular entries for {self.item.qlabel}/{propertyLabel}:{freqDesc}")
+        title=f"non tabular entries for {self.item.qlabel}/{propertyLabel}:{freqDesc}"
+        name=f"NonTabular {self.item.qlabel}/{propertyLabel}:{freqDesc}"
+        query=Query(query=sparql,name=name,title=title)
         return query
 
     def noneTabular(self,wdProperty:WikidataProperty):
@@ -435,7 +450,7 @@ ORDER BY DESC(?count)"""
             if count>maxCount:
                 maxCount=count     
             total+=f
-        statsRow["max"]=maxCount
+        statsRow["maxf"]=maxCount
         if withQuery:
             statsRow["queryf"]=self.noneTabularQuery(wdProperty).query
             statsRow["queryex"]=self.noneTabularQuery(wdProperty,asFrequency=False).query

{pylodstorage-0.2.9 → pylodstorage-0.2.10}/lodstorage/version.py

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

{pylodstorage-0.2.9 → pylodstorage-0.2.10/pylodstorage.egg-info}/PKG-INFO

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