primitive 0.1.78__py3-none-any.whl → 0.1.80__py3-none-any.whl

primitive/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Dylan Stein <dylan@primitive.tech>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.1.78"
+__version__ = "0.1.80"

primitive/agent/actions.py

@@ -138,8 +138,7 @@ class Agent(BaseAction):
                         runner = AgentRunner(
                             primitive=self.primitive,
                             source_dir=source_dir,
-                            job_id=job_run["id"],
-                            job_slug=job_run["job"]["slug"],
+                            job_run=job_run,
                             max_log_size=500 * 1024,
                         )
                     except Exception as e:

primitive/agent/process.py

@@ -24,6 +24,7 @@ class Process:
         self.stdout_thread = None
         self.stderr_thread = None
         self._errors = 0
+        self._warnings = 0
 
     def start(self):
         # Start the process
@@ -53,6 +54,7 @@ class Process:
                     self._errors += 1
                 elif "warning" in raw_data.lower():
                     logger.warning(raw_data)
+                    self._warnings += 1
                 else:
                     logger.info(raw_data)
             elif key.fileobj is self.process.stderr:
@@ -117,3 +119,7 @@ class Process:
     @property
     def errors(self) -> int:
         return self._errors
+
+    @property
+    def warnings(self) -> int:
+        return self._warnings

primitive/agent/runner.py

@@ -4,6 +4,7 @@ import typing
 from pathlib import Path, PurePath
 from time import sleep
 from typing import Dict, Iterable, List, Optional, TypedDict, Callable
+from enum import IntEnum
 
 import yaml
 from loguru import logger
@@ -39,22 +40,29 @@ class JobDescription(TypedDict):
     steps: List[JobStep]
 
 
+# NOTE This must match FailureLevel subclass in JobSettings model
+class FailureLevel(IntEnum):
+    ERROR = 1
+    WARNING = 2
+
+
 class AgentRunner:
     def __init__(
         self,
         primitive: "primitive.client.Primitive",
         source_dir: Path,
-        job_id: str,
-        job_slug: str,
+        job_run: Dict,
         max_log_size: int = 10 * 1024 * 1024,
         log_to_file: bool = True,
     ) -> None:
         self.primitive = primitive
         self.source_dir = source_dir
         self.workdir = "."
-        self.job_id = job_id
-        self.job_slug = job_slug
+        self.job_id = job_run["id"]
+        self.job_slug = job_run["job"]["slug"]
         self.max_log_size = max_log_size
+        self.parse_logs = job_run["jobSettings"]["parseLogs"]
+        self.failure_level = job_run["jobSettings"]["failureLevel"]
         self.log_to_file = log_to_file
 
         # Enable and configure logger
@@ -140,7 +148,8 @@ class AgentRunner:
                 logger.error(f"{self.job_slug} concluded with error(s)")
                 return
 
-        total_job_errors = 0
+        fail_level_detected = False
+        total_parsed_levels = {FailureLevel.ERROR: 0, FailureLevel.WARNING: 0}
         for step in self.steps():
             logger.info(f"Beginning step {step['name']}")
 
@@ -183,7 +192,16 @@ class AgentRunner:
                 status_thread.start()
 
                 returncode = proc.wait()
-                total_job_errors += proc.errors
+
+                if proc.errors > 0 and self.failure_level >= FailureLevel.ERROR:
+                    fail_level_detected = True
+
+                if proc.warnings > 0 and self.failure_level >= FailureLevel.WARNING:
+                    fail_level_detected = True
+
+                total_parsed_levels[FailureLevel.ERROR] += proc.errors
+                total_parsed_levels[FailureLevel.WARNING] += proc.warnings
+
                 status_thread.join()
 
             self.collect_artifacts(step)
@@ -195,11 +213,18 @@ class AgentRunner:
                 logger.error(f"{self.job_slug} concluded with error(s)")
                 return
 
-        if total_job_errors > 0:
+        if fail_level_detected and self.parse_logs:
             self.primitive.jobs.job_run_update(
                 self.job_id, status="request_completed", conclusion="failure"
             )
