edge-containers-cli 4.2.1__tar.gz → 4.3.0__tar.gz

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 2.3.0
+_commit: 2.6.0
 _src_path: gh:DiamondLightSource/python-copier-template
 author_email: giles.knap@gmail.com
 author_name: Giles Knap

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/.devcontainer/devcontainer.json

@@ -28,11 +28,11 @@
         }
     },
     "features": {
-        // Some default things like git config
-        "ghcr.io/devcontainers/features/common-utils:2": {
-            "upgradePackages": false
-        }
+        // add in eternal history and other bash features
+        "ghcr.io/diamondlightsource/devcontainer-features/bash-config:1.0.0": {}
     },
+    // Create the config folder for the bash-config feature
+    "initializeCommand": "mkdir -p ${localEnv:HOME}/.config/bash-config",
     "runArgs": [
         // Allow the container to access the host X11 display and EPICS CA
         "--net=host",

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/.github/CONTRIBUTING.md

@@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua
 
 This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects.
 
-For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/2.3.0/how-to.html).
+For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/2.6.0/how-to.html).

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/.github/workflows/_pypi.yml

@@ -15,3 +15,5 @@ jobs:
 
       - name: Publish to PyPI using trusted publishing
         uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          attestations: false

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/.github/workflows/_release.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Create GitHub Release
         # We pin to the SHA, not the tag, for security reasons.
         # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
-        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
         with:
           prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
           files: "*"

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/.github/workflows/_test.yml

@@ -54,7 +54,7 @@ jobs:
         run: tox -e tests
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           name: ${{ inputs.python-version }}/${{ inputs.runs-on }}
           files: cov.xml

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/.vscode/launch.json

@@ -18,6 +18,19 @@
                 // Enable break on exception when debugging tests (see: tests/conftest.py)
                 "PYTEST_RAISE": "1",
             },
+        },
+        {
+            "name": "Debug Monitor",
+            "type": "debugpy",
+            "request": "launch",
+            "module": "edge_containers_cli",
+            "args": [
+                "monitor"
+            ],
+            "console": "integratedTerminal",
+            "env": {
+                "EC_CLI_BACKEND": "DEMO",
+            },
         }
     ]
 }

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/Dockerfile

@@ -1,7 +1,7 @@
 # The devcontainer should use the developer target and run as root with podman
 # or docker with user namespaces.
 ARG PYTHON_VERSION=3.11
