artefacts-cli 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

artefacts/cli/app.py

@@ -71,7 +71,7 @@ def get_artefacts_api_url(project_profile):
 
 
 class APIConf:
-    def __init__(self, project_name):
+    def __init__(self, project_name: str, job_name: str = None) -> None:
         config = get_conf_from_file()
         if project_name in config:
             profile = config[project_name]
@@ -96,7 +96,10 @@ class APIConf:
         self.headers["User-Agent"] = (
             f"ArtefactsClient/{__version__} ({platform.platform()}/{platform.python_version()})"
         )
-        click.echo(f"Connecting to {self.api_url} using {auth_type}")
+        if job_name:
+            click.echo(f"[{job_name}] Connecting to {self.api_url} using {auth_type}")
+        else:
+            click.echo(f"Connecting to {self.api_url} using {auth_type}")
 
 
 def validate_artefacts_config(config_file: str) -> dict:
@@ -243,8 +246,8 @@ def hello(project_name):
 )
 @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.",
+    default=None,
+    help="[Deprecated and unused from 0.8.0; Image names are now internally managed] Run the job using the image name passed here. Only used when running with --in-container set.",
 )
 @click.option(
     "--no-rebuild",
@@ -281,38 +284,37 @@ def run(
     * Directly in the shell by default.
     * Inside a packaged container when using the --in-container option.
     """
+    warpconfig = read_config(config)
+    project_id = warpconfig["project"]
+
     if in_container:
-        image_exist = ctx.invoke(containers.check, name=with_image)
-        if not no_rebuild or not image_exist:
-            if image_exist:
-                announce = "Rebuilding container image to prepare the run..."
-            else:
-                announce = "Building container image to prepare the run..."
-            click.echo(announce)
+        click.echo("#" * 80)
+        click.echo(f"# Job {jobname}".ljust(79, " ") + "#")
+        click.echo("#" * 80)
+        click.echo(f"[{jobname}] Checking container image")
+        if not no_rebuild:
             ctx.invoke(
-                containers.build, path=".", dockerfile="Dockerfile", name=with_image
+                containers.build,
+                root=".",
             )
-            click.echo("Build complete.\n")
-        click.echo("Starting the container run...")
+            click.echo(f"[{jobname}] Container image ready")
+        click.echo(f"[{jobname}] Run in container")
         return ctx.invoke(
             containers.run,
-            image=with_image,
             jobname=jobname,
             config=config,
             with_gui=with_gui,
         )
 
-    warpconfig = read_config(config)
-
-    project_id = warpconfig["project"]
-    api_conf = APIConf(project_id)
-    click.echo(f"Starting tests for {project_id}")
+    api_conf = APIConf(project_id, jobname)
+    click.echo(f"[{jobname}] Starting tests")
     if jobname not in warpconfig["jobs"]:
-        raise click.ClickException(f"Job {jobname} not defined")
+        click.echo(f"[{jobname}] Error: Job name not defined")
+        raise click.ClickException()
     jobconf = warpconfig["jobs"][jobname]
     job_type = jobconf.get("type", "test")
     if job_type not in ["test"]:
-        click.echo(f"Job type not supported: f{job_type}")
+        click.echo(f"[{jobname}] Job type not supported: {job_type}")
         return
 
     framework = jobconf["runtime"].get("framework", None)
@@ -321,19 +323,19 @@ def run(
     if framework in DEPRECATED_FRAMEWORKS.keys():
         migrated_framework = DEPRECATED_FRAMEWORKS[framework]
         click.echo(
-            f"The selected framework '{framework}' is deprecated. Using '{migrated_framework}' instead."
+            f"[{jobname}] The selected framework '{framework}' is deprecated. Using '{migrated_framework}' instead."
         )
         framework = migrated_framework
 
     if framework not in SUPPORTED_FRAMEWORKS:
         click.echo(
-            f"WARNING: framework: '{framework}' is not officially supported. Attempting run."
+            f"[{jobname}] WARNING: framework: '{framework}' is not officially supported. Attempting run."
         )
 
     batch_index = os.environ.get("AWS_BATCH_JOB_ARRAY_INDEX", None)
     if batch_index is not None:
         batch_index = int(batch_index)
-        click.echo(f"AWS BATCH ARRAY DETECTED, batch_index={batch_index}")
+        click.echo(f"[{jobname}] AWS BATCH ARRAY DETECTED, batch_index={batch_index}")
     scenarios, first = generate_scenarios(jobconf, batch_index)
     context = None
     execution_context = getpass.getuser() + "@" + platform.node()
@@ -356,30 +358,33 @@ def run(
             first,
         )
     except AuthenticationError:
-        raise click.ClickException(
-            "Unable to authenticate (Stage: Job initialisation), please check your project name and API key"
+        click.echo(
+            f"[{jobname}] Unable to authenticate (Stage: Job initialisation), please check your project name and API key"
         )
+        raise click.ClickException()
 
     job_success = True
     for scenario_n, scenario in enumerate(scenarios):
         click.echo(
-            f"Starting scenario {scenario_n + 1}/{len(scenarios)}: {scenario['name']}"
+            f"[{jobname}] Starting scenario {scenario_n + 1}/{len(scenarios)}: {scenario['name']}"
         )
         try:
             run = warpjob.new_run(scenario)
         except AuthenticationError:
-            raise click.ClickException(
-                "Unable to authenticate (Stage: Job run), please check your project name and API key"
+            click.echo(
+                f"[{jobname}] Unable to authenticate (Stage: Job run), please check your project name and API key"
             )
+            raise click.ClickException()
         if framework is not None and framework.startswith("ros2:"):
             from artefacts.cli.ros2 import run_ros2_tests
 
             if "ros_testfile" not in run.params:
-                raise click.ClickException(
-                    "Test launch file not specified for ros2 project"
+                click.echo(
+                    f"[{jobname}] Test launch file not specified for ros2 project"
                 )
+                raise click.ClickException()
             if dryrun:
-                click.echo("performing dry run")
+                click.echo(f"[{jobname}] Performing dry run")
                 results, success = {}, True
             else:
                 try:
@@ -388,25 +393,28 @@ def run(
                     warpjob.stop()
                     warpjob.log_tests_result(False)
                     click.secho(e, bold=True, err=True)
-                    raise click.ClickException("artefacts failed to execute the tests")
+                    click.echo(f"[{jobname}] artefacts failed to execute the tests")
+                    raise click.ClickException()
             if success is None:
                 run.stop()
                 warpjob.stop()
                 warpjob.log_tests_result(job_success)
-                raise click.ClickException(
-                    "Not able to execute tests. Make sure that ROS2 is sourced and that your launch file syntax is correct."
+                click.echo(
+                    f"[{jobname}] Not able to execute tests. Make sure that ROS2 is sourced and that your launch file syntax is correct."
                 )
+                raise click.ClickException()
             if not success:
                 job_success = False
         elif framework is not None and framework.startswith("ros1:"):
             from artefacts.cli.ros1 import run_ros1_tests
 
             if "ros_testfile" not in run.params:
-                raise click.ClickException(
-                    "Test launch file not specified for ros1 project"
+                click.echo(
+                    f"[{jobname}] Test launch file not specified for ros1 project"
                 )
+                raise click.ClickException()
             if dryrun:
-                click.echo("performing dry run")
+                click.echo(f"[{jobname}] Performing dry run")
                 results, success = {}, True
             else:
                 results, success = run_ros1_tests(run)
@@ -416,9 +424,10 @@ def run(
             from artefacts.cli.other import run_other_tests
 
             if "run" not in run.params:
-                raise click.ClickException("run command not specified for scenario")
+                click.echo(f"[{jobname}] run command not specified for scenario")
+                raise click.ClickException()
             if dryrun:
-                click.echo("performing dry run")
+                click.echo(f"[{jobname}] Performing dry run")
                 results, success = {}, True
             else:
                 results, success = run_other_tests(run)
@@ -432,7 +441,7 @@ def run(
 
         run.stop()
     warpjob.log_tests_result(job_success)
-    click.echo("Done")
+    click.echo(f"[{jobname}] Done")
     time.sleep(random.random() * 1)
 
     warpjob.stop()
@@ -562,7 +571,7 @@ def run_remote(config, description, jobname, skip_validation=False):
                 )
 
             raise click.ClickException(
-                f"Error getting project info: {result['message']}"
+                f"Error getting project info: {upload_urls_response.status_code} {upload_urls_response.reason}. Response text: {upload_urls_response.text}."
             )
 
         upload_urls = upload_urls_response.json()["upload_urls"]

artefacts/cli/app_containers.py

@@ -1,7 +1,10 @@
 import os
+from pathlib import Path
 
 import click
 
+from c2d.core import Converter
+
 from artefacts.cli.constants import DEFAULT_API_URL
 from artefacts.cli.utils import config_validation, read_config
 from artefacts.cli.containers.utils import ContainerMgr
@@ -19,29 +22,93 @@ def containers(ctx: click.Context, debug: bool):
 @click.option(
     "--path",
     default=".",
-    help="Path to the root of the project, where a Dockerfile is available.",
+    help="[Deprecated since 0.8.0; please see --root] Path to the root of the project.",
+)
+@click.option(
+    "--root",
+    default=".",
+    help="Path to the root of the project.",
 )
 @click.option(
     "--dockerfile",
     default="Dockerfile",
-    help="File name of the container definition file. Defaults to the standard Dockerfile inside the project root (see --path)",
+    help="Path to a custom Dockerfile. Defaults to Dockerfile under `path` (see option of the same name).",
 )
 @click.option(
     "--name",
     required=False,
-    help="Name for the generated container",
+    help="[Deprecated since 0.8.0; not used and will disappear after 0.8.0] Name for the generated image",
+)
+@click.option(
+    "--config",
+    callback=config_validation,
+    default="artefacts.yaml",
+    help="Path to the Artefacts configuration file. It defaults to `./artefacts.yaml`",
 )
 @click.pass_context
-def build(ctx: click.Context, path: str, dockerfile: str, name: str):
-    if not os.path.exists(os.path.join(path, dockerfile)):
+def build(
+    ctx: click.Context,
+    path: str,
+    root: str,
+    dockerfile: str,
+    name: str,
+    config: str,
+):
+    try:
+        artefacts_config = read_config(config)
+    except FileNotFoundError:
         raise click.ClickException(
-            f"No {dockerfile} found here. I cannot build the container."
+            f"Project config file not found: {config}. Please provide an Artefacts configuration file to proceed (running `artefacts init` allows to generate one)."
         )
-    if name is None:
-        name = "artefacts"
+    prefix = artefacts_config["project"].strip().lower()
+    dockerfiles = []
+    if os.path.exists(dockerfile):
+        for job_name in artefacts_config["jobs"]:
+            dockerfiles.append(
+                dict(
+                    path=root,
+                    dockerfile=dockerfile,
+                    name=f"{prefix}/{job_name.strip().lower()}",
+                )
+            )
+    else:
+        # The split on `prefix` is to ensure there is no slash (project names are org/project) confusing the path across supported OS.
+        dest_root = (
+            Path.home()
+            / Path(".artefacts")
+            / Path("projects")
+            / Path(*(prefix.split("/")))
+            / Path("containers")
+        )
+        if not dest_root.exists():
+            click.echo(
+                f"No {dockerfile} found here. Let's generate one per scenario based on artefacts.yaml. They will be available under the `{dest_root}` folder and used from there."
+            )
+        # No condition on generating the Dockerfiles as:
+        #   - Fast
+        #   - We consider entirely managed, so any manual change should be ignored.
+        scenarios = Converter().process(config, as_text=False)
+        for idx, df in enumerate(scenarios.values()):
+            job_name = df.job_name.strip().lower()
+            dest = dest_root / Path(job_name)
+            dest.mkdir(parents=True, exist_ok=True)
+            _dockerfile = os.path.join(dest, "Dockerfile")
+            df.dump(_dockerfile)
+            click.echo(f"[{job_name}] Using generated Dockerfile at: {_dockerfile}")
+            dockerfiles.append(
+                dict(
+                    path=root,
+                    dockerfile=_dockerfile,
+                    name=f"{prefix}/{job_name}",
+                )
+            )
     handler = ContainerMgr()
-    image, _ = handler.build(path=path, name=name)
-    print(f"Package complete in image: {image}")
+    if len(dockerfiles) > 0:
+        for specs in dockerfiles:
+            # No condition on building the images, as relatively fast when already exists, and straightforward logic.
+            image, _ = handler.build(**specs)
+    else:
+        click.echo("No Dockerfile, nothing to do.")
 
 
 @containers.command()
@@ -59,13 +126,12 @@ def check(ctx: click.Context, name: str):
 
 
 @containers.command()
-@click.argument("image")
 @click.argument("jobname")
 @click.option(
     "--config",
     callback=config_validation,
     default="artefacts.yaml",
-    help="Artefacts config file.",
+    help="Path to the Artefacts configuration file. It defaults to `./artefacts.yaml`",
 )
 @click.option(
     "--with-gui",
@@ -74,7 +140,7 @@ def check(ctx: click.Context, name: str):
     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, with_gui: bool):
+def run(ctx: click.Context, jobname: str, config: str, with_gui: bool):
     try:
         artefacts_config = read_config(config)
     except FileNotFoundError:
@@ -82,7 +148,7 @@ def run(ctx: click.Context, image: str, jobname: str, config: str, with_gui: boo
     project = artefacts_config["project"]
     handler = ContainerMgr()
     params = dict(
-        image=image,
+        image=f"{project.strip().lower()}/{jobname}",
         project=project,
         jobname=jobname,
         with_gui=with_gui,

artefacts/cli/containers/docker.py

@@ -22,6 +22,10 @@ class DockerManager(CMgr):
 
     def build(self, **kwargs) -> Tuple[str, Generator]:
         kwargs["tag"] = kwargs.pop("name")
+        # Ensure `path` is a string, the Docker package does not support pathlib.
+        kwargs["path"] = str(kwargs.pop("path"))
+        # Remove intermediate containers
+        kwargs["rm"] = True
         logs = []
         img_id = None
         for entry in self.client.build(**kwargs):
@@ -32,7 +36,7 @@ class DockerManager(CMgr):
                 if "stream" in data:
                     line = data["stream"].strip()
                     if not line.startswith("---") and len(line) > 0:
-                        print(line)
+                        print(f"[{kwargs['tag'].split('/')[-1]}] {line}")
                         logs.append(line)
                 elif "aux" in data and "ID" in data["aux"]:
                     img_id = data["aux"]["ID"]

artefacts/cli/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.7.0'
-__version_tuple__ = version_tuple = (0, 7, 0)
+__version__ = version = '0.7.1'
+__version_tuple__ = version_tuple = (0, 7, 1)

{artefacts_cli-0.7.0.dist-info → artefacts_cli-0.7.1.dist-info}/METADATA

@@ -1,14 +1,16 @@
 Metadata-Version: 2.2
 Name: artefacts_cli
-Version: 0.7.0
+Version: 0.7.1
 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
+Project-URL: Changelog, https://github.com/art-e-fact/artefacts-client/CHANGELOG.md
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+Requires-Dist: artefacts-c2d>=1.7.1
 Requires-Dist: artefacts-copava>=0.1.11
 Requires-Dist: click>=8.0.4
 Requires-Dist: gitignore_parser>=0.1.11
@@ -42,7 +44,7 @@ Requires-Dist: twine; extra == "dev"
 CLI to the Artefacts platform.
 
 [![Documentation](https://img.shields.io/badge/documentation-blue.svg?style=flat-square)](https://docs.artefacts.com/)
-[![Code style: Black-compatible with Ruff](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Ruff Style](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 ## Requirements
 

{artefacts_cli-0.7.0.dist-info → artefacts_cli-0.7.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 artefacts/__init__.py,sha256=VLmogtpRQeJjQjAORV8ClSJ5qF-57Hxx3apvgy9H1zk,76
 artefacts/cli/__init__.py,sha256=pt8OK66hMeQUxT9iLcvzYIIjFGrPS63ecWo8hS0T2qQ,11980
-artefacts/cli/app.py,sha256=tEknMMi7WhAPnq8NlGgLuLqqoCDWssZqs1lB3eNlVg4,22571
-artefacts/cli/app_containers.py,sha256=dsyzN8UzGNwxkhV8BsFK7Sz9EOL6Se3YpeiUgzC2qic,3099
+artefacts/cli/app.py,sha256=eJ70xlvPvSrz6CGCaXCxzBI26qBx_-2IA_6V5TPhVow,23131
+artefacts/cli/app_containers.py,sha256=AOTiXjyJzYZn6JqfW26N3ehGQWcEVQ5mEmKDdp9a6tQ,5636
 artefacts/cli/bagparser.py,sha256=FE_QaztC9pg4hQzTjGSdyve6mzZbHJbyqa3wqvZSbxE,3702
 artefacts/cli/constants.py,sha256=bvsVDwqkAc49IZN7j6k6IL6EG87bECHd_VINtKJqbv8,320
 artefacts/cli/errors.py,sha256=BiCRo3IwVjtEotaFtmwsGTZiX-TRE69KqLrEQItLsag,34
@@ -12,13 +12,13 @@ artefacts/cli/ros1.py,sha256=rKepZckAuy5O_qraF2CW5GiTmTZHar7LRD4pvESy6T0,9622
 artefacts/cli/ros2.py,sha256=9Ax_WQIOV_cohKz3H1eo1LnWiahiaqxO8r99doMmhEc,4466
 artefacts/cli/utils.py,sha256=GJM2QdF_ewzPWr8NzO5BbrhyZdSSk9DNX12Nbwc4bnI,3814
 artefacts/cli/utils_ros.py,sha256=3EFoMrzBdlhLc-wAL3mmS5sSw_pACkurYhssKHqYJsI,2089
-artefacts/cli/version.py,sha256=itvIHlqPKoO_13qf_yPD2pmcp0U4z1s19vvBGZM927Q,511
+artefacts/cli/version.py,sha256=UENolcbPfd6sim2GUd3djX88atGsPXEKCbPHv1Wucs4,511
 artefacts/cli/containers/__init__.py,sha256=K0efkJXNCqXH-qYBqhCE_8zVUCHbVmeuKH-y_fE8s4M,2254
-artefacts/cli/containers/docker.py,sha256=fsGTzpj7Sj7ykCBxzaYlIt_so1yfWJ2j6ktxsWjvdvY,4073
+artefacts/cli/containers/docker.py,sha256=R0yA-aIZCyYWN7gzim_Dhn1owpKI9ekMu6qbz5URYbQ,4311
 artefacts/cli/containers/utils.py,sha256=bILX0uvazUJq7hoqKk4ztRzI_ZerYs04XQdKdx1ltjk,2002
 artefacts/wrappers/artefacts_ros1_meta.launch,sha256=9tN7_0xLH8jW27KYFerhF3NuWDx2dED3ks_qoGVZAPw,1412
-artefacts_cli-0.7.0.dist-info/METADATA,sha256=bYCIMBdVBOLHHW38dmsUqXj-hoFczntRhszgykDm_eM,3034
-artefacts_cli-0.7.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-artefacts_cli-0.7.0.dist-info/entry_points.txt,sha256=nlTXRzilNjccbi53FgaRWCQPkG-pv61HRkaCkrKjlec,58
-artefacts_cli-0.7.0.dist-info/top_level.txt,sha256=FdaMV1C9m36MWa-2Stm5xVODv7hss_nRYNwR83j_7ow,10
-artefacts_cli-0.7.0.dist-info/RECORD,,
+artefacts_cli-0.7.1.dist-info/METADATA,sha256=KuGOTvcRm3RPOqsEEp01SWAayNpBq6Z29kW-btfevOA,3183
+artefacts_cli-0.7.1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+artefacts_cli-0.7.1.dist-info/entry_points.txt,sha256=nlTXRzilNjccbi53FgaRWCQPkG-pv61HRkaCkrKjlec,58
+artefacts_cli-0.7.1.dist-info/top_level.txt,sha256=FdaMV1C9m36MWa-2Stm5xVODv7hss_nRYNwR83j_7ow,10
+artefacts_cli-0.7.1.dist-info/RECORD,,

{artefacts_cli-0.7.0.dist-info → artefacts_cli-0.7.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any