vantage6-algorithm-tools 5.0.0rc2__tar.gz → 5.0.0rc4__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 (49) hide show
  1. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/PKG-INFO +3 -3
  2. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/pyproject.toml +3 -3
  3. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/client/__init__.py +7 -6
  4. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/.gitignore +0 -0
  5. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/Makefile +0 -0
  6. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/README.md +0 -0
  7. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/__init__.py +0 -0
  8. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/_test_deserialization.py +0 -0
  9. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/_test_docker_wrapper.py +0 -0
  10. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/_test_preprocessing.py +0 -0
  11. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/_test_serialization.py +0 -0
  12. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/algorithm/__init__.py +0 -0
  13. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/algorithm/test___init__.py +0 -0
  14. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/algorithm_module.py +0 -0
  15. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/base/__init__.py +0 -0
  16. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/mock/__init__.py +0 -0
  17. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/mock/test_algorithm_client.py +0 -0
  18. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/mock/test_network.py +0 -0
  19. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/mock/test_node.py +0 -0
  20. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/mock/test_server.py +0 -0
  21. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/mock/test_user_client.py +0 -0
  22. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/tests/mock/test_util.py +0 -0
  23. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/data_extraction/__init__.py +0 -0
  24. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/data_extraction/mock_extract.py +0 -0
  25. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/decorator/__init__.py +0 -0
  26. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/decorator/action.py +0 -0
  27. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/decorator/algorithm_client.py +0 -0
  28. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/decorator/data.py +0 -0
  29. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/decorator/metadata.py +0 -0
  30. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/decorator/ohdsi.py +0 -0
  31. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/mock/__init__.py +0 -0
  32. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/mock/client.py +0 -0
  33. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/mock/globals.py +0 -0
  34. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/mock/hq.py +0 -0
  35. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/mock/network.py +0 -0
  36. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/mock/node.py +0 -0
  37. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/mock/util.py +0 -0
  38. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/preprocessing/__init__.py +0 -0
  39. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/preprocessing/aggregation.py +0 -0
  40. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/preprocessing/algorithm_json_data.py +0 -0
  41. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/preprocessing/column.py +0 -0
  42. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/preprocessing/datetime.py +0 -0
  43. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/preprocessing/encoding.py +0 -0
  44. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/preprocessing/filtering.py +0 -0
  45. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/tools/__init__.py +0 -0
  46. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/tools/error_handling.py +0 -0
  47. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/tools/exceptions.py +0 -0
  48. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/tools/util.py +0 -0
  49. {vantage6_algorithm_tools-5.0.0rc2 → vantage6_algorithm_tools-5.0.0rc4}/vantage6/algorithm/tools/wrap.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: vantage6-algorithm-tools
3
- Version: 5.0.0rc2
3
+ Version: 5.0.0rc4
4
4
  Summary: Vantage6 algorithm tools
5
5
  Author: Vantage6 Team
6
6
  Maintainer-email: Frank Martin <f.martin@iknl.nl>, Bart van Beusekom <b.vanbeusekom@iknl.nl>
@@ -11,10 +11,10 @@ Requires-Dist: pandas>=2.2.3
11
11
  Requires-Dist: psycopg2-binary==2.9.10
12
12
  Requires-Dist: pyarrow>=16.1.0
13
13
  Requires-Dist: pyfiglet==1.0.4
14
- Requires-Dist: pyjwt==2.9.0
14
+ Requires-Dist: pyjwt==2.12.1
15
15
  Requires-Dist: sparqlwrapper>=2.0.0
16
16
  Requires-Dist: sqlalchemy>=1.4.46
17
- Requires-Dist: vantage6-common==5.0.0rc2
17
+ Requires-Dist: vantage6-common==5.0.0rc4
18
18
  Provides-Extra: dev
19
19
  Requires-Dist: black; extra == 'dev'
20
20
  Requires-Dist: coverage==7.10.2; extra == 'dev'
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "vantage6-algorithm-tools"
7
- version = "5.0.0rc2"
7
+ version = "5.0.0rc4"
8
8
  description = "Vantage6 algorithm tools"
9
9
  readme = "README.md"
10
10
  license = {text = "MIT"}
@@ -23,11 +23,11 @@ dependencies = [
23
23
  # running SQL queries on a postgres database.
24
24
  "psycopg2-binary==2.9.10",
25
25
  "pyarrow>=16.1.0",
26
- "pyjwt==2.9.0",
26
+ "pyjwt==2.12.1",
27
27
  "pyfiglet==1.0.4",
28
28
  "SPARQLWrapper>=2.0.0",
29
29
  "sqlalchemy>=1.4.46",
30
- "vantage6-common==5.0.0rc2",
30
+ "vantage6-common==5.0.0rc4",
31
31
  ]
32
32
 
33
33
  [project.optional-dependencies]
@@ -145,7 +145,8 @@ class AlgorithmClient(ClientBase):
145
145
  endpoint: str
146
146
  Endpoint to which the request should be made.
147
147
  params: dict
148
- Parameters to be passed to the request.
148
+ Parameters to be passed to the request. If 'page' is present, it
149
+ will be ignored.
149
150
 
150
151
  Returns
151
152
  -------
@@ -156,18 +157,18 @@ class AlgorithmClient(ClientBase):
156
157
  params = {}
157
158
  # get first page
158
159
  page = 1
159
- params["page"] = page
160
- response = self.request(endpoint, params=params)
160
+ response = self.request(endpoint, params={**params, "page": page})
161
+ data = response["data"]
161
162
 
162
163
  # append next pages (if any)
163
164
  links = response.get("links")
164
165
  while links and links.get("next"):
165
166
  page += 1
166
- params["page"] = page
167
- response["data"] += self.request(endpoint, params=params)["data"]
167
+ response = self.request(endpoint, params={**params, "page": page})
168
+ data += response["data"]
168
169
  links = response.get("links")
169
170
 
170
- return response["data"]
171
+ return data
171
172
 
172
173
  class Run(ClientBase.SubClient):
173
174
  """