primitive 0.2.25__py3-none-any.whl → 0.2.27__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.27"

primitive/agent/actions.py

@@ -24,11 +24,11 @@ class Agent(BaseAction):
             diagnose=True,
             level="DEBUG" if self.primitive.DEBUG else "INFO",
         )
-        logger.info("[*] primitive agent")
-        logger.info(f"[*] Version: {__version__}")
+        logger.info("primitive agent")
+        logger.info(f"Version: {__version__}")
 
-        # Initialize the database
-        sqlite.init()
+        # Wait for monitor to make database
+        sqlite.wait_for_db()
 
         # Create uploader
         uploader = Uploader(primitive=self.primitive)
@@ -107,4 +107,4 @@ class Agent(BaseAction):
 
                 sleep(5)
         except KeyboardInterrupt:
-            logger.info("[*] Stopping primitive agent...")
+            logger.info("[agent] Stopping primitive agent...")

primitive/db/sqlite.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+from time import sleep
 
 from loguru import logger
 from sqlalchemy import Engine, create_engine
@@ -13,12 +14,12 @@ def init() -> None:
 
     # Drop DB existing database if it exists
     # if db_path.exists():
-    #     logger.warning(f"[*] Deleting existing SQLite database at {db_path}")
+    #     logger.warning(f"Deleting existing SQLite database at {db_path}")
     #     db_path.unlink()
     if db_path.exists():
         return
 
-    logger.info(f"[*] Initializing SQLite database at {db_path}")
+    logger.info(f"Initializing SQLite database at {db_path}")
     engine = create_engine(f"sqlite:///{db_path}", echo=False)
     Base.metadata.create_all(engine)
 
@@ -28,6 +29,28 @@ def engine() -> Engine:
     return create_engine(f"sqlite:///{db_path}", echo=False)
 
 
+def wait_for_db() -> None:
+    # Wait for the database to be created
+    db_path: Path = get_cache_dir() / "primitive.sqlite3"
+
+    max_tries = 60
+    current_try = 1
+    while not db_path.exists() and current_try <= max_tries:
+        logger.debug(
+            f"Waiting for SQLite database to be created... [{current_try} / {max_tries}]"
+        )
+        db_path.touch()
+        sleep(1)
+        current_try += 1
+        continue
+    if current_try > max_tries:
+        logger.error(
+            f"SQLite database was not created after {max_tries} tries. Exiting..."
+        )
+        raise RuntimeError("SQLite database was not created.")
+    logger.debug("SQLite database is ready.")
+
+
 def Session() -> SQLAlchemySession:
     from sqlalchemy.orm import sessionmaker
 

primitive/hardware/actions.py

@@ -366,11 +366,11 @@ class Hardware(BaseAction):
                 mutation, variable_values=variables, get_execution_result=True
             )
         except client_exceptions.ClientConnectorError as exception:
-            message = "[*] Failed to update hardware system info! "
+            message = "Failed to update hardware system info! "
             logger.exception(message)
             raise exception
 
-        message = "[*] Updated hardware system info successfully! "
+        message = "Updated hardware system info successfully! "
         logger.info(message)
 
         return result
@@ -432,7 +432,7 @@ class Hardware(BaseAction):
                     }
                 self.status_cache[fingerprint] = new_state.copy()
 
-                message = f"[*] Checked in successfully for {fingerprint}: "
+                message = f"Checked in successfully for {fingerprint}: "
                 is_new_status = False
                 for key, value in new_state.items():
                     if value != previous_status.get(key, None):
@@ -460,7 +460,7 @@ class Hardware(BaseAction):
             return result
         except client_exceptions.ClientConnectorError as exception:
             if not stopping_agent:
-                message = "[*] Failed to check in! "
+                message = "Failed to check in! "
                 logger.error(message)
                 raise exception
             else:

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,
@@ -21,24 +22,36 @@ class Monitor(BaseAction):
             diagnose=True,
             level="DEBUG" if self.primitive.DEBUG else "INFO",
         )
-        logger.info("[*] primitive monitor")
-        logger.info(f"[*] Version: {__version__}")
+        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"]:
@@ -187,13 +207,14 @@ class Monitor(BaseAction):
                     logger.debug(f"Creating job run in database: {job_run['id']}")
 
         except KeyboardInterrupt:
-            logger.info("[*] Stopping primitive monitor...")
+            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.")
+                logger.error("Error stopping primitive monitor.")
                 logger.error(str(exception))
             sys.exit()

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.27.dist-info}/METADATA

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

