primitive 0.1.20__tar.gz → 0.1.22__tar.gz

{primitive-0.1.20 → primitive-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: primitive
-Version: 0.1.20
+Version: 0.1.22
 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.20 → primitive-0.1.22}/src/primitive/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Dylan Stein <dylan@steins.studio>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.1.20"
+__version__ = "0.1.22"

{primitive-0.1.20 → primitive-0.1.22}/src/primitive/agent/actions.py

@@ -21,15 +21,40 @@ class Agent(BaseAction):
             sys.exit(1)
 
         try:
+            active_reservation_id = None
+            active_reservation_pk = None
+
             while True:
                 hardware = self.primitive.hardware.get_own_hardware_details()
+                if hardware["activeReservation"]:
+                    if (
+                        hardware["activeReservation"]["id"] != active_reservation_id
+                        or hardware["activeReservation"]["pk"] != active_reservation_pk
+                    ):
+                        logger.warning("New reservation for this hardware.")
+                        active_reservation_id = hardware["activeReservation"]["id"]
+                        active_reservation_pk = hardware["activeReservation"]["pk"]
+                        logger.debug("Active Reservation:")
+                        logger.debug(f"Node ID: {active_reservation_id}")
+                        logger.debug(f"PK: {active_reservation_pk}")
+                else:
+                    if (
+                        hardware["activeReservation"] is None
+                        and active_reservation_id is not None
+                        and hardware["isAvailable"]
+                    ):
+                        logger.debug("Previous Reservation is Complete:")
+                        logger.debug(f"Node ID: {active_reservation_id}")
+                        logger.debug(f"PK: {active_reservation_pk}")
+                        active_reservation_id = None
+                        active_reservation_pk = None
 
-                active_reservation_id = None
-                if hardware.get("activeReservation"):
-                    active_reservation_id = hardware["activeReservation"]["id"]
                 if not active_reservation_id:
-                    logger.debug("No active reservation found")
-                    sleep(5)
+                    sleep_amount = 5
+                    logger.debug(
+                        f"No active reservation found... [sleeping {sleep_amount} seconds]"
+                    )
+                    sleep(sleep_amount)
                     continue
 
                 job_runs_data = self.primitive.jobs.get_job_runs(
@@ -40,6 +65,14 @@ class Agent(BaseAction):
                     edge["node"] for edge in job_runs_data["jobRuns"]["edges"]
                 ]
 
+                if not pending_job_runs:
+                    sleep_amount = 5
+                    logger.debug(
+                        f"Waiting for Job Runs... [sleeping {sleep_amount} seconds]"
+                    )
+                    sleep(sleep_amount)
+                    continue
+
                 for job_run in pending_job_runs:
                     logger.debug("Found pending Job Run")
                     logger.debug(f"Job Run ID: {job_run['id']}")
@@ -65,6 +98,14 @@ class Agent(BaseAction):
                         )
                     )
 
+                    source_dir = downloaded_git_repository_dir.joinpath(
+                        job_run["jobSettings"]["rootDirectory"]
+                    )
+
+                    cmd = ("make",)
+                    if containerArgs := job_run["jobSettings"]["containerArgs"]:
+                        cmd = tuple(containerArgs.split(" "))
+
                     match job_run["job"]["slug"]:
                         case "lint":
                             logger.debug("Executing Lint Job")
@@ -74,7 +115,7 @@ class Agent(BaseAction):
                             )
 
                             result, message = self.primitive.lint.execute(
-                                source=downloaded_git_repository_dir
+                                source=source_dir
                             )
                             if result:
                                 conclusion = "success"
@@ -95,17 +136,13 @@ class Agent(BaseAction):
                                 job_run["id"], status="request_in_progress"
                             )
 
-                            cmd = ("make",)
-                            if containerArgs := job_run["jobSettings"]["containerArgs"]:
-                                cmd = tuple(containerArgs.split(" "))
-
                             result, message = self.primitive.sim.execute(
-                                source=downloaded_git_repository_dir, cmd=cmd
+                                source=source_dir, cmd=cmd
                             )
 
                             # Attempt artifact collection
                             self.primitive.sim.collect_artifacts(
-                                source=downloaded_git_repository_dir,
+                                source=source_dir,
                                 job_run_id=job_run["id"],
                                 organization_id=job_run["organization"]["id"],
                             )

{primitive-0.1.20 → primitive-0.1.22}/src/primitive/hardware/actions.py

@@ -464,6 +464,10 @@ fragment HardwareFragment on Hardware {
   slug
   createdAt
   updatedAt
+  isAvailable
+  isOnline
+  isQuarantined
+  isHealthy
   capabilities {
     id
     pk

{primitive-0.1.20 → primitive-0.1.22}/src/primitive/jobs/actions.py

@@ -131,6 +131,7 @@ fragment JobRunFragment on JobRun {
   }
   jobSettings {
     containerArgs
+    rootDirectory
   }
   gitCommit {
     sha