edge-containers-cli 3.5.2__tar.gz → 3.5.4__tar.gz

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         runs-on: ["ubuntu-latest"] # can add windows-latest, macos-latest
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
         include:
           # Include one that runs in the dev environment
           - runs-on: "ubuntu-latest"
@@ -40,7 +40,7 @@ jobs:
     strategy:
       matrix:
         runs-on: ["ubuntu-latest"]
-        python-version: ["3.11"]
+        python-version: ["3.12"]
       fail-fast: false
     uses: ./.github/workflows/_sys_test.yml
     with:

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edge-containers-cli
-Version: 3.5.2
+Version: 3.5.4
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License
@@ -208,10 +208,10 @@ License:                                  Apache License
 Project-URL: GitHub, https://github.com/epics-containers/edge-containers-cli
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.9
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: natsort

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/pyproject.toml

@@ -7,9 +7,9 @@ name = "edge-containers-cli"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 description = "CLI for deploying and managing epics containers IOCs and services"
 
@@ -26,7 +26,7 @@ dependencies = [
 dynamic = ["version"]
 license.file = "LICENSE"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 [project.optional-dependencies]
 dev = [
@@ -109,9 +109,10 @@ commands =
 src = ["src", "tests"]
 line-length = 88
 lint.ignore = [
-    "C408", # Unnecessary collection call - e.g. list(...) instead of [...]
-    "E501", # Line too long, should be fixed by black.
-    "B008", # Do not perform function calls in argument defaults.
+    "C408",  # Unnecessary collection call - e.g. list(...) instead of [...]
+    "E501",  # Line too long, should be fixed by black.
+    "B008",  # Do not perform function calls in argument defaults.
+    "UP007", # Do not complain about Optional[] (TODO: remove once typer is patched)
 ]
 lint.select = [
     "B",  # flake8-bugbear - https://docs.astral.sh/ruff/rules/#flake8-bugbear-b

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/src/edge_containers_cli/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.5.2'
-__version_tuple__ = version_tuple = (3, 5, 2)
+__version__ = version = '3.5.4'
+__version_tuple__ = version_tuple = (3, 5, 4)

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/src/edge_containers_cli/cmds/k8s_commands.py

@@ -7,7 +7,7 @@ Relies on the Helm class for deployment aspects.
 from datetime import datetime
 from io import StringIO
 from pathlib import Path
-from typing import Optional, Union
+from typing import Optional
 
 import polars
 import typer
@@ -39,7 +39,7 @@ def check_service(service_name: str, namespace: str) -> str:
     return str(result).strip()
 
 
-def check_namespace(namespace: Optional[str]):
+def check_namespace(namespace: str | None):
     """
     Verify we have a good namespace that exists in the cluster
     """
@@ -125,7 +125,7 @@ class K8sCommands(Commands):
 
     def logs(
         self, service_name: str, prev: bool, follow: bool, stdout: bool = False
-    ) -> Optional[Union[str, bool]]:
+    ) -> Optional[str | bool]:
         fullname = check_service(service_name, self.namespace)
         previous = "-p" if prev else ""
         fol = "-f" if follow else ""
@@ -194,7 +194,9 @@ class K8sCommands(Commands):
                 has_header=False,
                 new_columns=["name", "running", "restarts"],
             )
-            services_df = services_df.join(gtpo_df, on="name", how="left")
+            services_df = services_df.join(
+                gtpo_df, on="name", how="left", coalesce=True
+            )
             services_df = services_df.with_columns(
                 polars.col("running").replace({"Running": True}, default=False),
                 polars.col("restarts").fill_null(0),
@@ -214,7 +216,7 @@ class K8sCommands(Commands):
         helm_df = polars.read_json(StringIO(str(helm_out)))
         helm_df = helm_df.rename({"app_version": "version", "updated": "deployed"})
         helm_df = helm_df.with_columns(polars.col("deployed").str.slice(0, 19))
-        services_df = services_df.join(helm_df, on="name", how="left")
+        services_df = services_df.join(helm_df, on="name", how="left", coalesce=True)
         log.debug(services_df)
 
         # Arrange columns

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/src/edge_containers_cli/cmds/local_commands.py

@@ -10,6 +10,7 @@ tool like Portainer is a decent workflow.
 """
 
 import json
+import os
 import re
 import tempfile
 from datetime import datetime
@@ -84,9 +85,25 @@ class LocalCommands(Commands):
 
         vol = f"-v {volume}:{globals.IOC_CONFIG_FOLDER}"
         label = f"-l is_IOC=true -l version={version}"
-        cmd = f"run -dit --net host --restart unless-stopped {label} {vol} {args}"
         dest = "busybox:copyto"
 
+        # use environment to configure volumes and user id
+        data_folder = os.getenv("EC_LOCAL_DATA_FOLDER")
+        if data_folder:
+            vol = vol + f" -v {data_folder}:{data_folder}"
+        opi_folder = os.getenv("EC_LOCAL_OPI_FOLDER")
+        if opi_folder:
+            vol = vol + f" -v {opi_folder}:/epics/opi"
+
+        user_id = os.getenv("EC_LOCAL_USER_ID")
+        ids = f"-u {user_id}" if user_id else ""
+        group_id = os.getenv("EC_LOCAL_GROUP_ID")
+        if group_id:
+            cmd = f"{ids} -g {group_id}"
+
+        cmd = f"run -dit --net host --restart unless-stopped {label} {vol} {args} {ids}"
+        cmd = cmd.strip()
+
         # get the config into the volume before launching the IOC container
         shell.run_command(f"{self.docker.docker} rm -f busybox", interactive=False)
         shell.run_command(

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/src/edge_containers_cli/cmds/monitor.py

@@ -1,9 +1,10 @@
 """TUI monitor for containerised IOCs."""
 
+from collections.abc import Callable
 from functools import total_ordering
 from threading import Thread
 from time import sleep
-from typing import Any, Callable, Union, cast
+from typing import Any, cast
 
 import polars
 from rich.style import Style
@@ -185,17 +186,41 @@ class SortableText(Text):
     def __lt__(self, other: Any) -> bool:
         if type(other) != SortableText:
             return NotImplemented
-        return cast(bool, self.value < other.value)
+
+        # Handle None as values
+        match self.value, other.value:
+            case (None, None) | (None, _):
+                return False
+            case (_, None):
+                return True
+            case _:
+                return cast(bool, self.value < other.value)
 
     def __gt__(self, other: Any) -> bool:
         if type(other) != SortableText:
             return NotImplemented
-        return cast(bool, self.value > other.value)
+
+        # Handle None as values
+        match self.value, other.value:
+            case (None, None) | (_, None):
+                return False
+            case (None, _):
+                return True
+            case _:
+                return cast(bool, self.value > other.value)
 
     def __eq__(self, other: Any) -> bool:
         if type(other) != SortableText:
             return NotImplemented
-        return cast(bool, self.value == other.value)
+
+        # Handle None as values
+        match self.value, other.value:
+            case (None, _) | (_, None):
+                return False
+            case (None, None):
+                return True
+            case _:
+                return cast(bool, self.value == other.value)
 
 
 class IocTable(Widget):
@@ -240,7 +265,7 @@ class IocTable(Widget):
             self.iocs[i] = ioc
         self.columns = [key for key in self.iocs[0].keys() if key not in exclude]
 
-    def _convert_df_to_list(self, iocs_df: Union[polars.DataFrame, list]) -> list[dict]:
+    def _convert_df_to_list(self, iocs_df: polars.DataFrame | list) -> list[dict]:
         if isinstance(iocs_df, polars.DataFrame):
             iocs = iocs_df.to_dicts()
         else:
@@ -353,18 +378,6 @@ class IocTable(Widget):
 
 
 class MonitorApp(App):
-    def __init__(
-        self,
-        beamline: str,
-        commands: Commands,
-        running_only: bool,
-    ) -> None:
-        super().__init__()
-
-        self.commands = commands
-        self.running_only = running_only
-        self.beamline = beamline
-
     CSS_PATH = "monitor.tcss"
 
     BINDINGS = [
@@ -377,6 +390,18 @@ class MonitorApp(App):
         # Binding("d", "toggle_dark", "Toggle dark mode"),
     ]
 
+    def __init__(
+        self,
+        beamline: str,
+        commands: Commands,
+        running_only: bool,
+    ) -> None:
+        super().__init__()
+
+        self.commands = commands
+        self.running_only = running_only
+        self.beamline = beamline
+
     def compose(self) -> ComposeResult:
         """Create child widgets for the app."""
         yield Header(show_clock=True)
@@ -409,7 +434,7 @@ class MonitorApp(App):
         col_keys = [ord_col.key.value for ord_col in table.ordered_columns]
         col_i = col_keys.index(col_key)
         ioc_col = table.ordered_columns[col_i]
-        cell: Union[str, SortableText] = table.get_cell(ioc_row.key, ioc_col.key)
+        cell: str | SortableText = table.get_cell(ioc_row.key, ioc_col.key)
         # SortableText inherits __str__() from Text
         return str(cell)
 

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/src/edge_containers_cli/docker.py

@@ -5,7 +5,7 @@ Utility functions for working interacting with docker / podman CLI
 import re
 from pathlib import Path
 from time import sleep
-from typing import Optional, Union
+from typing import Optional
 
 import typer
 
@@ -111,7 +111,7 @@ class Docker:
         previous: bool = False,
         follow: bool = False,
         stdout: bool = False,
-    ) -> Optional[Union[str, bool]]:
+    ) -> Optional[str | bool]:
         """
         show logs from a container
         """

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/src/edge_containers_cli/shell.py

@@ -3,7 +3,6 @@ functions for executing commands and querying environment in the linux shell
 """
 
 import subprocess
-from typing import Union
 
 import typer
 from rich.console import Console
@@ -39,7 +38,7 @@ def echo_output(output: str):
 
 def run_command(
     command: str, interactive=True, error_OK=False, show=False
-) -> Union[str, bool]:
+) -> str | bool:
     """
     Run a command and return the output
 
@@ -65,7 +64,7 @@ def run_command(
         error_out = p_result.stderr.decode()
 
     if interactive:
-        result: Union[str, bool] = p_result.returncode == 0
+        result: str | bool = p_result.returncode == 0
     else:
         result = output + error_out
 

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/src/edge_containers_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edge-containers-cli
-Version: 3.5.2
+Version: 3.5.4
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License
@@ -208,10 +208,10 @@ License:                                  Apache License
 Project-URL: GitHub, https://github.com/epics-containers/edge-containers-cli
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.9
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: natsort

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/tests/conftest.py

@@ -1,8 +1,8 @@
 import re
 import shutil
+from collections.abc import Callable
 from pathlib import Path
 from types import SimpleNamespace
-from typing import Callable, Union
 
 from pytest import fixture
 from ruamel.yaml import YAML
@@ -73,7 +73,7 @@ class MockRun:
 
         return rsp
 
-    def set_seq(self, cmd_rsp: list[dict[str, Union[str, bool]]]):
+    def set_seq(self, cmd_rsp: list[dict[str, str | bool]]):
         """
         Set up the expected sequence of commands that we expect to see come
         through the mock of run_command. Also supplies the response to

{edge_containers_cli-3.5.2 → edge_containers_cli-3.5.4}/tests/data/local.yaml

@@ -37,7 +37,7 @@ deploy_local:
     rsp: ""
   - cmd: docker rm -f busybox
     rsp: ""
-  - cmd: docker run -dit --net host --restart unless-stopped -l is_IOC=true -l version=.* -v bl01t-ea-test-01_config:\/epics\/ioc\/config\/  --name bl01t-ea-test-01 ghcr.io\/epics-containers\/ioc-adsimdetector-runtime:2024.4.1
+  - cmd: docker run -dit --net host --restart unless-stopped -l is_IOC=true -l version=.* -v bl01t-ea-test-01_config:\/epics\/ioc\/config\/ --name bl01t-ea-test-01 ghcr.io\/epics-containers\/ioc-adsimdetector-runtime:2024.4.1
     rsp: True
   - cmd: docker ps -f name=bl01t-ea-test-01 --format .*
     rsp: bl01t-ea-test-01
@@ -64,7 +64,7 @@ deploy:
     rsp: ""
   - cmd: docker rm -f busybox
     rsp: ""
-  - cmd: docker run -dit --net host --restart unless-stopped -l is_IOC=true -l version=2.0 -v bl01t-ea-test-01_config:/epics/ioc/config/  --name bl01t-ea-test-01 ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.4.1
+  - cmd: docker run -dit --net host --restart unless-stopped -l is_IOC=true -l version=2.0 -v bl01t-ea-test-01_config:/epics/ioc/config/ --name bl01t-ea-test-01 ghcr.io/epics-containers/ioc-adsimdetector-runtime:2024.4.1
     rsp: True
   - cmd: docker ps -f name=bl01t-ea-test-01 --format .*
     rsp: bl01t-ea-test-01