primitive 0.2.46__tar.gz → 0.2.49__tar.gz

{primitive-0.2.46 → primitive-0.2.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.46
+Version: 0.2.49
 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.46 → primitive-0.2.49}/pyproject.toml

@@ -30,7 +30,6 @@ dependencies = [
   "click",
   "gql[all]",
   "loguru",
-  "pyyaml",
   # "primitive-pal == 0.1.4",
   "paramiko[invoke]",
   "speedtest-cli",

{primitive-0.2.46 → primitive-0.2.49}/src/primitive/__about__.py

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

{primitive-0.2.46 → primitive-0.2.49}/src/primitive/agent/runner.py

@@ -1,35 +1,21 @@
 import asyncio
 import os
-import re
 import shutil
 import typing
 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
-from primitive.utils.shell import env_to_dict
-
-try:
-    from yaml import CLoader as Loader
-except ImportError:
-    from yaml import Loader
 
 if typing.TYPE_CHECKING:
     import primitive.client
 
-CHUNK_SIZE = 64 * 1024
-ENV_VAR_LOOKUP_START = "_ENV_VAR_LOOKUP_START"
-START_DELIMITER_SIZE = len(bytes(ENV_VAR_LOOKUP_START, encoding="utf-8"))
-ENV_VAR_LOOKUP_END = "_ENV_VAR_LOOKUP_END"
-END_DELIMITER_SIZE = len(bytes(ENV_VAR_LOOKUP_END, encoding="utf-8"))
-
-assert CHUNK_SIZE > START_DELIMITER_SIZE + END_DELIMITER_SIZE
+BUFFER_SIZE = 4096
 
 
 class Task(TypedDict):
@@ -68,8 +54,7 @@ class Runner:
         self.job = job_run["job"]
         self.job_run = job_run
         self.job_settings = job_run["jobSettings"]
-        self.config = None
-        self.source_dir: Path | None = None
+        self.config = job_run["jobSettings"]["config"]
         self.initial_env = {}
         self.modified_env = {}
         self.file_logger = None
@@ -109,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 = {
@@ -140,6 +109,11 @@ class Runner:
             self.job_run["gitCommit"]["repoFullName"]
         )
 
+        if "VIRTUAL_ENV" in self.initial_env:
+            del self.initial_env["VIRTUAL_ENV"]
+        if "SHELL" in self.initial_env:
+            self.initial_env["SHELL"] = "/bin/bash"
+
     @log_context(label="execute")
     def execute_job_run(self) -> None:
         self.modified_env = {**self.initial_env}
@@ -253,13 +227,11 @@ class Runner:
             # Adding an additional echo and utilizing stdbuf to force line buffering
             # This ensures that the environment variables and starting delimiter are
             # always in a new chunk, vastly simplifying our parsing logic
-            args = [
-                "/bin/bash",
-                "-c",
-                f"{cmd} && echo -n '{ENV_VAR_LOOKUP_START}' && env && echo -n '{ENV_VAR_LOOKUP_END}'",
-            ]
+            args = ["/bin/bash", "-c", cmd]
 
-            logger.info(f"Executing command {i + 1}/{len(commands)}: {cmd}")
+            logger.info(
+                f"Executing command {i + 1}/{len(commands)}: {cmd} at {self.source_dir / task.get('workdir', '')}"
+            )
 
             process = await asyncio.create_subprocess_exec(
                 *args,
@@ -281,13 +253,9 @@ class Runner:
                 kill_process_and_children(pid=process.pid)
                 return False
 
-            stdout_failed, stderr_failed = await asyncio.gather(
-                self.log_cmd(
-                    process=process, stream=process.stdout, tags=task.get("tags", {})
-                ),
-                self.log_cmd(
-                    process=process, stream=process.stderr, tags=task.get("tags", {})
-                ),
+            await asyncio.gather(
+                self.log_cmd(stream=process.stdout, level=LogLevel.INFO),
+                self.log_cmd(stream=process.stderr, level=LogLevel.ERROR),
             )
 
             returncode = await process.wait()
@@ -301,106 +269,26 @@ class Runner:
                     f"Task {task['label']} failed on '{cmd}' with return code {returncode}"
                 )
                 return True
-            elif stdout_failed or stderr_failed:
-                logger.error(f"Task {task['label']} failed on '{cmd}'")
-                return True
 
         logger.success(f"Completed {task['label']} task")
         return False
 
-    async def log_cmd(self, process, stream, tags: Dict = {}) -> bool:
-        failure_detected = False
-        parse_environment = False
-        last_chunk_buffer = b""
-        environment_buffer = b""
-        while chunk := await stream.read(CHUNK_SIZE):
-            if parse_environment:
-                environment_buffer += chunk
-                continue
-
-            # First, look for start delimiter in chunk
-            full_chunk = last_chunk_buffer + chunk
-            last_chunk_buffer = b""
-            start_index = full_chunk.find(bytes(ENV_VAR_LOOKUP_START, encoding="utf-8"))
-
-            if start_index != -1:
-                environment_buffer = full_chunk[start_index + START_DELIMITER_SIZE :]
-                processed_lines = await self.read_chunk(full_chunk[:start_index])
-                parse_environment = True
-            else:
-                processed_lines = await self.read_chunk(full_chunk)
-
-                while (
-                    len(last_chunk_buffer) < START_DELIMITER_SIZE
-                    and len(processed_lines) > 0
-                ):
-                    last_chunk_buffer += bytes(
-                        processed_lines.pop() + "\n", encoding="utf-8"
-                    )
-
-            # Handle logging
-            parse_logs = self.job_settings["parseLogs"]
-            parse_stderr = self.job_settings["parseStderr"]
-
-            for line in processed_lines:
-                level = LogLevel.INFO
-                tag = None
-                if (parse_logs and "error" in line.lower()) or (
-                    parse_stderr and stream is process.stderr
-                ):
-                    level = LogLevel.ERROR
-                elif parse_logs and "warning" in line.lower():
-                    level = LogLevel.WARNING
-
-                # If we already detected a failure, skip checking
-                if not failure_detected:
-                    failure_detected = (
-                        level == LogLevel.ERROR
-                        and self.job_settings["failureLevel"] >= FailureLevel.ERROR
-                    ) or (
-                        level == LogLevel.WARNING
-                        and self.job_settings["failureLevel"] >= FailureLevel.WARNING
-                    )
-
-                # Tag on the first matching regex in the list
-                for tag_key, regex in tags.items():
-                    pattern = re.compile(regex)
-                    if pattern.match(line):
-                        tag = tag_key
-                        break
-
-                logger.bind(tag=tag).log(level.value, line)
-
-        start_index = environment_buffer.find(
-            bytes(ENV_VAR_LOOKUP_END, encoding="utf-8")
-        )
-        if parse_environment and start_index == -1:
-            logger.error("Environment variable buffer did not contain end delimiter")
-            failure_detected = True
-            return failure_detected
-
-        environment_buffer = environment_buffer[:start_index]
-        new_env_vars = env_to_dict(environment_buffer)
-        if len(new_env_vars.keys()) > 0:
-            self.modified_env = {**self.modified_env, **new_env_vars}
-        return failure_detected
-
-    async def read_chunk(self, chunk: bytes) -> List[str]:
-        """Converts a chunk of bytes into proper lines."""
-        lines = []
-        current_line = ""
-        for char in chunk.decode():
-            if char in ("\n", "\r"):
-                lines.append(current_line)
-                current_line = ""
-            else:
-                current_line += char
-
-        # Handle extra characters in the buffer
-        if len(current_line) > 0:
-            lines.append(current_line)
-
-        return [line for line in lines if len(line) > 0]
+    async def log_cmd(
+        self,
+        stream: asyncio.StreamReader | None,
+        level: LogLevel,
+    ):
+        buffer = bytearray()
+        while stream and not stream.at_eof():
+            chunk = await stream.read(BUFFER_SIZE)
+            if not chunk:
+                break
+            buffer += chunk
+            while b"\n" in buffer:
+                line, _, buffer = buffer.partition(b"\n")
+                logger.log(level.value, line.decode(errors="replace"))
+        if buffer:
+            logger.log(level.value, buffer.decode(errors="replace"))
 
     @log_context(label="cleanup")
     def cleanup(self) -> None:

{primitive-0.2.46 → primitive-0.2.49}/uv.lock

@@ -810,7 +810,6 @@ dependencies = [
     { name = "loguru" },
     { name = "paramiko", extra = ["invoke"] },
     { name = "psutil" },
-    { name = "pyyaml" },
     { name = "rich" },
     { name = "speedtest-cli" },
 ]
@@ -830,7 +829,6 @@ requires-dist = [
     { name = "loguru" },
     { name = "paramiko", extras = ["invoke"] },
     { name = "psutil", specifier = ">=7.0.0" },
-    { name = "pyyaml" },
     { name = "rich", specifier = ">=13.9.4" },
     { name = "speedtest-cli" },
 ]
@@ -1024,41 +1022,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892, upload-time = "2024-03-01T18:36:18.57Z" },
 ]
 
