primitive 0.2.33__py3-none-any.whl → 0.2.35__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.2.33"
+__version__ = "0.2.35"

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/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/jobs/graphql/fragments.py

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

{primitive-0.2.33.dist-info → primitive-0.2.35.dist-info}/METADATA

@@ -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.dist-info → primitive-0.2.35.dist-info}/RECORD

@@ -1,11 +1,11 @@
-primitive/__about__.py,sha256=VgaNzMy13Zl_7Ph2LzRKGJY9WBIR3X3iXpy-0CtxYTQ,130
+primitive/__about__.py,sha256=hEyqfjOzciSUTNTdMBjYfDhPQ78HUi4rV_w9imBssec,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=g7EtHI9MATAB0qQu5w-WzbXtxz_8zu8z5E7sETmMkKU,2509
 primitive/client.py,sha256=h8WZVnQylVe0vbpuyC8YZHl2JyITSPC-1HbUcmrE5pc,3623
 primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/agent/actions.py,sha256=JLnHCtu0AgeHRZccCc2I39mziLixmj9EKtKeYmvBE7A,3700
+primitive/agent/actions.py,sha256=VHlNTw2M-T1MRajpIBu2weT8AsdDdYtlgbBnRBYYeco,3692
 primitive/agent/commands.py,sha256=cK7d3OcN5Z65gQWVZFQ-Y9ddw9Pes4f9OVBpeMsj5sE,255
-primitive/agent/runner.py,sha256=duF0iQCvf23ZOKRUk5e3yL2wQz9pr-XnpPijFqmb4uc,15143
+primitive/agent/runner.py,sha256=u1uEJiXUi2ps7wHFYo5iOW4WURo4ObnApUbzhsG-6AU,15784
 primitive/agent/uploader.py,sha256=ZzrzsajNBogwEC7mT6Ejy0h2Jd9axMYGzt9pbCvVMlk,3171
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=9NIEXJ1BNJutJs6AMMSjMN_ziONUAUhY_xHwojYJCLA,942
@@ -54,7 +54,7 @@ primitive/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/jobs/actions.py,sha256=Fx2cPc1x09nRasOVtjhPjNRJ-jNoi3RJhXqC3verD9s,5444
 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=pS6jXZ9yxvPKjKx50zpwzARJHYlg7NQLYCm1voiuCzI,642
+primitive/jobs/graphql/fragments.py,sha256=flBi4REkfPX3sao22McmjclK-lFsqiXQa21YKmTbxu8,653
 primitive/jobs/graphql/mutations.py,sha256=8ASvCmwQh7cMeeiykOdYaYVryG8FRIuVF6v_J8JJZuw,219
 primitive/jobs/graphql/queries.py,sha256=ZxNmm-WovytbggNuKRnwa0kc26T34_0yhqkoqx-2uj0,1736
 primitive/monitor/actions.py,sha256=aYe5OfgCxhapXbcvz7vSlIMAcLOFRcAUWmdBZ8H7UWs,10889
@@ -96,8 +96,8 @@ primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIU
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=Z4zxmOaSyGCrS0D6I436iQci-ewHLt4UxVg1CD9Serc,2171
 primitive/utils/text.py,sha256=XiESMnlhjQ534xE2hMNf08WehE1SKaYFRNih0MmnK0k,829
-primitive-0.2.33.dist-info/METADATA,sha256=d38zBbaz0OFTGWtf-ZmSEUSWJX1NgmWf3aotjjZkMA8,3569
-primitive-0.2.33.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.2.33.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.2.33.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.2.33.dist-info/RECORD,,
+primitive-0.2.35.dist-info/METADATA,sha256=PLtjAKPLgi5K7IkgS3mqqeroGABE4fnmDTnSLYZE0P4,3569
+primitive-0.2.35.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.35.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.35.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.35.dist-info/RECORD,,