-FROM python:${PYTHON_VERSION} as developer
+FROM python:${PYTHON_VERSION} AS developer
 
 # Add any system dependencies for the developer/build environment here
 RUN apt-get update && apt-get install -y --no-install-recommends \

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: edge-containers-cli
-Version: 4.2.1
+Version: 4.3.0
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License
@@ -236,7 +236,7 @@ Requires-Dist: types-mock; extra == "dev"
 [![CI](https://github.com/epics-containers/edge-containers-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/epics-containers/edge-containers-cli/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/epics-containers/edge-containers-cli/branch/main/graph/badge.svg)](https://codecov.io/gh/epics-containers/edge-containers-cli)
 [![PyPI](https://img.shields.io/pypi/v/edge-containers-cli.svg)](https://pypi.org/project/edge-containers-cli)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
 # edge_containers_cli
 

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/README.md

@@ -1,7 +1,7 @@
 [![CI](https://github.com/epics-containers/edge-containers-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/epics-containers/edge-containers-cli/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/epics-containers/edge-containers-cli/branch/main/graph/badge.svg)](https://codecov.io/gh/epics-containers/edge-containers-cli)
 [![PyPI](https://img.shields.io/pypi/v/edge-containers-cli.svg)](https://pypi.org/project/edge-containers-cli)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
 # edge_containers_cli
 

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/src/edge_containers_cli/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.2.1'
-__version_tuple__ = version_tuple = (4, 2, 1)
+__version__ = version = '4.3.0'
+__version_tuple__ = version_tuple = (4, 3, 0)

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/src/edge_containers_cli/cli.py

@@ -238,7 +238,7 @@ def start(
 ):
     """Start a service"""
     try:
-        backend.commands.start(service_name, commit)
+        backend.commands.start(service_name, commit=commit)
     except GitError as e:
         msg = f"{str(e)} - Commit failed. Try 'ec start <service> --no-commit to set values without updating git"
         raise GitError(msg) from e
@@ -255,7 +255,7 @@ def stop(
 ):
     """Stop a service"""
     try:
-        backend.commands.stop(service_name, commit)
+        backend.commands.stop(service_name, commit=commit)
     except GitError as e:
         msg = f"{str(e)} - Commit failed. Try ec stop <service> --no-commit to set values without updating git"
         raise GitError(msg) from e

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/src/edge_containers_cli/cmds/argo_commands.py

@@ -7,14 +7,21 @@ Relies on the Helm class for deployment aspects.
 import webbrowser
 from datetime import datetime
 from pathlib import Path
+from time import sleep
 
 import polars
 from ruamel.yaml import YAML
 
-from edge_containers_cli.cmds.commands import CommandError, Commands, ServicesDataFrame
+from edge_containers_cli.cmds.commands import (
+    CommandError,
+    Commands,
+    ServicesDataFrame,
+    ServicesSchema,
+)
 from edge_containers_cli.definitions import ECContext
 from edge_containers_cli.git import set_values
 from edge_containers_cli.globals import TIME_FORMAT
+from edge_containers_cli.logging import log
 from edge_containers_cli.shell import ShellError, shell
 
 
@@ -23,13 +30,35 @@ def extract_ns_app(target: str) -> tuple[str, str]:
     return namespace, app
 
 
+def do_retry(cmd):
+    def _do_retry(*args, **kwargs):
+        max_attempts = 5
+        attempt = 1
+        sleep_time = 1
+        while attempt <= max_attempts:
+            try:
+                cmd(*args, **kwargs)
+                return None
+            except ShellError:
+                if attempt == max_attempts:
+                    log.debug(f"Retry failed after {max_attempts} attempts")
+                    raise
+                else:
+                    log.debug(f"Retry attempt {attempt} failed. Retrying...")
+                    sleep(sleep_time)
+                    attempt += 1
+
+    return _do_retry
+
+
+@do_retry
 def patch_value(target: str, key: str, value: str | bool | int):
     cmd_temp_ = f"argocd app set {target} -p {key}={value}"
     shell.run_command(cmd_temp_, skip_on_dryrun=True)
-    cmd_sync = f"argocd app sync {target} --apply-out-of-sync-only"
-    shell.run_command(cmd_sync, skip_on_dryrun=True)
+    # Rely on argocd autosync to get the cluster into the right state
 
 
+@do_retry
 def push_value(target: str, key: str, value: str | bool | int):
     # Get source details
     app_resp = shell.run_command(
@@ -46,11 +75,12 @@ def push_value(target: str, key: str, value: str | bool | int):
         value,
     )
 
-    # Sync & release a possible patched value
-    cmd_sync = f"argocd app sync {target} --apply-out-of-sync-only"
-    shell.run_command(cmd_sync, skip_on_dryrun=True)
+    # Free a possible patched value & refresh repo
     cmd_unset = f"argocd app unset {target} -p {key}"
     shell.run_command(cmd_unset, skip_on_dryrun=True)
+    cmd_refresh = f"argocd app get {target} --refresh"
+    shell.run_command(cmd_refresh, skip_on_dryrun=True)
+    # Rely on argocd autosync to get the cluster into the right state
 
 
 class ArgoCommands(Commands):
@@ -79,19 +109,18 @@ class ArgoCommands(Commands):
         self._check_service(service_name)
         namespace, app = extract_ns_app(self.target)
         cmd = (
-            f"argocd app delete-resource {namespace}/{service_name} "
-            f"--kind StatefulSet"
+            f"argocd app delete-resource {namespace}/{service_name} --kind StatefulSet"
         )
         shell.run_command(cmd, skip_on_dryrun=True)
 
-    def start(self, service_name, commit):
+    def start(self, service_name, commit=False):
         self._check_service(service_name)
         if commit:
             push_value(self.target, f"ec_services.{service_name}.enabled", True)
         else:
             patch_value(self.target, f"ec_services.{service_name}.enabled", True)
 
-    def stop(self, service_name, commit):
+    def stop(self, service_name, commit=False):
         self._check_service(service_name)
         if commit:
             push_value(self.target, f"ec_services.{service_name}.enabled", False)
@@ -122,45 +151,47 @@ class ArgoCommands(Commands):
         )
         app_dicts = YAML(typ="safe").load(app_resp)
 
-        if not app_dicts:
-            raise CommandError(f"No ec-services found in {self.target}")
-        for app in app_dicts:
-            resources_dict = app["status"]["resources"]
-
-            for resource in resources_dict:
-                is_ready = False
-                if resource["kind"] == "StatefulSet":
-                    name = app["metadata"]["name"]
-
-                    # check if replicas ready
-                    mani_resp = shell.run_command(
-                        f"argocd app manifests {namespace}/{name} --source live",
-                    )
-                    for resource_manifest in mani_resp.split("---")[1:]:
-                        manifest = YAML(typ="safe").load(resource_manifest)
-                        if not manifest:
-                            continue
-                        kind = manifest["kind"]
-                        resource_name = manifest["metadata"]["name"]
-                        if kind == "StatefulSet" and resource_name == name:
-                            try:
-                                is_ready = bool(manifest["status"]["readyReplicas"])
-                            except (KeyError, TypeError):  # Not ready if doesnt exist
-                                is_ready = False
-                            time_stamp = datetime.strptime(
-                                manifest["metadata"]["creationTimestamp"],
-                                "%Y-%m-%dT%H:%M:%SZ",
-                            )
-                            service_data["name"].append(name)
-                            service_data["version"].append(
-                                app["spec"]["source"]["targetRevision"]
-                            )
-                            service_data["ready"].append(is_ready)
-                            service_data["deployed"].append(
-                                datetime.strftime(time_stamp, TIME_FORMAT)
-                            )
-
-        services_df = polars.from_dict(service_data)
+        if app_dicts:
+            for app in app_dicts:
+                resources_dict = app["status"]["resources"]
+
+                for resource in resources_dict:
+                    is_ready = False
+                    if resource["kind"] == "StatefulSet":
+                        name = app["metadata"]["name"]
+
+                        # check if replicas ready
+                        mani_resp = shell.run_command(
+                            f"argocd app manifests {namespace}/{name} --source live",
+                        )
+                        for resource_manifest in mani_resp.split("---")[1:]:
+                            manifest = YAML(typ="safe").load(resource_manifest)
+                            if not manifest:
+                                continue
+                            kind = manifest["kind"]
+                            resource_name = manifest["metadata"]["name"]
+                            if kind == "StatefulSet" and resource_name == name:
+                                try:
+                                    is_ready = bool(manifest["status"]["readyReplicas"])
+                                except (
+                                    KeyError,
+                                    TypeError,
+                                ):  # Not ready if doesnt exist
+                                    is_ready = False
+                                time_stamp = datetime.strptime(
+                                    manifest["metadata"]["creationTimestamp"],
+                                    "%Y-%m-%dT%H:%M:%SZ",
+                                )
+                                service_data["name"].append(name)
+                                service_data["version"].append(
+                                    app["spec"]["source"]["targetRevision"]
+                                )
+                                service_data["ready"].append(is_ready)
+                                service_data["deployed"].append(
+                                    datetime.strftime(time_stamp, TIME_FORMAT)
+                                )
+
+        services_df = polars.from_dict(service_data, schema=ServicesSchema)
 
         if running_only:
             services_df = services_df.filter(polars.col("ready").eq(True))

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/src/edge_containers_cli/cmds/commands.py

@@ -47,6 +47,34 @@ class Commands(ABC):
         self._repo = ctx.repo
         self._log_url = ctx.log_url
 
+    def __getattribute__(self, attr_name):
+        """Override to wrap each abstract method"""
+        attr = super().__getattribute__(attr_name)
+        if callable(attr):
+            if attr_name[0] == "_":
+                log_f = log.debug
+            else:
+                log_f = log.info
+
+            def wrapper(*args, **kwargs):
+                call_msg = (
+                    f"Calling: {attr_name} {', '.join(str(item) for item in args)}"
+                )
+                return_msg = (
+                    f"Returned: {attr_name} {', '.join(str(item) for item in args)}"
+                )
+                if kwargs:
+                    call_msg = f"{call_msg} [{', '.join(f'{k}={v}' for k, v in kwargs.items())}]"
+                    return_msg = f"{return_msg} [{', '.join(f'{k}={v}' for k, v in kwargs.items())}]"
+                log_f(call_msg)
+                result = attr(*args, **kwargs)
+                log_f(return_msg)
+                return result
+
+            return wrapper
+        else:
+            return attr
+
     @property
     def target(self):
         if not self._target_valid:  # Only validate once
@@ -103,11 +131,11 @@ class Commands(ABC):
         raise NotImplementedError
 
     @abstractmethod
-    def start(self, service_name: str, commit: bool) -> None:
+    def start(self, service_name: str, commit: bool = False) -> None:
         raise NotImplementedError
 
     @abstractmethod
-    def stop(self, service_name: str, commit: bool) -> None:
+    def stop(self, service_name: str, commit: bool = False) -> None:
         raise NotImplementedError
 
     def template(self, svc_instance: Path, args: str) -> None:

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/src/edge_containers_cli/cmds/demo_commands.py

@@ -6,6 +6,7 @@ Relies on the Helm class for deployment aspects.
 
 import time
 from datetime import datetime
+from random import randrange, seed
 
 import polars
 
@@ -13,7 +14,9 @@ from edge_containers_cli.cmds.commands import CommandError, Commands, ServicesDa
 from edge_containers_cli.definitions import ECContext
 from edge_containers_cli.globals import TIME_FORMAT
 
-DELAY = 0.0
+DELAY = 2.0
+NUM_SERVICES = 8
+seed(237)
 
 
 def process_t(time_string) -> str:
@@ -22,13 +25,12 @@ def process_t(time_string) -> str:
 
 
 sample_data = {
-    "name": ["demo-ea-01", "demo-ea-02", "demo-ea-03"],  # type: ignore
-    "version": ["2024.10.1", "2024.10.1b", "2024.10.1"],
-    "ready": [True, True, False],
+    "name": [f"demo-ea-0{cnt}" for cnt in range(NUM_SERVICES)],
+    "version": ["1.0." + str(25 - cnt) for cnt in range(NUM_SERVICES)],
+    "ready": [True] * NUM_SERVICES,
     "deployed": [
-        process_t("2024-10-22T11:23:10Z"),
-        process_t("2024-10-28T14:53:55Z"),
-        process_t("2024-10-22T12:51:50Z"),
+        process_t(f"2024-10-22T11:23:0{randrange(1, 9)}Z")
+        for cnt in range(NUM_SERVICES)
     ],
 }
 sample_ServicesDataFrame = ServicesDataFrame(polars.from_dict(sample_data))
@@ -69,6 +71,11 @@ class DemoCommands(Commands):
         self._target_valid = False
         self._stateDF = sample_ServicesDataFrame
 
+        self.lorem_min = 10
+        self.lorem_max = 50
+        self.lorem_step = 5
+        self.lorem_count = self.lorem_min
+
     @demo_message
     def logs(self, service_name, prev):
         self._logs(service_name, prev)
@@ -83,11 +90,14 @@ class DemoCommands(Commands):
 
     @demo_message
     def restart(self, service_name):
-        self.stop(service_name, False)
-        self.start(service_name, False)
+        self._stop(service_name, commit=False)
+        self._start(service_name, commit=False)
 
     @demo_message
-    def start(self, service_name, commit):
+    def start(self, service_name, commit=False):
+        self._start(service_name, commit=commit)
+
+    def _start(self, service_name, commit=False):
         self._check_service(service_name)
         time.sleep(DELAY)
         self._stateDF = self._stateDF.with_columns(
@@ -98,7 +108,10 @@ class DemoCommands(Commands):
         )
 
     @demo_message
-    def stop(self, service_name, commit):
+    def stop(self, service_name, commit=False):
+        self._stop(service_name, commit=commit)
+
+    def _stop(self, service_name, commit=False):
         self._check_service(service_name)
         time.sleep(DELAY)
         self._stateDF = self._stateDF.with_columns(
@@ -110,7 +123,11 @@ class DemoCommands(Commands):
 
     def _get_logs(self, service_name, prev) -> str:
         self._check_service(service_name)
-        logs_list = ["Lorem ipsum dolor sit amet"] * 25
+        if self.lorem_count < self.lorem_max:
+            self.lorem_count += self.lorem_step
+        else:
+            self.lorem_count = self.lorem_min
+        logs_list = ["Lorem ipsum dolor sit amet"] * self.lorem_count
         return "\n".join(logs_list)
 
     def _get_services(self, running_only) -> ServicesDataFrame:

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/src/edge_containers_cli/cmds/helm.py

@@ -87,7 +87,7 @@ class Helm:
             with open("Chart.yaml") as fp:
                 chart_yaml = YAML(typ="safe").load(fp)
             package_path = (
-                service_folder / f'{chart_yaml["name"]}-{chart_yaml["version"]}.tgz'
+                service_folder / f"{chart_yaml['name']}-{chart_yaml['version']}.tgz"
             )
 
         # use helm to install the chart

{edge_containers_cli-4.2.1 → edge_containers_cli-4.3.0}/src/edge_containers_cli/cmds/k8s_commands.py

@@ -89,14 +89,14 @@ class K8sCommands(Commands):
             f"kubectl delete -n {self.target} {pod_name}", skip_on_dryrun=True
         )
 
-    def start(self, service_name, commit):
+    def start(self, service_name, commit=False):
         self._check_service(service_name)
         shell.run_command(
             f"kubectl scale -n {self.target} statefulset {service_name} --replicas=1",
             skip_on_dryrun=True,
         )
 
-    def stop(self, service_name, commit):
+    def stop(self, service_name, commit=False):
         self._check_service(service_name)
         shell.run_command(
             f"kubectl scale -n {self.target} statefulset {service_name} --replicas=0 ",
@@ -124,34 +124,46 @@ class K8sCommands(Commands):
             f'kubectl get statefulset -l "is_ioc==true" -n {self.target} -o yaml',
         )
         sts_dicts = YAML(typ="safe").load(kubectl_res)
-        if not sts_dicts["items"]:
-            raise CommandError(f"No ec-services found in {self.target}")
         service_data = {
             "name": [],  # type: ignore
             "ready": [],
             "deployed": [],
         }
-        for sts in sts_dicts["items"]:
-            name = sts["metadata"]["name"]
-            time_stamp = datetime.strptime(
-                sts["metadata"]["creationTimestamp"], "%Y-%m-%dT%H:%M:%SZ"
-            )
-            try:
-                is_ready = bool(sts["status"]["readyReplicas"])
-            except KeyError:  # Not ready if doesnt exist
-                is_ready = False
-
-            # Fill app data
-            service_data["name"].append(name)
-            service_data["ready"].append(is_ready)
-            service_data["deployed"].append(datetime.strftime(time_stamp, TIME_FORMAT))
-
-        services_df = polars.from_dict(service_data)
+        if sts_dicts["items"]:
+            for sts in sts_dicts["items"]:
+                name = sts["metadata"]["name"]
+                time_stamp = datetime.strptime(
+                    sts["metadata"]["creationTimestamp"], "%Y-%m-%dT%H:%M:%SZ"
+                )
+                try:
+                    is_ready = bool(sts["status"]["readyReplicas"])
+                except KeyError:  # Not ready if doesnt exist
+                    is_ready = False
+
+                # Fill app data
+                service_data["name"].append(name)
+                service_data["ready"].append(is_ready)
+                service_data["deployed"].append(
+                    datetime.strftime(time_stamp, TIME_FORMAT)
+                )
+
+        services_df = polars.from_dict(
+            service_data,
+            schema=polars.Schema(
+                {
+                    "name": polars.String,
+                    "ready": polars.Boolean,
+                    "deployed": polars.String,
+                }
+            ),
+        )
 
         # Adds the version for all services
         helm_out = str(shell.run_command(f"helm list -n {self.target} -o json"))
         if helm_out == "[]\n":
-            helm_df = polars.DataFrame({"name": [""], "version": [""]})
+            helm_df = polars.DataFrame(
+                schema=polars.Schema({"name": polars.String, "version": polars.String})
+            )
         else:
             helm_df = polars.read_json(StringIO(str(helm_out)))
             helm_df = helm_df.rename({"app_version": "version"})