vantage6-node 4.3.4__tar.gz → 4.4.0__tar.gz

{vantage6-node-4.3.4 → vantage6-node-4.4.0}/PKG-INFO

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

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

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

@@ -183,21 +183,39 @@ class DockerTaskManager(DockerBaseManager):
             results = fp.read()
         return results
 
-    def pull(self):
-        """Pull the latest docker image."""
+    def pull(self, local_exists: bool) -> None:
+        """
+        Pull the latest docker image.
+
+        Parameters
+        ----------
+        local_exists: bool
+            Whether the image already exists locally
+
+        Raises
+        ------
+        PermanentAlgorithmStartFail
+            If the image could not be pulled and does not exist locally
+        """
         try:
             self.log.info(f"Retrieving latest image: '{self.image}'")
             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)
-            self.status = TaskStatus.NO_DOCKER_IMAGE
-            raise PermanentAlgorithmStartFail
+            self.log.warning("Failed to pull image: could not find image")
+            if not local_exists:
+                self.log.exception(e)
+                self.status = TaskStatus.NO_DOCKER_IMAGE
+                raise PermanentAlgorithmStartFail
+            else:
+                self.log.info("Using local image")
         except Exception as e:
-            self.log.debug("Failed to pull image")
-            self.log.exception(e)
-            self.status = TaskStatus.FAILED
-            raise PermanentAlgorithmStartFail
+            self.log.warning("Failed to pull image")
+            if not local_exists:
+                self.log.exception(e)
+                self.status = TaskStatus.FAILED
+                raise PermanentAlgorithmStartFail
+            else:
+                self.log.info("Using local image")
 
     def run(
         self,
@@ -272,7 +290,8 @@ class DockerTaskManager(DockerBaseManager):
         helper_container_name = container_name + "-helper"
 
         # Try to pull the latest image
-        self.pull()
+        local_exists = len(self.docker.images.list(name=self.image)) > 0
+        self.pull(local_exists=local_exists)
 
         # remove algorithm containers if they were already running
         self.log.debug("Check if algorithm container is already running")

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

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

{vantage6-node-4.3.4 → vantage6-node-4.4.0}/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.4
-vantage6-client==4.3.4
-vantage6-algorithm-tools==4.3.4
+vantage6==4.4.0
+vantage6-client==4.4.0
+vantage6-algorithm-tools==4.4.0
 
 [dev]
 coverage==6.4.4