vantage6 5.0.0a22__tar.gz → 5.0.0a29__tar.gz

{vantage6-5.0.0a22 → vantage6-5.0.0a29}/PKG-INFO

@@ -1,11 +1,35 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: vantage6
-Version: 5.0.0a22
+Version: 5.0.0a29
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
-Requires-Python: >=3.10
+Requires-Python: >=3.13
 Description-Content-Type: text/markdown
+Requires-Dist: click==8.1.3
+Requires-Dist: colorama==0.4.6
+Requires-Dist: copier==9.2.0
+Requires-Dist: docker==7.1.0
+Requires-Dist: ipython==8.10.0
+Requires-Dist: jinja2==3.1.6
+Requires-Dist: kubernetes==28.1.0
+Requires-Dist: pandas>=2.2.3
+Requires-Dist: questionary==1.10.0
+Requires-Dist: rich==13.5.2
+Requires-Dist: schema==0.7.5
+Requires-Dist: sqlalchemy==2.0.37
+Requires-Dist: vantage6-common==5.0.0a29
+Requires-Dist: vantage6-client==5.0.0a29
 Provides-Extra: dev
+Requires-Dist: coverage==6.4.4; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <h1 align="center">
   <br>
@@ -54,7 +78,7 @@ collaborations. The server contains users, organizations, collaborations, tasks
 their results. It provides a central access point for both the clients and nodes. The
 nodes have access to privacy sensitive data and handle computation requests retrieved
 from the server. Computation request are executed as separate containers on the node.
-These containers are connected to containers at other nodes by a VPN network._
+These containers are connected to containers at other nodes by a internal network._
 
 ## :books: Quickstart
 
@@ -169,11 +193,7 @@ with `VERSION` being the full semantic version of the vantage6 infrastructure, e
 Several other images are used to support the infrastructure:
 
 - `harbor2.vantage6.ai/infrastructure/infrastructure-base:VERSION` -> _Base image for the infrastructure_
-- `harbor2.vantage6.ai/infrastructure/squid:VERSION` -> _Squid proxy image used for the whitelisting service_
 - `harbor2.vantage6.ai/infrastructure/alpine` -> _Alpine image used for vpn traffic forwarding_
-- `harbor2.vantage6.ai/infrastructure/vpn-client` -> _VPN image used to connect to the VPN_
-- `harbor2.vantage6.ai/infrastructure/vpn-configurator` -> _VPN image used for initialization_
-- `harbor2.vantage6.ai/infrastructure/ssh-tunnel` -> _SSH tunnel image used for connecting algorithms to external services_
 
 And finally there are some images released for algorithm development:
 

{vantage6-5.0.0a22 → vantage6-5.0.0a29}/setup.py

@@ -1,11 +1,11 @@
 import codecs
 import os
-
-from os import path
 from codecs import open
-from setuptools import setup, find_namespace_packages
+from os import path
 from pathlib import Path
 
+from setuptools import find_namespace_packages, setup
+
 # get current directory
 here = Path(path.abspath(path.dirname(__file__)))
 parent_dir = here.parent.absolute()
