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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: artefacts_cli
-Version: 0.6.16
+Version: 0.6.17
 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
@@ -18,6 +18,7 @@ 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"

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

@@ -15,7 +15,7 @@ logging.basicConfig(level=logging.INFO)
 
 
 try:
-    __version__ = version("package-name")
+    __version__ = version("artefacts-cli")
 except PackageNotFoundError:
     try:
         # Package is not installed, most likely dev/test mode

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

@@ -231,11 +231,64 @@ def hello(project_name):
     is_eager=True,  # Necessary for callbacks to see it.
     help="Skip configuration validation, so that unsupported settings can be tried out, e.g. non-ROS settings or simulators like SAPIEN.",
 )
+@click.option(
+    "--in-container",
+    is_flag=True,
+    default=False,
+    help='[Experimental] Run the job inside a package container. The container image is build if it does not exist yet, with default name as "artefacts" (please use --with-image to override the image name). This option overrides (for now) --dryrun, --nosim, --noisolation and --description.',
+)
+@click.option(
+    "--with-image",
+    default="artefacts",
+    help="[Experimental] Run the job using the image name passed here. Only used when running with --in-container set.",
+)
+@click.option(
+    "--rebuild-container",
+    is_flag=True,
+    default=False,
+    help="[Experimental] Rebuild the container image before running. This flag guarantees that the run uses the latest code available when building the image, and usually takes more time before the run can start (time to compile and generate the image).",
+)
+@click.option(
+    "--with-gui",
+    is_flag=True,
+    default=False,
+    help="Show any GUI if any is created by the test runs. By default, UI elements are run but hidden---only test logs are returned. Please note GUI often assume X11 (e.g. ROS), typically with Qt, so this may not work without a appropriate environment.",
+)
 @click.argument("jobname")
+@click.pass_context
 def run(
-    config, jobname, dryrun, nosim, noisolation, description="", skip_validation=False
+    ctx: click.Context,
+    config,
+    jobname,
+    dryrun,
+    nosim,
+    noisolation,
+    description="",
+    skip_validation=False,
+    in_container: bool = False,
+    with_image: str = "artefacts",
+    rebuild_container: bool = False,
+    with_gui: bool = False,
 ):
-    """Run JOBNAME locally"""
+    """
+    Run JOBNAME locally
+
+    * Directly in the shell by default.
+    * Inside a packaged container when using the --in-container option.
+    """
+    if in_container:
+        if rebuild_container or not ctx.invoke(containers.check, name=with_image):
+            ctx.invoke(
+                containers.build, path=".", dockerfile="Dockerfile", name=with_image
+            )
+        return ctx.invoke(
+            containers.run,
+            image=with_image,
+            jobname=jobname,
+            config=config,
+            with_gui=with_gui,
+        )
+
     warpconfig = read_config(config)
 
     project_id = warpconfig["project"]
@@ -573,7 +626,7 @@ artefacts.add_command(config)
 artefacts.add_command(hello)
 artefacts.add_command(run)
 artefacts.add_command(run_remote)
-artefacts.add_command(containers.package)
+artefacts.add_command(containers.containers)
 
 
 if __name__ == "__main__":

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

@@ -10,12 +10,12 @@ from artefacts.cli.containers.utils import ContainerMgr
 @click.group()
 @click.option("--debug/--no-debug", default=False)
 @click.pass_context
-def package(ctx: click.Context, debug: bool):
+def containers(ctx: click.Context, debug: bool):
     ctx.ensure_object(dict)
     ctx.obj["debug"] = debug
 
 
