vantage6-algorithm-tools 5.0.0b2__tar.gz → 5.0.0rc1__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.0b2 → vantage6_algorithm_tools-5.0.0rc1}/PKG-INFO +4 -4
  2. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/README.md +2 -2
  3. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/pyproject.toml +2 -2
  4. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/client/__init__.py +0 -3
  5. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/mock/client.py +5 -0
  6. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/mock/node.py +1 -1
  7. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/tools/wrap.py +2 -0
  8. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/.gitignore +0 -0
  9. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/Makefile +0 -0
  10. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/__init__.py +0 -0
  11. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/_test_deserialization.py +0 -0
  12. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/_test_docker_wrapper.py +0 -0
  13. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/_test_preprocessing.py +0 -0
  14. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/_test_serialization.py +0 -0
  15. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/algorithm/__init__.py +0 -0
  16. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/algorithm/test___init__.py +0 -0
  17. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/algorithm_module.py +0 -0
  18. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/base/__init__.py +0 -0
  19. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/mock/__init__.py +0 -0
  20. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/mock/test_algorithm_client.py +0 -0
  21. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/mock/test_network.py +0 -0
  22. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/mock/test_node.py +0 -0
  23. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/mock/test_server.py +0 -0
  24. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/mock/test_user_client.py +0 -0
  25. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/tests/mock/test_util.py +0 -0
  26. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/data_extraction/__init__.py +0 -0
  27. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/data_extraction/mock_extract.py +0 -0
  28. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/decorator/__init__.py +0 -0
  29. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/decorator/action.py +0 -0
  30. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/decorator/algorithm_client.py +0 -0
  31. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/decorator/data.py +0 -0
  32. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/decorator/metadata.py +0 -0
  33. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/decorator/ohdsi.py +0 -0
  34. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/mock/__init__.py +0 -0
  35. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/mock/globals.py +0 -0
  36. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/mock/hq.py +0 -0
  37. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/mock/network.py +0 -0
  38. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/mock/util.py +0 -0
  39. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/preprocessing/__init__.py +0 -0
  40. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/preprocessing/aggregation.py +0 -0
  41. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/preprocessing/algorithm_json_data.py +0 -0
  42. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/preprocessing/column.py +0 -0
  43. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/preprocessing/datetime.py +0 -0
  44. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/preprocessing/encoding.py +0 -0
  45. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/preprocessing/filtering.py +0 -0
  46. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/tools/__init__.py +0 -0
  47. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/tools/error_handling.py +0 -0
  48. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/tools/exceptions.py +0 -0
  49. {vantage6_algorithm_tools-5.0.0b2 → vantage6_algorithm_tools-5.0.0rc1}/vantage6/algorithm/tools/util.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: vantage6-algorithm-tools
3
- Version: 5.0.0b2
3
+ Version: 5.0.0rc1
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>
@@ -14,7 +14,7 @@ Requires-Dist: pyfiglet==1.0.4
14
14
  Requires-Dist: pyjwt==2.9.0
15
15
  Requires-Dist: sparqlwrapper>=2.0.0
16
16
  Requires-Dist: sqlalchemy>=1.4.46
17
- Requires-Dist: vantage6-common==5.0.0b2
17
+ Requires-Dist: vantage6-common==5.0.0rc1
18
18
  Provides-Extra: dev
19
19
  Requires-Dist: black; extra == 'dev'
20
20
  Requires-Dist: coverage==7.10.2; extra == 'dev'
@@ -44,5 +44,5 @@ the **[main Vantage6 README](https://github.com/vantage6/vantage6/blob/main/READ
44
44
 
45
45
  Vantage6 is a Privacy Enhancing Technology (PET) Operations platform that enables
46
46
  federated learning and multi-party computation. For more information, visit
47
- [vantage6.ai](https://vantage6.ai) or join our
48
- [Discord community](https://discord.gg/yAyFf6Y).
47
+ [vantage6.ai](https://vantage6.ai) or view our
48
+ [documentation](https://docs.vantage6.ai).
@@ -21,5 +21,5 @@ the **[main Vantage6 README](https://github.com/vantage6/vantage6/blob/main/READ
21
21
 
22
22
  Vantage6 is a Privacy Enhancing Technology (PET) Operations platform that enables
23
23
  federated learning and multi-party computation. For more information, visit
24
- [vantage6.ai](https://vantage6.ai) or join our
25
- [Discord community](https://discord.gg/yAyFf6Y).
24
+ [vantage6.ai](https://vantage6.ai) or view our
25
+ [documentation](https://docs.vantage6.ai).
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "vantage6-algorithm-tools"
7
- version = "5.0.0b2"
7
+ version = "5.0.0rc1"
8
8
  description = "Vantage6 algorithm tools"
9
9
  readme = "README.md"
10
10
  license = {text = "MIT"}
@@ -27,7 +27,7 @@ dependencies = [
27
27
  "pyfiglet==1.0.4",
28
28
  "SPARQLWrapper>=2.0.0",
29
29
  "sqlalchemy>=1.4.46",
30
- "vantage6-common==5.0.0b2",
30
+ "vantage6-common==5.0.0rc1",
31
31
  ]
32
32
 
33
33
  [project.optional-dependencies]
@@ -172,9 +172,6 @@ class AlgorithmClient(ClientBase):
172
172
  class Run(ClientBase.SubClient):
173
173
  """
174
174
  Algorithm Run client for the algorithm container.
175
-
176
- This client is used to obtain algorithm runs of tasks with the same
177
- job_id from HQ.
178
175
  """
179
176
 
180
177
  def get(self, id_) -> dict:
@@ -527,6 +527,11 @@ class MockUserClient(MockBaseClient):
527
527
  "setup_collaboration",
528
528
  "User",
529
529
  "Util",
530
+ "_try_open_browser_for_device_flow",
531
+ "_get_device_flow_endpoints",
532
+ "_poll_device_token",
533
+ "_start_device_authorization",
534
+ "_finalize_successful_authentication",
530
535
  ]
531
536
  )
532
537
 
@@ -60,7 +60,7 @@ class MockNode:
60
60
  self.dataframes = {}
61
61
 
62
62
  # In case a pandas dataframe is provided we assume the user directly wants to
63
- # use it rather than running an extraction job first.
63
+ # use it rather than running an extraction algorithm step first.
64
64
  for dataset in self.datasets:
65
65
  if isinstance(dataset.database, pd.DataFrame):
66
66
  self.dataframes[dataset.label] = dataset.database
@@ -135,6 +135,8 @@ def _run_algorithm_method(
135
135
  exit(1)
136
136
 
137
137
  # try to run the method
138
+ if not arguments:
139
+ arguments = {}
138
140
  try:
139
141
  result = method_fn(**arguments)
140
142
  except Exception as exc: