primitive 0.2.50__py3-none-any.whl → 0.2.52__py3-none-any.whl

primitive/__about__.py

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

primitive/agent/actions.py

@@ -89,35 +89,49 @@ class Agent(BaseAction):
                 logger.debug(f"Job Run ID: {job_run_data.get('id')}")
                 logger.debug(f"Job Name: {job_run_data.get('job').get('name')}")
 
-                logger.info(
-                    f"Setting JobRun {job_run_data.get('job').get('name')} to request_in_progress"
-                )
+                job_run_status = job_run_data.get("status", None)
 
-                job_run_status = job_run_data.get("jobRun", {}).get("status", None)
-
-                while job_run_status != "in_progress":
-                    if job_run_status == "request_completed":
-                        logger.error(
-                            f"JobRun {job_run_data.get('name')} is already completed. Exiting."
-                        )
-                        if RUNNING_IN_CONTAINER:
-                            logger.info("Running in container, exiting after job run")
-                            return
-                    elif job_run_status == "pending":
+                while True:
+                    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(
+                        logger.info(
+                            f"Setting JobRun {job_run_data.get('id')} to request_in_progress."
+                        )
+                        # get the status back from the job run update, this should be 'in progress'
+                        job_run_update_result = self.primitive.jobs.job_run_update(
                             id=job_run_id, status="request_in_progress"
                         )
+                        job_run_update_data = job_run_update_result.data
+                        if job_run_update_data is not None:
+                            # if the job_run_status is not in "in_progress", short circuit
+                            job_run_status = job_run_update_data.get(
+                                "jobRunUpdate", {}
+                            ).get("status", None)
+                    if job_run_status == "in_progress":
+                        logger.info(f"JobRun {job_run_data.get('id')} in progress.")
+                        break
+                    if (
+                        job_run_status == "request_completed"
+                        or job_run_status == "completed"
+                    ):
+                        logger.error(
+                            f"JobRun {job_run_data.get('name')} is already completed with conclusion {job_run_data.get('jobRun', {}).get('conclusion', 'unknown')}. Exiting."
+                        )
+                        if RUNNING_IN_CONTAINER:
+                            logger.info("Running in container, exiting after job run")
+                            break
+
                     logger.info(
-                        f"Waiting for JobRun {job_run_data.get('name')} to be in_progress. Current status: {job_run_status}"
+                        f"Waiting for JobRun {job_run_data.get('id')} 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)
 
+                    sleep(1)
+
                 try:
                     runner = Runner(
                         primitive=self.primitive,

primitive/monitor/actions.py

@@ -67,6 +67,7 @@ class Monitor(BaseAction):
                 # handles cleanup of old reservations
                 # obtains an active JobRun's ID
                 if not RUNNING_IN_CONTAINER:
+                    self.primitive.hardware.check_in_http(is_online=True)
                     hardware = self.primitive.hardware.get_own_hardware_details()
                     # fetch the latest hardware and activeReservation details
                     if active_reservation_data := hardware["activeReservation"]:

{primitive-0.2.50.dist-info → primitive-0.2.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.50
+Version: 0.2.52
 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.50.dist-info → primitive-0.2.52.dist-info}/RECORD

@@ -1,9 +1,9 @@
-primitive/__about__.py,sha256=pVgRtP9euIj2aqbCG6NFCty_F3aeISv6t3lLrnVIYEo,130
+primitive/__about__.py,sha256=UtAiRLmZsc3f1bwn5K2VjhCbBzl-o3wVd6tEGPtrw_M,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=g7EtHI9MATAB0qQu5w-WzbXtxz_8zu8z5E7sETmMkKU,2509
 primitive/client.py,sha256=RMF46F89oK82gfZH6Bf0WZrhXPUu01pbieSO_Vcuoc4,3624
 primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/agent/actions.py,sha256=Ald56Lq8KOtQ0_eFm2TseKkEIa8RP3IClLNVyv9IL4E,7035
+primitive/agent/actions.py,sha256=5lWnhLX8pH972u9WBbgmx3zIUrHhB5KXON4ofPvh84Q,7871
 primitive/agent/commands.py,sha256=o847pK7v7EWQGG67tky6a33qtwoutX6LZrP2FIS_NOk,388
 primitive/agent/runner.py,sha256=deMLa4l758k-BeK7Up4LVeD9hXfmAf6o3jJh8OmURys,11315
 primitive/agent/uploader.py,sha256=ZzrzsajNBogwEC7mT6Ejy0h2Jd9axMYGzt9pbCvVMlk,3171
@@ -54,7 +54,7 @@ primitive/jobs/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 primitive/jobs/graphql/fragments.py,sha256=Ldhsc-NFHZGY8_1FjO2uZIdOL5UUGZjsldHea_GLJ_g,667
 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=nXa8UZT0dXVZma39KDnIpxHt3147xWpnflLIHGOQHpg,9558
+primitive/monitor/actions.py,sha256=vXj6JQC17qNjoVUkOhnvOWMjVIuNUH2jKys3k599Bj8,9632
 primitive/monitor/commands.py,sha256=VDlEL_Qpm_ysHxug7VpI0cVAZ0ny6AS91Y58D7F1zkU,409
 primitive/organizations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/organizations/actions.py,sha256=kVHOhG1oS2sI5p8uldSo5L-RUZsnG36eaulVuKLyZ-M,1863
@@ -95,8 +95,8 @@ primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,37
 primitive/utils/psutil.py,sha256=xa7ef435UL37jyjmUPbEqCO2ayQMpCs0HCrxVEvLcuM,763
 primitive/utils/shell.py,sha256=Z4zxmOaSyGCrS0D6I436iQci-ewHLt4UxVg1CD9Serc,2171
 primitive/utils/text.py,sha256=XiESMnlhjQ534xE2hMNf08WehE1SKaYFRNih0MmnK0k,829
-primitive-0.2.50.dist-info/METADATA,sha256=KcFa1iuH5VN3jpBUJD6-85Cnyka0p-cb8wLWmEr_JnQ,3513
-primitive-0.2.50.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.2.50.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.2.50.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.2.50.dist-info/RECORD,,
+primitive-0.2.52.dist-info/METADATA,sha256=mDQ41sAqkHcxC1iAP4_9lXskUln2QrHVZllTW1HXoII,3513
+primitive-0.2.52.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.52.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.52.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.52.dist-info/RECORD,,