pyLodStorage 0.3.7__tar.gz → 0.3.9__tar.gz

{pylodstorage-0.3.7/pylodstorage.egg-info → pylodstorage-0.3.9}/PKG-INFO

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

{pylodstorage-0.3.7 → pylodstorage-0.3.9}/lodstorage/query.py

@@ -199,7 +199,6 @@ class QueryResultDocumentation():
         self.resultHeader=resultHeader
         self.result=result
         
-        
     @staticmethod
     def uniCode2Latex(text:str,withConvert:bool=False)->str:
         '''
@@ -245,7 +244,7 @@ class QueryResultDocumentation():
 class Query(object):
     ''' a Query e.g. for SPAQRL '''
     
-    def __init__(self,name:str,query:str,lang='sparql',endpoint:str=None,title:str=None,description:str=None,prefixes=None,tryItUrl:str=None,formats:list=None,debug=False):
+    def __init__(self,name:str,query:str,lang='sparql',endpoint:str=None,database:str="blazegraph",title:str=None,description:str=None,prefixes=None,tryItUrl:str=None,formats:list=None,debug=False):
         '''
         constructor 
         Args:
@@ -253,6 +252,7 @@ class Query(object):
             query(string): the native Query text e.g. in SPARQL
             lang(string): the language of the query e.g. SPARQL
             endpoint(string): the endpoint url to use 
+            database(string): the type of database e.g. "blazegraph"
             title(string): the header/title of the query
             description(string): the description of the query
             prefixes(list): list of prefixes to be resolved
@@ -264,11 +264,13 @@ class Query(object):
         self.query=query
         self.lang=lang
         self.endpoint=endpoint
+        self.database=database
+        self.tryItUrl=tryItUrl
+        
         self.title=title=name if title is None else title
         self.description="" if description is None else description
         self.prefixes=prefixes
         self.debug=debug
-        self.tryItUrl=tryItUrl
         self.formats=formats
         self.formatCallBacks=[]
         
@@ -325,7 +327,7 @@ class Query(object):
                     valueFormatter.applyFormat(record,keytoformat,tablefmt)
             pass
         
-    def getTryItUrl(self,baseurl:str):
+    def getTryItUrl(self,baseurl:str,database:str="blazegraph"):
         '''
         return the "try it!" url for the given baseurl
         
@@ -337,8 +339,11 @@ class Query(object):
         '''
         # https://stackoverflow.com/a/9345102/1497139
         quoted=urllib.parse.quote(str(self.query))
-        quoted=f"#{quoted}"
-        url=f"{baseurl}/{quoted}"
+        if database=="blazegraph":
+            delim="/#"
+        else:
+            delim="?query="
+        url=f"{baseurl}{delim}{quoted}"
         return url
     
     def getLink(self,url,title,tablefmt):
@@ -463,7 +468,7 @@ class Query(object):
             title=f"{self.title}"
             resultHeader="result:"
         if withSourceCode:
-            tryItUrlEncoded=self.getTryItUrl(tryItUrl)
+            tryItUrlEncoded=self.getTryItUrl(tryItUrl,self.database)
             tryItMarkup=self.getLink(tryItUrlEncoded, "try it!", tablefmt)
             if tablefmt=="github":
                 sourceCodeHeader="### query"
