pyLodStorage 0.3.14__tar.gz → 0.4.1__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.
- {pylodstorage-0.3.14/pylodstorage.egg-info → pylodstorage-0.4.1}/PKG-INFO +3 -3
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/README.md +2 -1
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/sql.py +11 -4
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/trulytabular.py +5 -2
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/version.py +2 -2
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/xml.py +1 -1
- {pylodstorage-0.3.14 → pylodstorage-0.4.1/pylodstorage.egg-info}/PKG-INFO +3 -3
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/pylodstorage.egg-info/requires.txt +1 -1
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/setup.py +0 -1
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/LICENSE +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/__init__.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/csv.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/entity.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/jsonable.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/jsonpicklemixin.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/lod.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/mwTable.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/plot.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/query.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/querymain.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/sample.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/schema.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/sparql.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/storageconfig.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/tabulateCounter.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/uml.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/lodstorage/yamlablemixin.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/pylodstorage.egg-info/SOURCES.txt +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/pylodstorage.egg-info/dependency_links.txt +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/pylodstorage.egg-info/entry_points.txt +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/pylodstorage.egg-info/top_level.txt +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/sampledata/__init__.py +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/sampledata/endpoints.yaml +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/sampledata/formats.yaml +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/sampledata/got.yaml +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/sampledata/queries.yaml +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/sampledata/scholia.yaml +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/sampledata/trulytabular.yaml +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/sampledata/wf.yaml +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/sampledata/wikidata.yaml +0 -0
- {pylodstorage-0.3.14 → pylodstorage-0.4.1}/setup.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: pylodstorage
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.4.1
|
|
4
4
|
Summary: python List of Dict (Table) Storage library
|
|
5
5
|
Home-page: https://github.com/WolfgangFahl/pyLodStorage
|
|
6
6
|
Author: Wolfgang Fahl
|
|
@@ -12,7 +12,6 @@ Project-URL: Code, https://github.com/WolfgangFahl/pyLoDStorage/blob/master/lods
|
|
|
12
12
|
Project-URL: Issue tracker, https://github.com/WolfgangFahl/pyLodStorage/issues
|
|
13
13
|
Platform: UNKNOWN
|
|
14
14
|
Classifier: Programming Language :: Python
|
|
15
|
-
Classifier: Programming Language :: Python :: 3.6
|
|
16
15
|
Classifier: Programming Language :: Python :: 3.7
|
|
17
16
|
Classifier: Programming Language :: Python :: 3.8
|
|
18
17
|
Classifier: Programming Language :: Python :: 3.9
|
|
@@ -46,7 +45,7 @@ Installation
|
|
|
46
45
|
pip install pylodstorage
|
|
47
46
|
```
|
|
48
47
|
|
|
49
|
-
Get Sources
|
|
48
|
+
Get Sources
|
|
50
49
|
===========
|
|
51
50
|
```bash
|
|
52
51
|
git clone https://github.com/WolfgangFahl/pyLoDStorage
|
|
@@ -69,5 +68,6 @@ see [test cases](https://github.com/WolfgangFahl/pyLoDStorage/tree/master/tests)
|
|
|
69
68
|
|
|
70
69
|
### Authors
|
|
71
70
|
* [Wolfgang Fahl](http://www.bitplan.com/Wolfgang_Fahl)
|
|
71
|
+
* [Tim Holzheim](https://www.semantic-mediawiki.org/wiki/Tim_Holzheim)
|
|
72
72
|
|
|
73
73
|
|
|
@@ -24,7 +24,7 @@ Installation
|
|
|
24
24
|
pip install pylodstorage
|
|
25
25
|
```
|
|
26
26
|
|
|
27
|
-
Get Sources
|
|
27
|
+
Get Sources
|
|
28
28
|
===========
|
|
29
29
|
```bash
|
|
30
30
|
git clone https://github.com/WolfgangFahl/pyLoDStorage
|
|
@@ -47,3 +47,4 @@ see [test cases](https://github.com/WolfgangFahl/pyLoDStorage/tree/master/tests)
|
|
|
47
47
|
|
|
48
48
|
### Authors
|
|
49
49
|
* [Wolfgang Fahl](http://www.bitplan.com/Wolfgang_Fahl)
|
|
50
|
+
* [Tim Holzheim](https://www.semantic-mediawiki.org/wiki/Tim_Holzheim)
|
|
@@ -123,8 +123,7 @@ class SQLDB(object):
|
|
|
123
123
|
# show only index
|
|
124
124
|
debugInfo="\nrecord #%d" % index
|
|
125
125
|
return debugInfo
|
|
126
|
-
|
|
127
|
-
|
|
126
|
+
|
|
128
127
|
def store(self,listOfRecords,entityInfo,executeMany=False,fixNone=False):
|
|
129
128
|
'''
|
|
130
129
|
store the given list of records based on the given entityInfo
|
|
@@ -154,8 +153,16 @@ class SQLDB(object):
|
|
|
154
153
|
except sqlite3.ProgrammingError as pe:
|
|
155
154
|
msg=pe.args[0]
|
|
156
155
|
if "You did not supply a value for binding" in msg:
|
|
157
|
-
|
|
158
|
-
|
|
156
|
+
if ":" in msg:
|
|
157
|
+
# sqlite now returns the parameter name not the number
|
|
158
|
+
# You did not supply a value for binding parameter :type.
|
|
159
|
+
columnName=re.findall(r':([a-zA-Z][a-zA-Z0-9_]*)',msg)[0]
|
|
160
|
+
columnName=columnName.replace(":","")
|
|
161
|
+
else:
|
|
162
|
+
# pre python 3.10
|
|
163
|
+
# You did not supply a value for binding 2.
|
|
164
|
+
columnIndex=int(re.findall(r'\d+',msg)[0])
|
|
165
|
+
columnName=list(entityInfo.typeMap.keys())[columnIndex-1]
|
|
159
166
|
debugInfo=self.getDebugInfo(record, index, executeMany)
|
|
160
167
|
raise Exception("%s\nfailed: no value supplied for column '%s'%s" % (insertCmd,columnName,debugInfo))
|
|
161
168
|
else:
|
|
@@ -80,11 +80,12 @@ class WikidataProperty():
|
|
|
80
80
|
valuesClause+=f' "{propertyLabel}"@{lang}\n'
|
|
81
81
|
query=f"""# get the properties for the given labels
|
|
82
82
|
{WikidataItem.getPrefixes(["rdf","rdfs","wikibase"])}
|
|
83
|
-
SELECT ?property ?propertyLabel WHERE {{
|
|
83
|
+
SELECT ?property ?propertyLabel ?wbType WHERE {{
|
|
84
84
|
VALUES ?propertyLabel {{
|
|
85
85
|
{valuesClause}
|
|
86
86
|
}}
|
|
87
87
|
?property rdf:type wikibase:Property;rdfs:label ?propertyLabel.
|
|
88
|
+
?property wikibase:propertyType ?wbType.
|
|
88
89
|
FILTER(LANG(?propertyLabel) = "{lang}")
|
|
89
90
|
}}"""
|
|
90
91
|
cls.addPropertiesForQuery(wdProperties,sparql,query)
|
|
@@ -109,11 +110,12 @@ SELECT ?property ?propertyLabel WHERE {{
|
|
|
109
110
|
query=f"""
|
|
110
111
|
# get the property for the given property Ids
|
|
111
112
|
{WikidataItem.getPrefixes(["rdf","rdfs","wd","wikibase"])}
|
|
112
|
-
SELECT ?property ?propertyLabel WHERE {{
|
|
113
|
+
SELECT ?property ?propertyLabel ?wbType WHERE {{
|
|
113
114
|
VALUES ?property {{
|
|
114
115
|
{valuesClause}
|
|
115
116
|
}}
|
|
116
117
|
?property rdf:type wikibase:Property;rdfs:label ?propertyLabel.
|
|
118
|
+
?property wikibase:propertyType ?wbType.
|
|
117
119
|
FILTER(LANG(?propertyLabel) = "{lang}")
|
|
118
120
|
}}"""
|
|
119
121
|
cls.addPropertiesForQuery(wdProperties,sparql,query)
|
|
@@ -135,6 +137,7 @@ SELECT ?property ?propertyLabel WHERE {{
|
|
|
135
137
|
pid=re.sub(r"http://www.wikidata.org/entity/(.*)",r"\1",url)
|
|
136
138
|
prop=WikidataProperty(pid)
|
|
137
139
|
prop.plabel=record["propertyLabel"]
|
|
140
|
+
prop.wbtype=record["wbType"]
|
|
138
141
|
prop.url=url
|
|
139
142
|
wdProperties[prop.plabel]=prop
|
|
140
143
|
prop.varname=Variable.validVarName(prop.plabel)
|
|
@@ -9,7 +9,7 @@ class Version(object):
|
|
|
9
9
|
Version handling for pyLoDStorage
|
|
10
10
|
'''
|
|
11
11
|
name="pylodstorage"
|
|
12
|
-
version='0.
|
|
12
|
+
version='0.4.1'
|
|
13
13
|
date = '2020-09-10'
|
|
14
|
-
updated = '2022-08-
|
|
14
|
+
updated = '2022-08-03'
|
|
15
15
|
description='python List of Dict (Table) Storage library'
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: pylodstorage
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.4.1
|
|
4
4
|
Summary: python List of Dict (Table) Storage library
|
|
5
5
|
Home-page: https://github.com/WolfgangFahl/pyLodStorage
|
|
6
6
|
Author: Wolfgang Fahl
|
|
@@ -12,7 +12,6 @@ Project-URL: Code, https://github.com/WolfgangFahl/pyLoDStorage/blob/master/lods
|
|
|
12
12
|
Project-URL: Issue tracker, https://github.com/WolfgangFahl/pyLodStorage/issues
|
|
13
13
|
Platform: UNKNOWN
|
|
14
14
|
Classifier: Programming Language :: Python
|
|
15
|
-
Classifier: Programming Language :: Python :: 3.6
|
|
16
15
|
Classifier: Programming Language :: Python :: 3.7
|
|
17
16
|
Classifier: Programming Language :: Python :: 3.8
|
|
18
17
|
Classifier: Programming Language :: Python :: 3.9
|
|
@@ -46,7 +45,7 @@ Installation
|
|
|
46
45
|
pip install pylodstorage
|
|
47
46
|
```
|
|
48
47
|
|
|
49
|
-
Get Sources
|
|
48
|
+
Get Sources
|
|
50
49
|
===========
|
|
51
50
|
```bash
|
|
52
51
|
git clone https://github.com/WolfgangFahl/pyLoDStorage
|
|
@@ -69,5 +68,6 @@ see [test cases](https://github.com/WolfgangFahl/pyLoDStorage/tree/master/tests)
|
|
|
69
68
|
|
|
70
69
|
### Authors
|
|
71
70
|
* [Wolfgang Fahl](http://www.bitplan.com/Wolfgang_Fahl)
|
|
71
|
+
* [Tim Holzheim](https://www.semantic-mediawiki.org/wiki/Tim_Holzheim)
|
|
72
72
|
|
|
73
73
|
|
|
@@ -36,7 +36,6 @@ setup(
|
|
|
36
36
|
install_requires=requirements,
|
|
37
37
|
classifiers=[
|
|
38
38
|
'Programming Language :: Python',
|
|
39
|
-
'Programming Language :: Python :: 3.6',
|
|
40
39
|
'Programming Language :: Python :: 3.7',
|
|
41
40
|
'Programming Language :: Python :: 3.8',
|
|
42
41
|
'Programming Language :: Python :: 3.9',
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|