primitive 0.2.48__py3-none-any.whl → 0.2.50__py3-none-any.whl

primitive/__about__.py

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

primitive/agent/runner.py

@@ -6,18 +6,12 @@ from enum import Enum, IntEnum
 from pathlib import Path, PurePath
 from typing import Dict, List, TypedDict
 
-import yaml
 from loguru import logger
 
 from primitive.utils.cache import get_artifacts_cache, get_logs_cache, get_sources_cache
 from primitive.utils.logging import fmt, log_context
 from primitive.utils.psutil import kill_process_and_children
 
-try:
-    from yaml import CLoader as Loader
-except ImportError:
-    from yaml import Loader
-
 if typing.TYPE_CHECKING:
     import primitive.client
 
@@ -60,7 +54,7 @@ class Runner:
         self.job = job_run["job"]
         self.job_run = job_run
         self.job_settings = job_run["jobSettings"]
-        self.config = None
+        self.config = job_run["jobSettings"]["config"]
         self.initial_env = {}
         self.modified_env = {}
         self.file_logger = None
@@ -100,22 +94,6 @@ class Runner:
             self.job_settings["rootDirectory"]
         )
 
-        job_filename = self.job_settings["repositoryFilename"]
-        logger.info(f"Scanning directory for job file {job_filename}")
-
-        job_config_file = Path(self.source_dir / ".primitive" / job_filename)
-
-        if job_config_file.exists():
-            logger.info(
-                f"Found job description for {self.job['slug']} at {job_config_file}"
-            )
-            self.config = yaml.load(open(job_config_file, "r"), Loader=Loader)
-        else:
-            logger.error(
-                f"No job description with matching filename '{job_filename}' found"
-            )
-            raise FileNotFoundError
-
         # Setup initial process environment
         self.initial_env = os.environ
         self.initial_env = {

primitive/monitor/actions.py

@@ -60,6 +60,8 @@ class Monitor(BaseAction):
             previous_reservation_id = None
             active_reservation_id = None
 
+            last_provisioned_reservation_id = None
+
             while True:
                 # this block determines if there is a reservation at all
                 # handles cleanup of old reservations
@@ -108,12 +110,11 @@ class Monitor(BaseAction):
                         )
                         job_run_id = job_run_data.get("id")
                         previous_reservation_id = None
+                        last_provisioned_reservation_id = None
 
                     # if we are on the new reservation
-                    elif (
-                        (previous_reservation_id is not None)
-                        and (active_reservation_id is not None)
-                        and (previous_reservation_id == active_reservation_id)
+                    elif (active_reservation_id is not None) and (
+                        last_provisioned_reservation_id != active_reservation_id
                     ):
                         logger.info(
                             f"Reason: {active_reservation_data.get('reason', '')}"
@@ -121,6 +122,7 @@ class Monitor(BaseAction):
                         self.primitive.provisioning.add_reservation_authorized_keys(
                             reservation_id=active_reservation_id
                         )
+                        last_provisioned_reservation_id = active_reservation_id
 
                     # we have an active reservation, check if we have JobRuns attached to it
                     if active_reservation_id is not None:

{primitive-0.2.48.dist-info → primitive-0.2.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.48
+Version: 0.2.50
 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
@@ -23,7 +23,6 @@ Requires-Dist: gql[all]
 Requires-Dist: loguru
 Requires-Dist: paramiko[invoke]
 Requires-Dist: psutil>=7.0.0
-Requires-Dist: pyyaml
 Requires-Dist: rich>=13.9.4
 Requires-Dist: speedtest-cli
 Description-Content-Type: text/markdown

{primitive-0.2.48.dist-info → primitive-0.2.50.dist-info}/RECORD

@@ -1,11 +1,11 @@
-primitive/__about__.py,sha256=bd7zqrhM-zA3yQP6j5b6PPQSsJvyGOYbK2kklQX6w44,130
+primitive/__about__.py,sha256=pVgRtP9euIj2aqbCG6NFCty_F3aeISv6t3lLrnVIYEo,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=g7EtHI9MATAB0qQu5w-WzbXtxz_8zu8z5E7sETmMkKU,2509
 primitive/client.py,sha256=RMF46F89oK82gfZH6Bf0WZrhXPUu01pbieSO_Vcuoc4,3624
 primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/agent/actions.py,sha256=Ald56Lq8KOtQ0_eFm2TseKkEIa8RP3IClLNVyv9IL4E,7035
 primitive/agent/commands.py,sha256=o847pK7v7EWQGG67tky6a33qtwoutX6LZrP2FIS_NOk,388
-primitive/agent/runner.py,sha256=MBMRv0gKkj9n2JKPie1hiHZvHUfTxEqM53-7o7yx8TY,12021
+primitive/agent/runner.py,sha256=deMLa4l758k-BeK7Up4LVeD9hXfmAf6o3jJh8OmURys,11315
 primitive/agent/uploader.py,sha256=ZzrzsajNBogwEC7mT6Ejy0h2Jd9axMYGzt9pbCvVMlk,3171
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=9NIEXJ1BNJutJs6AMMSjMN_ziONUAUhY_xHwojYJCLA,942
@@ -54,7 +54,7 @@ primitive/jobs/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 primitive/jobs/graphql/fragments.py,sha256=Ldhsc-NFHZGY8_1FjO2uZIdOL5UUGZjsldHea_GLJ_g,667
 primitive/jobs/graphql/mutations.py,sha256=8ASvCmwQh7cMeeiykOdYaYVryG8FRIuVF6v_J8JJZuw,219
 primitive/jobs/graphql/queries.py,sha256=ZxNmm-WovytbggNuKRnwa0kc26T34_0yhqkoqx-2uj0,1736
-primitive/monitor/actions.py,sha256=80adDYkXi8i1C6WCV1N75tFAMhEbRw2NBMobWoFwpbg,9447
+primitive/monitor/actions.py,sha256=nXa8UZT0dXVZma39KDnIpxHt3147xWpnflLIHGOQHpg,9558
 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
@@ -95,8 +95,8 @@ primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,37
 primitive/utils/psutil.py,sha256=xa7ef435UL37jyjmUPbEqCO2ayQMpCs0HCrxVEvLcuM,763
 primitive/utils/shell.py,sha256=Z4zxmOaSyGCrS0D6I436iQci-ewHLt4UxVg1CD9Serc,2171
 primitive/utils/text.py,sha256=XiESMnlhjQ534xE2hMNf08WehE1SKaYFRNih0MmnK0k,829
-primitive-0.2.48.dist-info/METADATA,sha256=P4J6B0qzIe8UFyYrv7Kw24wNFpJv3cxRgieyWuUR_lA,3535
-primitive-0.2.48.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.2.48.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.2.48.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.2.48.dist-info/RECORD,,
+primitive-0.2.50.dist-info/METADATA,sha256=KcFa1iuH5VN3jpBUJD6-85Cnyka0p-cb8wLWmEr_JnQ,3513
+primitive-0.2.50.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.50.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.50.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.50.dist-info/RECORD,,