@@ -606,5 +611,5 @@ class Endpoint(JSONAble):
         Returns:    
             str: a string representation of this Endpoint
         '''
-        text=f"{self.name}({self.name}):{self.endpoint}({self.method})"
+        text=f"{self.name}:{self.website}:{self.endpoint}({self.method})"
         return text

{pylodstorage-0.3.7 → pylodstorage-0.3.9}/lodstorage/querymain.py

@@ -53,6 +53,7 @@ class QueryMain:
             for name,query in qm.queriesByName.items():
                 print(f"{name}:{query.title}")
         elif args.listEndpoints:
+            # list endpoints
             for endpoint in endpoints.values():
                 if hasattr(endpoint, "lang") and endpoint.lang==args.language:
                     print(endpoint)
@@ -85,6 +86,8 @@ class QueryMain:
                 if args.endpointName:
                     endPointUrl=endpointConf.endpoint
                     method=endpointConf.method
+                    query.tryItUrl=endpointConf.website
+                    query.database=endpointConf.database
                 else:
                     endPointUrl=query.endpoint
                 if args.method:

{pylodstorage-0.3.7 → pylodstorage-0.3.9}/lodstorage/trulytabular.py

@@ -607,8 +607,8 @@ ORDER BY DESC(?count)"""
         nttotal=0
         maxCount=0
         for record in ntlod:
-            f=record["frequency"]
-            count=record["count"]
+            f=int(record["frequency"])
+            count=int(record["count"])
             #statsRow[f"f{count}"]=f
             if count>1:
                 nttotal+=f

{pylodstorage-0.3.7 → pylodstorage-0.3.9}/lodstorage/version.py

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

{pylodstorage-0.3.7 → pylodstorage-0.3.9/pylodstorage.egg-info}/PKG-INFO

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

{pylodstorage-0.3.7 → pylodstorage-0.3.9}/pylodstorage.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ pylodstorage.egg-info/top_level.txt
 sampledata/__init__.py
 sampledata/endpoints.yaml
 sampledata/formats.yaml
+sampledata/got.yaml
 sampledata/queries.yaml
 sampledata/scholia.yaml
 sampledata/trulytabular.yaml

{pylodstorage-0.3.7 → pylodstorage-0.3.9}/sampledata/endpoints.yaml

@@ -3,7 +3,7 @@
 'wikidata':
   lang: sparql
   endpoint: https://query.wikidata.org/sparql
-  website: https://query.wikidata.org/
+  website: https://query.wikidata.org
   database: blazegraph
   method: POST
   prefixes: |

pylodstorage-0.3.9/sampledata/got.yaml

@@ -0,0 +1,62 @@
+# Game of Thrones example
+# WF 2022-07-31
+'gotNaive1':
+  sparql: |
+    # Game of Thrones Characters
+    SELECT
+      ?item ?itemLabel
+      ?genderLabel
+      ?countryLabel
+      ?placeOfBirthLabel
+      ?placeOfDeathLabel
+    WHERE
+    {
+      ?item wdt:P31 wd:Q20086263. # must be a game of thrones character
+      ?item wdt:P21 ?gender.
+      ?item wdt:P27 ?country.
+      ?item wdt:P19 ?placeOfBirth.
+      ?item wdt:P20 ?placeOfDeath.
+      SERVICE wikibase:label { bd:serviceParam wikibase:language "en". }
+    }
+'gotNaive2':
+  sparql: |
+    # Game of Thrones Characters
+    SELECT
+      ?item ?itemLabel
+      ?genderLabel
+      ?countryLabel
+      ?placeOfBirthLabel
+      ?placeOfDeathLabel
+    WHERE
+    {
+      ?item wdt:P31 wd:Q20086263. # must be a game of thrones character
+      OPTIONAL { ?item wdt:P21 ?gender}.
+      OPTIONAL { ?item wdt:P27 ?country}.
+      OPTIONAL { ?item wdt:P19 ?placeOfBirth}.
+      OPTIONAL { ?item wdt:P20 ?placeOfDeath}.
+      SERVICE wikibase:label { bd:serviceParam wikibase:language "en". }
+    }
+'gotNaive3':
+  sparql: |
+    # Game of Thrones Characters
+    SELECT
+      ?item ?itemLabel
+      ?genderLabel
+      ?countryLabel
+      ?placeOfBirthLabel
+      ?placeOfDeathLabel
+      ?killedByLabel
+      ?familyLabel
+      ?occupationLabel
+    WHERE
+    {
+      ?item wdt:P31 wd:Q20086263. # must be a game of thrones character
+      OPTIONAL { ?item wdt:P21 ?gender}.
+      OPTIONAL { ?item wdt:P27 ?country}.
+      OPTIONAL { ?item wdt:P19 ?placeOfBirth}.
+      OPTIONAL { ?item wdt:P20 ?placeOfDeath}.
+      OPTIONAL { ?item wdt:P157 ?killedBy}.
+      OPTIONAL { ?item wdt:P53 ?family}.
+      OPTIONAL { ?item wdt:P106 ?occupation}.
+      SERVICE wikibase:label { bd:serviceParam wikibase:language "en". }
+    }