primitive 0.2.28__tar.gz → 0.2.30__tar.gz

{primitive-0.2.28 → primitive-0.2.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.28
+Version: 0.2.30
 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.28 → primitive-0.2.30}/src/primitive/__about__.py

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

{primitive-0.2.28 → primitive-0.2.30}/src/primitive/agent/actions.py

@@ -6,8 +6,8 @@ from loguru import logger
 from primitive.__about__ import __version__
 from primitive.agent.runner import Runner
 from primitive.agent.uploader import Uploader
-from primitive.db import sqlite
 from primitive.db.models import JobRun
+from primitive.db.sqlite import wait_for_db
 from primitive.utils.actions import BaseAction
 
 
@@ -27,7 +27,7 @@ class Agent(BaseAction):
         logger.info(f"Version: {__version__}")
 
         # Wait for monitor to make database
-        sqlite.wait_for_db()
+        wait_for_db()
 
         # Create uploader
         uploader = Uploader(primitive=self.primitive)

{primitive-0.2.28 → primitive-0.2.30}/src/primitive/db/sqlite.py

@@ -2,7 +2,7 @@ from pathlib import Path
 from time import sleep
 
 from loguru import logger
-from sqlalchemy import Engine, create_engine
+from sqlalchemy import Engine, create_engine, inspect
 from sqlalchemy.orm import Session as SQLAlchemySession
 
 from primitive.db.base import Base
@@ -39,15 +39,28 @@ def wait_for_db() -> None:
         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..."
+        message = f"SQLite database was not created after {max_tries} tries. Exiting..."
+        logger.error(message)
+        raise RuntimeError(message)
+
+    # check if table exists
+    max_tries = 60
+    current_try = 1
+    while not inspect(engine()).has_table("JobRun") and current_try <= max_tries:
+        logger.error("SQLite database is not ready.")
+        sleep(1)
+        current_try += 1
+        continue
+    if current_try > max_tries:
+        message = (
+            f"Database tables were not created after {max_tries} tries. Exiting..."
         )
-        raise RuntimeError("SQLite database was not created.")
+        logger.error(message)
+        raise RuntimeError(message)
     logger.debug("SQLite database is ready.")
 
 

{primitive-0.2.28 → primitive-0.2.30}/src/primitive/monitor/actions.py

@@ -6,8 +6,8 @@ import psutil
 from loguru import logger
 
 from primitive.__about__ import __version__
-from primitive.db import sqlite
 from primitive.db.models import JobRun
+from primitive.db.sqlite import init, wait_for_db
 from primitive.utils.actions import BaseAction
 from primitive.utils.exceptions import P_CLI_100
 
@@ -45,7 +45,8 @@ class Monitor(BaseAction):
                 sys.exit(1)
 
         # Initialize the database
-        sqlite.init()
+        init()
+        wait_for_db()
 
         try:
             if job_run_id is not None:
@@ -61,6 +62,22 @@ class Monitor(BaseAction):
                 # FIRST, check for jobs in the database that are running
                 db_job_runs = JobRun.objects.all()
                 for job_run in db_job_runs:
+                    # first check if the job run completed already
+                    status = self.primitive.jobs.get_job_status(job_run.job_run_id)
+                    if status is None or status.data is None:
+                        logger.error(
+                            f"Error fetching status of <JobRun {job_run.job_run_id}>."
+                        )
+                        continue
+
+                    status_value = status.data["jobRun"]["status"]
+                    if status_value == "completed":
+                        logger.debug(
+                            f"Job run {job_run.job_run_id} is completed. Removing from database."
+                        )
+                        JobRun.objects.filter_by(job_run_id=job_run.job_run_id).delete()
+                        continue
+
                     if job_run.pid is None:
                         pid_sleep_amount = 0.1
                         logger.debug(