artefacts-cli 0.6.15__py3-none-any.whl → 0.6.16__py3-none-any.whl

artefacts/cli/app.py

@@ -430,7 +430,7 @@ def run_remote(config, description, jobname, skip_validation=False):
     click.echo(f"Packaging source...")
 
     with tempfile.NamedTemporaryFile(
-        prefix=project_id, suffix=".tgz", delete=True
+        prefix=project_id.split("/")[-1], suffix=".tgz", delete=True
     ) as temp_file:
         # get list of patterns to be ignored in .artefactsignore
         ignore_file = Path(project_folder) / Path(".artefactsignore")

artefacts/cli/app_containers.py

@@ -2,6 +2,7 @@ import os
 
 import click
 
+from artefacts.cli.constants import DEFAULT_API_URL
 from artefacts.cli.utils import config_validation, read_config
 from artefacts.cli.containers.utils import ContainerMgr
 
@@ -60,7 +61,14 @@ def run(ctx: click.Context, image: str, jobname: str, config: str):
         raise click.ClickException(f"Project config file not found: {config}")
     project = artefacts_config["project"]
     handler = ContainerMgr()
-    container, logs = handler.run(image, project, jobname)
+    params = dict(
+        image=image,
+        project=project,
+        jobname=jobname,
+        # Hidden setting primarily useful to Artefacts developers
+        api_url=os.environ.get("ARTEFACTS_API_URL", DEFAULT_API_URL),
+    )
+    container, logs = handler.run(**params)
     if container:
         print(f"Package run complete: Container Id for inspection: {container['Id']}")
     else:

artefacts/cli/constants.py

