vantage6 4.10.0rc3__tar.gz → 4.10.1__tar.gz

{vantage6-4.10.0rc3 → vantage6-4.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.10.0rc3
+Version: 4.10.1
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10

{vantage6-4.10.0rc3 → vantage6-4.10.1}/setup.py

@@ -38,7 +38,7 @@ setup(
         "copier==9.2.0",
         "docker==7.1.0",
         "ipython==8.10.0",
-        "jinja2==3.1.5",
+        "jinja2==3.1.6",
         "pandas>=1.5.3",
         "questionary==1.10.0",
         "rich==13.5.2",

{vantage6-4.10.0rc3 → vantage6-4.10.1}/tests_cli/test_server_cli.py

@@ -132,7 +132,7 @@ class ServerCLITest(unittest.TestCase):
         """Stop server without errors."""
 
         container1 = MagicMock()
-        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER}"
+        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER.value}"
         containers.containers.list.return_value = [container1]
 
         runner = CliRunner()
@@ -146,7 +146,7 @@ class ServerCLITest(unittest.TestCase):
     def test_attach(self, containers, sleep):
         """Attach log to the console without errors."""
         container1 = MagicMock()
-        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER}"
+        container1.name = f"{APPNAME}-iknl-system-{InstanceType.SERVER.value}"
         containers.list.return_value = [container1]
 
         sleep.side_effect = KeyboardInterrupt("Boom!")

vantage6-4.10.1/vantage6/cli/__build__

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

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/_version.py

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

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/algostore/attach.py

@@ -25,7 +25,7 @@ def cli_algo_store_attach(name: str, system_folders: bool) -> None:
     client = docker.from_env()
 
     running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE.value}"}
     )
     running_server_names = [container.name for container in running_servers]
 
@@ -40,7 +40,7 @@ def cli_algo_store_attach(name: str, system_folders: bool) -> None:
             return
     else:
         post_fix = "system" if system_folders else "user"
-        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.ALGORITHM_STORE}"
+        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.ALGORITHM_STORE.value}"
 
     if name in running_server_names:
         container = client.containers.get(name)

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/algostore/list.py

@@ -12,4 +12,4 @@ def cli_algo_store_configuration_list() -> None:
     """
     check_docker_running()
 
-    get_server_configuration_list(InstanceType.ALGORITHM_STORE)
+    get_server_configuration_list(InstanceType.ALGORITHM_STORE.value)

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/algostore/start.py

@@ -54,7 +54,7 @@ def cli_algo_store_start(
     Start the algorithm store server.
     """
     info("Starting algorithm store...")
-    docker_client = check_for_start(ctx, InstanceType.ALGORITHM_STORE)
+    docker_client = check_for_start(ctx, InstanceType.ALGORITHM_STORE.value)
 
     image = get_image(image, ctx, "algorithm-store", DEFAULT_ALGO_STORE_IMAGE)
 
@@ -91,7 +91,7 @@ def cli_algo_store_start(
         mounts=mounts,
         detach=True,
         labels={
-            f"{APPNAME}-type": InstanceType.ALGORITHM_STORE,
+            f"{APPNAME}-type": InstanceType.ALGORITHM_STORE.value,
             "name": ctx.config_file_name,
         },
         environment=environment_vars,

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/algostore/stop.py

@@ -23,7 +23,7 @@ def cli_algo_store_stop(ctx: AlgorithmStoreContext, all_stores: bool):
     client = docker.from_env()
 
     running_stores = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.ALGORITHM_STORE.value}"}
     )
 
     if not running_stores:

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/common/utils.py

@@ -1,3 +1,4 @@
+import enum
 import questionary as q
 from colorama import Fore, Style
 import click
@@ -87,7 +88,11 @@ def get_server_configuration_list(instance_type: InstanceType.SERVER) -> None:
     client = docker.from_env()
     ctx_class = select_context_class(instance_type)
 
-    running_server_names = get_running_servers(client, instance_type)
+    instance_type_value = (
+        instance_type.value if isinstance(instance_type, enum.Enum) else instance_type
+    )
+
+    running_server_names = get_running_servers(client, instance_type_value)
     header = "\nName" + (21 * " ") + "Status" + (10 * " ") + "System/User"
 
     click.echo(header)
