primitive 0.2.42__tar.gz → 0.2.44__tar.gz

{primitive-0.2.42 → primitive-0.2.44}/PKG-INFO

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

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

{primitive-0.2.42 → primitive-0.2.44}/src/primitive/agent/actions.py

@@ -92,20 +92,24 @@ class Agent(BaseAction):
                 logger.info(
                     f"Setting JobRun {job_run_data.get('job').get('name')} to request_in_progress"
                 )
-                # we are setting to request_in_progress here which puts a started_at time on the JobRun in the API's database
-                # any time spent pulling Git repositories, setting up, etc, counts as compute time
-                job_run_result = self.primitive.jobs.job_run_update(
-                    id=job_run_id, status="request_in_progress"
-                )
 
-                while job_run_data["status"] != "in_progress":
+                job_run_status = job_run_data.get("jobRun", {}).get("status", None)
+
+                while job_run_status != "in_progress":
+                    if job_run_status == "pending":
+                        # we are setting to request_in_progress here which puts a started_at time on the JobRun in the API's database
+                        # any time spent pulling Git repositories, setting up, etc, counts as compute time
+                        self.primitive.jobs.job_run_update(
+                            id=job_run_id, status="request_in_progress"
+                        )
                     logger.info(
-                        f"Waiting for JobRun {job_run_data.get('name')} to be in_progress"
+                        f"Waiting for JobRun {job_run_data.get('name')} to be in_progress. Current status: {job_run_status}"
                     )
                     sleep(1)
                     job_run_result = self.primitive.jobs.get_job_run(id=job_run_id)
                     if job_run_result.data is not None:
                         job_run_data = job_run_result.data.get("jobRun", {})
+                        job_run_status = job_run_data.get("status", None)
 
                 runner = Runner(
                     primitive=self.primitive,

{primitive-0.2.42 → primitive-0.2.44}/src/primitive/hardware/graphql/fragments.py

@@ -24,6 +24,7 @@ fragment HardwareFragment on Hardware {
     pk
     status
     reservationNumber
+    reason
     createdBy {
       username
     }

{primitive-0.2.42 → primitive-0.2.44}/src/primitive/monitor/actions.py

@@ -115,6 +115,9 @@ class Monitor(BaseAction):
                         and (active_reservation_id is not None)
                         and (previous_reservation_id == active_reservation_id)
                     ):
+                        logger.info(
+                            f"Reason: {active_reservation_data.get('reason', '')}"
+                        )
                         self.primitive.provisioning.add_reservation_authorized_keys(
                             reservation_id=active_reservation_id
                         )
@@ -127,7 +130,7 @@ class Monitor(BaseAction):
                                 reservation_id=active_reservation_id
                             )
                         )
-                        job_run_id = job_run_data.get("id")
+                        job_run_id = job_run_data.get("id", None)
 
                     # Golden state for normal reservation
                     if not job_run_id and active_reservation_id:

{primitive-0.2.42 → primitive-0.2.44}/src/primitive/reservations/actions.py

@@ -189,14 +189,13 @@ class Reservations(BaseAction):
         )
 
         while job_runs_for_reservation is None or job_runs_for_reservation.data is None:
-            logger.error("Error fetching job runs.")
             sleep_amount = 5
             logger.info(f"Error fetching job runs... [sleeping {sleep_amount} seconds]")
             sleep(sleep_amount)
             continue
 
         if not job_runs_for_reservation.data["jobRuns"]["edges"]:
-            logger.error("No job runs found for the given reservation ID.")
+            logger.info("No job runs found for the given reservation ID.")
             return {}
 
         return job_runs_for_reservation.data["jobRuns"]["edges"][0]["node"]