primitive 0.2.33__tar.gz → 0.2.35__tar.gz

{primitive-0.2.33 → primitive-0.2.35}/PKG-INFO

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

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

{primitive-0.2.33 → primitive-0.2.35}/src/primitive/agent/actions.py

@@ -102,4 +102,4 @@ class Agent(BaseAction):
 
                 sleep(5)
         except KeyboardInterrupt:
-            logger.info("[agent] Stopping primitive agent...")
+            logger.info("Stopping primitive agent...")

{primitive-0.2.33 → primitive-0.2.35}/src/primitive/agent/runner.py

@@ -119,20 +119,27 @@ class Runner:
             self.job_settings["rootDirectory"]
         )
 
-        # Attempt to parse the job yaml file
-        job_filename = self.job_settings["repositoryFilename"]
-        logger.info(f"Scanning directory for job file {job_filename}")
+        db_config = self.job_settings.get("config", None)
+        if db_config:
+            logger.info(f"Using job config from database for {self.job['slug']}")
+            self.config = db_config
+        else:
+            # Attempt to parse the job yaml file
+            job_filename = self.job_settings["repositoryFilename"]
+            logger.info(f"Scanning directory for job file {job_filename}")
 
-        job_config_file = Path(self.source_dir / ".primitive" / job_filename)
+            job_config_file = Path(self.source_dir / ".primitive" / job_filename)
 
-        if job_config_file.exists():
-            logger.info(f"Found job description for {self.job['slug']}")
-            self.config = yaml.load(open(job_config_file, "r"), Loader=Loader)
-        else:
-            logger.error(
-                f"No job description with matching filename '{job_filename}' found"
-            )
-            raise FileNotFoundError
+            if job_config_file.exists():
+                logger.info(
+                    f"Found job description for {self.job['slug']} at {job_config_file}"
+                )
+                self.config = yaml.load(open(job_config_file, "r"), Loader=Loader)
+            else:
+                logger.error(
+                    f"No job description with matching filename '{job_filename}' found"
+                )
+                raise FileNotFoundError
 
         # Setup initial process environment
         self.initial_env = os.environ
@@ -254,7 +261,9 @@ class Runner:
         return number_of_files_produced
 
     async def run_task(self, task: Task) -> bool:
-        for cmd in task["cmd"].strip().split("\n"):
+        logger.info(f"Running step '{task['label']}'")
+        commands = task["cmd"].strip().split("\n")
+        for i, cmd in enumerate(commands):
             # Adding an additional echo and utilizing stdbuf to force line buffering
             # This ensures that the environment variables and starting delimiter are
             # always in a new chunk, vastly simplifying our parsing logic
@@ -264,6 +273,8 @@ class Runner:
                 f"{cmd} && echo -n '{ENV_VAR_LOOKUP_START}' && env && echo -n '{ENV_VAR_LOOKUP_END}'",
             ]
 
+            logger.info(f"Executing command {i + 1}/{len(commands)}: {cmd}")
+
             process = await asyncio.create_subprocess_exec(
                 *args,
                 env=self.modified_env,
@@ -287,6 +298,10 @@ class Runner:
 
             returncode = await process.wait()
 
+            logger.info(
+                f"Finished executing command {i + 1}/{len(commands)}: {cmd} with return code {returncode}"
+            )
+
             JobRun.objects.filter_by(job_run_id=self.job_run["id"]).update(
                 {"pid": None}
             )

{primitive-0.2.33 → primitive-0.2.35}/src/primitive/jobs/graphql/fragments.py

@@ -35,6 +35,7 @@ fragment JobRunFragment on JobRun {
     parseStderr
     failureLevel
     repositoryFilename
+    config
   }
   gitCommit {
     sha