@@ -1,3 +1,5 @@
+DEFAULT_API_URL = "https://app.artefacts.com/api"
+
 SUPPORTED_FRAMEWORKS = [
     "ros2:iron",
     "ros2:humble",

artefacts/cli/containers/__init__.py

@@ -4,6 +4,8 @@ import os
 from pathlib import Path
 from typing import Any, Tuple, Union
 
+from artefacts.cli.constants import DEFAULT_API_URL
+
 
 class CMgr:
     def build(self, **kwargs) -> Tuple[str, Generator]:
@@ -14,7 +16,12 @@ class CMgr:
         raise NotImplemented()
 
     def run(
-        self, image: str, project: str, jobname: str = None
+        self,
+        image: str,
+        project: str,
+        jobname: str = None,
+        artefacts_dir: str = Path("~/.artefacts").expanduser(),
+        api_url: str = DEFAULT_API_URL,
     ) -> Tuple[Any, Generator]:
         """
         Returns a container (Any type as depends on the framework)

artefacts/cli/containers/docker.py

@@ -1,9 +1,11 @@
 from collections.abc import Generator
 import json
 import os
+from pathlib import Path
 from typing import Any, Tuple
 from uuid import uuid4
 
+from artefacts.cli.constants import DEFAULT_API_URL
 from artefacts.cli.containers import CMgr
 from artefacts.cli.utils import ensure_available
 
@@ -42,7 +44,8 @@ class DockerManager(CMgr):
         image: str,
         project: str,
         jobname: str = None,
-        artefacts_dir: str = os.path.join(os.path.expanduser("~/.artefacts")),
+        artefacts_dir: str = Path("~/.artefacts").expanduser(),
+        api_url: str = DEFAULT_API_URL,
     ) -> Tuple[Any, Generator]:
         if not self._valid_artefacts_api_key(project, artefacts_dir):
             return None, iter(
@@ -51,12 +54,15 @@ class DockerManager(CMgr):
                 ]
             )
         try:
+            env = {
+                "JOB_ID": str(uuid4()),
+                "ARTEFACTS_JOB_NAME": jobname,
+                "ARTEFACTS_API_URL": api_url,
+            }
+
             container = self.client.create_container(
                 image,
-                environment={
-                    "JOB_ID": str(uuid4()),
-                    "ARTEFACTS_JOB_NAME": jobname,
-                },
+                environment=env,
                 detach=False,
                 volumes=["/root/.artefacts"],
                 host_config=self.client.create_host_config(

artefacts/cli/containers/utils.py

@@ -50,7 +50,5 @@ class ContainerMgr:
     def build(self, **kwargs) -> Tuple[str, Generator]:
         return self.mgr.build(**kwargs)
 
-    def run(
-        self, image: str, project: str, jobname: str = None
-    ) -> Tuple[Any, Generator]:
-        return self.mgr.run(image, project, jobname)
+    def run(self, **kwargs) -> Tuple[Any, Generator]:
+        return self.mgr.run(**kwargs)

artefacts/cli/version.py

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

{artefacts_cli-0.6.15.dist-info → artefacts_cli-0.6.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: artefacts_cli
-Version: 0.6.15
+Version: 0.6.16
 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
@@ -9,33 +9,33 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: artefacts-copava >=0.1.11
-Requires-Dist: click >=8.0.4
-Requires-Dist: gitignore-parser >=0.1.11
-Requires-Dist: junitparser >=2.5
+Requires-Dist: artefacts-copava>=0.1.11
+Requires-Dist: click>=8.0.4
+Requires-Dist: gitignore_parser>=0.1.11
+Requires-Dist: junitparser>=2.5
 Requires-Dist: mcap
 Requires-Dist: mcap-ros2-support
-Requires-Dist: PyYAML >=6.0
-Requires-Dist: requests >=2.27.1
+Requires-Dist: PyYAML>=6.0
+Requires-Dist: requests>=2.27.1
 Requires-Dist: setuptools-scm
 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: pre-commit ; extra == 'dev'
-Requires-Dist: python-markdown-math ; 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: pre-commit; extra == "dev"
+Requires-Dist: python-markdown-math; extra == "dev"
 
 # Artefacts CLI
 

artefacts_cli-0.6.16.dist-info/RECORD

@@ -0,0 +1,21 @@
+artefacts/cli/__init__.py,sha256=9rTAfBoS9ALJxKSqaUo32ThbDshbvNN4-EmoyUsPhRI,11643
+artefacts/cli/app.py,sha256=597uPtK4A_wujvqhk5h4KkrXV_XVkDLpymedd2lZB5k,20140
+artefacts/cli/app_containers.py,sha256=7OAtc4n9YeK8ZYUKvteOMbZr7lYjx_YMa6tu8Pnu9Yc,2280
+artefacts/cli/bagparser.py,sha256=FE_QaztC9pg4hQzTjGSdyve6mzZbHJbyqa3wqvZSbxE,3702
+artefacts/cli/constants.py,sha256=bvsVDwqkAc49IZN7j6k6IL6EG87bECHd_VINtKJqbv8,320
+artefacts/cli/other.py,sha256=7NvzlspvG0zF7sryR-QznwdLupXLln1BKWxHB9VuEcc,1160
+artefacts/cli/parameters.py,sha256=MDhrM7ur95wKTLDteqz2f-sLdCPcepi5wk0XjeLo6TU,788
+artefacts/cli/ros1.py,sha256=RbtirCGarD9a0ikfuGK-pdpWYSXfqJhEt4rpA0uFsyU,9625
+artefacts/cli/ros2.py,sha256=YaCi3HRuCdvCTjM0Ftnm-SLgMOy1OneIr0aU7KVTiAM,4476
+artefacts/cli/utils.py,sha256=6yQJRzv-xaLbtcA73Tty9C9QZeV06n5pjXMYl3xsLPE,3156
+artefacts/cli/utils_ros.py,sha256=pYbhAU9fK2VbnWm3nSLBwUMVBzsZuCn10SFZmVW3-Zo,2090
+artefacts/cli/version.py,sha256=zbqzBVUYJbK8o4vMJuNyIN5tBM9QXVZa7XiEM2PNdR8,413
+artefacts/cli/containers/__init__.py,sha256=S3DXLsb0csUdfjOZIngTfhMHrmYAaWBeu5EctLEEXbM,2057
+artefacts/cli/containers/docker.py,sha256=RtUOMbtWHQumTtDRa0ALjJ29tSaa7Pp497Ah1aJ7nZ4,2964
+artefacts/cli/containers/utils.py,sha256=5yUoREHM9AxnTkDNCY-DFUPSR5OWtu1rNxIVs6n5zZo,1816
+artefacts/wrappers/artefacts_ros1_meta.launch,sha256=9tN7_0xLH8jW27KYFerhF3NuWDx2dED3ks_qoGVZAPw,1412
+artefacts_cli-0.6.16.dist-info/METADATA,sha256=OLy7Jmo_RMo9CiktBZSKiZRN1HVILJkuhz-W24YB0RA,3021
+artefacts_cli-0.6.16.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+artefacts_cli-0.6.16.dist-info/entry_points.txt,sha256=nlTXRzilNjccbi53FgaRWCQPkG-pv61HRkaCkrKjlec,58
+artefacts_cli-0.6.16.dist-info/top_level.txt,sha256=FdaMV1C9m36MWa-2Stm5xVODv7hss_nRYNwR83j_7ow,10
+artefacts_cli-0.6.16.dist-info/RECORD,,

{artefacts_cli-0.6.15.dist-info → artefacts_cli-0.6.16.dist-info}/WHEEL

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

artefacts_cli-0.6.15.dist-info/RECORD

@@ -1,21 +0,0 @@
-artefacts/cli/__init__.py,sha256=9rTAfBoS9ALJxKSqaUo32ThbDshbvNN4-EmoyUsPhRI,11643
-artefacts/cli/app.py,sha256=J9lBtYDrBx9vPam1hJWDXKwkTEP4IXIfNEGCrGBzEE8,20125
-artefacts/cli/app_containers.py,sha256=hHJvqjxirbLUxgAT8fsOAMjkPmN0XGIX73krr5TEm7I,2011
-artefacts/cli/bagparser.py,sha256=FE_QaztC9pg4hQzTjGSdyve6mzZbHJbyqa3wqvZSbxE,3702
-artefacts/cli/constants.py,sha256=vZxtUprVqqZx1k4-LFFDU2tI0AnENV2cBt655uR17R8,269
-artefacts/cli/other.py,sha256=7NvzlspvG0zF7sryR-QznwdLupXLln1BKWxHB9VuEcc,1160
-artefacts/cli/parameters.py,sha256=MDhrM7ur95wKTLDteqz2f-sLdCPcepi5wk0XjeLo6TU,788
-artefacts/cli/ros1.py,sha256=RbtirCGarD9a0ikfuGK-pdpWYSXfqJhEt4rpA0uFsyU,9625
-artefacts/cli/ros2.py,sha256=YaCi3HRuCdvCTjM0Ftnm-SLgMOy1OneIr0aU7KVTiAM,4476
-artefacts/cli/utils.py,sha256=6yQJRzv-xaLbtcA73Tty9C9QZeV06n5pjXMYl3xsLPE,3156
-artefacts/cli/utils_ros.py,sha256=pYbhAU9fK2VbnWm3nSLBwUMVBzsZuCn10SFZmVW3-Zo,2090
-artefacts/cli/version.py,sha256=mm-8uYlR9TBoYFbfyOehz69r2OAONIb8KypEpPRKVqU,413
-artefacts/cli/containers/__init__.py,sha256=xOVmjLw3um8joQmjK_se-D1S9juufA-1s-RqXYJ5EoQ,1875
-artefacts/cli/containers/docker.py,sha256=nHVZ4ZSge7oUCbwvIT1vI-GAxuiSdJ-MVvLHJ2Un_OY,2805
-artefacts/cli/containers/utils.py,sha256=yahjJr9Oh7NuvJvy5X_nREMupQZ8A6hrhss3mscyqio,1882
-artefacts/wrappers/artefacts_ros1_meta.launch,sha256=9tN7_0xLH8jW27KYFerhF3NuWDx2dED3ks_qoGVZAPw,1412
-artefacts_cli-0.6.15.dist-info/METADATA,sha256=JXVv2Yc_Q859rR3F1qxSUl-uVaHa_1PV5sZEUAQZHPQ,3048
-artefacts_cli-0.6.15.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-artefacts_cli-0.6.15.dist-info/entry_points.txt,sha256=nlTXRzilNjccbi53FgaRWCQPkG-pv61HRkaCkrKjlec,58
-artefacts_cli-0.6.15.dist-info/top_level.txt,sha256=FdaMV1C9m36MWa-2Stm5xVODv7hss_nRYNwR83j_7ow,10
-artefacts_cli-0.6.15.dist-info/RECORD,,