primitive 0.1.56__py3-none-any.whl → 0.1.58__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.56"
+__version__ = "0.1.58"

primitive/agent/actions.py

@@ -119,18 +119,23 @@ class Agent(BaseAction):
                         job_run["jobSettings"]["rootDirectory"]
                     )
 
-                    runner = AgentRunner(
-                        primitive=self.primitive,
-                        source_dir=source_dir,
-                        job_id=job_run["id"],
-                        job_slug=job_run["job"]["slug"],
-                    )
-
-                    # Execute job
-                    runner.execute()
-
-                    # Clean up
-                    shutil.rmtree(path=downloaded_git_repository_dir)
+                    try:
+                        # Initialize Runner
+                        runner = AgentRunner(
+                            primitive=self.primitive,
+                            source_dir=source_dir,
+                            job_id=job_run["id"],
+                            job_slug=job_run["job"]["slug"],
+                        )
+                    except Exception as e:
+                        # Log Error
+                        logger.error(f"Error initializing agent runner: {e}")
+                    else:
+                        # Execute job
+                        runner.execute()
+                    finally:
+                        # Clean up
+                        shutil.rmtree(path=downloaded_git_repository_dir)
 
                 sleep(5)
         except KeyboardInterrupt:

primitive/agent/runner.py

@@ -1,5 +1,4 @@
 import yaml
-import sys
 import typing
 import os
 import threading
@@ -50,6 +49,7 @@ class AgentRunner:
     ) -> None:
         self.primitive = primitive
         self.source_dir = source_dir
+        self.workdir = "."
         self.job_id = job_id
         self.job_slug = job_slug
         self.max_log_size = max_log_size
@@ -71,7 +71,8 @@ class AgentRunner:
             logger.error(
                 f"Found two job descriptions with the same slug: {self.job_slug}"
             )
-            sys.exit(1)
+            self.conclude(conclusion="failure")
+            raise FileExistsError
 
         if yaml_file.exists():
             self.job = yaml.load(open(yaml_file, "r"), Loader=Loader)
@@ -81,7 +82,8 @@ class AgentRunner:
             logger.error(
                 f"No job description with matching slug '{self.job_slug}' found"
             )
-            sys.exit(1)
+            self.conclude(conclusion="failure")
+            raise FileNotFoundError
 
         logger.info(f"Found job description for {self.job_slug}")
 
@@ -111,10 +113,14 @@ class AgentRunner:
         for step in self.steps():
             logger.info(f"Beginning step {step['name']}")
 
+            # Update workdir
+            if "workdir" in step:
+                self.workdir = step["workdir"]
+
             # Define step proc
             proc = Process(
                 cmd=step["cmd"],
-                workdir=Path(self.source_dir / step["workdir"]),
+                workdir=Path(self.source_dir / self.workdir),
                 env=environment,
             )
 

{primitive-0.1.56.dist-info → primitive-0.1.58.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: primitive
-Version: 0.1.56
+Version: 0.1.58
 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.56.dist-info → primitive-0.1.58.dist-info}/RECORD

@@ -1,12 +1,12 @@
-primitive/__about__.py,sha256=G8f_XIhSuZl81EImSEsDRejrLptiz_CliMVlAJcUxdY,130
+primitive/__about__.py,sha256=S0YUSrE8kYLnnrDEf3Zg8iyjiV8CQb2jsfZ4uoquTtc,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=VQPSewC6ouGdEG9W1gllawGJTydpOY0Lzg7LURXcqQg,2374
 primitive/client.py,sha256=vSJkifx450czuLvu0f2o-viSCC0p2f1UicA-2P5cJAw,2188
-primitive/agent/actions.py,sha256=m1FGvtOHdrZRP-YC31bFoUj-ZunXlFFW4NnPH9Bpzc0,5499
+primitive/agent/actions.py,sha256=BnGHzh63R4ST_EqEB_hYEOzVwbzEaGKOZTaZo0vb6Vg,5818
 primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,254
 primitive/agent/process.py,sha256=2ZY3YoJHvoukrsCAZIt-AF2YKY4HEO5_jWji5K3W9fM,2267
 primitive/agent/provision.py,sha256=3EEzOV-ria6zf-pvfNddad1lzzd1QmfKInTIjmwX71Y,1673
-primitive/agent/runner.py,sha256=hDh6ip_Jb0EsvygrB7-GWVTOf-jN8E7H0RgCGOdQnPU,6634
+primitive/agent/runner.py,sha256=wkvXjXxD7dg0XeZIvatpI12RSifYzRYUIL9NX42oRus,6876
 primitive/agent/uploader.py,sha256=5ZxonvRlMGRVBYx3hPEaWiPio5lMPi_zhtxz64V5S-A,2379
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=2vZEC3LLAXj6eBBmt_2OEDEcBIb3uLkkNjgbZTIaQsY,1095
@@ -46,8 +46,8 @@ primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIU
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=-7UjQaBqSGHzEEyX8pNjeYFFP0P3lVnDV0OkgPz1qHU,1050
 primitive/utils/verible.py,sha256=r7c_hfqvL0UicMmIzK3Cy_BfZI1ZpcfBeLqKEWFWqJo,2252
-primitive-0.1.56.dist-info/METADATA,sha256=2IyWZdGzA3ZYaQUHQby350EkrKE339efkLSJa-bo_VA,3782
-primitive-0.1.56.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-primitive-0.1.56.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.56.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.56.dist-info/RECORD,,
+primitive-0.1.58.dist-info/METADATA,sha256=3QDuLyoZeKRlghEHBplLVLthic-a3o64edGzI3XHmzE,3782
+primitive-0.1.58.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+primitive-0.1.58.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.58.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.58.dist-info/RECORD,,