primitive 0.1.76__py3-none-any.whl → 0.1.78__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.1.76"
+__version__ = "0.1.78"

primitive/agent/process.py

@@ -1,7 +1,11 @@
+from typing import List
+from pathlib import Path
 from subprocess import Popen, PIPE
 import shlex
+import glob
 import selectors
 from loguru import logger
+from abc import abstractmethod
 
 
 class Process:
@@ -11,7 +15,9 @@ class Process:
         env,
         workdir: str = ".",
     ):
-        self.cmd = shlex.split(cmd)
+        self.cmd = Process.expand_glob_in_cmd(
+            cmd_parts=shlex.split(cmd), workdir=workdir
+        )
         self.env = env
         self.workdir = workdir
         self.process = None
@@ -90,6 +96,24 @@ class Process:
         if self.process:
             self.process.kill()
 
+    @abstractmethod
+    def expand_glob_in_cmd(cmd_parts: List[str], workdir: Path):
+        # Characters that indicate a glob pattern
+        glob_chars = {"*", "?", "[", "]", "{", "}"}
+        expanded_cmd = []
+        for part in cmd_parts:
+            if any(c in part for c in glob_chars):
+                matches = glob.glob(str(workdir / part))
+                if matches:
+                    expanded_cmd.extend(
+                        [str(Path(match).relative_to(workdir)) for match in matches]
+                    )
+                else:
+                    expanded_cmd.append(part)
+            else:
+                expanded_cmd.append(part)
+        return expanded_cmd
+
     @property
     def errors(self) -> int:
         return self._errors

primitive/agent/runner.py

@@ -48,7 +48,6 @@ class AgentRunner:
         job_slug: str,
         max_log_size: int = 10 * 1024 * 1024,
         log_to_file: bool = True,
-        job: Optional[JobDescription] = None,
     ) -> None:
         self.primitive = primitive
         self.source_dir = source_dir
@@ -69,37 +68,33 @@ class AgentRunner:
                 format=AgentRunner.log_serializer(),
             )
 
-        # Attempt to load job from file
-        if not job:
-            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")
+        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")
 
-            if yaml_file.exists() and yml_file.exists():
-                logger.error(
-                    f"Found two job descriptions with the same slug: {self.job_slug}"
-                )
-                self.primitive.jobs.job_run_update(
-                    self.job_id, status="request_completed", conclusion="failure"
-                )
-                raise FileExistsError
-
-            if yaml_file.exists():
-                self.job = yaml.load(open(yaml_file, "r"), Loader=Loader)
-            elif yml_file.exists():
-                self.job = yaml.load(open(yml_file, "r"), Loader=Loader)
-            else:
-                logger.error(
-                    f"No job description with matching slug '{self.job_slug}' found"
-                )
-                self.primitive.jobs.job_run_update(
-                    self.job_id, status="request_completed", conclusion="failure"
-                )
-                raise FileNotFoundError
+        if yaml_file.exists() and yml_file.exists():
+            logger.error(
+                f"Found two job descriptions with the same slug: {self.job_slug}"
+            )
+            self.primitive.jobs.job_run_update(
+                self.job_id, status="request_completed", conclusion="failure"
+            )
+            raise FileExistsError
 
-            logger.info(f"Found job description for {self.job_slug}")
+        if yaml_file.exists():
+            self.job = yaml.load(open(yaml_file, "r"), Loader=Loader)
+        elif yml_file.exists():
+            self.job = yaml.load(open(yml_file, "r"), Loader=Loader)
         else:
-            self.job = job
+            logger.error(
+                f"No job description with matching slug '{self.job_slug}' found"
+            )
+            self.primitive.jobs.job_run_update(
+                self.job_id, status="request_completed", conclusion="failure"
+            )
+            raise FileNotFoundError
+
+        logger.info(f"Found job description for {self.job_slug}")
 
     @staticmethod
     def log_serializer() -> Callable:

{primitive-0.1.76.dist-info → primitive-0.1.78.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.1.76
+Version: 0.1.78
 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
@@ -98,19 +98,10 @@ git config --global user.name “<firstName lastName>”
 brew install make
 fish_add_path /opt/homebrew/opt/make/libexec/gnubin
 
-# install pyenv (python version manager)
-brew install pyenv
-set -Ux PYENV_ROOT $HOME/.pyenv
-fish_add_path $PYENV_ROOT/bin
-echo 'pyenv init - | source' >> ~/.config/fish/config.fish
-
-# install the latest version of python
-pyenv install 3.12.2
-pyenv global 3.12.2
-pip install --upgrade pip
-
 # install uv
-pip install uv
+curl -LsSf https://astral.sh/uv/install.sh | sh
+uv python install
+fish_add_path "$(uv python dir)/bin"
 ```
 
 ### Repository Setup

{primitive-0.1.76.dist-info → primitive-0.1.78.dist-info}/RECORD

@@ -1,13 +1,13 @@
-primitive/__about__.py,sha256=EYbYfJTot30aqVJWBENADheY8VcBhNRZTzkewjATzNc,130
+primitive/__about__.py,sha256=8gbR_hS2TXmTT8fMyHO_YgVOC1s2J-DqRmh7UU5Z5dU,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=CiI60bG3UZyNFuLTpchr0KeJRG5SALj455Ob11CegGE,2412
 primitive/client.py,sha256=PPyIQRvKKSqCF9RRF5mJJ4Vqqolpzy1YXqffNLKIvAA,2390
 primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/agent/actions.py,sha256=Hosy2o2FntfBtcNqqHuMFq9dm99EVfySy0v2JGeufvc,6474
 primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,254
-primitive/agent/process.py,sha256=7o8axjJ1OauKaFBL0jbZL9tGlZdZbDCXAdT5F-S_XQ8,2541
+primitive/agent/process.py,sha256=4dpuO4cZg_SYi0kCoZJrm-ugB_mAnxYWaNbIyUHkoII,3395
 primitive/agent/provision.py,sha256=rmwnro1K5F8mwtd45XAq7RVQmpDWnbBCQ8X_qgWhm3M,1546
-primitive/agent/runner.py,sha256=b2Rdm44-w_1_uMwODjrfMvb75n8vVmCTDsvaiiU7-d8,8442
+primitive/agent/runner.py,sha256=rJq-UE1ONc2uMdymxAes72q9kiSQPESvOOfgpSxXEIg,8199
 primitive/agent/uploader.py,sha256=OkgwXhWKoECOJnW_ZmpzmUS_cpb-orC_uebNcmf5byw,2948
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=MPsG9LcKcOPwA7gZ9Ewk0PZJhTQvIrGfODdz4GxSzgA,999
@@ -90,8 +90,8 @@ primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIU
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=j7E1YwgNWw57dFHVfEbqRNVcPHX0xDefX2vFSNgeI_8,1648
 primitive/utils/verible.py,sha256=Zb5NUISvcaIgEvgCDBWr-GCoceMa79Tcwvr5Wl9lfnA,2252
-primitive-0.1.76.dist-info/METADATA,sha256=zXs0TSPKi3K2exL-kdRFHNEWv1YVWd8MLg-xNLC4wxY,3843
-primitive-0.1.76.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.1.76.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.76.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.76.dist-info/RECORD,,
+primitive-0.1.78.dist-info/METADATA,sha256=Lg0DHnkK_9k1gZyRk-BfxOf_Vu6EfgLkBarZTAyiGww,3642
+primitive-0.1.78.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.1.78.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.78.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.78.dist-info/RECORD,,