primitive 0.2.52__py3-none-any.whl → 0.2.54__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.52"
+__version__ = "0.2.54"

primitive/agent/actions.py

@@ -118,56 +118,55 @@ class Agent(BaseAction):
                         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
+                        break
 
-                    logger.info(
-                        f"Waiting for JobRun {job_run_data.get('id')} to be in_progress. Current status: {job_run_status}"
-                    )
                     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,
-                        job_run=job_run_data,
-                    )
-                    runner.setup()
-                except Exception as exception:
-                    logger.exception(
-                        f"Exception while initializing runner: {exception}"
-                    )
-                    self.primitive.jobs.job_run_update(
-                        id=job_run_id,
-                        status="request_completed",
-                        conclusion="failure",
+                    logger.info(
+                        f"Waiting for JobRun {job_run_data.get('id')} to be in_progress. Current status: {job_run_status}"
                     )
-                    continue
+                    sleep(1)
 
-                try:
-                    runner.execute_job_run()
-                except Exception as exception:
-                    logger.exception(f"Exception while executing job: {exception}")
-                    self.primitive.jobs.job_run_update(
-                        id=job_run_id,
-                        status="request_completed",
-                        conclusion="failure",
-                    )
-                finally:
-                    runner.cleanup()
+                # the backend has said it's okay for the agent to run this job
+                if job_run_status == "in_progress":
+                    try:
+                        runner = Runner(
+                            primitive=self.primitive,
+                            job_run=job_run_data,
+                        )
+                        runner.setup()
+                    except Exception as exception:
+                        logger.exception(
+                            f"Exception while initializing runner: {exception}"
+                        )
+                        self.primitive.jobs.job_run_update(
+                            id=job_run_id,
+                            status="request_completed",
+                            conclusion="failure",
+                        )
+                        continue
+
+                    try:
+                        runner.execute_job_run()
+                    except Exception as exception:
+                        logger.exception(f"Exception while executing job: {exception}")
+                        self.primitive.jobs.job_run_update(
+                            id=job_run_id,
+                            status="request_completed",
+                            conclusion="failure",
+                        )
+                    finally:
+                        runner.cleanup()
 
-                    # NOTE: also run scan here to force upload of artifacts
-                    # This should probably eventually be another daemon?
-                    uploader.scan()
+                        # NOTE: also run scan here to force upload of artifacts
+                        # This should probably eventually be another daemon?
+                        uploader.scan()
 
-                if RUNNING_IN_CONTAINER:
-                    logger.info("Running in container, exiting after job run")
-                    break
+                    if RUNNING_IN_CONTAINER:
+                        logger.info("Running in container, exiting after job run")
+                        break
 
                 sleep(5)
         except KeyboardInterrupt:

primitive/agent/runner.py

@@ -242,8 +242,14 @@ class Runner:
             )
 
             try:
+                while process.pid is None:
+                    logger.debug(
+                        f"Waiting for process PID to be set for command {i + 1}/{len(commands)}: {cmd}"
+                    )
+                    await asyncio.sleep(1)
+                logger.debug(f"Process started with PID {process.pid} for command")
                 await self.primitive.jobs.ajob_run_update(
-                    self.job_run["id"],
+                    id=self.job_run["id"],
                     parent_pid=process.pid,
                 )
             except ValueError:

primitive/agent/uploader.py

@@ -46,22 +46,24 @@ class Uploader:
 
         for file in files:
             try:
-                result = self.primitive.files.upload_file_direct(
+                upload_file_result = self.primitive.files.upload_file_direct(
                     path=file,
                     key_prefix=str(PurePath(file).relative_to(cache.parent).parent),
                 )
-            except Exception as exception:
-                if "is empty" in str(exception):
-                    logger.warning(f"{file} is empty, skipping upload")
-                continue
 
-            upload_id = result.data["fileUpdate"]["id"]
+                if upload_file_result and upload_file_result.data is not None:
+                    upload_file_data = upload_file_result.data
+                    upload_id = upload_file_data.get("fileUpdate", {}).get("id")
 
-            if upload_id:
-                file_ids.append(upload_id)
-                continue
+                    if upload_id:
+                        file_ids.append(upload_id)
+                        continue
 
-            logger.error(f"Unable to upload file {file}")
+                logger.error(f"Unable to upload file {file}")
+            except Exception as exception:
+                if "is empty" in str(exception):
+                    logger.warning(f"{file} is empty, skipping upload")
+                    continue
 
         # Clean up job cache
         shutil.rmtree(path=cache)

primitive/monitor/actions.py

@@ -67,7 +67,6 @@ 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.52.dist-info → primitive-0.2.54.dist-info}/METADATA

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

@@ -1,12 +1,12 @@
-primitive/__about__.py,sha256=UtAiRLmZsc3f1bwn5K2VjhCbBzl-o3wVd6tEGPtrw_M,130
+primitive/__about__.py,sha256=3GVdNm566EatiamrqY12JpaMf-SbFWKLhamV3dQjvPE,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=5lWnhLX8pH972u9WBbgmx3zIUrHhB5KXON4ofPvh84Q,7871
+primitive/agent/actions.py,sha256=-vHuwZZv8tWfq5SSljr18tUJz3BbyodrfdXKZvvrWEM,7993
 primitive/agent/commands.py,sha256=o847pK7v7EWQGG67tky6a33qtwoutX6LZrP2FIS_NOk,388
-primitive/agent/runner.py,sha256=deMLa4l758k-BeK7Up4LVeD9hXfmAf6o3jJh8OmURys,11315
-primitive/agent/uploader.py,sha256=ZzrzsajNBogwEC7mT6Ejy0h2Jd9axMYGzt9pbCvVMlk,3171
+primitive/agent/runner.py,sha256=1ceYsEY1mYTLzvsm3vIT8UgohxyvEQZVrErFci5rcM0,11648
+primitive/agent/uploader.py,sha256=DT_Nzt5eOTm_uRcYKm1sjBBaQZzp5iNZ_uN5XktfQ30,3382
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=9NIEXJ1BNJutJs6AMMSjMN_ziONUAUhY_xHwojYJCLA,942
 primitive/auth/commands.py,sha256=Krm38ioduDJZw0OIrIcb6eR2X6iECiWX0JPAI-2HNxY,2352
@@ -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=vXj6JQC17qNjoVUkOhnvOWMjVIuNUH2jKys3k599Bj8,9632
+primitive/monitor/actions.py,sha256=nXa8UZT0dXVZma39KDnIpxHt3147xWpnflLIHGOQHpg,9558
 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.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,,
+primitive-0.2.54.dist-info/METADATA,sha256=TCd6axGqx7iJZeVaDAVzXrBrSzRRtaRgtqRDmcLjc6A,3513
+primitive-0.2.54.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.54.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.54.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.54.dist-info/RECORD,,