-@package.command()
+@containers.command()
 @click.option(
     "--path",
     default=".",
@@ -29,13 +29,13 @@ def package(ctx: click.Context, debug: bool):
 @click.option(
     "--name",
     required=False,
-    help="Name for the generated package",
+    help="Name for the generated container",
 )
 @click.pass_context
 def build(ctx: click.Context, path: str, dockerfile: str, name: str):
     if not os.path.exists(os.path.join(path, dockerfile)):
         raise click.ClickException(
-            f"No {dockerfile} found here. I cannot build the package."
+            f"No {dockerfile} found here. I cannot build the container."
         )
     if name is None:
         name = "artefacts"
@@ -44,7 +44,21 @@ def build(ctx: click.Context, path: str, dockerfile: str, name: str):
     print(f"Package complete in image: {image}")
 
 
-@package.command()
+@containers.command()
+@click.argument("name")
+@click.pass_context
+def check(ctx: click.Context, name: str):
+    if name is None:
+        name = "artefacts"
+    handler = ContainerMgr()
+    result = handler.check(name)
+    if ctx.parent is None:
+        # Print only if the command is called directly.
+        print(f"Package {name} exists and ready to use.")
+    return result
+
+
+@containers.command()
 @click.argument("image")
 @click.argument("jobname")
 @click.option(
@@ -53,8 +67,14 @@ def build(ctx: click.Context, path: str, dockerfile: str, name: str):
     default="artefacts.yaml",
     help="Artefacts config file.",
 )
+@click.option(
+    "--with-gui",
+    "with_gui",
+    default=False,
+    help="Show any GUI if any is created by the test runs. By default, UI elements are run but hidden---only test logs are returned. Please note GUI often assume an X11 environment, typically with Qt, so this may not work without a appropriate environment.",
+)
 @click.pass_context
-def run(ctx: click.Context, image: str, jobname: str, config: str):
+def run(ctx: click.Context, image: str, jobname: str, config: str, with_gui: bool):
     try:
         artefacts_config = read_config(config)
     except FileNotFoundError:
@@ -67,6 +87,7 @@ def run(ctx: click.Context, image: str, jobname: str, config: str):
         jobname=jobname,
         # Hidden setting primarily useful to Artefacts developers
         api_url=os.environ.get("ARTEFACTS_API_URL", DEFAULT_API_URL),
+        with_gui=with_gui,
     )
     container, logs = handler.run(**params)
     if container:

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

@@ -15,6 +15,12 @@ class CMgr:
         """
         raise NotImplemented()
 
+    def check(self, image: str) -> bool:
+        """
+        Checks whether a target image exists locally.
+        """
+        raise NotImplemented()
+
     def run(
         self,
         image: str,
@@ -22,6 +28,7 @@ class CMgr:
         jobname: str = None,
         artefacts_dir: str = Path("~/.artefacts").expanduser(),
         api_url: str = DEFAULT_API_URL,
+        with_gui: bool = False,
     ) -> Tuple[Any, Generator]:
         """
         Returns a container (Any type as depends on the framework)
