artefacts-cli 0.6.17__tar.gz → 0.6.19__tar.gz

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: artefacts_cli
-Version: 0.6.17
+Version: 0.6.19
 Author-email: FD <fabian@artefacts.com>, AGC <alejandro@artefacts.com>, TN <tomo@artefacts.com>, EP <eric@artefacts.com>
 Project-URL: Homepage, https://github.com/art-e-fact/artefacts-client
 Project-URL: Bug Tracker, https://github.com/art-e-fact/artefacts-client/issues
@@ -17,26 +17,25 @@ Requires-Dist: mcap
 Requires-Dist: mcap-ros2-support
 Requires-Dist: PyYAML>=6.0
 Requires-Dist: requests>=2.27.1
-Requires-Dist: setuptools-scm
-Requires-Dist: setuptools>=74
 Provides-Extra: dev
 Requires-Dist: awscli; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: docker; extra == "dev"
 Requires-Dist: lark; extra == "dev"
-Requires-Dist: pyre-check; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-env; extra == "dev"
-Requires-Dist: pytest-mock; extra == "dev"
-Requires-Dist: ruff; extra == "dev"
-Requires-Dist: twine; extra == "dev"
 Requires-Dist: mkdocs-click==0.8.0; extra == "dev"
 Requires-Dist: mkdocs-material==8.5.6; extra == "dev"
 Requires-Dist: mkdocs-mermaid2-plugin==0.6.0; extra == "dev"
 Requires-Dist: mkdocs==1.4.2; extra == "dev"
+Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pyre-check; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-env; extra == "dev"
+Requires-Dist: pytest-mock; extra == "dev"
 Requires-Dist: python-markdown-math; extra == "dev"
+Requires-Dist: ruff>=0.9.2; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 
 # Artefacts CLI
 

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/__init__.py

@@ -2,7 +2,6 @@ from importlib.metadata import version, PackageNotFoundError
 import json
 import glob
 from datetime import datetime, timezone
-import logging
 import os
 import math
 import requests
@@ -10,8 +9,7 @@ import copy
 from typing import Optional
 
 from .parameters import iter_grid
-
-logging.basicConfig(level=logging.INFO)
+from .logger import logger
 
 
 try:
@@ -23,7 +21,7 @@ except PackageNotFoundError:
 
         __version__ = get_version()
     except Exception as e:
-        logging.warning(f"Could not determine package version: {e}. Default to 0.0.0")
+        logger.warning(f"Could not determine package version: {e}. Default to 0.0.0")
         __version__ = "0.0.0"
 
 
@@ -42,6 +40,7 @@ class WarpJob:
         jobconf,
         dryrun=False,
         nosim=False,
+        noupload=False,
         noisolation=False,
         context=None,
         run_offset=0,
@@ -57,6 +56,7 @@ class WarpJob:
         self.n_runs = run_offset
         self.dryrun = dryrun
         self.nosim = nosim
+        self.noupload = noupload
         self.noisolation = noisolation
         self.context = context
 
@@ -84,10 +84,10 @@ class WarpJob:
             if response.status_code != 200:
                 if response.status_code == 403:
                     msg = response.json()["message"]
-                    logging.warning(msg)
+                    logger.warning(msg)
                     raise AuthenticationError(msg)
-                logging.warning(f"Error on job creation: {response.status_code}")
-                logging.warning(response.text)
+                logger.warning(f"Error on job creation: {response.status_code}")
+                logger.warning(response.text)
                 raise AuthenticationError(str(response.status_code))
             self.job_id = response.json()["job_id"]
         self.output_path = self.params.get("output_path", f"/tmp/{self.job_id}")
@@ -108,7 +108,7 @@ class WarpJob:
             "success": self.success,  # need to be determined based on all runs, can be an AND in the API
             "status": "finished",  # need to be determined based on all runs
         }