@@ -31,7 +31,7 @@ setup(
     long_description_content_type="text/markdown",
     url="https://github.com/vantage6/vantage6",
     packages=find_namespace_packages(),
-    python_requires=">=3.10",
+    python_requires=">=3.13",
     install_requires=[
         "click==8.1.3",
         "colorama==0.4.6",
@@ -39,13 +39,14 @@ setup(
         "docker==7.1.0",
         "ipython==8.10.0",
         "jinja2==3.1.6",
-        "pandas>=1.5.3",
+        "kubernetes==28.1.0",
+        "pandas>=2.2.3",
         "questionary==1.10.0",
         "rich==13.5.2",
         "schema==0.7.5",
         "sqlalchemy==2.0.37",
-        f'vantage6-common == {version_ns["__version__"]}',
-        f'vantage6-client == {version_ns["__version__"]}',
+        f"vantage6-common == {version_ns['__version__']}",
+        f"vantage6-client == {version_ns['__version__']}",
     ],
     extras_require={
         "dev": [
@@ -63,6 +64,8 @@ setup(
             "template/server_import_config.j2",
             "template/algo_store_config.j2",
             "dev/data/olympic_athletes_2016.csv",
+            "dev/data/km_dataset.csv",
+            "prometheus/prometheus.yml",
         ],
     },
     entry_points={

vantage6-5.0.0a29/tests_cli/test_client_script.py

@@ -0,0 +1,23 @@
+# from click import UsageError
+# from vantage6.cli.test.client_script import cli_test_client_script
+
+# import click
+# import unittest
+
+
+# class TestScriptTest(unittest.TestCase):
+#     def test_script_incorrect_usage(self):
+#         ctx = click.Context(cli_test_client_script)
+
+#         with self.assertRaises(UsageError):
+#             ctx.invoke(
+#                 cli_test_client_script,
+#                 script="path/to/script.py",
+#                 task_arguments="{'my_arg': 1}",
+#             )
+
+#         with self.assertRaises(UsageError):
+#             ctx.invoke(
+#                 cli_test_client_script,
+#                 task_arguments="not_a_json",
+#             )

{vantage6-5.0.0a22 → vantage6-5.0.0a29}/tests_cli/test_server_cli.py

@@ -1,18 +1,19 @@
 import unittest
-
-from unittest.mock import MagicMock, patch
 from pathlib import Path
+from unittest.mock import MagicMock, patch
+
 from click.testing import CliRunner
 
 from vantage6.common.globals import APPNAME, InstanceType
+
 from vantage6.cli.common.utils import attach_logs
-from vantage6.cli.server.start import cli_server_start
-from vantage6.cli.server.list import cli_server_configuration_list
+from vantage6.cli.server.attach import cli_server_attach
 from vantage6.cli.server.files import cli_server_files
 from vantage6.cli.server.import_ import cli_server_import
+from vantage6.cli.server.list import cli_server_configuration_list
 from vantage6.cli.server.new import cli_server_new
+from vantage6.cli.server.start import cli_server_start
 from vantage6.cli.server.stop import cli_server_stop
-from vantage6.cli.server.attach import cli_server_attach
 
 
 class ServerCLITest(unittest.TestCase):
@@ -133,7 +134,7 @@ class ServerCLITest(unittest.TestCase):
         """Stop server without errors."""
 
         container1 = MagicMock()
-        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER.value}"
+        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER}"
         containers.containers.list.return_value = [container1]
 
         runner = CliRunner()

{vantage6-5.0.0a22 → vantage6-5.0.0a29}/tests_cli/test_wizard.py

@@ -1,15 +1,15 @@
 import unittest
-
 from pathlib import Path
-from unittest.mock import patch, MagicMock
+from unittest.mock import MagicMock, patch
+
+from vantage6.common.globals import InstanceType, NodePolicy
 
 from vantage6.cli.configuration_wizard import (
-    node_configuration_questionaire,
-    server_configuration_questionaire,
     configuration_wizard,
+    node_configuration_questionaire,
     select_configuration_questionaire,
+    server_configuration_questionaire,
 )
-from vantage6.common.globals import InstanceType, NodePolicy
 
 module_path = "vantage6.cli.configuration_wizard"
 
@@ -70,8 +70,8 @@ class WizardTest(unittest.TestCase):
         for key in keys:
             self.assertIn(key, config)
         nested_keys = [
-            ["policies", NodePolicy.ALLOWED_ALGORITHMS],
-            ["policies", NodePolicy.ALLOWED_ALGORITHM_STORES],
+            ["policies", NodePolicy.ALLOWED_ALGORITHMS.value],
+            ["policies", NodePolicy.ALLOWED_ALGORITHM_STORES.value],
         ]
         for nesting in nested_keys:
             current_config = config

vantage6-5.0.0a29/vantage6/cli/__build__

@@ -0,0 +1 @@
+29