-            logger.error(f"{self.job_slug} concluded with error(s)")
+
+            logger.error(
+                (
+                    f"{self.job_slug} concluded"
+                    f" with {total_parsed_levels[FailureLevel.ERROR]} error(s)"
+                    f" and {total_parsed_levels[FailureLevel.WARNING]} warning(s)"
+                )
+            )
             return
 
         self.primitive.jobs.job_run_update(

primitive/jobs/graphql/fragments.py

@@ -30,6 +30,8 @@ fragment JobRunFragment on JobRun {
   jobSettings {
     containerArgs
     rootDirectory
+    parseLogs
+    failureLevel
   }
   gitCommit {
     sha

{primitive-0.1.78.dist-info → primitive-0.1.80.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.1.78
+Version: 0.1.80
 Project-URL: Documentation, https://github.com//primitivecorp/primitive-cli#readme
 Project-URL: Issues, https://github.com//primitivecorp/primitive-cli/issues
 Project-URL: Source, https://github.com//primitivecorp/primitive-cli

{primitive-0.1.78.dist-info → primitive-0.1.80.dist-info}/RECORD

@@ -1,13 +1,13 @@
-primitive/__about__.py,sha256=8gbR_hS2TXmTT8fMyHO_YgVOC1s2J-DqRmh7UU5Z5dU,130
+primitive/__about__.py,sha256=MuDJ1utcALDmUQcdbvjxA6n2_Yo25uRsjxiWT-AdSTo,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=CiI60bG3UZyNFuLTpchr0KeJRG5SALj455Ob11CegGE,2412
 primitive/client.py,sha256=PPyIQRvKKSqCF9RRF5mJJ4Vqqolpzy1YXqffNLKIvAA,2390
 primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/agent/actions.py,sha256=Hosy2o2FntfBtcNqqHuMFq9dm99EVfySy0v2JGeufvc,6474
+primitive/agent/actions.py,sha256=YUlpi4VCQQTMpoNwDg9meW4liWtdzXCweEm9gD8MXYw,6408
 primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,254
-primitive/agent/process.py,sha256=4dpuO4cZg_SYi0kCoZJrm-ugB_mAnxYWaNbIyUHkoII,3395
+primitive/agent/process.py,sha256=32eoj0W1-LG-9xxeHia-jk9jTah1cnmjCYnvczgXYGU,3538
 primitive/agent/provision.py,sha256=rmwnro1K5F8mwtd45XAq7RVQmpDWnbBCQ8X_qgWhm3M,1546
-primitive/agent/runner.py,sha256=rJq-UE1ONc2uMdymxAes72q9kiSQPESvOOfgpSxXEIg,8199
+primitive/agent/runner.py,sha256=2xGv_Lcr536RjJySC4fX8MxAb4yF8IywHC047VKAfuM,9168
 primitive/agent/uploader.py,sha256=OkgwXhWKoECOJnW_ZmpzmUS_cpb-orC_uebNcmf5byw,2948
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=MPsG9LcKcOPwA7gZ9Ewk0PZJhTQvIrGfODdz4GxSzgA,999
@@ -50,7 +50,7 @@ primitive/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/jobs/actions.py,sha256=CtyO-Z9614TgIoXJJX1QGsoll0fgpBIjG9PJH5JwCQs,4901
 primitive/jobs/commands.py,sha256=MxPCkBEYW_eLNqgCRYeyj7ZcLOFAWfpVZlqDR2Y_S0o,830
 primitive/jobs/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/jobs/graphql/fragments.py,sha256=xtT168P-ChEj3UhSXxFiYPgYuMDyey9bXYkk-TtM3a4,542
+primitive/jobs/graphql/fragments.py,sha256=GZ_rVc_pc3MfC8EhCY_X9rjeNUdiwEytdqrknHYWO-E,573
 primitive/jobs/graphql/mutations.py,sha256=8ASvCmwQh7cMeeiykOdYaYVryG8FRIuVF6v_J8JJZuw,219
 primitive/jobs/graphql/queries.py,sha256=BrU_GnLjK0bTAmWsLSmGEUea7EM8MqTKxN1Qp6sSjwc,1597
 primitive/organizations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -90,8 +90,8 @@ primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIU
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=j7E1YwgNWw57dFHVfEbqRNVcPHX0xDefX2vFSNgeI_8,1648
 primitive/utils/verible.py,sha256=Zb5NUISvcaIgEvgCDBWr-GCoceMa79Tcwvr5Wl9lfnA,2252
-primitive-0.1.78.dist-info/METADATA,sha256=Lg0DHnkK_9k1gZyRk-BfxOf_Vu6EfgLkBarZTAyiGww,3642
-primitive-0.1.78.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.1.78.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.78.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.78.dist-info/RECORD,,
+primitive-0.1.80.dist-info/METADATA,sha256=_o8ysAq3wRYyuzFNeawg8t3UodjR21Pc9xZBksVPxWI,3642
+primitive-0.1.80.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.1.80.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.80.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.80.dist-info/RECORD,,