vantage6-node 4.3.2rc2__tar.gz → 4.3.4__tar.gz

{vantage6-node-4.3.2rc2 → vantage6-node-4.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6-node
-Version: 4.3.2rc2
+Version: 4.3.4
 Summary: vantage6 node
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10

vantage6-node-4.3.4/vantage6/node/__build__

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

{vantage6-node-4.3.2rc2 → vantage6-node-4.3.4}/vantage6/node/__init__.py

@@ -498,9 +498,10 @@ class Node:
             self.log.warn(
                 f"You are trying to reach the server at {self.client.host}."
                 " As your node is running inside a Docker container, it cannot"
-                " reach localhost on your host system. Probably, you have to "
-                "change your serverl URL to http://host.docker.internal "
-                "(Windows/MacOS) or http://172.17.0.1 (Linux)."
+                " reach localhost on your host system. Probably, you have to"
+                " change your server URL to http://host.docker.internal (Windows/MacOS)"
+                ' or look into node config option "node_extra_hosts" if using'
+                " http://172.17.0.1 does not work (Linux)."
             )
         else:
             self.log.debug(

{vantage6-node-4.3.2rc2 → vantage6-node-4.3.4}/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, 3, 2, "candidate", __build__, 0)
+version_info = (4, 3, 4, "final", __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}

{vantage6-node-4.3.2rc2 → vantage6-node-4.3.4}/vantage6/node/docker/docker_base.py

@@ -1,5 +1,7 @@
 import docker
 
+from docker import DockerClient
+
 from vantage6.common.docker.network_manager import NetworkManager
 
 
@@ -9,11 +11,25 @@ class DockerBaseManager(object):
     by multiple derived classes
     """
 
-    def __init__(self, isolated_network_mgr: NetworkManager) -> None:
+    def __init__(
+        self,
+        isolated_network_mgr: NetworkManager,
+        docker_client: DockerClient = None,
+    ) -> None:
+        """
+        Constructor for DockerBaseManager
+
+        Parameters
+        ----------
+        isolated_network_mgr: NetworkManager
+            Manager of an isolated network
+        docker_client: DockerClient
+            Docker client to use. If None is provided, a new client will be created
+        """
         self.isolated_network_mgr = isolated_network_mgr
 
         # Connect to docker daemon
-        self.docker = docker.from_env()
+        self.docker = docker_client if docker_client else docker.from_env()
 
     def get_isolated_netw_ip(self, container) -> str:
         """

{vantage6-node-4.3.2rc2 → vantage6-node-4.3.4}/vantage6/node/docker/docker_manager.py

@@ -511,8 +511,10 @@ class DockerManager(DockerBaseManager):
             self.log.debug(f"run_id={run_id} is discarded")
             return TaskStatus.ACTIVE, None
 
+        # we pass self.docker instance, in which we may have logged in to registries
         task = DockerTaskManager(
             image=image,
+            docker_client=self.docker,
             run_id=run_id,
             task_info=task_info,
             vpn_manager=self.vpn_manager,

{vantage6-node-4.3.2rc2 → vantage6-node-4.3.4}/vantage6/node/docker/squid.py

@@ -20,7 +20,7 @@ from vantage6.common.docker.addons import (
     remove_container,
     running_in_docker,
     remove_container_if_exists,
-    pull_if_newer,
+    pull_image,
 )
 from vantage6.node.docker.docker_base import DockerBaseManager
 from vantage6.node.docker.docker_manager import NetworkManager
@@ -90,7 +90,7 @@ class Squid(DockerBaseManager):
         # This is the default port of the squid container, which is exposed
         # to the algorithm containers.
         self.port = 3128
-        log.debug(f"Squid hostname: {self.hostname}, port: {self.port}")
+        log.debug("Squid hostname: %s, port: %s", self.hostname, self.port)
 
         try:
             # Create squid configuration, which can later be mounted by the
@@ -100,15 +100,17 @@ class Squid(DockerBaseManager):
             # parent class should handle this
             raise KeyError(f"Invalid Squid configuration: {e}")
 
-        log.debug(f"Squid configuration: {self.squid_config}")
+        log.debug("Squid configuration: %s", self.squid_config)
 
         # Check if the whitelist is safe, if not, log a warning
         self.check_safety_of_whitelist(self.squid_config)
 
         # The image is overridable by the user configuration
         self.image = squid_image if squid_image else f"{SQUID_IMAGE}:{major_minor}"
-        pull_if_newer(self.docker, self.image, log)
-        log.debug(f"Squid image: {self.image}")
+        log.info("Pulling Squid image: %s", self.image)
+        pull_image(self.docker, self.image)
+
+        log.debug("Squid image: %s", self.image)
 
         # Create the SSH configuration files
         self.create_squid_config_file(self.squid_config)

{vantage6-node-4.3.2rc2 → vantage6-node-4.3.4}/vantage6/node/docker/task_manager.py

@@ -7,12 +7,12 @@ import json
 import base64
 
 from pathlib import Path
+from docker import DockerClient
 
 from vantage6.common.globals import APPNAME, ENV_VAR_EQUALS_REPLACEMENT, STRING_ENCODING
 from vantage6.common.docker.addons import (
     remove_container_if_exists,
     remove_container,
-    pull_if_newer,
     running_in_docker,
 )
 from vantage6.common.docker.network_manager import NetworkManager
@@ -42,6 +42,7 @@ class DockerTaskManager(DockerBaseManager):
     def __init__(
         self,
         image: str,
+        docker_client: DockerClient,
         vpn_manager: VPNManager,
         node_name: str,
         run_id: int,
@@ -61,6 +62,8 @@ class DockerTaskManager(DockerBaseManager):
         ----------
         image: str
             Name of docker image to be run
+        docker_client: DockerClient
+            Docker client instance to use
         vpn_manager: VPNManager
             VPN manager required to set up traffic forwarding via VPN
         node_name: str
@@ -86,7 +89,7 @@ class DockerTaskManager(DockerBaseManager):
         self.task_id = task_info["id"]
         self.log = logging.getLogger(f"task ({self.task_id})")
 
-        super().__init__(isolated_network_mgr)
+        super().__init__(isolated_network_mgr, docker_client=docker_client)
         self.image = image
         self.__vpn_manager = vpn_manager
         self.run_id = run_id
@@ -184,8 +187,7 @@ class DockerTaskManager(DockerBaseManager):
         """Pull the latest docker image."""
         try:
             self.log.info(f"Retrieving latest image: '{self.image}'")
-            pull_if_newer(self.docker, self.image, self.log)
-
+            self.docker.images.pull(self.image)
         except docker.errors.APIError as e:
             self.log.debug("Failed to pull image: could not find image")
             self.log.exception(e)
@@ -655,5 +657,5 @@ class DockerTaskManager(DockerBaseManager):
 
         encoded_environment_variables = {}
         for key, val in environment_variables.items():
-            encoded_environment_variables[key] = _encode(val)
+            encoded_environment_variables[key] = _encode(str(val))
         return encoded_environment_variables

{vantage6-node-4.3.2rc2 → vantage6-node-4.3.4}/vantage6/node/docker/vpn_manager.py

@@ -12,7 +12,7 @@ from vantage6.common.globals import APPNAME, VPN_CONFIG_FILE
 from vantage6.common.docker.addons import (
     remove_container_if_exists,
     remove_container,
-    pull_if_newer,
+    pull_image,
 )
 from vantage6.common.docker.network_manager import NetworkManager
 from vantage6.node.globals import (
@@ -101,9 +101,12 @@ class VPNManager(DockerBaseManager):
     def _update_images(self) -> None:
         """Pulls the latest version of the VPN images"""
         self.log.info("Updating VPN images...")
-        pull_if_newer(self.docker, self.alpine_image, self.log)
-        pull_if_newer(self.docker, self.vpn_client_image, self.log)
-        pull_if_newer(self.docker, self.network_config_image, self.log)
+        self.log.debug("Pulling Alpine image")
+        pull_image(self.docker, self.alpine_image)
+        self.log.debug("Pulling VPN client image")
+        pull_image(self.docker, self.vpn_client_image)
+        self.log.debug("Pulling network config image")
+        pull_image(self.docker, self.network_config_image)
         self.log.info("Done updating VPN images")
 
     def connect_vpn(self) -> None:

{vantage6-node-4.3.2rc2 → vantage6-node-4.3.4}/vantage6/node/proxy_server.py

@@ -119,7 +119,10 @@ def make_request(
             # verify that the server gave us a valid response, else we
             # would want to try again
             if response.status_code > 210:
-                log.warn("Proxy server received status code:" f"{response.status_code}")
+                log.warning(
+                    "Proxy server received status code %s", response.status_code
+                )
+                log.warning("Error messages: %s", response.json())
                 log.debug(
                     f"method: {request.method}, url: {url}, json: {json}"
                     f", params: {params}, headers: {headers}"

{vantage6-node-4.3.2rc2 → vantage6-node-4.3.4}/vantage6_node.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6-node
-Version: 4.3.2rc2
+Version: 4.3.4
 Summary: vantage6 node
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10

{vantage6-node-4.3.2rc2 → vantage6-node-4.3.4}/vantage6_node.egg-info/requires.txt

@@ -4,9 +4,9 @@ gevent==23.9.1
 jinja2==3.1.3
 python-socketio==5.7.2
 requests==2.31.0
-vantage6==4.3.2rc2
-vantage6-client==4.3.2rc2
-vantage6-algorithm-tools==4.3.2rc2
+vantage6==4.3.4
+vantage6-client==4.3.4
+vantage6-algorithm-tools==4.3.4
 
 [dev]
 coverage==6.4.4

vantage6-node-4.3.2rc2/vantage6/node/__build__

@@ -1 +0,0 @@
-2