vantage6-node 4.15.2__tar.gz → 4.15.3__tar.gz

{vantage6_node-4.15.2 → vantage6_node-4.15.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vantage6_node
-Version: 4.15.2
+Version: 4.15.3
 Summary: vantage6 node
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10
@@ -13,9 +13,9 @@ Requires-Dist: python-socketio==5.15.0
 Requires-Dist: requests==2.33.1
 Requires-Dist: psutil==5.9.0
 Requires-Dist: nvidia-ml-py==12.535.133
-Requires-Dist: vantage6==4.15.2
-Requires-Dist: vantage6-client==4.15.2
-Requires-Dist: vantage6-algorithm-tools==4.15.2
+Requires-Dist: vantage6==4.15.3
+Requires-Dist: vantage6-client==4.15.3
+Requires-Dist: vantage6-algorithm-tools==4.15.3
 Provides-Extra: dev
 Requires-Dist: coverage==6.4.4; extra == "dev"
 Requires-Dist: python-coveralls==2.9.3; extra == "dev"

{vantage6_node-4.15.2 → vantage6_node-4.15.3}/tests/docker/test_docker_manager.py

@@ -31,9 +31,7 @@ class TestIsDockerImageAllowed(unittest.TestCase):
 
     def test_allowed_algorithms_exact_match(self):
         """Baseline regression check for the (unchanged) allowed_algorithms policy."""
-        self.manager._policies = {
-            NodePolicy.ALLOWED_ALGORITHMS: ["some/image:tag"]
-        }
+        self.manager._policies = {NodePolicy.ALLOWED_ALGORITHMS: ["some/image:tag"]}
 
         self.assertTrue(
             self.manager.is_docker_image_allowed("some/image:tag", self._task_info())

vantage6_node-4.15.3/tests/test_algorithm_policies.py

@@ -0,0 +1,80 @@
+import unittest
+from unittest.mock import MagicMock, patch
+
+from vantage6.common.globals import NodePolicy
+
+from vantage6.node import Node
+
+
+class TestCheckAlgorithmPolicies(unittest.TestCase):
+    """
+    Tests for Node.check_algorithm_policies().
+
+    Node.__init__ connects to the server and Docker, so these tests bypass it (via
+    __new__) and set up only the attributes the check reads: `config` and `log`.
+    """
+
+    def _node(self, config: dict) -> Node:
+        node = Node.__new__(Node)
+        node.config = config
+        node.log = MagicMock()
+        return node
+
+    def _assert_exits(self, config: dict):
+        node = self._node(config)
+        with (
+            patch("vantage6.node.sys.exit", side_effect=SystemExit(1)) as mock_exit,
+            self.assertRaises(SystemExit),
+        ):
+            node.check_algorithm_policies()
+        mock_exit.assert_called_once_with(1)
+        node.log.error.assert_called_once()
+
+    def _assert_starts(self, config: dict) -> Node:
+        node = self._node(config)
+        with patch("vantage6.node.sys.exit") as mock_exit:
+            node.check_algorithm_policies()
+        mock_exit.assert_not_called()
+        return node
+
+    def test_production_without_policies_exits(self):
+        self._assert_exits({"production": True})
+
+    def test_production_is_default(self):
+        self._assert_exits({})
+
+    def test_production_with_empty_policies_exits(self):
+        self._assert_exits(
+            {
+                "policies": {
+                    NodePolicy.ALLOWED_ALGORITHMS: [],
+                    NodePolicy.ALLOWED_ALGORITHM_STORES: [],
+                    NodePolicy.ALLOWED_USERS: [1],
+                }
+            }
+        )
+
+    def test_production_with_allowed_algorithms_starts(self):
+        node = self._assert_starts(
+            {
+                "production": True,
+                "policies": {NodePolicy.ALLOWED_ALGORITHMS: ["^some/image$"]},
+            }
+        )
+        node.log.warning.assert_not_called()
+
+    def test_production_with_allowed_stores_starts(self):
+        node = self._assert_starts(
+            {
+                "production": True,
+                "policies": {
+                    NodePolicy.ALLOWED_ALGORITHM_STORES: ["https://store.example"]
+                },
+            }
+        )
+        node.log.warning.assert_not_called()
+
+    def test_non_production_without_policies_warns(self):
+        node = self._assert_starts({"production": False})
+        node.log.warning.assert_called()
+        node.log.error.assert_not_called()

{vantage6_node-4.15.2 → vantage6_node-4.15.3}/vantage6/node/__init__.py

@@ -64,7 +64,6 @@ from vantage6.node.globals import (
 )
 from vantage6.common.client.node_client import NodeClient
 from vantage6.node import proxy_server
-from vantage6.node.util import get_parent_id
 from vantage6.node.docker.docker_manager import DockerManager
 from vantage6.node.docker.utils import login_to_registries
 from vantage6.node.docker.vpn_manager import VPNManager
@@ -117,6 +116,9 @@ class Node:
 
         self.config = self.ctx.config
         self.debug: dict = self.config.get("debug", {})
+
+        self.check_algorithm_policies()
+
         self.queue = queue.Queue()
         self._using_encryption = None
 
@@ -224,6 +226,36 @@ class Node:
 
         self.log.info("Init complete")
 
+    def check_algorithm_policies(self) -> None:
+        """
+        Verify that the node restricts which algorithms are allowed to run.
+
+        When ``production`` is true (default), the node exits if neither the
+        ``allowed_algorithms`` nor the ``allowed_algorithm_stores`` policy is set.
+        Otherwise, all algorithms are allowed and a warning is logged.
+        """
+        policies = self.config.get("policies") or {}
+        if policies.get(NodePolicy.ALLOWED_ALGORITHMS) or policies.get(
+            NodePolicy.ALLOWED_ALGORITHM_STORES
+        ):
+            return
+
+        if self.config.get("production", True):
+            self.log.error(
+                "No policies on allowed algorithms have been set for this node. Nodes "
+                "with production=true require that you set the '%s' and/or '%s' "
+                "policy in the node configuration.",
+                NodePolicy.ALLOWED_ALGORITHMS.value,
+                NodePolicy.ALLOWED_ALGORITHM_STORES.value,
+            )
+            sys.exit(1)
+        self.log.warning(
+            "No policies on allowed algorithms have been set for this node!"
+        )
+        self.log.warning(
+            "This means that all algorithms are allowed to run on this node."
+        )
+
     def __metadata_worker(self) -> None:
         """
         Periodically send system metadata to the server.
@@ -516,15 +548,7 @@ class Node:
         # send socket event to alert everyone of task status change
         self.socketIO.emit(
             "algorithm_status_change",
-            data={
-                "node_id": self.client.whoami.id_,
-                "status": task_status,
-                "run_id": task_incl_run["id"],
-                "task_id": task["id"],
-                "collaboration_id": self.client.collaboration_id,
-                "organization_id": self.client.whoami.organization_id,
-                "parent_id": get_parent_id(task),
-            },
+            data={"run_id": task_incl_run["id"], "status": task_status},
             namespace="/tasks",
         )
 
@@ -578,15 +602,7 @@ class Node:
                 # notify socket channel of algorithm status change
                 self.socketIO.emit(
                     "algorithm_status_change",
-                    data={
-                        "node_id": self.client.whoami.id_,
-                        "status": results.status,
-                        "run_id": results.run_id,
-                        "task_id": results.task_id,
-                        "collaboration_id": self.client.collaboration_id,
-                        "organization_id": self.client.whoami.organization_id,
-                        "parent_id": results.parent_id,
-                    },
+                    data={"run_id": results.run_id, "status": results.status},
                     namespace="/tasks",
                 )
 
@@ -1095,8 +1111,9 @@ class Node:
         while not self.socketIO.connected:
             if i > TIME_LIMIT_INITIAL_CONNECTION_WEBSOCKET:
                 self.log.critical(
-                    "Could not connect to the websocket channels, do you have a "
-                    "slow connection?"
+                    "Could not connect to the websocket channels. Either the "
+                    "connection is slow, or the server refused the connection because "
+                    "the node could not be authenticated (check the server logs)."
                 )
                 exit(1)
             self.log.debug("Waiting for socket connection...")

{vantage6_node-4.15.2 → vantage6_node-4.15.3}/vantage6/node/_version.py

@@ -7,7 +7,7 @@ with open(os.path.join(here, "__build__")) as fp:
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 15, 2, "final", __build__, 0)
+version_info = (4, 15, 3, "final", __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}

{vantage6_node-4.15.2 → vantage6_node-4.15.3}/vantage6/node/docker/docker_manager.py

@@ -350,18 +350,7 @@ class DockerManager(DockerBaseManager):
         dict
             Dictionary with the policies
         """
-        policies = config.get("policies", {})
-        if not policies or (
-            not policies.get(NodePolicy.ALLOWED_ALGORITHMS)
-            and not policies.get(NodePolicy.ALLOWED_ALGORITHM_STORES)
-        ):
-            self.log.warning(
-                "No policies on allowed algorithms have been set for this node!"
-            )
-            self.log.warning(
-                "This means that all algorithms are allowed to run on this node."
-            )
-        return policies
+        return config.get("policies") or {}
 
     def create_volume(self, volume_name: str) -> None:
         """

{vantage6_node-4.15.2 → vantage6_node-4.15.3}/vantage6/node/docker/task_manager.py

@@ -400,8 +400,6 @@ class DockerTaskManager(DockerBaseManager):
                 share_algorithm_logs=self.share_algorithm_logs,
                 socketIO=self.socket,
                 run_id=self.run_id,
-                task_id=self.task_id,
-                collaboration_id=self.collaboration_id,
             )
 
         except Exception as e:
@@ -935,9 +933,7 @@ class DockerTaskManager(DockerBaseManager):
             encoded_environment_variables[key] = _encode(str(val))
         return encoded_environment_variables
 
-    def _stream_logs(
-        self, share_algorithm_logs, socketIO, run_id, task_id, collaboration_id
-    ):
+    def _stream_logs(self, share_algorithm_logs, socketIO, run_id):
         """
         Stream logs from the running container to node logs and optionally to
         the server
@@ -955,12 +951,7 @@ class DockerTaskManager(DockerBaseManager):
                 if share_algorithm_logs:
                     socketIO.emit(
                         "algorithm_log",
-                        data={
-                            "collaboration_id": collaboration_id,
-                            "run_id": run_id,
-                            "task_id": task_id,
-                            "log": decoded_log,
-                        },
+                        data={"run_id": run_id, "log": decoded_log},
                         namespace="/tasks",
                     )
 

{vantage6_node-4.15.2 → vantage6_node-4.15.3}/vantage6/node/socket.py

@@ -154,14 +154,6 @@ class NodeTaskNamespace(ClientNamespace):
         for killed in killed_ids:
             self.emit(
                 "algorithm_status_change",
-                {
-                    "run_id": killed.run_id,
-                    "task_id": killed.task_id,
-                    "collaboration_id": self.node_worker_ref.client.collaboration_id,
-                    "node_id": self.node_worker_ref.client.whoami.id_,
-                    "status": TaskStatus.KILLED,
-                    "organization_id": self.node_worker_ref.client.whoami.organization_id,
-                    "parent_id": killed.parent_id,
-                },
+                {"run_id": killed.run_id, "status": TaskStatus.KILLED},
                 namespace="/tasks",
             )

{vantage6_node-4.15.2 → vantage6_node-4.15.3}/vantage6_node.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vantage6_node
-Version: 4.15.2
+Version: 4.15.3
 Summary: vantage6 node
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10
@@ -13,9 +13,9 @@ Requires-Dist: python-socketio==5.15.0
 Requires-Dist: requests==2.33.1
 Requires-Dist: psutil==5.9.0
 Requires-Dist: nvidia-ml-py==12.535.133
-Requires-Dist: vantage6==4.15.2
-Requires-Dist: vantage6-client==4.15.2
-Requires-Dist: vantage6-algorithm-tools==4.15.2
+Requires-Dist: vantage6==4.15.3
+Requires-Dist: vantage6-client==4.15.3
+Requires-Dist: vantage6-algorithm-tools==4.15.3
 Provides-Extra: dev
 Requires-Dist: coverage==6.4.4; extra == "dev"
 Requires-Dist: python-coveralls==2.9.3; extra == "dev"

{vantage6_node-4.15.2 → vantage6_node-4.15.3}/vantage6_node.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 setup.py
 tests/__init__.py
+tests/test_algorithm_policies.py
 tests/test_ssh_tunnel.py
 tests/docker/__init__.py
 tests/docker/test_docker_manager.py

{vantage6_node-4.15.2 → vantage6_node-4.15.3}/vantage6_node.egg-info/requires.txt

@@ -6,9 +6,9 @@ python-socketio==5.15.0
 requests==2.33.1
 psutil==5.9.0
 nvidia-ml-py==12.535.133
-vantage6==4.15.2
-vantage6-client==4.15.2
-vantage6-algorithm-tools==4.15.2
+vantage6==4.15.3
+vantage6-client==4.15.3
+vantage6-algorithm-tools==4.15.3
 
 [dev]
 coverage==6.4.4