-[[package]]
-name = "pyyaml"
-version = "6.0.2"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17/pyyaml-6.0.2.tar.gz", hash = "sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e", size = 130631, upload-time = "2024-08-06T20:33:50.674Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/f8/aa/7af4e81f7acba21a4c6be026da38fd2b872ca46226673c89a758ebdc4fd2/PyYAML-6.0.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774", size = 184612, upload-time = "2024-08-06T20:32:03.408Z" },
-    { url = "https://files.pythonhosted.org/packages/8b/62/b9faa998fd185f65c1371643678e4d58254add437edb764a08c5a98fb986/PyYAML-6.0.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee", size = 172040, upload-time = "2024-08-06T20:32:04.926Z" },
-    { url = "https://files.pythonhosted.org/packages/ad/0c/c804f5f922a9a6563bab712d8dcc70251e8af811fce4524d57c2c0fd49a4/PyYAML-6.0.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c", size = 736829, upload-time = "2024-08-06T20:32:06.459Z" },
-    { url = "https://files.pythonhosted.org/packages/51/16/6af8d6a6b210c8e54f1406a6b9481febf9c64a3109c541567e35a49aa2e7/PyYAML-6.0.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317", size = 764167, upload-time = "2024-08-06T20:32:08.338Z" },
-    { url = "https://files.pythonhosted.org/packages/75/e4/2c27590dfc9992f73aabbeb9241ae20220bd9452df27483b6e56d3975cc5/PyYAML-6.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85", size = 762952, upload-time = "2024-08-06T20:32:14.124Z" },
-    { url = "https://files.pythonhosted.org/packages/9b/97/ecc1abf4a823f5ac61941a9c00fe501b02ac3ab0e373c3857f7d4b83e2b6/PyYAML-6.0.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4", size = 735301, upload-time = "2024-08-06T20:32:16.17Z" },
-    { url = "https://files.pythonhosted.org/packages/45/73/0f49dacd6e82c9430e46f4a027baa4ca205e8b0a9dce1397f44edc23559d/PyYAML-6.0.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e", size = 756638, upload-time = "2024-08-06T20:32:18.555Z" },
-    { url = "https://files.pythonhosted.org/packages/22/5f/956f0f9fc65223a58fbc14459bf34b4cc48dec52e00535c79b8db361aabd/PyYAML-6.0.2-cp311-cp311-win32.whl", hash = "sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5", size = 143850, upload-time = "2024-08-06T20:32:19.889Z" },
-    { url = "https://files.pythonhosted.org/packages/ed/23/8da0bbe2ab9dcdd11f4f4557ccaf95c10b9811b13ecced089d43ce59c3c8/PyYAML-6.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44", size = 161980, upload-time = "2024-08-06T20:32:21.273Z" },
-    { url = "https://files.pythonhosted.org/packages/86/0c/c581167fc46d6d6d7ddcfb8c843a4de25bdd27e4466938109ca68492292c/PyYAML-6.0.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab", size = 183873, upload-time = "2024-08-06T20:32:25.131Z" },
-    { url = "https://files.pythonhosted.org/packages/a8/0c/38374f5bb272c051e2a69281d71cba6fdb983413e6758b84482905e29a5d/PyYAML-6.0.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725", size = 173302, upload-time = "2024-08-06T20:32:26.511Z" },
-    { url = "https://files.pythonhosted.org/packages/c3/93/9916574aa8c00aa06bbac729972eb1071d002b8e158bd0e83a3b9a20a1f7/PyYAML-6.0.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5", size = 739154, upload-time = "2024-08-06T20:32:28.363Z" },
-    { url = "https://files.pythonhosted.org/packages/95/0f/b8938f1cbd09739c6da569d172531567dbcc9789e0029aa070856f123984/PyYAML-6.0.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425", size = 766223, upload-time = "2024-08-06T20:32:30.058Z" },
-    { url = "https://files.pythonhosted.org/packages/b9/2b/614b4752f2e127db5cc206abc23a8c19678e92b23c3db30fc86ab731d3bd/PyYAML-6.0.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476", size = 767542, upload-time = "2024-08-06T20:32:31.881Z" },
-    { url = "https://files.pythonhosted.org/packages/d4/00/dd137d5bcc7efea1836d6264f049359861cf548469d18da90cd8216cf05f/PyYAML-6.0.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48", size = 731164, upload-time = "2024-08-06T20:32:37.083Z" },
-    { url = "https://files.pythonhosted.org/packages/c9/1f/4f998c900485e5c0ef43838363ba4a9723ac0ad73a9dc42068b12aaba4e4/PyYAML-6.0.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b", size = 756611, upload-time = "2024-08-06T20:32:38.898Z" },
-    { url = "https://files.pythonhosted.org/packages/df/d1/f5a275fdb252768b7a11ec63585bc38d0e87c9e05668a139fea92b80634c/PyYAML-6.0.2-cp312-cp312-win32.whl", hash = "sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4", size = 140591, upload-time = "2024-08-06T20:32:40.241Z" },
-    { url = "https://files.pythonhosted.org/packages/0c/e8/4f648c598b17c3d06e8753d7d13d57542b30d56e6c2dedf9c331ae56312e/PyYAML-6.0.2-cp312-cp312-win_amd64.whl", hash = "sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8", size = 156338, upload-time = "2024-08-06T20:32:41.93Z" },
-    { url = "https://files.pythonhosted.org/packages/ef/e3/3af305b830494fa85d95f6d95ef7fa73f2ee1cc8ef5b495c7c3269fb835f/PyYAML-6.0.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba", size = 181309, upload-time = "2024-08-06T20:32:43.4Z" },
-    { url = "https://files.pythonhosted.org/packages/45/9f/3b1c20a0b7a3200524eb0076cc027a970d320bd3a6592873c85c92a08731/PyYAML-6.0.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1", size = 171679, upload-time = "2024-08-06T20:32:44.801Z" },
-    { url = "https://files.pythonhosted.org/packages/7c/9a/337322f27005c33bcb656c655fa78325b730324c78620e8328ae28b64d0c/PyYAML-6.0.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133", size = 733428, upload-time = "2024-08-06T20:32:46.432Z" },
-    { url = "https://files.pythonhosted.org/packages/a3/69/864fbe19e6c18ea3cc196cbe5d392175b4cf3d5d0ac1403ec3f2d237ebb5/PyYAML-6.0.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484", size = 763361, upload-time = "2024-08-06T20:32:51.188Z" },
-    { url = "https://files.pythonhosted.org/packages/04/24/b7721e4845c2f162d26f50521b825fb061bc0a5afcf9a386840f23ea19fa/PyYAML-6.0.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5", size = 759523, upload-time = "2024-08-06T20:32:53.019Z" },
-    { url = "https://files.pythonhosted.org/packages/2b/b2/e3234f59ba06559c6ff63c4e10baea10e5e7df868092bf9ab40e5b9c56b6/PyYAML-6.0.2-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc", size = 726660, upload-time = "2024-08-06T20:32:54.708Z" },
-    { url = "https://files.pythonhosted.org/packages/fe/0f/25911a9f080464c59fab9027482f822b86bf0608957a5fcc6eaac85aa515/PyYAML-6.0.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652", size = 751597, upload-time = "2024-08-06T20:32:56.985Z" },
-    { url = "https://files.pythonhosted.org/packages/14/0d/e2c3b43bbce3cf6bd97c840b46088a3031085179e596d4929729d8d68270/PyYAML-6.0.2-cp313-cp313-win32.whl", hash = "sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183", size = 140527, upload-time = "2024-08-06T20:33:03.001Z" },
-    { url = "https://files.pythonhosted.org/packages/fa/de/02b54f42487e3d3c6efb3f89428677074ca7bf43aae402517bc7cca949f3/PyYAML-6.0.2-cp313-cp313-win_amd64.whl", hash = "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563", size = 156446, upload-time = "2024-08-06T20:33:04.33Z" },
-]
-
 [[package]]
 name = "requests"
 version = "2.32.3"