@@ -101,7 +106,8 @@ def get_server_configuration_list(instance_type: InstanceType.SERVER) -> None:
     for config in configs:
         status = (
             running
-            if f"{APPNAME}-{config.name}-system-{instance_type}" in running_server_names
+            if f"{APPNAME}-{config.name}-system-{instance_type_value}"
+            in running_server_names
             else stopped
         )
         click.echo(f"{config.name:25}" f"{status:25} System ")
@@ -111,7 +117,8 @@ def get_server_configuration_list(instance_type: InstanceType.SERVER) -> None:
     for config in configs:
         status = (
             running
-            if f"{APPNAME}-{config.name}-user-{instance_type}" in running_server_names
+            if f"{APPNAME}-{config.name}-user-{instance_type_value}"
+            in running_server_names
             else stopped
         )
         click.echo(f"{config.name:25}" f"{status:25} User   ")

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/context/algorithm_store.py

@@ -53,7 +53,7 @@ class AlgorithmStoreContext(BaseServerContext):
         str
             Server's docker container name
         """
-        return f"{APPNAME}-{self.name}-{self.scope}-{ServerType.ALGORITHM_STORE}"
+        return f"{APPNAME}-{self.name}-{self.scope}-{ServerType.ALGORITHM_STORE.value}"
 
     @classmethod
     def from_external_config_file(

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/context/node.py

@@ -132,7 +132,7 @@ class NodeContext(AppContext):
         Path
             Path to the data folder
         """
-        return AppContext.type_data_folder(InstanceType.NODE, system_folders)
+        return AppContext.type_data_folder(InstanceType.NODE.value, system_folders)
 
     @property
     def databases(self) -> dict:

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/dev/remove.py

@@ -40,10 +40,10 @@ def remove_demo_network(
     # check that the server is not running
     client = docker.from_env()
     running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER.value}"}
     )
     running_server_names = [server.name for server in running_servers]
-    container_name = f"{APPNAME}-{name}-user-{InstanceType.SERVER}"
+    container_name = f"{APPNAME}-{name}-user-{InstanceType.SERVER.value}"
     if container_name in running_server_names:
         error(
             f"Server {Fore.RED}{name}{Style.RESET_ALL} is still running! First stop "

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/node/common/__init__.py

@@ -130,6 +130,6 @@ def find_running_node_names(client: docker.DockerClient) -> list[str]:
         List of names of running nodes
     """
     running_nodes = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.NODE}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.NODE.value}"}
     )
     return [node.name for node in running_nodes]

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/node/start.py

@@ -78,7 +78,7 @@ def cli_node_start(
 
     # check that this node is not already running
     running_nodes = docker_client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.NODE}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.NODE.value}"}
     )
 
     suffix = "system" if system_folders else "user"
@@ -306,7 +306,7 @@ def cli_node_start(
         volumes=volumes,
         detach=True,
         labels={
-            f"{APPNAME}-type": InstanceType.NODE,
+            f"{APPNAME}-type": InstanceType.NODE.value,
             "system": str(system_folders),
             "name": ctx.config_file_name,
         },

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/server/attach.py

@@ -29,7 +29,7 @@ def cli_server_attach(name: str, system_folders: bool) -> None:
     client = docker.from_env()
 
     running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER.value}"}
     )
     running_server_names = [node.name for node in running_servers]
 
@@ -43,7 +43,7 @@ def cli_server_attach(name: str, system_folders: bool) -> None:
             return
     else:
         post_fix = "system" if system_folders else "user"
-        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER}"
+        name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER.value}"
 
     if name in running_server_names:
         container = client.containers.get(name)

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/server/import_.py

@@ -132,7 +132,10 @@ def cli_server_import(
         command=cmd,
         mounts=mounts,
         detach=True,
-        labels={f"{APPNAME}-type": InstanceType.SERVER, "name": ctx.config_file_name},
+        labels={
+            f"{APPNAME}-type": InstanceType.SERVER.value,
+            "name": ctx.config_file_name,
+        },
         environment=environment_vars,
         auto_remove=not keep,
         tty=True,

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/server/list.py

@@ -12,4 +12,4 @@ def cli_server_configuration_list() -> None:
     """
     check_docker_running()
 
-    get_server_configuration_list(InstanceType.SERVER)
+    get_server_configuration_list(InstanceType.SERVER.value)

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/server/shell.py

@@ -28,7 +28,7 @@ def cli_server_shell(ctx: ServerContext) -> None:
     docker_client = docker.from_env()
 
     running_servers = docker_client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER.value}"}
     )
 
     if ctx.docker_container_name not in [s.name for s in running_servers]:

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/server/start.py