@@ -1,9 +1,9 @@
-primitive/__about__.py,sha256=emMCm4cHzvmdYDOL83iUzQz3eDl0L-1JkrP95MpoyT8,130
+primitive/__about__.py,sha256=DiY29pKV2K5D1JKr9jAi4jEELMktClhq9SkZurDA7L0,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=g7EtHI9MATAB0qQu5w-WzbXtxz_8zu8z5E7sETmMkKU,2509
 primitive/client.py,sha256=h8WZVnQylVe0vbpuyC8YZHl2JyITSPC-1HbUcmrE5pc,3623
 primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/agent/actions.py,sha256=PzFOgxuRrhbUGpUygnTZVru58Fv87GI8tgJYkZB1LjI,3773
+primitive/agent/actions.py,sha256=bTzEaMOs5kK8cnJw6VvrGeJNrXmu8rr_-2-87k8uNkg,3786
 primitive/agent/commands.py,sha256=cK7d3OcN5Z65gQWVZFQ-Y9ddw9Pes4f9OVBpeMsj5sE,255
 primitive/agent/runner.py,sha256=CoRyReO3jPV8B7vILVWdszFD4GVop7HsVEUo1hoRXjo,14556
 primitive/agent/uploader.py,sha256=ZzrzsajNBogwEC7mT6Ejy0h2Jd9axMYGzt9pbCvVMlk,3171
@@ -20,7 +20,7 @@ primitive/daemons/launch_service.py,sha256=iuklHeuEqadlf8U1n9xFg4ZG1EKdK2jyaPI-V
 primitive/daemons/ui.py,sha256=Af3OJWJ0jdGlb1nfA5yaGYdhBEqqpM8zP2U2vUQdCbw,1236
 primitive/db/base.py,sha256=mH7f2d_jiyxJSSx9Gk53QBXRa3LiKBsBjkFgvmtH1WA,83
 primitive/db/models.py,sha256=GfnJdAq4Tb68CI4BKAuJDZVqioGavveaAHbCPeLNngw,2840
-primitive/db/sqlite.py,sha256=3V9ZxbgME1ThfJp90MPLUxU8b9imgNZM5CHOnA-WkaQ,953
+primitive/db/sqlite.py,sha256=chX4ih_TCn1Y-jJn8WGOC2prqBUIpRUJrUwQ2KaYsko,1659
 primitive/exec/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/exec/actions.py,sha256=4d_TCjNDcVFoZ9Zw7ZuBa6hKMv2Xzm7_UX_8wcX1aSk,4124
 primitive/exec/commands.py,sha256=66LO2kkJC-ynNZQpUCXv4Ol15QoacdSZAHblePDcmLo,510
@@ -42,7 +42,7 @@ primitive/graphql/relay.py,sha256=bmij2AjdpURQ6GGVCxwWhauF-r_SxuAU2oJ4sDbLxpI,72
 primitive/graphql/sdk.py,sha256=KhVWDZms_eMBgt6ftSJitRALguagy-nmrj4IC2taeXY,1535
 primitive/graphql/utility_fragments.py,sha256=uIjwILC4QtWNyO5vu77VjQf_p0jvP3A9q_6zRq91zqs,303
 primitive/hardware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/hardware/actions.py,sha256=d5KwuSsceOhDH9rgOL7YTCpQPhqT2inRTiZnROtiDic,26076
+primitive/hardware/actions.py,sha256=qBMcCcgSf3XRe-ua1unf5M64J-Y8EelUQKysa8vje0s,26060
 primitive/hardware/android.py,sha256=tu7pBPxWFrIwb_mm5CEdFFf1_veNDOKjOCQg13i_Lh4,2758
 primitive/hardware/commands.py,sha256=NMliVHBZDl4UAvhmNEjrvN9KWPuqn87-d7eVb0ZqEYA,3752
 primitive/hardware/ui.py,sha256=12rucuZ2s-w5R4bKyxON5dEbrdDnVf5sbj3K_nbdo44,2473
@@ -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=kgXzj45B-mFZke06pOHdKJ4RTDo32_YRV5hMpS65Pjk,9706
+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.27.dist-info/METADATA,sha256=CaxlEEfLCa1XxJ6ydce8TLWbPShjNVzfrJgUxHn6PXo,3569
+primitive-0.2.27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.27.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.27.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.27.dist-info/RECORD,,