artefacts-cli 0.16.0__tar.gz → 0.16.2__tar.gz

{artefacts_cli-0.16.0 → artefacts_cli-0.16.2}/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.16.0] - 2026-04-08
+
 ### Added
 
 - New command `artefacts download` to list and download artifacts from job runs (#347)
@@ -299,7 +301,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Local metrics errors do not block publication of results.
 - Introduction of Black formatting.
 
-[unreleased]: https://github.com/art-e-fact/artefacts-client/compare/0.14.0...HEAD
+[unreleased]: https://github.com/art-e-fact/artefacts-client/compare/0.16.0...HEAD
+[0.16.0]: https://github.com/art-e-fact/artefacts-client/releases/tag/0.16.0
+[0.15.0]: https://github.com/art-e-fact/artefacts-client/releases/tag/0.15.0
 [0.14.0]: https://github.com/art-e-fact/artefacts-client/releases/tag/0.14.0
 [0.13.0]: https://github.com/art-e-fact/artefacts-client/releases/tag/0.13.0
 [0.12.0]: https://github.com/art-e-fact/artefacts-client/releases/tag/0.12.0

{artefacts_cli-0.16.0/artefacts_cli.egg-info → artefacts_cli-0.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: artefacts_cli
-Version: 0.16.0
+Version: 0.16.2
 Author-email: FD <fabian@artefacts.com>, AGC <alejandro@artefacts.com>, TN <tomo@artefacts.com>, EP <eric@artefacts.com>
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/art-e-fact/artefacts-client

{artefacts_cli-0.16.0 → artefacts_cli-0.16.2}/artefacts/cli/app_containers.py

@@ -259,8 +259,8 @@ def run(
 
     api_conf = APIConf(project, __version__, jobname)
     api_key = api_conf.api_key
-    bearer_token = api_conf.bearer_token
-    if bearer_token is None and not is_valid_api_key(api_key):
+    access_token = api_conf.access_token
+    if access_token is None and not is_valid_api_key(api_key):
         raise click.ClickException(
             localise(
                 "Invalid API key for {project}: A key must be a non-empty string".format(
@@ -280,7 +280,7 @@ def run(
         # Hidden settings primarily useful to Artefacts developers
         api_url=os.environ.get("ARTEFACTS_API_URL", DEFAULT_API_URL),
         api_key=api_key,
-        bearer_token=bearer_token,
+        access_token=access_token,
         engine_args=list(engine_args),
         code_state=code_env.get_state(),
         code_reference=code_env.get_reference(),

{artefacts_cli-0.16.0 → artefacts_cli-0.16.2}/artefacts/cli/app_project.py

@@ -170,13 +170,8 @@ def create_project_cmd(name: str):
             data = response.parsed
             click.secho(localise("Project created!"), fg="green", bold=True)
             click.echo()
-            click.echo(
-                localise("  Organization: {org}").format(org=data.project.organization)
-            )
-            click.echo(
-                localise("  Project:      {project}").format(project=data.project.name)
-            )
-            click.echo(localise("  API Key:      {key}").format(key=data.api_key))
+            click.echo(localise("  Organization: {org}").format(org=data.organization))
+            click.echo(localise("  Project:      {project}").format(project=data.name))
             click.echo()
             click.echo(localise("Add this to your artefacts.yaml:"))
             click.secho(f"  project: {org}/{project_name}", fg="cyan")

{artefacts_cli-0.16.0 → artefacts_cli-0.16.2}/artefacts/cli/config.py

@@ -48,17 +48,20 @@ class APIConf:
             profile = {}
 
         self.api_url = get_artefacts_api_url(profile)
+        access_token_from_env = os.environ.get("ARTEFACTS_ACCESS_TOKEN")
 
         # Check for OAuth access token first (from `artefacts login`).
-        # ARTEFACTS_BEARER_TOKEN is injected by the host when running in-container.
-        oauth_token = os.environ.get("ARTEFACTS_BEARER_TOKEN") or get_access_token()
+        # ARTEFACTS_ACCESS_TOKEN is injected by the host when running in-container.
+        oauth_token = access_token_from_env or get_access_token()
         if oauth_token:
             auth_type = "Bearer"
-            self.bearer_token = oauth_token
+            self.access_token = oauth_token
+            self._refreshable_access_auth = access_token_from_env is None
             self.headers = {"Authorization": f"{auth_type} {oauth_token}"}
             self.api_key = None
         else:
-            self.bearer_token = None
+            self.access_token = None
+            self._refreshable_access_auth = False
             # Fall back to API key
             self.api_key = os.environ.get("ARTEFACTS_KEY", profile.get("ApiKey", None))
 
@@ -156,7 +159,22 @@ class APIConf:
             ),
         )
 
+    def _refresh_access_auth(self) -> None:
+        if not self._refreshable_access_auth:
+            return
+
+        token = get_access_token()
+        if not token or token == self.access_token:
+            return
+
+        self.access_token = token
+        self.headers["Authorization"] = f"Bearer {token}"
+        self.client = self.client.with_headers(
+            {"Authorization": self.headers["Authorization"]}
+        )
+
     def sdk(self, cmd, handle_errors: bool = True, **cmd_kwargs) -> SdkResponse:
+        self._refresh_access_auth()
         try:
             response = cmd.sync_detailed(client=self.client, **cmd_kwargs)
 
@@ -217,6 +235,7 @@ class APIConf:
 
     @contextmanager
     def _api(self):
+        self._refresh_access_auth()
         try:
             yield self.session
         except ConnectionError as e:
@@ -389,6 +408,7 @@ class APIConf:
            without the context extras (as this returns and so exits
            the context).
         """
+        self._refresh_access_auth()
         return partial(
             getattr(self.session, verb),
             headers=self.headers,

{artefacts_cli-0.16.0 → artefacts_cli-0.16.2}/artefacts/cli/containers/__init__.py

@@ -43,7 +43,7 @@ class CMgr:
         jobname: Optional[str] = None,
         artefacts_dir: Union[str, Path] = Path("~/.artefacts").expanduser(),
         api_url: str = DEFAULT_API_URL,
-        bearer_token: Optional[str] = None,
+        access_token: Optional[str] = None,
         with_gui: bool = False,
     ) -> Tuple[Any, Iterator]:
         """

{artefacts_cli-0.16.0 → artefacts_cli-0.16.2}/artefacts/cli/containers/docker_cm.py

@@ -79,7 +79,7 @@ class DockerManager(CMgr):
         artefacts_dir: Union[str, Path] = Path("~/.artefacts").expanduser(),
         api_url: str = DEFAULT_API_URL,
         api_key: Optional[str] = None,
-        bearer_token: Optional[str] = None,
+        access_token: Optional[str] = None,
         with_gui: bool = False,
         engine_args: Optional[list] = None,
         code_state: Optional[str] = None,
@@ -101,8 +101,8 @@ class DockerManager(CMgr):
         if description:
             env["ARTEFACTS_DESCRIPTION"] = description
 
-        if bearer_token:
-            env["ARTEFACTS_BEARER_TOKEN"] = bearer_token
+        if access_token:
+            env["ARTEFACTS_ACCESS_TOKEN"] = access_token
         else:
             env["ARTEFACTS_KEY"] = api_key or self._get_artefacts_api_key(
                 project, artefacts_dir

{artefacts_cli-0.16.0 → artefacts_cli-0.16.2}/artefacts/cli/version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.16.0'
-__version_tuple__ = version_tuple = (0, 16, 0)
+__version__ = version = '0.16.2'
+__version_tuple__ = version_tuple = (0, 16, 2)
 
-__commit_id__ = commit_id = 'ged8814f21'
+__commit_id__ = commit_id = 'gabcf69e03'

{artefacts_cli-0.16.0 → artefacts_cli-0.16.2/artefacts_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: artefacts_cli
-Version: 0.16.0
+Version: 0.16.2
 Author-email: FD <fabian@artefacts.com>, AGC <alejandro@artefacts.com>, TN <tomo@artefacts.com>, EP <eric@artefacts.com>
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/art-e-fact/artefacts-client

{artefacts_cli-0.16.0 → artefacts_cli-0.16.2}/artefacts_cli.egg-info/SOURCES.txt

@@ -135,6 +135,7 @@ bin/release
 infra-tests/test_run_remote.yaml
 infra-tests/turtlesim2/launch_turtle.py
 infra-tests/turtlesim2/sample_node.py
+scripts/dev_version.py
 scripts/whats_latest.rb
 tests/__init__.py
 tests/conftest.py

artefacts_cli-0.16.2/scripts/dev_version.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+"""
+Script to print the current development release version to stdout
+
+Aimed at being used in shell scripts, typically CI on GHA.
+
+Logic:
+* Use x.y.z semver
+* Return x.(y+1).0
+* Never save anything (SISO approach, aka idempotent)
+
+Example:
+0.16.1.dev12         -> 0.17.0
+0.16.1-pre.2+build.4 -> 0.17.0
+0.16.1               -> 0.17.0
+0.16.0               -> 0.17.0
+"""
+
+from setuptools_scm import get_version
+import semver
+
+last_known = get_version()
+last_known = last_known.split(".")
+v = ".".join(last_known[0:3])
+v = semver.Version.parse(v)
+
+print(f"{v.major}.{v.minor + 1}.0.{'.'.join(last_known[3:])}")

{artefacts_cli-0.16.0 → artefacts_cli-0.16.2}/tests/cli/test_app_containers.py

@@ -58,4 +58,4 @@ def test_container_run_with_oauth_token(
     assert result.exit_code == 0
     handler.run.assert_called_once()
     assert handler.run.call_args.kwargs["api_key"] is None
-    assert handler.run.call_args.kwargs["bearer_token"] == "test-token"
+    assert handler.run.call_args.kwargs["access_token"] == "test-token"

{artefacts_cli-0.16.0 → artefacts_cli-0.16.2}/tests/cli/test_config.py

@@ -228,3 +228,41 @@ def test_put_invalid_json_error_converted_to_click_error(
     )
     with pytest.raises(ClickException, match=expected):
         sut.update("url", "id", None)
+
+
+def test_sdk_refreshes_access_token_before_request(
+    monkeypatch, mocker, valid_project_settings
+):
+    tokens = iter(["stale-token", "fresh-token"])
+    monkeypatch.setattr("artefacts.cli.config.get_access_token", lambda: next(tokens))
+
+    response = mocker.Mock()
+    response.status_code = 200
+    command = mocker.Mock()
+    command.sync_detailed.return_value = response
+
+    sut = APIConf(valid_project_settings["full_project_name"], "test_version")
+    sut.sdk(command)
+
+    assert sut.headers["Authorization"] == "Bearer fresh-token"
+    assert command.sync_detailed.call_args.kwargs["client"]._headers[
+        "Authorization"
+    ] == ("Bearer fresh-token")
+
+
+def test_sdk_keeps_env_access_token(monkeypatch, mocker, valid_project_settings):
+    monkeypatch.setenv("ARTEFACTS_ACCESS_TOKEN", "env-token")
+    monkeypatch.setattr("artefacts.cli.config.get_access_token", lambda: "fresh-token")
+
+    response = mocker.Mock()
+    response.status_code = 200
+    command = mocker.Mock()
+    command.sync_detailed.return_value = response
+
+    sut = APIConf(valid_project_settings["full_project_name"], "test_version")
+    sut.sdk(command)
+
+    assert sut.headers["Authorization"] == "Bearer env-token"
+    assert command.sync_detailed.call_args.kwargs["client"]._headers[
+        "Authorization"
+    ] == ("Bearer env-token")