@@ -83,7 +83,7 @@ def cli_server_start(
     Start the server.
     """
     info("Starting server...")
-    docker_client = check_for_start(ctx, InstanceType.SERVER)
+    docker_client = check_for_start(ctx, InstanceType.SERVER.value)
 
     image = get_image(image, ctx, "server", DEFAULT_SERVER_IMAGE)
 
@@ -157,7 +157,10 @@ def cli_server_start(
         command=cmd,
         mounts=mounts,
         detach=True,
-        labels={f"{APPNAME}-type": InstanceType.SERVER, "name": ctx.config_file_name},
+        labels={
+            f"{APPNAME}-type": InstanceType.SERVER.value,
+            "name": ctx.config_file_name,
+        },
         environment=environment_vars,
         ports={f"{internal_port}/tcp": (ip, port_)},
         name=ctx.docker_container_name,

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/server/stop.py

@@ -37,7 +37,7 @@ def cli_server_stop(name: str, system_folders: bool, all_servers: bool):
     client = docker.from_env()
 
     running_servers = client.containers.list(
-        filters={"label": f"{APPNAME}-type={InstanceType.SERVER}"}
+        filters={"label": f"{APPNAME}-type={InstanceType.SERVER.value}"}
     )
 
     if not running_servers:
@@ -62,7 +62,7 @@ def cli_server_stop(name: str, system_folders: bool, all_servers: bool):
             return
     else:
         post_fix = "system" if system_folders else "user"
-        container_name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER}"
+        container_name = f"{APPNAME}-{name}-{post_fix}-{InstanceType.SERVER.value}"
 
     if container_name not in running_server_names:
         error(f"{Fore.RED}{name}{Style.RESET_ALL} is not running!")

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/server/version.py

@@ -22,10 +22,10 @@ def cli_server_version(name: str, system_folders: bool) -> None:
     check_docker_running()
     client = docker.from_env()
 
-    running_server_names = get_running_servers(client, InstanceType.SERVER)
+    running_server_names = get_running_servers(client, InstanceType.SERVER.value)
 
     name = get_server_name(
-        name, system_folders, running_server_names, InstanceType.SERVER
+        name, system_folders, running_server_names, InstanceType.SERVER.value
     )
 
     if name in running_server_names:

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/template/algo_store_config.j2

@@ -1,4 +1,4 @@
-allow_drop_all: 'True'
+allow_drop_all: true
 description: 'default_algorithm_store'
 ip: 0.0.0.0
 logging:

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6/cli/template/server_config.j2

@@ -1,4 +1,4 @@
-allow_drop_all: 'False'
+allow_drop_all: false
 api_path: /api
 description: 'defaultserver'
 ip: 0.0.0.0

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.10.0rc3
+Version: 4.10.1
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10

{vantage6-4.10.0rc3 → vantage6-4.10.1}/vantage6.egg-info/requires.txt

@@ -3,14 +3,14 @@ colorama==0.4.6
 copier==9.2.0
 docker==7.1.0
 ipython==8.10.0
-jinja2==3.1.5
+jinja2==3.1.6
 pandas>=1.5.3
 questionary==1.10.0
 rich==13.5.2
 schema==0.7.5
 SQLAlchemy==1.4.46
-vantage6-common==4.10.0rc3
-vantage6-client==4.10.0rc3
+vantage6-common==4.10.1
+vantage6-client==4.10.1
 
 [dev]
 coverage==6.4.4

vantage6-4.10.0rc3/vantage6/cli/__build__

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