primitive 0.1.20__py3-none-any.whl → 0.1.22__py3-none-any.whl

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/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/hardware/actions.py

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

primitive/jobs/actions.py

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

{primitive-0.1.20.dist-info → primitive-0.1.22.dist-info}/METADATA

@@ -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.dist-info → primitive-0.1.22.dist-info}/RECORD

@@ -1,8 +1,8 @@
-primitive/__about__.py,sha256=7eoCOvzu9H0d1p_Cn8tHVxRG_98gwgBZVH4ubq5VuRo,129
+primitive/__about__.py,sha256=GLbyQLa84sxg9eRnmnWkVVauDFJZS0FGa5ocDebd_3g,129
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=VQPSewC6ouGdEG9W1gllawGJTydpOY0Lzg7LURXcqQg,2374
 primitive/client.py,sha256=SFPG4H2wJao8euGdnYp-l7dk_fDpWeVn2aT2WNJUAqo,2370
-primitive/agent/actions.py,sha256=nFBF4BtuX41B-W4aRfsZ8IjZpLJm3PkHW17oK81_wXM,5328
+primitive/agent/actions.py,sha256=uTT3Ke95BTL9haAHFhPJPasZEDlqDuC2uEF03Omap7E,7020
 primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,254
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=N2bGcwXNsB89pzs66gF9A5_WzUScY5fhfOyWixqo2y8,1054
@@ -18,9 +18,9 @@ primitive/git/actions.py,sha256=fepcl5529w_hsaC6fBw9f-QHeyqNjGXz8HI5ebzbZMs,1386
 primitive/git/commands.py,sha256=64B2STTOn0dwVDmJHqEwekmIqKMfSyBBFwKg29Wt8Aw,1230
 primitive/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/graphql/sdk.py,sha256=BhCGmDtc4sNnH8CxbQSJyFwOZ-ZSqMtjsxMB3JRBhPw,1456
-primitive/hardware/actions.py,sha256=Ea3_2E3F_3WapV60g_mOIcpXhadoknwihR7slXyUWtk,18840
+primitive/hardware/actions.py,sha256=JJXEeW35QzVGcLN4ym5gYZwY71hxLzM1GYPXWaObEts,18893
 primitive/hardware/commands.py,sha256=QE7LLeFdfOqlvz3JwdwJJRZAY3fHI1zB9kYmmDajpq0,1477
-primitive/jobs/actions.py,sha256=Bs7bpS6J-RItjuZtk6m89Lbb-MFzBotrzli657J4m-A,7700
+primitive/jobs/actions.py,sha256=1Mc-bg4nCd5qiKC-hPODveTPZwwo0Kztl5BuidLr-Sc,7718
 primitive/jobs/commands.py,sha256=MxPCkBEYW_eLNqgCRYeyj7ZcLOFAWfpVZlqDR2Y_S0o,830
 primitive/lint/actions.py,sha256=fGnNlcD_B-E0SvRUTvTdSlTm2kCQUTrlBLB0mt1sXKM,2268
 primitive/lint/commands.py,sha256=3CZvkOEMpJspJWmaQzA5bpPKx0_VCijQIXA9l-eTnZE,487
@@ -41,8 +41,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=QYczN1IvxODfj4jeq0nqjFuF0Oi0Zdx-Q32ySOJgcw8,2205
-primitive-0.1.20.dist-info/METADATA,sha256=uWAq11mVwGfTB8nCQAzyM0AHnhdwdfE1_kny1KxJ-nw,1818
-primitive-0.1.20.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-primitive-0.1.20.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.20.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.20.dist-info/RECORD,,
+primitive-0.1.22.dist-info/METADATA,sha256=O1FnkxZf7VZ8cu575Na1xlA2-6z6esA-sqgWp-0sWtc,1818
+primitive-0.1.22.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+primitive-0.1.22.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.22.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.22.dist-info/RECORD,,