vantage6-node 5.0.1__tar.gz → 5.0.2__tar.gz

{vantage6_node-5.0.1 → vantage6_node-5.0.2}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: vantage6-node
-Version: 5.0.1
+Version: 5.0.2
 Summary: vantage6 node
 Author: Vantage6 Team
 Maintainer-email: Frank Martin <f.martin@iknl.nl>, Bart van Beusekom <b.vanbeusekom@iknl.nl>
 License: MIT
 Requires-Python: >=3.13
 Requires-Dist: click==8.1.3
+Requires-Dist: flask==3.1.3
 Requires-Dist: gevent==25.4.2
 Requires-Dist: jinja2==3.1.6
 Requires-Dist: kubernetes==36.0.2
@@ -15,9 +16,9 @@ Requires-Dist: parquet-tools==0.2.16
 Requires-Dist: psutil==7.0.0
 Requires-Dist: python-socketio==5.15.0
 Requires-Dist: requests==2.33.1
-Requires-Dist: vantage6-client==5.0.1
-Requires-Dist: vantage6-common==5.0.1
-Requires-Dist: vantage6==5.0.1
+Requires-Dist: vantage6-client==5.0.2
+Requires-Dist: vantage6-common==5.0.2
+Requires-Dist: vantage6==5.0.2
 Provides-Extra: dev
 Requires-Dist: black; extra == 'dev'
 Requires-Dist: coverage==7.10.2; extra == 'dev'

{vantage6_node-5.0.1 → vantage6_node-5.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "vantage6-node"
-version = "5.0.1"
+version = "5.0.2"
 description = "vantage6 node"
 readme = "README.md"
 license = {text = "MIT"}
@@ -18,6 +18,7 @@ maintainers = [
 requires-python = ">=3.13"
 dependencies = [
     "click==8.1.3",
+    "flask==3.1.3",
     "gevent==25.4.2",
     "jinja2==3.1.6",
     "kubernetes==36.0.2",
@@ -26,9 +27,9 @@ dependencies = [
     "psutil==7.0.0",
     "python-socketio==5.15.0",
     "requests==2.33.1",
-    "vantage6==5.0.1",
-    "vantage6-client==5.0.1",
-    "vantage6-common==5.0.1",
+    "vantage6==5.0.2",
+    "vantage6-client==5.0.2",
+    "vantage6-common==5.0.2",
 ]
 
 [project.optional-dependencies]

{vantage6_node-5.0.1 → vantage6_node-5.0.2}/vantage6/node/__init__.py

@@ -327,7 +327,7 @@ class Node:
 
     def sync_task_queue_with_HQ(self) -> None:
         """Get all unprocessed tasks from HQ for this node."""
-        assert self.client.cryptor, "Encrpytion has not been setup"
+        assert self.client.cryptor, "Encryption has not been setup"
 
         # request open tasks from HQ
         runs_to_execute = self.client.run.list(

{vantage6_node-5.0.1 → vantage6_node-5.0.2}/vantage6/node/k8s/container_manager.py

@@ -32,6 +32,7 @@ from vantage6.common.globals import (
     ContainerEnvNames,
     NodePolicy,
 )
+from vantage6.common.kubernetes.utils import database_env_label
 
 from vantage6.cli.context.node import NodeContext
 from vantage6.cli.node.common.task_cleanup import delete_run_related_pods
@@ -263,19 +264,24 @@ class ContainerManager:
         }
         ```
         """
-        db_labels = os.environ.get("DATABASE_LABELS", "").split(",")
+        db_labels = [
+            label.strip()
+            for label in os.environ.get("DATABASE_LABELS", "").split(",")
+            if label.strip()
+        ]
         if not db_labels:
             self.log.warning("No databases found in the environment variables")
             return {}
 
         databases = {}
         for label in db_labels:
+            env_label = database_env_label(label)
             # The URI on the host system. This can either be a path to a file or folder
             # or an address to a service.
-            uri_env_var = f"DATABASE_{label.upper()}_URI"
+            uri_env_var = f"DATABASE_{env_label}_URI"
             uri = os.environ.get(uri_env_var, "")
 
-            db_type_env_var = f"DATABASE_{label.upper()}_TYPE"
+            db_type_env_var = f"DATABASE_{env_label}_TYPE"
             db_type = os.environ.get(db_type_env_var, "")
             # In case we are dealing with a file or directory and when running the node
             # instance in a POD, our internal path to that file or folder is different.
@@ -299,11 +305,11 @@ class ContainerManager:
             # prefix
             env = {}
             for key in os.environ:
-                if key.startswith(f"DATABASE_{label.upper()}_") and key not in [
+                if key.startswith(f"DATABASE_{env_label}_") and key not in [
                     uri_env_var,
                     db_type_env_var,
                 ]:
-                    env[key.replace(f"DATABASE_{label.upper()}_", "")] = os.environ[key]
+                    env[key.replace(f"DATABASE_{env_label}_", "")] = os.environ[key]
 
             databases[label] = TaskDB(
                 label=label,