-        response = requests.put(
+        requests.put(
             f"{self.api_conf.api_url}/{self.project_id}/job/{self.job_id}",
             json=data,
             headers=self.api_conf.headers,
@@ -155,10 +155,10 @@ class WarpRun:
         if response.status_code != 200:
             if response.status_code == 403:
                 msg = response.json()["message"]
-                logging.warning(msg)
+                logger.warning(msg)
                 raise AuthenticationError(msg)
-            logging.warning(f"Error on scenario creation: {response.status_code}")
-            logging.warning(response.text)
+            logger.warning(f"Error on scenario creation: {response.status_code}")
+            logger.warning(response.text)
             raise AuthenticationError(str(response.status_code))
         return
 
@@ -170,7 +170,7 @@ class WarpRun:
 
     def log_metrics(self):
         metrics = self.params.get("metrics", None)
-        if type(metrics) == str:
+        if type(metrics) is str:
             with open(f"{self.output_path}/{metrics}") as f:
                 metric_values = json.load(f)
             for k, v in metric_values.items():
@@ -182,7 +182,8 @@ class WarpRun:
                 metric_values = json.load(f)
             for k, v in metric_values.items():
                 self.log_metric(k, v)
-        except:  # if the metrics.json file does not exist, do nothing
+        except FileNotFoundError:
+            # if the metrics.json file does not exist, do nothing
             pass
 
     def log_tests_results(self, test_results, success):
@@ -225,7 +226,7 @@ class WarpRun:
         """log a single file filename"""
 
         def _get_filename(path):
-            return path.split(f"/")[-1]
+            return path.split("/")[-1]
 
         if prefix is not None:
             self.uploads.update({f"{prefix}/{_get_filename(filename)}": filename})
@@ -255,23 +256,28 @@ class WarpRun:
             headers=self.job.api_conf.headers,
         )
         # use s3 presigned urls to upload the artifacts
-        upload_urls = response.json()["upload_urls"]
-        for key, file_name in self.uploads.items():
-            files = {"file": open(file_name, "rb")}
-            upload_info = upload_urls[key]
-            file_size_mb = os.path.getsize(file_name) / 1024 / 1024
-            try:
-                print(f"Uploading {file_name} ({file_size_mb:.2f} MB)")
-                # TODO: add a retry policy
-                r = requests.post(
-                    upload_info["url"],
-                    data=upload_info["fields"],
-                    files=files,
-                )
-            except OverflowError:
-                logging.warning(f"File too large: {file_name} could not be uploaded")
-            except Exception as e:
-                logging.warning(f"Error uploading {file_name}: {e}, skipping")
+        if self.job.noupload:
+            print(
+                "noupload: job artifacts are not uploaded to cloud, including the ones specified in output_dirs"
+            )
+        else:
+            upload_urls = response.json()["upload_urls"]
+            for key, file_name in self.uploads.items():
+                files = {"file": open(file_name, "rb")}
+                upload_info = upload_urls[key]
+                file_size_mb = os.path.getsize(file_name) / 1024 / 1024
+                try:
+                    print(f"Uploading {file_name} ({file_size_mb:.2f} MB)")
+                    # TODO: add a retry policy
+                    requests.post(
+                        upload_info["url"],
+                        data=upload_info["fields"],
+                        files=files,
+                    )
+                except OverflowError:
+                    logger.warning(f"File too large: {file_name} could not be uploaded")
+                except Exception as e:
+                    logger.warning(f"Error uploading {file_name}: {e}, skipping")
 
 
 def init_job(
@@ -281,6 +287,7 @@ def init_job(
     jobconf: dict,
     dryrun: bool = False,
     nosim: bool = False,
+    noupload: bool = False,
     noisolation: bool = False,
     context: Optional[dict] = None,
     run_offset=0,
@@ -292,6 +299,7 @@ def init_job(
         jobconf,
         dryrun,
         nosim,
+        noupload,
         noisolation,
         context,
         run_offset,

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/app.py

@@ -5,7 +5,6 @@ import os
 import platform
 import random
 import subprocess
-import sys
 import tarfile
 import tempfile
 import time
@@ -22,7 +21,6 @@ from artefacts.cli import init_job, generate_scenarios, AuthenticationError, __v
 from artefacts.cli import app_containers as containers
 from artefacts.cli.constants import DEPRECATED_FRAMEWORKS, SUPPORTED_FRAMEWORKS
 from artefacts.cli.utils import read_config, config_validation
-import artefacts_copava as copava
 
 HOME = os.path.expanduser("~")
 CONFIG_DIR = f"{HOME}/.artefacts"
@@ -213,6 +211,12 @@ def hello(project_name):
     default=False,
     help="nosim: no simulator resource provided by Artefacts",
 )
+@click.option(
+    "--noupload",
+    is_flag=True,
+    default=False,
+    help="noupload: rosbags are not uploaded to cloud",
+)
 @click.option(
     "--noisolation",
     is_flag=True,
@@ -262,6 +266,7 @@ def run(
     jobname,
     dryrun,
     nosim,
+    noupload,
     noisolation,
     description="",
     skip_validation=False,
@@ -337,6 +342,7 @@ def run(
             jobconf,
             dryrun,
             nosim,
+            noupload,
             noisolation,
             context,
             first,
@@ -349,7 +355,7 @@ def run(
     job_success = True
     for scenario_n, scenario in enumerate(scenarios):
         click.echo(
-            f"Starting scenario {scenario_n+1}/{len(scenarios)}: {scenario['name']}"
+            f"Starting scenario {scenario_n + 1}/{len(scenarios)}: {scenario['name']}"
         )
         try:
             run = warpjob.new_run(scenario)
@@ -410,7 +416,7 @@ def run(
                 results, success = run_other_tests(run)
             if not success:
                 job_success = False
-            if type(run.params.get("metrics", [])) == str:
+            if type(run.params.get("metrics", [])) is str:
                 run.log_metrics()
 
         run.stop()
@@ -480,7 +486,7 @@ def run_remote(config, description, jobname, skip_validation=False):
     if "on" in run_config:
         del run_config["on"]
 
-    click.echo(f"Packaging source...")
+    click.echo("Packaging source...")
 
     with tempfile.NamedTemporaryFile(
         prefix=project_id.split("/")[-1], suffix=".tgz", delete=True
@@ -490,7 +496,7 @@ def run_remote(config, description, jobname, skip_validation=False):
         try:
             ignore_matches = parse_gitignore(ignore_file)
         except FileNotFoundError:
-            ignore_matches = lambda x: False
+            ignore_matches = lambda x: False  # noqa: E731
         with tarfile.open(fileobj=temp_file, mode="w:gz") as tar_file:
             for root, dirs, files in os.walk(project_folder):
                 for file in files:
@@ -604,7 +610,7 @@ def run_remote(config, description, jobname, skip_validation=False):
                     )
 
         click.echo(
-            f"Uploading complete! The new job will show up shortly at {dashboard_url}/tests"
+            f"Uploading complete! The new job will show up shortly at {dashboard_url}"
         )
 
 

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/app_containers.py

@@ -85,14 +85,15 @@ def run(ctx: click.Context, image: str, jobname: str, config: str, with_gui: boo
         image=image,
         project=project,
         jobname=jobname,
-        # Hidden setting primarily useful to Artefacts developers
-        api_url=os.environ.get("ARTEFACTS_API_URL", DEFAULT_API_URL),
         with_gui=with_gui,
+        # Hidden settings primarily useful to Artefacts developers
+        api_url=os.environ.get("ARTEFACTS_API_URL", DEFAULT_API_URL),
+        api_key=os.environ.get("ARTEFACTS_KEY", None),
     )
     container, logs = handler.run(**params)
     if container:
         print(f"Package run complete: Container Id for inspection: {container['Id']}")
     else:
-        print(f"Package run failed:")
+        print("Package run failed:")
         for entry in logs:
             print("\t- " + entry)

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/containers/__init__.py

@@ -2,7 +2,7 @@ from collections.abc import Generator
 import configparser
 import os
 from pathlib import Path
-from typing import Any, Tuple, Union
+from typing import Any, Optional, Tuple, Union
 
 from artefacts.cli.constants import DEFAULT_API_URL
 
@@ -13,13 +13,13 @@ class CMgr:
         Returns the build image ID (e.g. sha256:abcdefghi)
         and an iterator over the build log entries.
         """
-        raise NotImplemented()
+        raise NotImplementedError()
 
     def check(self, image: str) -> bool:
         """
         Checks whether a target image exists locally.
         """
-        raise NotImplemented()
+        raise NotImplementedError()
 
     def run(
         self,
@@ -34,19 +34,19 @@ class CMgr:
         Returns a container (Any type as depends on the framework)
         and an iterator over the container log entries.
         """
-        raise NotImplemented()
+        raise NotImplementedError()
 
-    def _valid_artefacts_api_key(
+    def _get_artefacts_api_key(
         self, project: str, path: Union[str, Path] = Path("~/.artefacts").expanduser()
-    ) -> bool:
+    ) -> Optional[str]:
         """
-        Check if a valid API key is available to embed in containers.
+        Get any valid API key to embed in containers.
 
-        1. Check overrides with the ARTEFACTS_KEY environment variable.
-        2. If `path` is not given, check the default .artefacts folder for the config file.
-        3. If `path` is given, check the file directly is a file, or check for a `config` file if a folder.
+        1. Checks first from the ARTEFACTS_KEY environment variable.
+        2. If `path` is not given, check from the default configuraiton file in the .artefacts folder.
+        3. If `path` is given, check the file directly if a file, or check for a `config` file if a folder.
 
-        When a config file is found, we check here if the API key for the `project` is available.
+        When a config file is found, we get the API key for the `project`.
 
         `path` set to None is an error, and aborts execution.
         """
@@ -55,7 +55,7 @@ class CMgr:
                 "`path` must be a string, a Path object, or excluded from the kwargs"
             )
         if os.environ.get("ARTEFACTS_KEY", None):
-            return True
+            return os.environ["ARTEFACTS_KEY"]
         path = Path(path)  # Ensure we have a Path object
         config = configparser.ConfigParser()
         if path.is_dir():
@@ -63,6 +63,6 @@ class CMgr:
         else:
             config.read(path)
         try:
-            return config[project].get("apikey") != None
+            return config[project].get("apikey")
         except KeyError:
-            return False
+            return None

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/containers/docker.py

@@ -12,8 +12,8 @@ from artefacts.cli.utils import ensure_available
 
 ensure_available("docker")
 
-import docker
-from docker import APIClient
+import docker  # noqa: E402
+from docker import APIClient  # noqa: E402
 
 
 class DockerManager(CMgr):
@@ -53,21 +53,35 @@ class DockerManager(CMgr):
         jobname: str = None,
         artefacts_dir: str = Path("~/.artefacts").expanduser(),
         api_url: str = DEFAULT_API_URL,
+        api_key: str = None,
         with_gui: bool = False,
     ) -> Tuple[Any, Generator]:
-        if not self._valid_artefacts_api_key(project, artefacts_dir):
+        """
+        Run an application as an Artefacts-enabled container in a Docker engine
+
+        The arguments are considered straightforward, except the different
+        priorities between `artefacts_dir` and `api_key`:
+        * `api_key` has the highest priority. When specified, `artefacts_dir`
+          is ignored. The container will rely on the key as an environment
+          variable (ARTEFACTS_KEY).
+        * Whenever `api_key` is not provided, the container gets `artefacts_dir`
+          mounted as volume. The directory must contain a valid configuration
+          with the project's key.
+        """
+        env = {
+            "JOB_ID": str(uuid4()),
+            "ARTEFACTS_JOB_NAME": jobname,
+            "ARTEFACTS_API_URL": api_url,
+        }
+
+        env["ARTEFACTS_KEY"] = self._get_artefacts_api_key(project, artefacts_dir)
+        if env["ARTEFACTS_KEY"] is None:
             return None, iter(
                 [
-                    "Missing API key for the project. Does `~/.artefacts/config` exist and contain your key?"
+                    f"Missing API key for the project. Does `{artefacts_dir}/config` exist and contain your key? Alternatively ARTEFACTS_KEY can be set with the key."
                 ]
             )
         try:
-            env = {
-                "JOB_ID": str(uuid4()),
-                "ARTEFACTS_JOB_NAME": jobname,
-                "ARTEFACTS_API_URL": api_url,
-            }
-
             if platform.system() in ["Darwin", "Windows"]:
                 # Assume we run in Docker Desktop
                 env["DISPLAY"] = "host.docker.internal:0"
@@ -77,24 +91,21 @@ class DockerManager(CMgr):
             if not with_gui:
                 env["QT_QPA_PLATFORM"] = "offscreen"
 
-            container = self.client.create_container(
-                image,
+            container_conf = dict(
+                image=image,
                 environment=env,
                 detach=False,
-                volumes=["/root/.artefacts"],
                 host_config=self.client.create_host_config(
-                    binds={
-                        artefacts_dir: {
-                            "bind": "/root/.artefacts",
-                            "mode": "ro",
-                        },
-                    },
                     network_mode="host",
                 ),
             )
+
+            container = self.client.create_container(**container_conf)
             self.client.start(container=container.get("Id"))
+
             for entry in self.client.logs(container=container.get("Id"), stream=True):
                 print(entry.decode("utf-8").strip())
+
             return container, iter([])
         except docker.errors.ImageNotFound:
             return None, iter(

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/containers/utils.py

@@ -1,8 +1,11 @@
+import sys
+
 from collections.abc import Generator
-import logging
 from typing import Any, Tuple
 
+from artefacts.cli import errors
 from artefacts.cli.containers import CMgr
+from artefacts.cli.logger import logger
 
 
 class ContainerMgr:
@@ -12,12 +15,13 @@ class ContainerMgr:
     }
 
     def __init__(self):
-        self.logger = logging.getLogger(__name__)
+        self.logger = logger
         self.mgr = self._configure()
         if self.mgr is None:
-            raise Exception(
-                f"Failed to find supported container stack. Please install and start one in {list(self.SUPPORTED_PRIORITISED_ENGINES.values())}, with default settings (custom sockets not supported at this stage)"
+            self.logger.error(
+                f"Failed to find supported container stack. Please install and start one of {list(self.SUPPORTED_PRIORITISED_ENGINES.values())}, with default settings (custom sockets not supported at this stage)"
             )
+            sys.exit(errors.CONTAINER_ENGINE_NOT_FOUND)
 
     def _configure(self) -> CMgr:
         manager = None

artefacts_cli-0.6.19/artefacts/cli/errors.py

@@ -0,0 +1 @@
+CONTAINER_ENGINE_NOT_FOUND = 1000

artefacts_cli-0.6.19/artefacts/cli/logger.py

@@ -0,0 +1,10 @@
+import logging
+import sys
+
+logger = logging.getLogger()
+
+default_handler = logging.StreamHandler(stream=sys.stderr)
+default_handler.setLevel(logging.ERROR)
+default_handler.setFormatter(logging.Formatter())
+
+logger.addHandler(default_handler)

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/parameters.py

@@ -17,7 +17,7 @@ def iter_grid(grid_spec: dict) -> Iterable[dict]:
         items = sorted(grid_spec.items())
         keys, values = zip(*items)
         # Make sure single values are converted to lists
-        values = [x if type(x) == list else [x] for x in values]
+        values = [x if type(x) is list else [x] for x in values]
         for v in product(*values):
             params = dict(zip(keys, v))
             yield params

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/ros1.py

@@ -50,17 +50,17 @@ def generate_rosbag_args(scenario: dict) -> str:
             return topics
         else:
             logging.warning(
-                f"[warning in generate_rosbag_args] rosbag_record asks for 'subscriptions' but they are not specified. Falling back to default: no rosbag will be recorded"
+                "[warning in generate_rosbag_args] rosbag_record asks for 'subscriptions' but they are not specified. Falling back to default: no rosbag will be recorded"
             )
             return "none"
     else:
-        assert (
-            type(rosbag_record) == list
-        ), f"rosbag_record supports 'all', 'none', 'subscriptions' or a list of strings interpreted as a list of ROS topics, regex supported"
+        assert type(rosbag_record) is list, (
+            "rosbag_record supports 'all', 'none', 'subscriptions' or a list of strings interpreted as a list of ROS topics, regex supported"
+        )
         for e in rosbag_record:
-            assert (
-                type(e) == str
-            ), f"Elements of the rosbag_record list must only be strings. They are interpreted as a list of ROS topics, regex supported"
+            assert type(e) is str, (
+                "Elements of the rosbag_record list must only be strings. They are interpreted as a list of ROS topics, regex supported"
+            )
         return f"--regex {' '.join(rosbag_record)}"
 
 

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/ros2.py

@@ -114,9 +114,9 @@ def run_ros2_tests(run):
                 try:
                     last_value = bag.get_last_message(metric)[1].data
                     run.log_metric(metric, last_value)
-                except KeyError as e:
+                except KeyError:
                     print(f"Metric {metric} not found in rosbag, skipping.")
-                except TypeError or IndexError as e:
+                except TypeError or IndexError:
                     print(
                         f"Metric {metric} not found. Is it being published?. Skipping."
                     )

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/utils.py

@@ -1,7 +1,7 @@
 import os
 import subprocess
 import sys
-from typing import Any, Union
+from typing import Union
 
 import click
 

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/utils_ros.py

@@ -49,7 +49,7 @@ def parse_tests_results(file):
 
     except Exception as e:
         print(f"[Exception in parse_tests_results] {e}")
-        print(f"Test result xml could not be loaded, marking success as False")
+        print("Test result xml could not be loaded, marking success as False")
         results = [
             {
                 "suite": "unittest.suite.TestSuite",

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts/cli/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.6.17'
-__version_tuple__ = version_tuple = (0, 6, 17)
+__version__ = version = '0.6.19'
+__version_tuple__ = version_tuple = (0, 6, 19)

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts.yaml

@@ -1,6 +1,6 @@
 version: 0.1.0
 
-project: artefacts-tests/cli-run-remote-testing
+project: artefacts/cli-run-remote-testing
 
 on:
   push:
@@ -43,12 +43,13 @@ jobs:
     type: test
     package:
       custom:
-        os: public.ecr.aws/artefacts/ros2:galactic-turtlesim-noartefacts
+        os: public.ecr.aws/artefacts/ros2:humble-turtlesim-noartefacts
         commands:
-          - pip3 install --upgrade setuptools pip && pip3 install ./src
+          - cd src
+          - pip3 install .
     runtime:
       simulator: turtlesim
-      framework: ros2:galactic
+      framework: ros2:humble
     scenarios:
       defaults:
         subscriptions:

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: artefacts_cli
-Version: 0.6.17
+Version: 0.6.19
 Author-email: FD <fabian@artefacts.com>, AGC <alejandro@artefacts.com>, TN <tomo@artefacts.com>, EP <eric@artefacts.com>
 Project-URL: Homepage, https://github.com/art-e-fact/artefacts-client
 Project-URL: Bug Tracker, https://github.com/art-e-fact/artefacts-client/issues
@@ -17,26 +17,25 @@ Requires-Dist: mcap
 Requires-Dist: mcap-ros2-support
 Requires-Dist: PyYAML>=6.0
 Requires-Dist: requests>=2.27.1
-Requires-Dist: setuptools-scm
-Requires-Dist: setuptools>=74
 Provides-Extra: dev
 Requires-Dist: awscli; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: docker; extra == "dev"
 Requires-Dist: lark; extra == "dev"
-Requires-Dist: pyre-check; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-env; extra == "dev"
-Requires-Dist: pytest-mock; extra == "dev"
-Requires-Dist: ruff; extra == "dev"
-Requires-Dist: twine; extra == "dev"
 Requires-Dist: mkdocs-click==0.8.0; extra == "dev"
 Requires-Dist: mkdocs-material==8.5.6; extra == "dev"
 Requires-Dist: mkdocs-mermaid2-plugin==0.6.0; extra == "dev"
 Requires-Dist: mkdocs==1.4.2; extra == "dev"
+Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pyre-check; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-env; extra == "dev"
+Requires-Dist: pytest-mock; extra == "dev"
 Requires-Dist: python-markdown-math; extra == "dev"
+Requires-Dist: ruff>=0.9.2; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 
 # Artefacts CLI
 

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts_cli.egg-info/SOURCES.txt

@@ -8,6 +8,8 @@ artefacts/cli/app.py
 artefacts/cli/app_containers.py
 artefacts/cli/bagparser.py
 artefacts/cli/constants.py
+artefacts/cli/errors.py
+artefacts/cli/logger.py
 artefacts/cli/other.py
 artefacts/cli/parameters.py
 artefacts/cli/ros1.py
@@ -26,6 +28,7 @@ artefacts_cli.egg-info/entry_points.txt
 artefacts_cli.egg-info/requires.txt
 artefacts_cli.egg-info/top_level.txt
 bin/release
+infra-tests/test_run_remote.yaml
 infra-tests/turtlesim1/ros_workspace/src/turtle_odometry/CMakeLists.txt
 infra-tests/turtlesim1/ros_workspace/src/turtle_odometry/package.xml
 infra-tests/turtlesim1/ros_workspace/src/turtle_odometry/setup.py
@@ -52,6 +55,8 @@ tests/cli/test_parameters.py
 tests/cli/test_ros1.py
 tests/cli/test_ros2.py
 tests/cli/test_warp.py
+tests/cli/containers/__init__.py
+tests/cli/containers/test_utils.py
 tests/fixtures/artefacts_deprecated.yaml
 tests/fixtures/artefacts_ros1.yaml
 tests/fixtures/warp-env-param.yaml

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/artefacts_cli.egg-info/requires.txt

@@ -6,24 +6,23 @@ mcap
 mcap-ros2-support
 PyYAML>=6.0
 requests>=2.27.1
-setuptools-scm
-setuptools>=74
 
 [dev]
 awscli
 build
 docker
 lark
-pyre-check
-pytest
-pytest-cov
-pytest-env
-pytest-mock
-ruff
-twine
 mkdocs-click==0.8.0
 mkdocs-material==8.5.6
 mkdocs-mermaid2-plugin==0.6.0
 mkdocs==1.4.2
+numpy
 pre-commit
+pyre-check
+pytest
+pytest-cov
+pytest-env
+pytest-mock
 python-markdown-math
+ruff>=0.9.2
+twine

artefacts_cli-0.6.19/infra-tests/test_run_remote.yaml

@@ -0,0 +1,25 @@
+version: 0.1.0
+
+project: artefacts/cli-run-remote-testing
+
+on:
+  push:
+    jobs:
+      - turtlesim
+
+jobs:
+  turtlesim:
+    type: test
+    package:
+      custom:
+        os: public.ecr.aws/artefacts/ros2:humble-turtlesim
+    runtime:
+      simulator: turtlesim
+      framework: ros2:humble
+    scenarios:
+      defaults:
+        subscriptions:
+          pose: turtle1/pose
+      settings:
+        - name: turtle
+          ros_testfile: turtlesim2/launch_turtle.py

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/infra-tests/turtlesim1/ros_workspace/src/turtle_odometry/src/TestTurtle.py

@@ -14,7 +14,6 @@ NAME = "turtle1"
 
 
 class TestTurtle(unittest.TestCase):
-
     # runs before each test_* method
     def setUp(self):
         ## Arange
@@ -22,12 +21,12 @@ class TestTurtle(unittest.TestCase):
         # setup the turtlesim simulator
         rospy.wait_for_service(f"/{NAME}/teleport_absolute")
         rospy.wait_for_service(f"/{NAME}/set_pen")
-        rospy.wait_for_service(f"/clear")
+        rospy.wait_for_service("/clear")
         self.srv_teleport_absolute = rospy.ServiceProxy(
             f"/{NAME}/teleport_absolute", TeleportAbsolute
         )
         self.srv_set_pen = rospy.ServiceProxy(f"/{NAME}/set_pen", SetPen)
-        self.srv_clear = rospy.ServiceProxy(f"/clear", EmptySrv)
+        self.srv_clear = rospy.ServiceProxy("/clear", EmptySrv)
         self.srv_set_pen(r=255, g=255, b=255, width=5, off=False)
         while not rospy.has_param("test/start_pose"):
             rospy.sleep(0.1)
@@ -70,7 +69,7 @@ class TestTurtle(unittest.TestCase):
         self.assertNotEqual(
             distance_to_start,
             0,
-            msg=f"turtle position at end of test exactly at starting position: did not move?",
+            msg="turtle position at end of test exactly at starting position: did not move?",
         )
         # check if the turtle finished the loop trajectory
         self.assertAlmostEqual(

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/infra-tests/turtlesim1/ros_workspace/src/turtle_odometry/src/turtle_odom.py

@@ -94,7 +94,7 @@ class TurtleOdom:
 def main():
     rospy.init_node("turtle_odometry")
     try:
-        to = TurtleOdom("turtle1")
+        TurtleOdom("turtle1")
         rospy.spin()
     except rospy.ROSInterruptException:
         pass

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/infra-tests/turtlesim1/ros_workspace/src/turtle_odometry/src/turtle_post_process.py

@@ -57,6 +57,7 @@ with rosbag.Bag(args["bag_path"], "r") as bag:
     estimated_messages = [_ for _ in bag.read_messages(topics=estimated_topic)]
     groundtruth_messages = [_ for _ in bag.read_messages(topics=groundtruth_topic)]
 
+
 # helper functions
 def compute_distance_travelled(message_list):
     """given a list of messages of TurtlePose type,
@@ -88,9 +89,9 @@ def match_lookup(lookup_time, lookup_list, previous_index, max_search=100):
     within previous_index and previous_index + max_search
     checks the previous message too. returns whichever is the closest to the lookup_time
     """
-    assert (
-        len(lookup_list) > previous_index
-    ), f"previous index = {previous_index} is beyond bounds of lookup list of length {len(lookup_list)}"
+    assert len(lookup_list) > previous_index, (
+        f"previous index = {previous_index} is beyond bounds of lookup list of length {len(lookup_list)}"
+    )
     time_delta = -1  # initialize as negative
     i = previous_index
     while (
@@ -141,9 +142,9 @@ for msg in estimated_messages:
     matched_messages.append({"estimated": msg, "groundtruth": matched_msg})
 assert len(matched_messages) == len(estimated_messages)
 N = 50
-assert (
-    len(matched_messages) > N
-), f"[error in turtle_post_process] not enough matched messages found"
+assert len(matched_messages) > N, (
+    "[error in turtle_post_process] not enough matched messages found"
+)
 # remove garbage messages logged during test setup
 # @TODO replace hard-coded assumption of N first messages with an event trigger
 matched_messages = matched_messages[N:]
@@ -156,7 +157,7 @@ time_deltas = [
 ]
 fig = px.scatter(
     time_deltas,
-    title=f"Time delta for each matched pair of messages <br>Max time delta = {max([abs(t) for t in time_deltas])*1000:.0f} ms",
+    title=f"Time delta for each matched pair of messages <br>Max time delta = {max([abs(t) for t in time_deltas]) * 1000:.0f} ms",
     labels={"value": "time delta (s)"},
 )
 fig.write_html(args["out_folder"] + "/mtime_deltas.html")
@@ -214,7 +215,7 @@ fig = px.scatter(
         error_horiz(match["groundtruth"], match["estimated"])
         for match in matched_messages
     ],
-    title=f"Horizontal error over distance travelled <br>Final error = { error_horiz(matched_messages[-1]['groundtruth'], matched_messages[-1]['estimated']):.2f} m",
+    title=f"Horizontal error over distance travelled <br>Final error = {error_horiz(matched_messages[-1]['groundtruth'], matched_messages[-1]['estimated']):.2f} m",
     labels={"x": "distance travelled (m)", "y": "error (m)"},
 )
 fig.write_html(args["out_folder"] + "/error_horiz_distance.html")
@@ -250,7 +251,7 @@ fig.add_trace(
     )
 )
 fig.update_layout(
-    title=f"Turtle trajectory: ground truth vs estimated from odometry",
+    title="Turtle trajectory: ground truth vs estimated from odometry",
     xaxis_title="x",
     yaxis_title="y",
     margin_t=30,

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/infra-tests/turtlesim2/launch_turtle.py

@@ -15,7 +15,7 @@ def generate_test_description():
     proc_env["PYTHONUNBUFFERED"] = "1"
     # TODO switch to package
     sample_process = ExecuteProcess(
-        cmd=[sys.executable, "infra-tests/turtlesim2/sample_node.py"],
+        cmd=[sys.executable, "turtlesim2/sample_node.py"],
         output="log",
         env=proc_env,
     )

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/infra-tests/turtlesim2/sample_node.py

@@ -20,7 +20,7 @@ class TestListener(Node):
         vel_msg.linear.x = 1.0
         self.velocity_publisher.publish(vel_msg)
         self.gt_pose = msg
-        if self.gt_pose.x > 8:
+        if self.gt_pose.x > 3:
             self.get_logger().info("Turtle nearing right edge")
 
 
@@ -29,7 +29,7 @@ def main():
     node = TestListener()
     try:
         while True:
-            rclpy.spin_once(node, timeout_sec=0.1)
+            rclpy.spin_once(node, timeout_sec=1)
         rclpy.shutdown()
     except KeyboardInterrupt:
         rclpy.shutdown()

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/pyproject.toml

@@ -27,8 +27,6 @@ dependencies = [
   "mcap-ros2-support",
   "PyYAML>=6.0",
   "requests>=2.27.1",
-  "setuptools-scm",
-  "setuptools>=74", # setuptools-scm requires without version, but does not work with oldish versions, so let's ensure a recent, tested one.
 ]
 dynamic = ["version"]
 
@@ -38,6 +36,7 @@ packages = ["artefacts", "artefacts.cli"]
 [tool.setuptools_scm]
 version_file = "artefacts/cli/version.py"
 local_scheme = "no-local-version"
+fallback_version = "0.0.0"
 
 [project.optional-dependencies]
 dev = [
@@ -45,19 +44,20 @@ dev = [
   "build",
   "docker",
   "lark",
-  "pyre-check",
-  "pytest",
-  "pytest-cov",
-  "pytest-env",
-  "pytest-mock",
-  "ruff",
-  "twine",
   "mkdocs-click==0.8.0",
   "mkdocs-material==8.5.6",
   "mkdocs-mermaid2-plugin==0.6.0",
   "mkdocs==1.4.2",
+  "numpy",
   "pre-commit",
+  "pyre-check",
+  "pytest",
+  "pytest-cov",
+  "pytest-env",
+  "pytest-mock",
   "python-markdown-math",
+  "ruff>=0.9.2",
+  "twine",
 ]
 
 [project.urls]

artefacts_cli-0.6.19/tests/cli/containers/test_utils.py

@@ -0,0 +1,13 @@
+import pytest
+
+from artefacts.cli import errors
+from artefacts.cli.containers.utils import ContainerMgr
+
+
+def test_exit_when_no_container_engine(mocker):
+    # Make believe there is no engine
+    mocker.patch.object(ContainerMgr, "_configure", lambda _: None)
+    with pytest.raises(SystemExit) as e:
+        ContainerMgr()
+    assert e.type is SystemExit
+    assert e.value.code == errors.CONTAINER_ENGINE_NOT_FOUND

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/tests/cli/test_app_containers.py

@@ -1,7 +1,6 @@
 import os
 from uuid import uuid4
 
-import pytest
 
 from artefacts.cli.app_containers import containers
 

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/tests/cli/test_ros1.py

@@ -5,7 +5,6 @@ from artefacts.cli.ros1 import (
 )
 import yaml
 import pytest
-import os
 
 
 def test_generate_parameter_output(tmp_path):

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/tests/cli/test_ros2.py

@@ -6,7 +6,6 @@ import pytest
 from artefacts.cli import WarpJob, WarpRun
 from artefacts.cli.app import APIConf
 from artefacts.cli.ros2 import generate_scenario_parameter_output, run_ros2_tests
-import artefacts.cli.utils
 
 
 def test_generate_parameter_output(tmp_path):
@@ -37,4 +36,6 @@ def test_passing_launch_arguments(mock_run_and_save_logs, _mock_exists):
     assert (
         " test.launch.py arg1:=val1 arg2:=val2"
         in mock_run_and_save_logs.call_args[0][0]
-    ), "Launch arguments should be passed to the test command after the launch file path"
+    ), (
+        "Launch arguments should be passed to the test command after the launch file path"
+    )

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/tests/conftest.py

@@ -3,7 +3,6 @@ import pytest
 import os
 
 from click.testing import CliRunner
-import docker
 
 from tests.utils import docker_mock
 

{artefacts_cli-0.6.17 → artefacts_cli-0.6.19}/tests/utils/docker_mock.py

@@ -1,10 +1,8 @@
 # Fake Docker client
 
-import copy
 from dataclasses import dataclass, asdict
 import hashlib
 from random import randint
-from unittest import mock
 
 from docker import DockerClient, APIClient
 from docker.constants import DEFAULT_DOCKER_API_VERSION