artefacts-cli 0.9.4__tar.gz → 0.9.5__tar.gz

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+TODO and upcoming
+
+## [0.9.5] - 2025-06-30
+
 ### Added
 
 - API calls are automatically retried up to 3 times on server-side 502, 503, 504 errors (#264)
@@ -116,7 +120,8 @@ 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.9.3...HEAD
+[unreleased]: https://github.com/art-e-fact/artefacts-client/compare/0.9.5...HEAD
+[0.9.5]: https://github.com/art-e-fact/artefacts-client/releases/tag/0.9.5
 [0.9.3]: https://github.com/art-e-fact/artefacts-client/releases/tag/0.9.3
 [0.8.0]: https://github.com/art-e-fact/artefacts-client/releases/tag/0.8.0
 [0.7.0]: https://github.com/art-e-fact/artefacts-client/releases/tag/0.7.0

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: artefacts_cli
-Version: 0.9.4
+Version: 0.9.5
 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
@@ -42,6 +42,9 @@ Requires-Dist: python-markdown-math; extra == "dev"
 Requires-Dist: ruff>=0.9.2; extra == "dev"
 Requires-Dist: setuptools_scm>=8; extra == "dev"
 Requires-Dist: twine; extra == "dev"
+Provides-Extra: dev-extended
+Requires-Dist: artefacts_cli[dev]; extra == "dev-extended"
+Requires-Dist: pytest-watch; extra == "dev-extended"
 
 # Artefacts CLI
 

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/artefacts/cli/__init__.py

@@ -32,7 +32,15 @@ except PackageNotFoundError:
         __version__ = "0.0.0"
 
 
-class AuthenticationError(Exception):
+class ArtefactsAPIError(Exception):
+    """
+    Tentative base error class for Artefacts API interactions
+    """
+
+    pass
+
+
+class AuthenticationError(ArtefactsAPIError):
     """Raised when artefacts authentication failed"""
 
     pass
@@ -74,6 +82,7 @@ class WarpJob:
         if self.job_id is None:
             # Only create a new job if job_id is not specified
             data = {
+                "project_id": self.project_id,
                 "start": round(self.start),
                 "status": "in progress",
                 "params": json.dumps(self.params),
@@ -100,7 +109,7 @@ class WarpJob:
                     )
                 )
                 logger.warning(response.text)
-                raise AuthenticationError(str(response.status_code))
+                raise ArtefactsAPIError(str(response.status_code))
             self.job_id = response.json()["job_id"]
         self.output_path = self.params.get("output_path", f"/tmp/{self.job_id}")
         os.makedirs(self.output_path, exist_ok=True)
@@ -109,20 +118,21 @@ class WarpJob:
     def log_tests_result(self, success):
         self.success = success
 
-    def update(self, last_run_success: bool):
+    def update(self, last_run_success: bool) -> bool:
         end = datetime.now(timezone.utc).timestamp()
         if self.dryrun:
-            return
+            return True
         # Log metadata
         data = {
+            "project_id": self.project_id,
             "end": round(end),
             "duration": round(end - self.start),
             "success": last_run_success,
             "status": "finished",  # need to be determined based on all runs
         }
-        self.api_conf.update("job", self.job_id, data)
+        response = self.api_conf.update("job", self.job_id, data)
 
-        return
+        return response.status_code == 200
 
     def new_run(self, scenario):
         run = WarpRun(self, scenario["name"], scenario, self.n_runs)
@@ -173,7 +183,7 @@ class WarpRun:
                 )
             )
             self.logger.warning(response.text)
-            raise AuthenticationError(str(response.status_code))
+            raise ArtefactsAPIError(str(response.status_code))
         return
 
     def log_params(self, params):

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/artefacts/cli/config.py

