primitive 0.2.25__py3-none-any.whl → 0.2.26__py3-none-any.whl

primitive/__about__.py

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

primitive/monitor/actions.py

@@ -1,5 +1,6 @@
 import sys
 from time import sleep
+from typing import Optional
 
 import psutil
 from loguru import logger
@@ -12,7 +13,7 @@ from primitive.utils.exceptions import P_CLI_100
 
 
 class Monitor(BaseAction):
-    def start(self):
+    def start(self, job_run_id: Optional[str] = None):
         logger.remove()
         logger.add(
             sink=sys.stderr,
@@ -24,21 +25,33 @@ class Monitor(BaseAction):
         logger.info("[*] primitive monitor")
         logger.info(f"[*] Version: {__version__}")
 
-        try:
-            # hey stupid:
-            # do not set is_available to True here, it will mess up the reservation logic
-            # only set is_available after we've checked that no active reservation is present
-            # setting is_available of the parent also effects the children,
-            # which may have active reservations as well
-            self.primitive.hardware.check_in_http(is_online=True)
-        except Exception as exception:
-            logger.exception(f"Error checking in hardware: {exception}")
-            sys.exit(1)
+        # TODO: tighten logic for determining if we're running in a container
+        RUNNING_IN_CONTAINER = False
+        if job_run_id is not None:
+            logger.info("[*] Running in container...")
+            RUNNING_IN_CONTAINER = True
+
+        # can't check if if it is a container
+        if not RUNNING_IN_CONTAINER:
+            try:
+                # hey stupid:
+                # do not set is_available to True here, it will mess up the reservation logic
+                # only set is_available after we've checked that no active reservation is present
+                # setting is_available of the parent also effects the children,
+                # which may have active reservations as well
+                self.primitive.hardware.check_in_http(is_online=True)
+            except Exception as exception:
+                logger.exception(f"Error checking in hardware: {exception}")
+                sys.exit(1)
 
         # Initialize the database
         sqlite.init()
 
         try:
+            if job_run_id is not None:
+                JobRun.objects.create(job_run_id=job_run_id, pid=None)
+                logger.debug(f"Creating job run in database: {job_run_id}")
+
             active_reservation_id = None
             active_reservation_pk = None
 
@@ -95,6 +108,13 @@ class Monitor(BaseAction):
                         sleep(1)
                         continue
 
+                if RUNNING_IN_CONTAINER:
+                    # if we get here and we're running in a container,
+                    # it means the job run is complete and there is nothing left in the database
+                    # so we can exit
+                    logger.debug("Running in container, initial job complete.")
+                    sys.exit(0)
+
                 # Second, check for active reservations
                 hardware = self.primitive.hardware.get_own_hardware_details()
                 if hardware["activeReservation"]:
@@ -189,9 +209,10 @@ class Monitor(BaseAction):
         except KeyboardInterrupt:
             logger.info("[*] Stopping primitive monitor...")
             try:
-                self.primitive.hardware.check_in_http(
-                    is_available=False, is_online=False, stopping_agent=True
-                )
+                if not RUNNING_IN_CONTAINER:
+                    self.primitive.hardware.check_in_http(
+                        is_available=False, is_online=False, stopping_agent=True
+                    )
 
             except P_CLI_100 as exception:
                 logger.error("[*] Error stopping primitive monitor.")

primitive/monitor/commands.py

@@ -1,13 +1,15 @@
+from typing import TYPE_CHECKING, Optional
+
 import click
-import typing
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     from ..client import Primitive
 
 
 @click.command("monitor")
+@click.option("--job-run-id", type=str, help="Explicit Job Run to pull")
 @click.pass_context
-def cli(context):
+def cli(context, job_run_id: Optional[str] = None):
     """monitor"""
     primitive: Primitive = context.obj.get("PRIMITIVE")
-    primitive.monitor.start()
+    primitive.monitor.start(job_run_id=job_run_id)

{primitive-0.2.25.dist-info → primitive-0.2.26.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-primitive/__about__.py,sha256=emMCm4cHzvmdYDOL83iUzQz3eDl0L-1JkrP95MpoyT8,130
+primitive/__about__.py,sha256=oMpyVg2UpvXjSCtuQGv9QEUGqwIl1DtBLRAtQa5pBhE,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=g7EtHI9MATAB0qQu5w-WzbXtxz_8zu8z5E7sETmMkKU,2509
 primitive/client.py,sha256=h8WZVnQylVe0vbpuyC8YZHl2JyITSPC-1HbUcmrE5pc,3623
@@ -57,8 +57,8 @@ primitive/jobs/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 primitive/jobs/graphql/fragments.py,sha256=1_ZttT7dx36KDC3DClJz9M8LMpsPwXySBygHSiUEcGg,619
 primitive/jobs/graphql/mutations.py,sha256=8ASvCmwQh7cMeeiykOdYaYVryG8FRIuVF6v_J8JJZuw,219
 primitive/jobs/graphql/queries.py,sha256=BrU_GnLjK0bTAmWsLSmGEUea7EM8MqTKxN1Qp6sSjwc,1597
-primitive/monitor/actions.py,sha256=GUQrwuan82pOJ5gI2FvQYzgDoP4fs28PdcI_fg_aXRs,8692
-primitive/monitor/commands.py,sha256=dZsD8WKGU4OYO_AlKawfeRNVTMN0xJ-DFRkmKTS464s,258
+primitive/monitor/actions.py,sha256=Fem8i-I1CZnLGNCHq8gKqURTHUtfmYEJ9h5zAv1wD18,9726
+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
 primitive/organizations/commands.py,sha256=_dwgVEJCqMa5VgB_7P1wLPFc0AuT1p9dtyR9JRr4kpw,487
@@ -96,8 +96,8 @@ primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIU
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=jWzb7ky7p987dJas6ZvarK3IJNZ5cwBXcryRWb9Uh6U,2072
 primitive/utils/text.py,sha256=XiESMnlhjQ534xE2hMNf08WehE1SKaYFRNih0MmnK0k,829
-primitive-0.2.25.dist-info/METADATA,sha256=KzAEz2pPIFN5lBO7_7jERQ7oIL1trv05Jjqdp8icC9w,3569
-primitive-0.2.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.2.25.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.2.25.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.2.25.dist-info/RECORD,,
+primitive-0.2.26.dist-info/METADATA,sha256=IJmRQR_Wu5dMULSvjr_n0Pp5CIFDMGlrixZAuxtVUJ0,3569
+primitive-0.2.26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.26.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.26.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.26.dist-info/RECORD,,