primitive 0.2.27__py3-none-any.whl → 0.2.29__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.27"
+__version__ = "0.2.29"

primitive/agent/actions.py

@@ -4,13 +4,12 @@ from time import sleep
 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.utils.actions import BaseAction
 
-from ..db import sqlite
-from ..db.models import JobRun
-from .runner import Runner
-from .uploader import Uploader
-
 
 class Agent(BaseAction):
     def execute(

primitive/db/sqlite.py

@@ -5,8 +5,8 @@ from loguru import logger
 from sqlalchemy import Engine, create_engine
 from sqlalchemy.orm import Session as SQLAlchemySession
 
-from ..utils.cache import get_cache_dir
-from .base import Base
+from primitive.db.base import Base
+from primitive.utils.cache import get_cache_dir
 
 
 def init() -> None:

primitive/monitor/actions.py

@@ -49,8 +49,10 @@ class Monitor(BaseAction):
 
         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}")
+                if not JobRun.objects.filter_by(job_run_id=job_run_id).exists():
+                    logger.debug(f"Job run {job_run_id} does not exist in database.")
+                    logger.debug(f"Creating job run in database: {job_run_id}")
+                    JobRun.objects.create(job_run_id=job_run_id, pid=None)
 
             active_reservation_id = None
             active_reservation_pk = None
@@ -59,6 +61,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(
@@ -68,6 +86,7 @@ class Monitor(BaseAction):
                             f"Sleeping {pid_sleep_amount} seconds before checking again..."
                         )
                         sleep(pid_sleep_amount)
+                        pid_sleep_amount += 0.1
                         continue
 
                     logger.debug(
@@ -109,11 +128,14 @@ class Monitor(BaseAction):
                         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)
+                    if len(db_job_runs) == 0:
+                        # 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)
+                    else:
+                        continue
 
                 # Second, check for active reservations
                 hardware = self.primitive.hardware.get_own_hardware_details()

{primitive-0.2.27.dist-info → primitive-0.2.29.dist-info}/METADATA

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

@@ -1,9 +1,9 @@
-primitive/__about__.py,sha256=DiY29pKV2K5D1JKr9jAi4jEELMktClhq9SkZurDA7L0,130
+primitive/__about__.py,sha256=HaB4AohTz2I2snoLFoXHdHwP9yvCohtADZo1dibKpG4,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=bTzEaMOs5kK8cnJw6VvrGeJNrXmu8rr_-2-87k8uNkg,3786
+primitive/agent/actions.py,sha256=5etkxo1ylmNlgFY3AELnVoTEZamhN-wCb8pdskA2mWM,3831
 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=chX4ih_TCn1Y-jJn8WGOC2prqBUIpRUJrUwQ2KaYsko,1659
+primitive/db/sqlite.py,sha256=EJx80xPJ4PP2bso6qPaKys1-jfRTmYi_qYxPaFWM4iI,1679
 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
@@ -57,7 +57,7 @@ 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=kgXzj45B-mFZke06pOHdKJ4RTDo32_YRV5hMpS65Pjk,9706
+primitive/monitor/actions.py,sha256=tAeMMOzqdUl6_m6BW_YWEd72Tl9NnfTLPCZyOFR2GUs,10856
 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
@@ -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.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,,
+primitive-0.2.29.dist-info/METADATA,sha256=0bHCQZiRhrgQn7R-xu4zx5Es_7B6wjSCugoAOynW1pI,3569
+primitive-0.2.29.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.29.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.29.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.29.dist-info/RECORD,,