@@ -25,7 +25,11 @@ urllib3logger.setLevel(logging.ERROR)
 
 class APIConf:
     def __init__(
-        self, project_name: str, api_version: str, job_name: Optional[str] = None
+        self,
+        project_name: str,
+        api_version: str,
+        job_name: Optional[str] = None,
+        session: Optional[Session] = None,
     ) -> None:
         config = get_conf_from_file()
         if project_name in config:
@@ -76,7 +80,7 @@ class APIConf:
         #
         # Retry settings
         #
-        self.session = Session()
+        self.session = session or Session()
         retries = Retry(
             total=3,
             backoff_factor=0.1,
@@ -84,21 +88,23 @@ class APIConf:
             allowed_methods=Retry.DEFAULT_ALLOWED_METHODS | {"POST"},
         )
         # Default connect timeout set to a small value above the default 3s for TCP
-        # Default read timeout a bit aggressive to ensure snappy experience
+        # Default read timeout a typical value. Does not scale when too aggressive
         #    (note: read timeout is between byte sent, not the whole read)
-        self.request_timeout = (3.03, 7)
+        self.request_timeout = (3.03, 27)
         self.session.mount("https://", HTTPAdapter(max_retries=retries))
 
     @contextmanager
     def _api(self):
         try:
             yield self.session
-        except ConnectionError:
+        except ConnectionError as e:
             raise click.ClickException(
                 localise(
-                    "Unable to interact with the Artefacts API at this time. "
-                    "Our apologies, this looks like us. Please retry "
-                    "later, or perhaps confirm your internet connectivity."
+                    "Unable to complete the operation: Network error.\n"
+                    "This may be a problem with an Artefacts server, or your network.\n"
+                    "Please try again in a moment or confirm your internet connection.\n"
+                    "If the problem persists, please contact us (info@artefacts.com)!\n"
+                    f"All we know: {e}"
                 )
             )
 
@@ -173,13 +179,16 @@ class APIConf:
 
         Note this is temporary helper, as we expect to turn files as
         first-order resource at the API level, so move to CRUD model, etc.
