ricgraph 2.6__tar.gz → 2.7__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.
- {ricgraph-2.6/ricgraph.egg-info → ricgraph-2.7}/PKG-INFO +15 -21
- {ricgraph-2.6 → ricgraph-2.7}/README-PyPI.md +13 -10
- {ricgraph-2.6 → ricgraph-2.7}/README.md +15 -12
- {ricgraph-2.6 → ricgraph-2.7}/pyproject.toml +1 -10
- {ricgraph-2.6 → ricgraph-2.7}/ricgraph/__init__.py +1 -1
- {ricgraph-2.6 → ricgraph-2.7}/ricgraph/ricgraph.py +25 -2
- {ricgraph-2.6 → ricgraph-2.7/ricgraph.egg-info}/PKG-INFO +15 -21
- ricgraph-2.7/ricgraph.egg-info/requires.txt +4 -0
- ricgraph-2.6/ricgraph.egg-info/requires.txt +0 -13
- {ricgraph-2.6 → ricgraph-2.7}/LICENSE +0 -0
- {ricgraph-2.6 → ricgraph-2.7}/ricgraph.egg-info/SOURCES.txt +0 -0
- {ricgraph-2.6 → ricgraph-2.7}/ricgraph.egg-info/dependency_links.txt +0 -0
- {ricgraph-2.6 → ricgraph-2.7}/ricgraph.egg-info/top_level.txt +0 -0
- {ricgraph-2.6 → ricgraph-2.7}/setup.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: ricgraph
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.7
|
|
4
4
|
Summary: Ricgraph - Research in context graph
|
|
5
5
|
Author: Rik D.T. Janssen
|
|
6
6
|
Project-URL: Website, https://www.ricgraph.eu
|
|
@@ -17,36 +17,30 @@ Classifier: Programming Language :: Python :: 3
|
|
|
17
17
|
Requires-Python: >=3.9
|
|
18
18
|
Description-Content-Type: text/markdown
|
|
19
19
|
License-File: LICENSE
|
|
20
|
-
Requires-Dist: connexion[flask,swagger-ui,uvicorn]
|
|
21
|
-
Requires-Dist: flask
|
|
22
|
-
Requires-Dist: gunicorn
|
|
23
|
-
Requires-Dist: markupsafe
|
|
24
20
|
Requires-Dist: neo4j>=5.8
|
|
25
21
|
Requires-Dist: numpy
|
|
26
|
-
Requires-Dist: openapi_markdown
|
|
27
22
|
Requires-Dist: pandas
|
|
28
|
-
Requires-Dist: pyalex
|
|
29
|
-
Requires-Dist: ratelimit
|
|
30
23
|
Requires-Dist: requests
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
[
|
|
38
|
-
|
|
24
|
+
|
|
25
|
+
[](https://doi.org/10.5281/zenodo.7524314)
|
|
26
|
+
[](https://doi.org/10.1016/j.softx.2024.101736)
|
|
27
|
+
[](https://www.ricgraph.eu)
|
|
28
|
+
|
|
29
|
+
[](https://github.com/UtrechtUniversity/ricgraph/releases)
|
|
39
30
|
|
|
40
|
-
|
|
41
|
-
[
|
|
32
|
+
[](https://pypi.org/project/ricgraph)
|
|
33
|
+
[](https://pypistats.org/packages/ricgraph)
|
|
34
|
+
[](LICENSE)
|
|
42
35
|
[](https://www.repostatus.org/#active)
|
|
43
|
-
[](https://github.com/CLARIAH/clariah-plus/blob/main/requirements/software-metadata-requirements.md#15--you-should-express-a-technology-readiness-level)
|
|
44
37
|
[](https://fairsoftwarechecklist.net/v0.2?f=31&a=32113&i=32110&r=123)
|
|
45
38
|
<!---
|
|
46
39
|
Note, the lines 'Website' and
|
|
47
|
-
'
|
|
40
|
+
'PyPI downloads' end in two spaces, to force a line break but not a paragraph break.
|
|
48
41
|
--->
|
|
49
|
-
|
|
42
|
+
|
|
43
|
+
<img alt="Ricgraph logo" src="https://raw.githubusercontent.com/UtrechtUniversity/ricgraph/refs/heads/main/docs/images/ricgraph_logo.png" height="30">
|
|
50
44
|
|
|
51
45
|
# Ricgraph - Research in context graph
|
|
52
46
|
|
|
@@ -1,19 +1,22 @@
|
|
|
1
|
-
[
|
|
5
|
-
|
|
1
|
+
[](https://doi.org/10.5281/zenodo.7524314)
|
|
2
|
+
[](https://doi.org/10.1016/j.softx.2024.101736)
|
|
3
|
+
[](https://www.ricgraph.eu)
|
|
4
|
+
|
|
5
|
+
[](https://github.com/UtrechtUniversity/ricgraph/releases)
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
[
|
|
8
|
+
[](https://pypi.org/project/ricgraph)
|
|
9
|
+
[](https://pypistats.org/packages/ricgraph)
|
|
10
|
+
[](LICENSE)
|
|
9
11
|
[](https://www.repostatus.org/#active)
|
|
10
|
-
[](https://github.com/CLARIAH/clariah-plus/blob/main/requirements/software-metadata-requirements.md#15--you-should-express-a-technology-readiness-level)
|
|
11
13
|
[](https://fairsoftwarechecklist.net/v0.2?f=31&a=32113&i=32110&r=123)
|
|
12
14
|
<!---
|
|
13
15
|
Note, the lines 'Website' and
|
|
14
|
-
'
|
|
16
|
+
'PyPI downloads' end in two spaces, to force a line break but not a paragraph break.
|
|
15
17
|
--->
|
|
16
|
-
|
|
18
|
+
|
|
19
|
+
<img alt="Ricgraph logo" src="https://raw.githubusercontent.com/UtrechtUniversity/ricgraph/refs/heads/main/docs/images/ricgraph_logo.png" height="30">
|
|
17
20
|
|
|
18
21
|
# Ricgraph - Research in context graph
|
|
19
22
|
|
|
@@ -1,19 +1,22 @@
|
|
|
1
|
-
[
|
|
5
|
-
|
|
1
|
+
[](https://doi.org/10.5281/zenodo.7524314)
|
|
2
|
+
[](https://doi.org/10.1016/j.softx.2024.101736)
|
|
3
|
+
[](https://www.ricgraph.eu)
|
|
4
|
+
|
|
5
|
+
[](https://github.com/UtrechtUniversity/ricgraph/releases)
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
[
|
|
8
|
+
[](https://pypi.org/project/ricgraph)
|
|
9
|
+
[](https://pypistats.org/packages/ricgraph)
|
|
10
|
+
[](LICENSE)
|
|
9
11
|
[](https://www.repostatus.org/#active)
|
|
10
|
-
[](https://github.com/CLARIAH/clariah-plus/blob/main/requirements/software-metadata-requirements.md#15--you-should-express-a-technology-readiness-level)
|
|
11
13
|
[](https://fairsoftwarechecklist.net/v0.2?f=31&a=32113&i=32110&r=123)
|
|
12
14
|
<!---
|
|
13
15
|
Note, the lines 'Website' and
|
|
14
|
-
'
|
|
16
|
+
'PyPI downloads' end in two spaces, to force a line break but not a paragraph break.
|
|
15
17
|
--->
|
|
16
|
-
|
|
18
|
+
|
|
19
|
+
<img alt="Ricgraph logo" src="docs/images/ricgraph_logo.png" height="30">
|
|
17
20
|
|
|
18
21
|
# Ricgraph - Research in context graph
|
|
19
22
|
|
|
@@ -111,7 +114,7 @@ For a further introduction, you might want to read these two presentations:
|
|
|
111
114
|
(and other source systems) using Ricgraph
|
|
112
115
|
and [BackToPure](https://github.com/UtrechtUniversity/BackToPure):
|
|
113
116
|
https://doi.org/10.5281/zenodo.12634658.
|
|
114
|
-
This presentation explains that after harvesting several Pure
|
|
117
|
+
This presentation explains that after harvesting several Pure systems
|
|
115
118
|
(from different institutions) and other source systems,
|
|
116
119
|
such as [OpenAlex](https://openalex.org),
|
|
117
120
|
one can enrich its own Pure _A_ by using information in other source
|
|
@@ -304,7 +307,7 @@ More examples can be found in [Ricgraph details](docs/ricgraph_details.md).
|
|
|
304
307
|
(and other source systems) using Ricgraph
|
|
305
308
|
and [BackToPure](https://github.com/UtrechtUniversity/BackToPure):
|
|
306
309
|
https://doi.org/10.5281/zenodo.12634658.
|
|
307
|
-
This presentation explains that after harvesting several Pure
|
|
310
|
+
This presentation explains that after harvesting several Pure systems
|
|
308
311
|
(from different institutions) and other source systems,
|
|
309
312
|
such as [OpenAlex](https://openalex.org),
|
|
310
313
|
one can enrich its own Pure _A_ by using information in other source
|
|
@@ -7,7 +7,7 @@ packages = ["ricgraph"]
|
|
|
7
7
|
|
|
8
8
|
[project]
|
|
9
9
|
name = "ricgraph"
|
|
10
|
-
version = "2.
|
|
10
|
+
version = "2.7"
|
|
11
11
|
authors = [
|
|
12
12
|
{ name="Rik D.T. Janssen" },
|
|
13
13
|
]
|
|
@@ -24,19 +24,10 @@ keywords = ["Ricgraph", "Ricgraph Explorer", "Ricgraph REST API", "Research in c
|
|
|
24
24
|
"Graph", "Graph database", "Data harvesting", "Data enrichment", "Data linking",
|
|
25
25
|
"Linked data", "Knowledge graph", "Metadata", "Utrecht University"]
|
|
26
26
|
dependencies = [
|
|
27
|
-
"connexion[swagger-ui,flask,uvicorn]",
|
|
28
|
-
"flask",
|
|
29
|
-
"gunicorn",
|
|
30
|
-
"markupsafe",
|
|
31
27
|
"neo4j >= 5.8",
|
|
32
28
|
"numpy",
|
|
33
|
-
"openapi_markdown",
|
|
34
29
|
"pandas",
|
|
35
|
-
"pyalex",
|
|
36
|
-
"ratelimit",
|
|
37
30
|
"requests",
|
|
38
|
-
"Sickle",
|
|
39
|
-
"xmltodict",
|
|
40
31
|
]
|
|
41
32
|
|
|
42
33
|
[project.urls]
|
|
@@ -1317,7 +1317,11 @@ def read_all_nodes(name: str = '', category: str = '', value: str = '',
|
|
|
1317
1317
|
def read_all_values_of_property(node_property: str = '') -> list:
|
|
1318
1318
|
"""Read all the values of a certain property.
|
|
1319
1319
|
|
|
1320
|
-
:param node_property: the property to find all values
|
|
1320
|
+
:param node_property: the property to find all values:
|
|
1321
|
+
'name': all different name properties.
|
|
1322
|
+
'category': all different category properties.
|
|
1323
|
+
'_source': all different _source properties.
|
|
1324
|
+
'name_personal': all different name properties that are personal identifiers.
|
|
1321
1325
|
:return: a sorted list with all the values, or empty list on error.
|
|
1322
1326
|
"""
|
|
1323
1327
|
global _graph
|
|
@@ -1327,13 +1331,23 @@ def read_all_values_of_property(node_property: str = '') -> list:
|
|
|
1327
1331
|
return []
|
|
1328
1332
|
|
|
1329
1333
|
if node_property != 'name' \
|
|
1334
|
+
and node_property != 'name_personal' \
|
|
1330
1335
|
and node_property != 'category' \
|
|
1331
1336
|
and node_property != '_source':
|
|
1332
1337
|
print('\nread_all_values_of_property(): Error: function does not work for property "'
|
|
1333
1338
|
+ node_property + '".\n\n')
|
|
1334
1339
|
return []
|
|
1335
1340
|
|
|
1336
|
-
|
|
1341
|
+
|
|
1342
|
+
if node_property == 'name_personal':
|
|
1343
|
+
# Note that the comment property of 'person-root' contains FULL_NAMEs,
|
|
1344
|
+
# so it is also a name property that is a personal identifier.
|
|
1345
|
+
cypher_query = 'MATCH (node:RicgraphNode) '
|
|
1346
|
+
cypher_query += 'WHERE node.category = "person" '
|
|
1347
|
+
cypher_query += 'RETURN COLLECT (DISTINCT node.name) AS entries'
|
|
1348
|
+
else:
|
|
1349
|
+
cypher_query = 'MATCH (node:RicgraphNode) '
|
|
1350
|
+
cypher_query += 'RETURN COLLECT (DISTINCT node.' + node_property + ') AS entries'
|
|
1337
1351
|
result = _graph.execute_query(cypher_query,
|
|
1338
1352
|
result_transformer_=Result.data,
|
|
1339
1353
|
database_=ricgraph_databasename())
|
|
@@ -2139,6 +2153,15 @@ def get_all_neighbor_nodes(node: Node,
|
|
|
2139
2153
|
if node is None:
|
|
2140
2154
|
return []
|
|
2141
2155
|
|
|
2156
|
+
if name_want is None:
|
|
2157
|
+
name_want = []
|
|
2158
|
+
if name_dontwant is None:
|
|
2159
|
+
name_dontwant = []
|
|
2160
|
+
if category_want is None:
|
|
2161
|
+
category_want = []
|
|
2162
|
+
if category_dontwant is None:
|
|
2163
|
+
category_dontwant = []
|
|
2164
|
+
|
|
2142
2165
|
cypher_query = 'MATCH (node:RicgraphNode)-[]->(neighbor:RicgraphNode) '
|
|
2143
2166
|
if ricgraph_database() == 'neo4j':
|
|
2144
2167
|
cypher_query += 'WHERE (elementId(node)=$node_element_id) '
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: ricgraph
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.7
|
|
4
4
|
Summary: Ricgraph - Research in context graph
|
|
5
5
|
Author: Rik D.T. Janssen
|
|
6
6
|
Project-URL: Website, https://www.ricgraph.eu
|
|
@@ -17,36 +17,30 @@ Classifier: Programming Language :: Python :: 3
|
|
|
17
17
|
Requires-Python: >=3.9
|
|
18
18
|
Description-Content-Type: text/markdown
|
|
19
19
|
License-File: LICENSE
|
|
20
|
-
Requires-Dist: connexion[flask,swagger-ui,uvicorn]
|
|
21
|
-
Requires-Dist: flask
|
|
22
|
-
Requires-Dist: gunicorn
|
|
23
|
-
Requires-Dist: markupsafe
|
|
24
20
|
Requires-Dist: neo4j>=5.8
|
|
25
21
|
Requires-Dist: numpy
|
|
26
|
-
Requires-Dist: openapi_markdown
|
|
27
22
|
Requires-Dist: pandas
|
|
28
|
-
Requires-Dist: pyalex
|
|
29
|
-
Requires-Dist: ratelimit
|
|
30
23
|
Requires-Dist: requests
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
[
|
|
38
|
-
|
|
24
|
+
|
|
25
|
+
[](https://doi.org/10.5281/zenodo.7524314)
|
|
26
|
+
[](https://doi.org/10.1016/j.softx.2024.101736)
|
|
27
|
+
[](https://www.ricgraph.eu)
|
|
28
|
+
|
|
29
|
+
[](https://github.com/UtrechtUniversity/ricgraph/releases)
|
|
39
30
|
|
|
40
|
-
|
|
41
|
-
[
|
|
32
|
+
[](https://pypi.org/project/ricgraph)
|
|
33
|
+
[](https://pypistats.org/packages/ricgraph)
|
|
34
|
+
[](LICENSE)
|
|
42
35
|
[](https://www.repostatus.org/#active)
|
|
43
|
-
[](https://github.com/CLARIAH/clariah-plus/blob/main/requirements/software-metadata-requirements.md#15--you-should-express-a-technology-readiness-level)
|
|
44
37
|
[](https://fairsoftwarechecklist.net/v0.2?f=31&a=32113&i=32110&r=123)
|
|
45
38
|
<!---
|
|
46
39
|
Note, the lines 'Website' and
|
|
47
|
-
'
|
|
40
|
+
'PyPI downloads' end in two spaces, to force a line break but not a paragraph break.
|
|
48
41
|
--->
|
|
49
|
-
|
|
42
|
+
|
|
43
|
+
<img alt="Ricgraph logo" src="https://raw.githubusercontent.com/UtrechtUniversity/ricgraph/refs/heads/main/docs/images/ricgraph_logo.png" height="30">
|
|
50
44
|
|
|
51
45
|
# Ricgraph - Research in context graph
|
|
52
46
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|