primitive 0.1.79__tar.gz → 0.1.80__tar.gz

{primitive-0.1.79 → primitive-0.1.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.1.79
+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.79 → primitive-0.1.80}/src/primitive/__about__.py

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

{primitive-0.1.79 → primitive-0.1.80}/src/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-0.1.79 → primitive-0.1.80}/src/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-0.1.79 → primitive-0.1.80}/src/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)
@@ -194,14 +212,20 @@ class AgentRunner:
                 )
                 logger.error(f"{self.job_slug} concluded with error(s)")
                 return
-        
-        # TODO: Remove this for now until we have a setting to enable log parsing
-        # if total_job_errors > 0:
-        #     self.primitive.jobs.job_run_update(
-        #         self.job_id, status="request_completed", conclusion="failure"
-        #     )
-        #     logger.error(f"{self.job_slug} concluded with error(s)")
-        #     return
+
+        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"
+                    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(
             self.job_id, status="request_completed", conclusion="success"

{primitive-0.1.79 → primitive-0.1.80}/src/primitive/jobs/graphql/fragments.py

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