+
+        This facility disables all timeouts, as uploads can be very
+        long, and we'd better wait.
         """
         with self._api() as session:
             return session.post(
                 url,
                 data=data,
                 files=files,
-                timeout=self.request_timeout,
+                timeout=None,
             )
 
     def direct(self, verb: str) -> Callable:

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/artefacts/cli/locales/art.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: artefacts 0.9.4.dev18\n"
+"Project-Id-Version: artefacts 0.9.5.dev7\n"
 "Report-Msgid-Bugs-To: dev@artefacts.com\n"
-"POT-Creation-Date: 2025-06-18 09:50+0900\n"
+"POT-Creation-Date: 2025-06-24 09:46+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,33 +22,33 @@ msgstr ""
 msgid "Could not determine package version: {error_message}. Default to 0.0.0"
 msgstr ""
 
-#: artefacts/cli/__init__.py:97
+#: artefacts/cli/__init__.py:98
 #, python-brace-format
 msgid "Error on job creation: {status_code}"
 msgstr ""
 
-#: artefacts/cli/__init__.py:170
+#: artefacts/cli/__init__.py:172
 #, python-brace-format
 msgid "Error on scenario creation: {status_code}"
 msgstr ""
 
-#: artefacts/cli/__init__.py:279
+#: artefacts/cli/__init__.py:281
 msgid ""
 "Files generated by the job are not uploaded to Artefacts, including the "
 "ones specified in output_dirs"
 msgstr ""
 
-#: artefacts/cli/__init__.py:291
+#: artefacts/cli/__init__.py:293
 #, python-brace-format
 msgid "Uploading {file_name} ({file_size:.2f} MB)"
 msgstr ""
 
-#: artefacts/cli/__init__.py:302
+#: artefacts/cli/__init__.py:304
 #, python-brace-format
 msgid "File too large: {file_name} could not be uploaded"
 msgstr ""
 
-#: artefacts/cli/__init__.py:310
+#: artefacts/cli/__init__.py:312
 #, python-brace-format
 msgid "Error uploading {file_name}: {error_message}, skipping"
 msgstr ""
@@ -424,21 +424,22 @@ msgstr ""
 msgid "Package run failed:"
 msgstr ""
 
-#: artefacts/cli/config.py:43
+#: artefacts/cli/config.py:47
 #, python-brace-format
 msgid "No API KEY set. Please run `artefacts config add {project_name}`"
 msgstr ""
 
-#: artefacts/cli/config.py:62 artefacts/cli/config.py:70
+#: artefacts/cli/config.py:66 artefacts/cli/config.py:74
 #, python-brace-format
 msgid "Connecting to {api_url} using {auth_type}"
 msgstr ""
 
-#: artefacts/cli/config.py:99
+#: artefacts/cli/config.py:103
 msgid ""
-"Unable to interact with the Artefacts API at this time. Our apologies, "
-"this looks like us. Please retry later, or perhaps confirm your internet "
-"connectivity."
+"Unable to complete the operation: Network error.\n"
+"This may be a problem with an Artefacts server, or your network.\n"
+"Please try again in a moment or confirm your internet connection.\n"
+"If the problem persists, please contact us (info@artefacts.com)!\n"
 msgstr ""
 
 #: artefacts/cli/ros1.py:55

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/artefacts/cli/locales/base.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: artefacts 0.9.4.dev18\n"
+"Project-Id-Version: artefacts 0.9.5.dev7\n"
 "Report-Msgid-Bugs-To: dev@artefacts.com\n"
-"POT-Creation-Date: 2025-06-18 09:50+0900\n"
+"POT-Creation-Date: 2025-06-24 09:46+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,33 +22,33 @@ msgstr ""
 msgid "Could not determine package version: {error_message}. Default to 0.0.0"
 msgstr ""
 
-#: artefacts/cli/__init__.py:97
+#: artefacts/cli/__init__.py:98
 #, python-brace-format
 msgid "Error on job creation: {status_code}"
 msgstr ""
 
-#: artefacts/cli/__init__.py:170
+#: artefacts/cli/__init__.py:172
 #, python-brace-format
 msgid "Error on scenario creation: {status_code}"
 msgstr ""
 
-#: artefacts/cli/__init__.py:279
+#: artefacts/cli/__init__.py:281
 msgid ""
 "Files generated by the job are not uploaded to Artefacts, including the ones "
 "specified in output_dirs"
 msgstr ""
 
-#: artefacts/cli/__init__.py:291
+#: artefacts/cli/__init__.py:293
 #, python-brace-format
 msgid "Uploading {file_name} ({file_size:.2f} MB)"
 msgstr ""
 
-#: artefacts/cli/__init__.py:302
+#: artefacts/cli/__init__.py:304
 #, python-brace-format
 msgid "File too large: {file_name} could not be uploaded"
 msgstr ""
 
-#: artefacts/cli/__init__.py:310
+#: artefacts/cli/__init__.py:312
 #, python-brace-format
 msgid "Error uploading {file_name}: {error_message}, skipping"
 msgstr ""
@@ -421,21 +421,22 @@ msgstr ""
 msgid "Package run failed:"
 msgstr ""
 
-#: artefacts/cli/config.py:43
+#: artefacts/cli/config.py:47
 #, python-brace-format
 msgid "No API KEY set. Please run `artefacts config add {project_name}`"
 msgstr ""
 
-#: artefacts/cli/config.py:62 artefacts/cli/config.py:70
+#: artefacts/cli/config.py:66 artefacts/cli/config.py:74
 #, python-brace-format
 msgid "Connecting to {api_url} using {auth_type}"
 msgstr ""
 
-#: artefacts/cli/config.py:99
+#: artefacts/cli/config.py:103
 msgid ""
-"Unable to interact with the Artefacts API at this time. Our apologies, this "
-"looks like us. Please retry later, or perhaps confirm your internet "
-"connectivity."
+"Unable to complete the operation: Network error.\n"
+"This may be a problem with an Artefacts server, or your network.\n"
+"Please try again in a moment or confirm your internet connection.\n"
+"If the problem persists, please contact us (info@artefacts.com)!\n"
 msgstr ""
 
 #: artefacts/cli/ros1.py:55

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/artefacts/cli/locales/click.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: artefacts 0.9.4.dev18\n"
+"Project-Id-Version: artefacts 0.9.5.dev7\n"
 "Report-Msgid-Bugs-To: dev@artefacts.com\n"
-"POT-Creation-Date: 2025-06-18 09:50+0900\n"
+"POT-Creation-Date: 2025-06-24 09:46+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/artefacts/cli/locales/ja_JP/LC_MESSAGES/artefacts.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: artefacts VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-06-18 09:50+0900\n"
+"POT-Creation-Date: 2025-06-24 09:46+0900\n"
 "PO-Revision-Date: 2025-04-15 15:16+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: ja_JP\n"
@@ -23,33 +23,33 @@ msgstr ""
 msgid "Could not determine package version: {error_message}. Default to 0.0.0"
 msgstr "パッケージバージョン認識エラー：{error_message}. 0.0.0に設定して実行します"
 
-#: artefacts/cli/__init__.py:97
+#: artefacts/cli/__init__.py:98
 #, python-brace-format
 msgid "Error on job creation: {status_code}"
 msgstr "ジョブ作成エラー：{status_code}"
 
-#: artefacts/cli/__init__.py:170
+#: artefacts/cli/__init__.py:172
 #, python-brace-format
 msgid "Error on scenario creation: {status_code}"
 msgstr "シナリオ作成エラー：{status_code}"
 
-#: artefacts/cli/__init__.py:279
+#: artefacts/cli/__init__.py:281
 msgid ""
 "Files generated by the job are not uploaded to Artefacts, including the "
 "ones specified in output_dirs"
 msgstr "ジョブによって生成されたファイルは、output_dirsで指定されたものも含め、Artefactsにアップロードされません"
 
-#: artefacts/cli/__init__.py:291
+#: artefacts/cli/__init__.py:293
 #, python-brace-format
 msgid "Uploading {file_name} ({file_size:.2f} MB)"
 msgstr "{file_name}をアップロード中（{file_size:.2f} MB）"
 
-#: artefacts/cli/__init__.py:302
+#: artefacts/cli/__init__.py:304
 #, python-brace-format
 msgid "File too large: {file_name} could not be uploaded"
 msgstr "ファイルが大きすぎます：{file_name}をアップロードできませんでした"
 
-#: artefacts/cli/__init__.py:310
+#: artefacts/cli/__init__.py:312
 #, python-brace-format
 msgid "Error uploading {file_name}: {error_message}, skipping"
 msgstr "{file_name}のアップロードエラー：{error_message}、スキップします"
@@ -442,24 +442,27 @@ msgstr "コンテナ実行完了：検査用のコンテナID：{container_id}"
 msgid "Package run failed:"
 msgstr "パッケージ実行失敗："
 
-#: artefacts/cli/config.py:43
+#: artefacts/cli/config.py:47
 #, python-brace-format
 msgid "No API KEY set. Please run `artefacts config add {project_name}`"
 msgstr "APIキーが設定されていません。`artefacts config add {project_name}`を実行してください"
 
-#: artefacts/cli/config.py:62 artefacts/cli/config.py:70
+#: artefacts/cli/config.py:66 artefacts/cli/config.py:74
 #, python-brace-format
 msgid "Connecting to {api_url} using {auth_type}"
 msgstr "{auth_type}を使用して{api_url}に接続中"
 
-#: artefacts/cli/config.py:99
+#: artefacts/cli/config.py:103
 msgid ""
-"Unable to interact with the Artefacts API at this time. Our apologies, "
-"this looks like us. Please retry later, or perhaps confirm your internet "
-"connectivity."
+"Unable to complete the operation: Network error.\n"
+"This may be a problem with an Artefacts server, or your network.\n"
+"Please try again in a moment or confirm your internet connection.\n"
+"If the problem persists, please contact us (info@artefacts.com)!\n"
 msgstr ""
-"現在、Artefacts APIとの通信ができません。申し訳ございませんが、"
-"こちら側の問題のようです。後ほど再試行していただくか、インターネット接続をご確認ください。"
+"操作を完了できません：ネットワークエラー。\n"
+"これはArtefactsサーバーまたはお客様のネットワークの問題である可能性があります。\n"
+"しばらくしてから再度お試しいただくか、インターネット接続をご確認ください。\n"
+"問題が解決しない場合は、お気軽にお問い合わせください（info@artefacts.com）！\n"
 
 #: artefacts/cli/ros1.py:55
 msgid ""

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/artefacts/cli/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.9.4'
-__version_tuple__ = version_tuple = (0, 9, 4)
+__version__ = version = '0.9.5'
+__version_tuple__ = version_tuple = (0, 9, 5)

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/artefacts_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: artefacts_cli
-Version: 0.9.4
+Version: 0.9.5
 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
@@ -42,6 +42,9 @@ Requires-Dist: python-markdown-math; extra == "dev"
 Requires-Dist: ruff>=0.9.2; extra == "dev"
 Requires-Dist: setuptools_scm>=8; extra == "dev"
 Requires-Dist: twine; extra == "dev"
+Provides-Extra: dev-extended
+Requires-Dist: artefacts_cli[dev]; extra == "dev-extended"
+Requires-Dist: pytest-watch; extra == "dev-extended"
 
 # Artefacts CLI
 

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/artefacts_cli.egg-info/SOURCES.txt

@@ -56,6 +56,7 @@ infra-tests/turtlesim1/ros_workspace/src/turtle_odometry/src/turtle_trajectory.p
 infra-tests/turtlesim1/ros_workspace/src/turtle_odometry/test/viz_turtle_odom.xml
 infra-tests/turtlesim2/launch_turtle.py
 infra-tests/turtlesim2/sample_node.py
+scripts/whats_latest.rb
 tests/__init__.py
 tests/conftest.py
 tests/cli/__init__.py

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/artefacts_cli.egg-info/requires.txt

@@ -31,3 +31,7 @@ python-markdown-math
 ruff>=0.9.2
 setuptools_scm>=8
 twine
+
+[dev-extended]
+artefacts_cli[dev]
+pytest-watch

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/bin/release

@@ -3,6 +3,7 @@
 set -e
 
 production=${1:-no}
+version_override=${2:-no}
 
 if [[ -d venv ]]
 then
@@ -10,6 +11,10 @@ then
 fi
 
 # Get the new version
+if [[ "$version_override" != "no" ]]
+then
+  export SETUPTOOLS_SCM_PRETEND_VERSION=$version_override
+fi
 new_version=$(python -m setuptools_scm)
 
 if [[ ! "$new_version" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]+\.?\d?\e?\v?[0-9]?$ ]] && [[ "$production" != "production" ]]

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/pyproject.toml

@@ -68,6 +68,11 @@ dev = [
   "twine",
 ]
 
+dev-extended = [
+  "artefacts_cli[dev]",
+  "pytest-watch",
+]
+
 [project.urls]
 "Homepage" = "https://github.com/art-e-fact/artefacts-client"
 "Bug Tracker" = "https://github.com/art-e-fact/artefacts-client/issues"

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/pytest.ini

@@ -5,3 +5,7 @@ env =
     ARTEFACTS_CLI_ENV=test
 markers =
   ros2: mark a test as it requires ROS2 environment.
+
+[pytest-watch]
+clear = True
+nobeep = True

artefacts_cli-0.9.5/scripts/whats_latest.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+#
+# Parse our CHANGELOG.md file to get the latest release "block"
+# and prints it to stdout.
+#
+
+cl = open("CHANGELOG.md").read
+start = cl.index /## \[Unreleased\]/
+finish = cl.index /## \[\d\.\d+\.\d+\] - \d{4}-\d{2}-\d{2}/
+print cl[start...finish].chomp

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/tests/cli/test_warp.py

@@ -1,9 +1,16 @@
 import pytest
 from datetime import datetime, timezone
+from uuid import uuid4
 
 
-from artefacts.cli import generate_scenarios, WarpJob
+from artefacts.cli import (
+    ArtefactsAPIError,
+    AuthenticationError,
+    generate_scenarios,
+    WarpJob,
+)
 from artefacts.cli.app import run
+from artefacts.cli.config import APIConf
 
 
 def test_generate_scenarios(loaded_valid_conf):
@@ -119,15 +126,142 @@ def test_default_params_overwritten_by_launch_argument(loaded_valid_conf):
     }
 
 
-def test_job_empty_init():
+def test_job_empty_init_dryrun():
     """
