artefacts-cli 0.7.3__py3-none-any.whl → 0.9.1__py3-none-any.whl

artefacts/cli/__init__.py

@@ -1,13 +1,15 @@
+from datetime import datetime, timezone
 from importlib.metadata import version, PackageNotFoundError
-import json
+from typing import Optional
+import copy
 import glob
-from datetime import datetime, timezone
-import os
+import json
 import math
+import os
 import requests
-import copy
-from typing import Optional
 
+from .config import APIConf
+from .i18n import localise
 from .parameters import iter_grid
 from .logger import logger
 
@@ -21,7 +23,13 @@ except PackageNotFoundError:
 
         __version__ = get_version()
     except Exception as e:
-        logger.warning(f"Could not determine package version: {e}. Default to 0.0.0")
+        logger.warning(
+            localise(
+                "Could not determine package version: {error_message}. Default to 0.0.0".format(
+                    error_message=e
+                )
+            )
+        )
         __version__ = "0.0.0"
 
 
@@ -35,7 +43,7 @@ class WarpJob:
     def __init__(
         self,
         project_id,
-        api_conf,
+        api_conf: APIConf,
         jobname,
         jobconf,
         dryrun=False,
@@ -86,7 +94,13 @@ class WarpJob:
                     msg = response.json()["message"]
                     logger.warning(msg)
                     raise AuthenticationError(msg)
-                logger.warning(f"Error on job creation: {response.status_code}")
+                logger.warning(
+                    localise(
+                        "Error on job creation: {status_code}".format(
+                            status_code=response.status_code
+                        )
+                    )
+                )
                 logger.warning(response.text)
                 raise AuthenticationError(str(response.status_code))
             self.job_id = response.json()["job_id"]
@@ -133,6 +147,9 @@ class WarpRun:
         self.output_path = self.params.get(
             "output_path", f"{self.job.output_path}/{self.run_n}"
         )
+        self.test_results = None
+        self.success = False
+        self.logger = logger
         os.makedirs(self.output_path, exist_ok=True)
         data = {
             "job_id": job.job_id,
@@ -155,10 +172,16 @@ class WarpRun:
         if response.status_code != 200:
             if response.status_code == 403:
                 msg = response.json()["message"]
-                logger.warning(msg)
+                self.logger.warning(msg)
                 raise AuthenticationError(msg)
-            logger.warning(f"Error on scenario creation: {response.status_code}")
-            logger.warning(response.text)
+            self.logger.warning(
+                localise(
+                    "Error on scenario creation: {status_code}".format(
+                        status_code=response.status_code
+                    )
+                )
+            )
+            self.logger.warning(response.text)
             raise AuthenticationError(str(response.status_code))
         return
 
@@ -235,8 +258,10 @@ class WarpRun:
 
     def stop(self):
         end = datetime.now(timezone.utc).timestamp()
+
         if self.job.dryrun:
             return
+
         # Log metadata
         data = {
             "job_id": self.job.job_id,
@@ -247,18 +272,23 @@ class WarpRun:
             "duration": math.ceil(end - self.start),
             "tests": self.test_results,
             "success": self.success,
-            "uploads": self.uploads,
             "metrics": self.metrics,
         }
+        if not self.job.noupload:
+            data["uploads"] = self.uploads
+
         response = requests.put(
             f"{self.job.api_conf.api_url}/{self.job.project_id}/job/{self.job.job_id}/run/{self.run_n}",
             json=data,
             headers=self.job.api_conf.headers,
         )
+
         # use s3 presigned urls to upload the artifacts
         if self.job.noupload:
             print(
-                "noupload: job artifacts are not uploaded to cloud, including the ones specified in output_dirs"
+                localise(
+                    "Files generated by the job are not uploaded to Artefacts, including the ones specified in output_dirs"
+                )
             )
         else:
             upload_urls = response.json()["upload_urls"]
@@ -267,7 +297,13 @@ class WarpRun:
                 upload_info = upload_urls[key]
                 file_size_mb = os.path.getsize(file_name) / 1024 / 1024
                 try:
-                    print(f"Uploading {file_name} ({file_size_mb:.2f} MB)")
+                    print(
+                        localise(
+                            "Uploading {file_name} ({file_size:.2f} MB)".format(
+                                file_name=file_name, file_size=file_size_mb
+                            )
+                        )
+                    )
                     # TODO: add a retry policy
                     requests.post(
                         upload_info["url"],
@@ -275,14 +311,26 @@ class WarpRun:
                         files=files,
                     )
                 except OverflowError:
-                    logger.warning(f"File too large: {file_name} could not be uploaded")
+                    self.logger.warning(
+                        localise(
+                            "File too large: {file_name} could not be uploaded".format(
+                                file_name=file_name
+                            )
+                        )
+                    )
                 except Exception as e:
-                    logger.warning(f"Error uploading {file_name}: {e}, skipping")
+                    self.logger.warning(
+                        localise(
+                            "Error uploading {file_name}: {error_message}, skipping".format(
+                                file_name=file_name, error_message=e
+                            )
+                        )
+                    )
 
 
 def init_job(
     project_id: str,
-    api_token: str,
+    api_conf: APIConf,
     jobname: str,
     jobconf: dict,
     dryrun: bool = False,
@@ -294,7 +342,7 @@ def init_job(
 ):
     return WarpJob(
         project_id,
-        api_token,
+        api_conf,
         jobname,
         jobconf,
         dryrun,