primitive 0.2.22__tar.gz → 0.2.26__tar.gz

{primitive-0.2.22 → primitive-0.2.26}/PKG-INFO

@@ -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 → primitive-0.2.26}/pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
   "gql[all]",
   "loguru",
   "pyyaml",
-  "primitive-pal == 0.1.4",
+  # "primitive-pal == 0.1.4",
   "paramiko[invoke]",
   "speedtest-cli",
   "rich>=13.9.4",

{primitive-0.2.22 → primitive-0.2.26}/src/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-0.2.22 → primitive-0.2.26}/src/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-0.2.22 → primitive-0.2.26}/src/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-0.2.26/src/primitive/monitor/commands.py

@@ -0,0 +1,15 @@
+from typing import TYPE_CHECKING, Optional
+
+import click
+
+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, job_run_id: Optional[str] = None):
+    """monitor"""
+    primitive: Primitive = context.obj.get("PRIMITIVE")
+    primitive.monitor.start(job_run_id=job_run_id)

{primitive-0.2.22 → primitive-0.2.26}/src/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 → primitive-0.2.26}/uv.lock

@@ -846,7 +846,6 @@ dependencies = [
     { name = "gql", extra = ["all"] },
     { name = "loguru" },
     { name = "paramiko", extra = ["invoke"] },
-    { name = "primitive-pal" },
     { name = "psutil" },
     { name = "pyyaml" },
     { name = "rich" },
@@ -868,7 +867,6 @@ requires-dist = [
     { name = "gql", extras = ["all"] },
     { name = "loguru" },
     { name = "paramiko", extras = ["invoke"] },
-    { name = "primitive-pal", specifier = "==0.1.4" },
     { name = "psutil", specifier = ">=7.0.0" },
     { name = "pyyaml" },
     { name = "rich", specifier = ">=13.9.4" },
@@ -884,38 +882,6 @@ dev = [
     { name = "ruff" },
 ]
 
-[[package]]
-name = "primitive-pal"
-version = "0.1.4"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/4d/aa/ec3fa7ba0c007d4cb87c53fe2b200ee148772a949433b36c0f0f5cb637dd/primitive_pal-0.1.4.tar.gz", hash = "sha256:71372429a9f594f9f032789599e4d80790b5a118478a967f7a5e95f1b39966b0", size = 36244 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/3c/72/c40ad4cf49b37788ad93ec59e66064789b827d9c1f13841ef1d1b62bd6cc/primitive_pal-0.1.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:f179ddf100e413227a47fe109612a13a605745564eb961363f0cc346faf07229", size = 3086178 },
-    { url = "https://files.pythonhosted.org/packages/5a/b2/9433f6aa74a8f0b866975376c5ad46035b9846b26af85332b34bad311240/primitive_pal-0.1.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:73ec5d3128eb5a497e9033e7549a688b67986f0d0b8ed1bad546d89c561652a2", size = 2776898 },
-    { url = "https://files.pythonhosted.org/packages/30/4b/a1ecb322f5b6dbb7e4ce72d406e70de1920f411d9c3e2796874c4b33a6d9/primitive_pal-0.1.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:632b5d59b3aef2a43bed960878a01d45fff3389ec6541482636453b19dcc4ebc", size = 3201414 },
-    { url = "https://files.pythonhosted.org/packages/81/39/59dbf9206d4132cd735a99ad159c399df262db2b74ed2d2efaa4bd447c99/primitive_pal-0.1.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5294f03d80edc931ca5418b1e16854ac54ecc3007a0eca97c8b9585a9675fbe3", size = 3347102 },
-    { url = "https://files.pythonhosted.org/packages/96/06/e2148c3cd0c6d57bbdf2c99cb9d84a74a32a7e3ec283fe88ee854d181a74/primitive_pal-0.1.4-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8f1208d7de98dca18a8165293f3849f80087b3297b9f4e1e166aa7eea1161f27", size = 3526373 },
-    { url = "https://files.pythonhosted.org/packages/cf/84/f4e9138bd5be1eae3eadca256c73221055c9312d1277483497485d0ae99b/primitive_pal-0.1.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:87b938e42c61afee3391361bd33c4b91b3f0cb1b19453d55542232e647124ba3", size = 3423374 },
-    { url = "https://files.pythonhosted.org/packages/33/f8/a84d65748fd71d1947659a02d78fcef0887ea878df7cf7b57b6c3138a473/primitive_pal-0.1.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f034071a6e5df6b011a8bdf552fce13284b13e8b2e35974f38bb0aba1301f064", size = 3780519 },
-    { url = "https://files.pythonhosted.org/packages/9a/0d/95938ce84ad5c60737178c74bac62797e5f2eec8b3e61004e8783a079dd3/primitive_pal-0.1.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97139e90ffb69bf0a7cee8f1c8006616dc142ae2622512ff5b8a309cd03f1e7b", size = 3301957 },
-    { url = "https://files.pythonhosted.org/packages/c8/84/b46126ffd93df205785cb692b3a07661a289caebd5be19e3b8a9c1e83578/primitive_pal-0.1.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:710a4447da801d7dc131d1fafbacd3091f9dee2dddac7b041dbfd05b72492237", size = 3359015 },
-    { url = "https://files.pythonhosted.org/packages/d4/a8/666fd2b4634d7151fcdd24ffb02a4fd270ff853c95ee52783c118c3dda57/primitive_pal-0.1.4-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:8512eb412f11f1122af9e0d4de167fa8a53160bcf1b4da6a84078b6c7f9ecc82", size = 3597120 },
-    { url = "https://files.pythonhosted.org/packages/36/42/a83cff4b17c7a564b753eab2e6cf89e88276bb9ccadd63e2c7d6ae4e1945/primitive_pal-0.1.4-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:78776a42eb3f07a0d65673537977f77606c0b1036ea72ad97ece70f24ca163a7", size = 3564216 },
-    { url = "https://files.pythonhosted.org/packages/84/e9/b3b0abdf95cf6ea491d8c4ba093ac56ffc364b2aff5a3d51342bf9eb90ac/primitive_pal-0.1.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:3526f8fc6bb9bdff9bc5e29e31dcdb6b782c7b3badcd6fab18056cff82477b19", size = 3502739 },
-    { url = "https://files.pythonhosted.org/packages/d8/00/6d9de344b413c1c5171172095d847a580d92db701e850d0b3ce06570ac36/primitive_pal-0.1.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:58506e4fc158955f0a467583168d1d7a8c724f1b4fcce7f9cfab3e804e40dcdd", size = 3085998 },
-    { url = "https://files.pythonhosted.org/packages/52/c2/2e8e0ae4a0c02cfc9e64b4e48ac24e2ccaef9702707fe819af6f0e763cc6/primitive_pal-0.1.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:76656c02374592d10db4d47fd0d51174f1c628a59ab09bebe79dbd1f2d126cc4", size = 2776014 },
-    { url = "https://files.pythonhosted.org/packages/7f/0d/7afa6e64f8137f69ac268b9bff019bc25c4b674928c325ace6b4a74a7969/primitive_pal-0.1.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b52d9bc4e0e4c5beeb85b3acdef6fd4b8239fe38dba1f6a6378a18ce9c203e99", size = 3200906 },
-    { url = "https://files.pythonhosted.org/packages/23/71/0dbd4a09e55007e2683ad13e35accb94c34e2d6ecd8c33f03015f9d2a71d/primitive_pal-0.1.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c313cf6fbb18a724e8db3eb7e8e44b49ccebe930fb76f296939518f893569f83", size = 3347447 },
-    { url = "https://files.pythonhosted.org/packages/b9/97/67451c2bb4a4f80af9f8484d871a5cf4728ec2c6d59719c668653320270d/primitive_pal-0.1.4-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:af4a6138a564616414edc8d91fabdcf7a1162a8ae5dc4e21ae0865e70a5dba66", size = 3524468 },
-    { url = "https://files.pythonhosted.org/packages/60/a7/62ba6365c05265a328352fa7985737ca02cc69d011505bfa358bd2babfe4/primitive_pal-0.1.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:925bedbae08fa802512e6360e05f4de0f58e28869243afb76209e5c3e87c8739", size = 3420887 },
-    { url = "https://files.pythonhosted.org/packages/17/18/07e56ba349ebe0750af53b901c0119ca63e0ed1ede68f8ab764d6c6b1e89/primitive_pal-0.1.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3f3073b9f3bff10b2272c5322e5c988222604f749f1e0baade106c395a9e873e", size = 3779720 },
-    { url = "https://files.pythonhosted.org/packages/65/28/b21a093474177cd277426a3565febaabf2b78a0fc1e40a20b5ab3d405b49/primitive_pal-0.1.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:917943bda9e290ae6d8cbf4c5624d5a248258959f391ed9db2978b0afc96c098", size = 3303312 },
-    { url = "https://files.pythonhosted.org/packages/16/4a/de29c694c9749fc7481d7c48c24ee6a3b09e8f58c0749d4a7f4e259a699f/primitive_pal-0.1.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:cc3ef10b2a3fff99dd8c0346aac494e306be0aaa2a519b014ce083bb75e5e02d", size = 3358879 },
-    { url = "https://files.pythonhosted.org/packages/a5/e6/81497a288c67de326ffaf02f82c4f4bb5adf895fe0f98f2c61c1ac57c2f0/primitive_pal-0.1.4-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:67547efde9fb0e5af239add966c75489de1bd925b7176ba729a1b064cefab72c", size = 3597011 },
-    { url = "https://files.pythonhosted.org/packages/0a/75/821d17181f10d584b2c743f0edc7c2bd324ce953bc5d40392697356c0be6/primitive_pal-0.1.4-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:d1dc0db559824d0b8aefe421cb0960186efad54a6b62ce7e54d5fb26135203c0", size = 3562739 },
-    { url = "https://files.pythonhosted.org/packages/ce/3e/6d6ab1dd950c221b7a5e4a2dd1573f0e4d534ac5bdfd1729d281feb6ace2/primitive_pal-0.1.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9ca1a12b6b3e158273cbceaf33e28e3490d41421946f50efb2560245f00a4ec2", size = 3502645 },
-]
-
 [[package]]
 name = "prompt-toolkit"
 version = "3.0.51"

primitive-0.2.22/src/primitive/monitor/commands.py

@@ -1,13 +0,0 @@
-import click
-import typing
-
-if typing.TYPE_CHECKING:
-    from ..client import Primitive
-
-
-@click.command("monitor")
-@click.pass_context
-def cli(context):
-    """monitor"""
-    primitive: Primitive = context.obj.get("PRIMITIVE")
-    primitive.monitor.start()