pyLodStorage 0.2.11__tar.gz → 0.2.13__tar.gz

{pylodstorage-0.2.11/pylodstorage.egg-info → pylodstorage-0.2.13}/PKG-INFO

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

{pylodstorage-0.2.11 → pylodstorage-0.2.13}/lodstorage/querymain.py

@@ -4,6 +4,7 @@ Created on 2022-02-13
 @author: wf
 '''
 from lodstorage.version import Version
+from pathlib import Path
 __version__ = Version.version
 __date__ = Version.date
 __updated__ = Version.updated
@@ -20,7 +21,7 @@ from argparse import ArgumentParser
 from argparse import RawDescriptionHelpFormatter
 
 from lodstorage.csv import CSV
-from lodstorage.query import QueryManager, EndpointManager, Format, ValueFormatter
+from lodstorage.query import Query,QueryManager, EndpointManager, Format, ValueFormatter
 from lodstorage.sparql import SPARQL
 from lodstorage.sql import SQLDB
 from lodstorage.xml import Lod2Xml
@@ -42,6 +43,7 @@ class QueryMain:
         debug=args.debug
         endpoints=EndpointManager.getEndpoints(args.endpointPath)
         qm=QueryManager(lang=args.language,debug=debug,queriesPath=args.queriesPath)
+        query=None
         queryCode=args.query
         endpointConf=None
         formats=None
@@ -66,6 +68,13 @@ class QueryMain:
             if debug or args.showQuery:
                 if hasattr(query, "description") and query.description is not None:
                     print(query.description)
+        if query is None:
+            name="?"
+            if queryCode is None and args.queryFile is not None:
+                queryFilePath=Path(args.queryFile)
+                queryCode = queryFilePath.read_text()
+                name=queryFilePath.stem
+            query=Query(name="?",query=queryCode,lang=args.language)
         if queryCode:
             if debug or args.showQuery:
                 print(f"{args.language}:\n{queryCode}")
@@ -199,6 +208,7 @@ USAGE
         parser.add_argument('-sq','--showQuery',action="store_true",help="show the query") 
         parser.add_argument('-qp', '--queriesPath',help="path to YAML file with query definitions")
         parser.add_argument("-q", "--query",help="the query to run")
+        parser.add_argument("-qf", "--queryFile",help="the query file to run")
         parser.add_argument("-qn","--queryName",help="run a named query")
         parser.add_argument("-raw",action="store_true", help="return the raw query result from the endpoint. (MIME type defined over -f or -m)")
         parser.add_argument('-V', '--version', action='version', version=program_version_message)

{pylodstorage-0.2.11 → pylodstorage-0.2.13}/lodstorage/trulytabular.py

@@ -3,12 +3,32 @@ Created on 2022-04-14
 
 @author: wf
 '''
+import datetime
 from lodstorage.sparql import SPARQL
 from lodstorage.query import Query,QueryManager,YamlPath
+from pathlib import Path
 import os
 import textwrap
 import re
 
+class Variable:
+    '''
+    Variable e.g. name handling
+    '''
+    @classmethod
+    def validVarName(cls,varStr:str)->str:
+        '''
+        convert the given potential variable name string to a valid  
+        variable name
+        
+        Args:
+            varStr(str): the string to convert
+            
+        Returns:
+            str: a valid variable name
+        '''
+        return re.sub('\W|^(?=\d)','_', varStr)
+    
 class WikidataProperty():
     '''
     a WikidataProperty
@@ -29,13 +49,13 @@ class WikidataProperty():
         get me as a Predicate
         '''
         reverseToken="^" if self.reverse else ""
-        pLabel=f"{reverseToken}wdt:{self.pid}"
-        return pLabel
+        plabel=f"{reverseToken}wdt:{self.pid}"
+        return plabel
     
     def __str__(self):
         text=self.pid
-        if hasattr(self, "label"):
-            text=f"{self.label} ({self.pid})"
+        if hasattr(self, "plabel"):
+            text=f"{self.plabel} ({self.pid})"
         return text
       
     @classmethod
