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

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/agent/runner.py

@@ -116,25 +116,17 @@ class Runner:
         )
 
         # Attempt to parse the job yaml file
-        logger.info(f"Scanning directory for job file {self.job['slug']}")
-        yaml_file = Path(self.source_dir / ".primitive" / f"{self.job['slug']}.yaml")
-        yml_file = Path(self.source_dir / ".primitive" / f"{self.job['slug']}.yml")
+        job_filename = self.job_settings["repositoryFilename"]
+        logger.info(f"Scanning directory for job file {job_filename}")
 
-        if yaml_file.exists() and yml_file.exists():
-            logger.error(
-                f"Found two job descriptions with the same slug: {self.job['slug']}"
-            )
-            raise FileExistsError
+        job_config_file = Path(self.source_dir / ".primitive" / job_filename)
 
-        if yaml_file.exists() or yml_file.exists():
+        if job_config_file.exists():
             logger.info(f"Found job description for {self.job['slug']}")
-            config_file = yaml_file if yaml_file.exists() else yml_file
-            self.config = yaml.load(open(config_file, "r"), Loader=Loader)[
-                self.job["name"]
-            ]
+            self.config = yaml.load(open(job_config_file, "r"), Loader=Loader)
         else:
             logger.error(
-                f"No job description with matching slug '{self.job['slug']}' found"
+                f"No job description with matching filename '{job_filename}' found"
             )
             raise FileNotFoundError
 

primitive/daemons/launch_agents.py

@@ -132,7 +132,7 @@ class LaunchAgent(Daemon):
     <key>ProgramArguments</key>
     <array>
         <string>{self.executable}</string>
-        <string>{self.command}</string>
+        {"".join([f"<string>{arg}</string>" for arg in self.command.split(" ") if arg.strip() != ""])}
     </array>
     <key>RunAtLoad</key>
     <true/>

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/jobs/graphql/fragments.py

@@ -34,6 +34,7 @@ fragment JobRunFragment on JobRun {
     parseLogs
     parseStderr
     failureLevel
+    repositoryFilename
   }
   gitCommit {
     sha

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:

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

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

@@ -1,11 +1,11 @@
-primitive/__about__.py,sha256=HaB4AohTz2I2snoLFoXHdHwP9yvCohtADZo1dibKpG4,130
+primitive/__about__.py,sha256=LH2fP6k1EgAIeykRYn1baGNEf_y6ro_QPuG8jugYJpo,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=5etkxo1ylmNlgFY3AELnVoTEZamhN-wCb8pdskA2mWM,3831
+primitive/agent/actions.py,sha256=HDktV5FwtD19Bieg653w-ZWp7dQHTOj7cQx0-Aiae84,3836
 primitive/agent/commands.py,sha256=cK7d3OcN5Z65gQWVZFQ-Y9ddw9Pes4f9OVBpeMsj5sE,255
-primitive/agent/runner.py,sha256=CoRyReO3jPV8B7vILVWdszFD4GVop7HsVEUo1hoRXjo,14556
+primitive/agent/runner.py,sha256=SGI_vcFfey-VUH3gQasVJRgzPeSLMlP6FBjSImJqbOA,14180
 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
@@ -15,12 +15,12 @@ primitive/auth/graphql/queries.py,sha256=jhrr_VFzHIn8vcVprMIzUx7V4kkWYdR6CKMKPoV
 primitive/daemons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/daemons/actions.py,sha256=dqhxgIDxiJlcN6xvkzgBerN215KvbBKKdWteRpT_ICs,2730
 primitive/daemons/commands.py,sha256=Xt4qFymNrDLdHJhRnEH_4Re-2xX6w1OT-chV9k7dFCs,2670
-primitive/daemons/launch_agents.py,sha256=5MFDacs_IZd6PCm4VRNq9dPEYIDivkydBzqex1ggkFY,7740
+primitive/daemons/launch_agents.py,sha256=cCxsvCBFmGlKOiBINsKi_NxcozLC8yPw3w6pxqnz-qI,7803
 primitive/daemons/launch_service.py,sha256=iuklHeuEqadlf8U1n9xFg4ZG1EKdK2jyaPI-VTlpJ4I,7907
 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=EJx80xPJ4PP2bso6qPaKys1-jfRTmYi_qYxPaFWM4iI,1679
+primitive/db/sqlite.py,sha256=ZtSi8Z0wiA5NEvgnP7udSwZnoUMLp0qMWfNZNC3htuI,2116
 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
@@ -54,10 +54,10 @@ primitive/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/jobs/actions.py,sha256=lOfmjzZ7XvqLyP0f-ilyfYwQQZuNgUb4qxFCpf1d93M,5076
 primitive/jobs/commands.py,sha256=MxPCkBEYW_eLNqgCRYeyj7ZcLOFAWfpVZlqDR2Y_S0o,830
 primitive/jobs/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/jobs/graphql/fragments.py,sha256=1_ZttT7dx36KDC3DClJz9M8LMpsPwXySBygHSiUEcGg,619
+primitive/jobs/graphql/fragments.py,sha256=pS6jXZ9yxvPKjKx50zpwzARJHYlg7NQLYCm1voiuCzI,642
 primitive/jobs/graphql/mutations.py,sha256=8ASvCmwQh7cMeeiykOdYaYVryG8FRIuVF6v_J8JJZuw,219
 primitive/jobs/graphql/queries.py,sha256=BrU_GnLjK0bTAmWsLSmGEUea7EM8MqTKxN1Qp6sSjwc,1597
-primitive/monitor/actions.py,sha256=tAeMMOzqdUl6_m6BW_YWEd72Tl9NnfTLPCZyOFR2GUs,10856
+primitive/monitor/actions.py,sha256=aYe5OfgCxhapXbcvz7vSlIMAcLOFRcAUWmdBZ8H7UWs,10889
 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.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,,
+primitive-0.2.31.dist-info/METADATA,sha256=jEXyjNe3Uv2BFG9MZAUt0Em4YMU950c4T_xUq26f7NY,3569
+primitive-0.2.31.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.31.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.31.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.31.dist-info/RECORD,,