primitive 0.2.22__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.22"
+__version__ = "0.2.26"

primitive/hardware/commands.py

@@ -1,13 +1,15 @@
-import typing
+from typing import TYPE_CHECKING, Optional
 
 import click
 
 from ..utils.printer import print_result
 from .ui import render_hardware_table
 
-if typing.TYPE_CHECKING:
+if TYPE_CHECKING:
     from ..client import Primitive
 
+from loguru import logger
+
 
 @click.group()
 @click.pass_context
@@ -26,11 +28,25 @@ def systeminfo_command(context):
 
 
 @cli.command("register")
+@click.option(
+    "--organization",
+    type=str,
+    help="Organization [slug] to register hardware with",
+)
 @click.pass_context
-def register_command(context):
+def register_command(context, organization: Optional[str] = None):
     """Register Hardware with Primitive"""
     primitive: Primitive = context.obj.get("PRIMITIVE")
-    result = primitive.hardware.register()
+
+    organization_id = None
+    if organization:
+        organization_data = primitive.organizations.get_organization(slug=organization)
+        organization_id = organization_data.get("id")
+
+    if not organization_id:
+        logger.info("Registering hardware with the default organization.")
+
+    result = primitive.hardware.register(organization_id=organization_id)
     color = "green" if result else "red"
     if result.data.get("registerHardware"):
         message = "Hardware registered successfully"

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

@@ -39,3 +39,31 @@ class Organizations(BaseAction):
         )
         organizations = [edge["node"] for edge in result.data["organizations"]["edges"]]
         return organizations
+
+    @guard
+    def get_organization(
+        self,
+        organization_id: Optional[str] = None,
+        slug: Optional[str] = None,
+    ):
+        query = gql(organizations_query)
+
+        filters = {}
+        if organization_id:
+            filters["organization"] = {"id": organization_id}
+        if slug:
+            filters["slug"] = {"exact": slug}
+
+        variables = {
+            "first": 1,
+            "filters": filters,
+            "order": {
+                "createdAt": "DESC",
+            },
+        }
+
+        result = self.primitive.session.execute(
+            query, variable_values=variables, get_execution_result=True
+        )
+        organizations = [edge["node"] for edge in result.data["organizations"]["edges"]]
+        return organizations[0]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.22
+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
@@ -22,7 +22,6 @@ Requires-Dist: click
 Requires-Dist: gql[all]
 Requires-Dist: loguru
 Requires-Dist: paramiko[invoke]
-Requires-Dist: primitive-pal==0.1.4
 Requires-Dist: psutil>=7.0.0
 Requires-Dist: pyyaml
 Requires-Dist: rich>=13.9.4

{primitive-0.2.22.dist-info → primitive-0.2.26.dist-info}/RECORD

@@ -1,4 +1,4 @@
-primitive/__about__.py,sha256=ywjcAnYCZQZHX2ntgK8cvx23rSS44olGihhJWtXvKaw,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
@@ -44,7 +44,7 @@ primitive/graphql/utility_fragments.py,sha256=uIjwILC4QtWNyO5vu77VjQf_p0jvP3A9q_
 primitive/hardware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/hardware/actions.py,sha256=d5KwuSsceOhDH9rgOL7YTCpQPhqT2inRTiZnROtiDic,26076
 primitive/hardware/android.py,sha256=tu7pBPxWFrIwb_mm5CEdFFf1_veNDOKjOCQg13i_Lh4,2758
-primitive/hardware/commands.py,sha256=ixMPhDOpsU-eONxmimqKVynus-Eaq2XPKEK017WM_rM,3229
+primitive/hardware/commands.py,sha256=NMliVHBZDl4UAvhmNEjrvN9KWPuqn87-d7eVb0ZqEYA,3752
 primitive/hardware/ui.py,sha256=12rucuZ2s-w5R4bKyxON5dEbrdDnVf5sbj3K_nbdo44,2473
 primitive/hardware/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/hardware/graphql/fragments.py,sha256=kI6qnTNjaEaUr-C6eD55COphtueVYbYOWZwN5EW_3qw,350
@@ -57,10 +57,10 @@ 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=Tgp_rox0jcvfhQ-LmcWc9vkPdeJu5Bk6U1rNuT9oDnw,1088
+primitive/organizations/actions.py,sha256=kVHOhG1oS2sI5p8uldSo5L-RUZsnG36eaulVuKLyZ-M,1863
 primitive/organizations/commands.py,sha256=_dwgVEJCqMa5VgB_7P1wLPFc0AuT1p9dtyR9JRr4kpw,487
 primitive/organizations/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/organizations/graphql/fragments.py,sha256=a1qKq4FZB5qze0XTo1fOUeGAscIasjn_Ig4gA2_vStY,142
@@ -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.22.dist-info/METADATA,sha256=GofUxo6eFljTu6xAmepzr8PsS3OlZcOaz-RLzyLgnxo,3605
-primitive-0.2.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.2.22.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.2.22.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.2.22.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,,