@@ -115,9 +135,10 @@ SELECT ?property ?propertyLabel WHERE {
             url=record["property"]
             pid=re.sub(r"http://www.wikidata.org/entity/(.*)",r"\1",url)
             prop=WikidataProperty(pid)
-            prop.pLabel=record["propertyLabel"]
+            prop.plabel=record["propertyLabel"]
             prop.url=url
-            wdProperties[prop.pLabel]=prop
+            wdProperties[prop.plabel]=prop
+            prop.varname=Variable.validVarName(prop.plabel)
             pass
         return wdProperties
     
@@ -140,6 +161,7 @@ class WikidataItem:
         self.sparql=sparql
         if sparql is not None:
             self.qlabel,self.description=WikidataItem.getLabelAndDescription(sparql, self.qid, self.lang)
+            self.varname=Variable.validVarName(self.qlabel)
     
     def __str__(self):
         return self.asText(long=False)
@@ -238,6 +260,7 @@ WHERE {
             item=WikidataItem(qid)
             item.url=url
             item.qlabel=record["itemLabel"]
+            item.varname=Variable.validVarName(item.qlabel)
             item.description=record["itemDescription"]
             items.append(item)
         return items
@@ -274,6 +297,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.isodate=datetime.datetime.now().isoformat()
         self.error=None
         
     def __str__(self):
@@ -342,6 +366,41 @@ WHERE
                 return qm
         return None
     
+    
+    
+    def generateSparqlQuery(self,lang:str='en',naive:bool=True)->str:
+        '''
+        generate a SPARQL Query
+        '''
+        item=self.item
+        script=Path(__file__).name
+        sparqlQuery=f"""
+# truly tabular query for 
+# {item.qid}:{item.qlabel}
+# generated by {script} on {self.isodate}
+PREFIX wd: <http://www.wikidata.org/entity/>
+PREFIX wdt: <http://www.wikidata.org/prop/direct/>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+SELECT ?{item.varname} ?{item.varname}Label"""
+        for wdProp in self.properties.values():
+            sparqlQuery+=f"\n  ?{wdProp.varname}"
+        sparqlQuery+=f"""
+WHERE {{
+  # instanceof {item.qid}:{item.qlabel}
+  ?{item.varname} wdt:P31 wd:{item.qid}.
+  # label
+  ?{item.varname} rdfs:label ?{item.varname}Label  
+  FILTER (LANG(?{item.varname}Label) = "{lang}").
+"""
+        if naive:
+            for wdProp in self.properties.values():
+                sparqlQuery+=f"""  # {wdProp}
+  OPTIONAL {{ ?{item.varname} wdt:{wdProp.pid} ?{wdProp.varname}. }}
+"""                
+            pass
+        sparqlQuery+="""}\n"""
+        return sparqlQuery
+    
     def mostFrequentPropertiesQuery(self,whereClause:str=None):
         '''
         get the most frequently used properties
@@ -367,7 +426,7 @@ WHERE
             wdProperty(WikidataProperty): the property to analyze
             asFrequency(bool): if true do a frequency analysis
         '''
-        propertyLabel=wdProperty.pLabel
+        propertyLabel=wdProperty.plabel
         propertyId=wdProperty.pid
         # work around https://github.com/RDFLib/sparqlwrapper/issues/211
         if "described at" in propertyLabel:
@@ -436,7 +495,7 @@ ORDER BY DESC(?count)"""
             dict: a statistics row
         '''
         ntlod=self.noneTabular(wdProperty)
-        statsRow={"property":wdProperty.pLabel}
+        statsRow={"property":wdProperty.plabel}
         total=0
         nttotal=0
         maxCount=0

{pylodstorage-0.2.11 → pylodstorage-0.2.13}/lodstorage/version.py

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

{pylodstorage-0.2.11 → pylodstorage-0.2.13/pylodstorage.egg-info}/PKG-INFO

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