pyLodStorage 0.3.1__tar.gz → 0.3.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. {pylodstorage-0.3.1/pylodstorage.egg-info → pylodstorage-0.3.3}/PKG-INFO +1 -1
  2. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/trulytabular.py +19 -2
  3. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/version.py +2 -2
  4. {pylodstorage-0.3.1 → pylodstorage-0.3.3/pylodstorage.egg-info}/PKG-INFO +1 -1
  5. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/LICENSE +0 -0
  6. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/README.md +0 -0
  7. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/__init__.py +0 -0
  8. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/csv.py +0 -0
  9. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/entity.py +0 -0
  10. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/jsonable.py +0 -0
  11. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/jsonpicklemixin.py +0 -0
  12. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/lod.py +0 -0
  13. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/mwTable.py +0 -0
  14. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/plot.py +0 -0
  15. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/query.py +0 -0
  16. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/querymain.py +0 -0
  17. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/sample.py +0 -0
  18. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/schema.py +0 -0
  19. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/sparql.py +0 -0
  20. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/sql.py +0 -0
  21. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/storageconfig.py +0 -0
  22. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/tabulateCounter.py +0 -0
  23. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/uml.py +0 -0
  24. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/xml.py +0 -0
  25. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/yamlablemixin.py +0 -0
  26. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/pylodstorage.egg-info/SOURCES.txt +0 -0
  27. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/pylodstorage.egg-info/dependency_links.txt +0 -0
  28. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/pylodstorage.egg-info/entry_points.txt +0 -0
  29. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/pylodstorage.egg-info/requires.txt +0 -0
  30. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/pylodstorage.egg-info/top_level.txt +0 -0
  31. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/sampledata/__init__.py +0 -0
  32. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/sampledata/endpoints.yaml +0 -0
  33. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/sampledata/formats.yaml +0 -0
  34. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/sampledata/queries.yaml +0 -0
  35. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/sampledata/scholia.yaml +0 -0
  36. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/sampledata/trulytabular.yaml +0 -0
  37. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/sampledata/wf.yaml +0 -0
  38. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/sampledata/wikidata.yaml +0 -0
  39. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/setup.cfg +0 -0
  40. {pylodstorage-0.3.1 → pylodstorage-0.3.3}/setup.py +0 -0
{pylodstorage-0.3.1/pylodstorage.egg-info → pylodstorage-0.3.3}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pylodstorage
3
- Version: 0.3.1
3
+ Version: 0.3.3
4
4
  Summary: python List of Dict (Table) Storage library
5
5
  Home-page: https://github.com/WolfgangFahl/pyLodStorage
6
6
  Author: Wolfgang Fahl
{pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/trulytabular.py RENAMED
@@ -442,12 +442,29 @@ WHERE {{
442
442
  sparqlQuery+="""}\n"""
443
443
  # optionally add Aggregate
444
444
  if not naive:
445
- sparqlQuery+=f"GROUP BY ?{item.varname} ?{item.varname}Label"
445
+ sparqlQuery+=f"""GROUP BY
446
+ ?{item.varname}
447
+ ?{item.varname}Label
448
+ """
449
+ for wdProp in self.properties.values():
450
+ if wdProp.pid in genMap:
451
+ genList=genMap[wdProp.pid]
452
+ if "label" in genList:
453
+ sparqlQuery+=f"\n ?{wdProp.varname}Label"
454
+ havingCount=0
455
+ havingDelim=" "
446
456
  for wdProp in self.properties.values():
447
457
  if wdProp.pid in genMap:
448
458
  genList=genMap[wdProp.pid]
449
459
  if "ignore" in genList:
450
- sparqlQuery+=f"\nHAVING (COUNT(?{wdProp.varname})=1)"
460
+ havingCount+=1
461
+ if havingCount==1:
462
+ sparqlQuery+=f"\nHAVING ("
463
+
464
+ sparqlQuery+=f"\n {havingDelim}COUNT(?{wdProp.varname})<=1"
465
+ havingDelim="&& "
466
+ if havingCount>0:
467
+ sparqlQuery+=f"\n)"
451
468
  return sparqlQuery
452
469
 
453
470
  def mostFrequentPropertiesQuery(self,whereClause:str=None):
{pylodstorage-0.3.1 → pylodstorage-0.3.3}/lodstorage/version.py RENAMED
@@ -9,7 +9,7 @@ class Version(object):
9
9
  Version handling for pyLoDStorage
10
10
  '''
11
11
  name="pylodstorage"
12
- version='0.3.1'
12
+ version='0.3.3'
13
13
  date = '2020-09-10'
14
- updated = '2022-07-28'
14
+ updated = '2022-07-30'
15
15
  description='python List of Dict (Table) Storage library'
{pylodstorage-0.3.1 → pylodstorage-0.3.3/pylodstorage.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pylodstorage
3
- Version: 0.3.1
3
+ Version: 0.3.3
4
4
  Summary: python List of Dict (Table) Storage library
5
5
  Home-page: https://github.com/WolfgangFahl/pyLodStorage
6
6
  Author: Wolfgang Fahl
{pylodstorage-0.3.1 → pylodstorage-0.3.3}/LICENSE RENAMED
File without changes
{pylodstorage-0.3.1 → pylodstorage-0.3.3}/README.md RENAMED
File without changes
{pylodstorage-0.3.1 → pylodstorage-0.3.3}/setup.cfg RENAMED
File without changes
{pylodstorage-0.3.1 → pylodstorage-0.3.3}/setup.py RENAMED
File without changes