@@ -45,7 +52,7 @@ class CMgr:
         """
         if not path:
             raise Exception(
-                "`path` must be a string, a Path object, or exclusded from the kwargs"
+                "`path` must be a string, a Path object, or excluded from the kwargs"
             )
         if os.environ.get("ARTEFACTS_KEY", None):
             return True

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

@@ -2,6 +2,7 @@ from collections.abc import Generator
 import json
 import os
 from pathlib import Path
+import platform
 from typing import Any, Tuple
 from uuid import uuid4
 
@@ -39,6 +40,12 @@ class DockerManager(CMgr):
             img_id = self.client.inspect_image(kwargs["tag"])["Id"]
         return img_id, iter(logs)
 
+    def check(
+        self,
+        image: str,
+    ) -> bool:
+        return len(self.client.images(name=image)) > 0
+
     def run(
         self,
         image: str,
@@ -46,6 +53,7 @@ class DockerManager(CMgr):
         jobname: str = None,
         artefacts_dir: str = Path("~/.artefacts").expanduser(),
         api_url: str = DEFAULT_API_URL,
+        with_gui: bool = False,
     ) -> Tuple[Any, Generator]:
         if not self._valid_artefacts_api_key(project, artefacts_dir):
             return None, iter(
@@ -60,6 +68,15 @@ class DockerManager(CMgr):
                 "ARTEFACTS_API_URL": api_url,
             }
 
+            if platform.system() in ["Darwin", "Windows"]:
+                # Assume we run in Docker Desktop
+                env["DISPLAY"] = "host.docker.internal:0"
+            else:
+                env["DISPLAY"] = os.environ.get("DISPLAY", ":0")
+
+            if not with_gui:
+                env["QT_QPA_PLATFORM"] = "offscreen"
+
             container = self.client.create_container(
                 image,
                 environment=env,
@@ -72,6 +89,7 @@ class DockerManager(CMgr):
                             "mode": "ro",
                         },
                     },
+                    network_mode="host",
                 ),
             )
             self.client.start(container=container.get("Id"))

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

@@ -50,5 +50,8 @@ class ContainerMgr:
     def build(self, **kwargs) -> Tuple[str, Generator]:
         return self.mgr.build(**kwargs)
 
+    def check(self, image: str) -> bool:
+        return self.mgr.check(image)
+
     def run(self, **kwargs) -> Tuple[Any, Generator]:
         return self.mgr.run(**kwargs)

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

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

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

@@ -1,6 +1,6 @@
 version: 0.1.0
 
-project: client-test-platform
+project: artefacts-tests/cli-run-remote-testing
 
 on:
   push:
@@ -23,7 +23,7 @@ jobs:
     timeout: 5 # minutes
     scenarios:
       defaults: # Global to all scenarios, and overriden in specific scenarios.
-        output_dirs: 
+        output_dirs:
           - /tmp/outputs/
         subscriptions:
           pose: turtle1/pose
@@ -55,4 +55,4 @@ jobs:
           pose: turtle1/pose
       settings:
         - name: turtle
-          ros_testfile: infra-tests/turtlesim2/launch_turtle.py
+          ros_testfile: infra-tests/turtlesim2/launch_turtle.py

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: artefacts_cli
-Version: 0.6.16
+Version: 0.6.17
 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
@@ -18,6 +18,7 @@ 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"

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

@@ -7,6 +7,7 @@ mcap-ros2-support
 PyYAML>=6.0
 requests>=2.27.1
 setuptools-scm
+setuptools>=74
 
 [dev]
 awscli

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

@@ -28,6 +28,7 @@ dependencies = [
   "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"]
 

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

@@ -3,11 +3,11 @@ from uuid import uuid4
 
 import pytest
 
-from artefacts.cli import app_containers as containers
+from artefacts.cli.app_containers import containers
 
 
 def test_container_package_exists(cli_runner):
-    result = cli_runner.invoke(containers.package, [])
+    result = cli_runner.invoke(containers, [])
     assert result.exit_code == 0
 
 
@@ -15,9 +15,7 @@ def test_container_package_build_specific_dockerfile(
     cli_runner, dockerfile_available, docker_mocker
 ):
     dockerfile = "non_standard_dockerfile"
-    result = cli_runner.invoke(
-        containers.package, ["build", "--dockerfile", dockerfile]
-    )
+    result = cli_runner.invoke(containers, ["build", "--dockerfile", dockerfile])
     dockerfile_available.assert_any_call(os.path.join(".", dockerfile))
     assert result.exit_code == 0
 
@@ -26,14 +24,12 @@ def test_container_package_build_specific_dockerfile_missing(
     cli_runner, dockerfile_not_available
 ):
     dockerfile = "non_standard_dockerfile"
-    result = cli_runner.invoke(
-        containers.package, ["build", "--dockerfile", dockerfile]
-    )
+    result = cli_runner.invoke(containers, ["build", "--dockerfile", dockerfile])
     dockerfile_not_available.assert_any_call(os.path.join(".", dockerfile))
     assert result.exit_code == 1
     assert (
         result.output.strip()
-        == f"Error: No {dockerfile} found here. I cannot build the package."
+        == f"Error: No {dockerfile} found here. I cannot build the container."
     )
 
 
@@ -42,7 +38,7 @@ def test_container_package_build_specific_image_name(
 ):
     name = str(uuid4())
     before = len(docker_mocker.images())
-    result = cli_runner.invoke(containers.package, ["build", "--name", name])
+    result = cli_runner.invoke(containers, ["build", "--name", name])
     assert result.exit_code == 0
     assert len(docker_mocker.images()) == before + 1
     assert docker_mocker.get_image(name).Repository == name
@@ -52,7 +48,7 @@ def test_container_package_build_default_image_name(
     cli_runner, dockerfile_available, docker_mocker
 ):
     before = len(docker_mocker.images())
-    result = cli_runner.invoke(containers.package, ["build"])
+    result = cli_runner.invoke(containers, ["build"])
     assert result.exit_code == 0
     assert len(docker_mocker.images()) == before + 1
     assert docker_mocker.get_image("artefacts") is not None