-    Plain basic test the WarpJob object initialises as expected.
+    Plain basic test the WarpJob object initialises as expected on dryrun.
     """
     job = WarpJob("project", {}, "jobname", {}, dryrun=True)
     assert job.success is False
     assert job.start < datetime.now(timezone.utc).timestamp()
 
 
+def test_job_empty_init(mocker, valid_project_settings):
+    """
+    Plain basic test the WarpJob object initialises as expected.
+    """
+    success = mocker.Mock()
+    success.status_code = 200
+    success.json.return_value = {"job_id": str(uuid4())}
+    test_session = mocker.Mock()
+    test_session.post.return_value = success
+    job = WarpJob(
+        "project",
+        APIConf(
+            valid_project_settings["full_project_name"],
+            "test_version",
+            session=test_session,
+        ),
+        "jobname",
+        {},
+    )
+    assert job.success is False
+    assert job.start < datetime.now(timezone.utc).timestamp()
+
+
+def test_job_update(mocker, valid_project_settings):
+    """
+    Test on the update function of WarpJob objects.
+    """
+    success = mocker.Mock()
+    success.status_code = 200
+    success.json.return_value = {"job_id": str(uuid4())}
+    test_session = mocker.Mock()
+    test_session.post.return_value = success
+    test_session.put.return_value = success
+    job = WarpJob(
+        "project",
+        APIConf(
+            valid_project_settings["full_project_name"],
+            "test_version",
+            session=test_session,
+        ),
+        "jobname",
+        {},
+    )
+    assert job.update(True)
+
+
+def test_job_valid_context(mocker, valid_project_settings):
+    """
+    Check that a custom context param is processed as expected.
+
+    A job creation currently invokes the API at init time,
+    which is supposed to send any optional `context` data.
+    """
+    now = datetime.now()
+    time_mock = mocker.patch("datetime.datetime")
+    time_mock.now.return_value = now
+    success = mocker.Mock()
+    success.status_code = 200
+    success.json.return_value = {"job_id": str(uuid4())}
+    api_conf = mocker.Mock()
+    api_conf.create = mocker.Mock(return_value=success)
+    WarpJob(
+        "project",
+        api_conf,
+        "jobname",
+        {},
+        context={
+            "description": "test",
+            "commit": "testcommithash",
+            "ref": "testref",
+        },
+    )
+    api_conf.create.assert_called_with(
+        "job",
+        dict(
+            project_id="project",
+            start=round(now.timestamp()),
+            status="in progress",
+            params="{}",
+            project="project",
+            jobname="jobname",
+            timeout=300,
+            n_subjobs=1,
+            message="test",
+            commit="testcommithash",
+            ref="testref",
+        ),
+    )
+
+
+def test_job_creation_403(mocker):
+    """
+    Check bad authentication is handled.
+    """
+    error403 = mocker.Mock()
+    error403.status_code = 403
+    error403.json.return_value = {"message": "bad auth"}
+    api_conf = mocker.Mock()
+    api_conf.create = mocker.Mock(return_value=error403)
+    with pytest.raises(AuthenticationError) as error:
+        WarpJob(
+            "project",
+            api_conf,
+            "jobname",
+            {},
+        )
+        assert "bad auth" in str(error)
+
+
+def test_job_creation_non_403_error(mocker):
+    """
+    Check non-403 errors are handled.
+    """
+    error401 = mocker.Mock()
+    error401.status_code = 401
+    api_conf = mocker.Mock()
+    api_conf.create = mocker.Mock(return_value=error401)
+    with pytest.raises(ArtefactsAPIError) as error:
+        WarpJob(
+            "project",
+            api_conf,
+            "jobname",
+            {},
+        )
+        assert "401" in str(error)
+
+
 @pytest.mark.ros2
 def test_job_update_called_after_every_run(
     cli_runner, authorised_project_with_conf, mocker

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/tests/cli/test_warp_run.py

@@ -1,8 +1,10 @@
+import pytest
+
 import json
 
 from requests import Response
 
-from artefacts.cli import WarpRun
+from artefacts.cli import ArtefactsAPIError, AuthenticationError, WarpJob, WarpRun
 
 
 def test_run_with_upload_on_stop(mocker, artefacts_run):
@@ -137,3 +139,62 @@ def test_run_uses_scenario_name_on_stop_for_all_parameterised_runs(
         run.stop()
         assert "scenario_name" in spy.call_args.args[2]
         assert expected_name == spy.call_args.args[2]["scenario_name"]
+
+
+def test_run_creation_403(mocker):
+    """
+    Check bad authentication is handled.
+    """
+    success = mocker.Mock()
+    success.status_code = 200
+    success.json.return_value = {"job_id": "test"}
+    error403 = mocker.Mock()
+    error403.status_code = 403
+    error403.json.return_value = {"message": "bad auth"}
+
+    def behaviour(obj, data):
+        if "job" == obj:
+            return success
+        elif "run" == obj:
+            return error403
+
+    api_conf = mocker.Mock()
+    api_conf.create = mocker.Mock(side_effect=behaviour)
+    job = WarpJob(
+        "project",
+        api_conf,
+        "jobname",
+        {},
+    )
+    with pytest.raises(AuthenticationError) as error:
+        WarpRun(job=job, name="run", params={}, run_n=1)
+        assert "bad auth" in str(error)
+
+
+def test_run_creation_non_403_error(mocker):
+    """
+    Check non-403 errors are handled.
+    """
+    success = mocker.Mock()
+    success.status_code = 200
+    success.json.return_value = {"job_id": "test"}
+    error401 = mocker.Mock()
+    error401.status_code = 401
+
+    def behaviour(obj, data):
+        if "job" == obj:
+            return success
+        elif "run" == obj:
+            return error401
+
+    api_conf = mocker.Mock()
+    api_conf.create = mocker.Mock(side_effect=behaviour)
+    job = WarpJob(
+        "project",
+        api_conf,
+        "jobname",
+        {},
+    )
+    with pytest.raises(ArtefactsAPIError) as error:
+        WarpRun(job=job, name="run", params={}, run_n=1)
+        assert "401" in str(error)

{artefacts_cli-0.9.4 → artefacts_cli-0.9.5}/tests/conftest.py

@@ -154,10 +154,19 @@ def sample_artefacts_config():
 
 
 @pytest.fixture(scope="function")
-def artefacts_job(valid_project_settings):
+def test_session(mocker):
+    return mocker.Mock()
+
+
+@pytest.fixture(scope="function")
+def artefacts_job(valid_project_settings, test_session):
     return WarpJob(
         valid_project_settings["full_project_name"],
-        APIConf(valid_project_settings["full_project_name"], "test_version"),
+        APIConf(
+            valid_project_settings["full_project_name"],
+            "test_version",
+            session=test_session,
+        ),
         "jobname",
         {},
         dryrun=True,