primitive 0.2.1__tar.gz → 0.2.3__tar.gz

{primitive-0.2.1 → primitive-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.1
+Version: 0.2.3
 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.1 → primitive-0.2.3}/src/primitive/__about__.py

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

{primitive-0.2.1 → primitive-0.2.3}/src/primitive/agent/actions.py

@@ -1,4 +1,3 @@
-import shutil
 import sys
 from time import sleep
 
@@ -7,9 +6,8 @@ from loguru import logger
 from primitive.__about__ import __version__
 from primitive.utils.actions import BaseAction
 
-from ..utils.cache import get_sources_cache
 from ..utils.exceptions import P_CLI_100
-from .runner import AgentRunner
+from .runner import Runner
 from .uploader import Uploader
 
 
@@ -28,9 +26,6 @@ class Agent(BaseAction):
         logger.info(" [*] primitive")
         logger.info(f" [*] Version: {__version__}")
 
-        # Create cache dir if it doesn't exist
-        cache_dir = get_sources_cache()
-
         # Create uploader
         uploader = Uploader(primitive=self.primitive)
 
@@ -51,12 +46,12 @@ class Agent(BaseAction):
             active_reservation_pk = None
 
             while True:
-                logger.debug("Syncing children...")
-                self.primitive.hardware._sync_children()
-
                 logger.debug("Scanning for files to upload...")
                 uploader.scan()
 
+                logger.debug("Syncing children...")
+                self.primitive.hardware._sync_children()
+
                 hardware = self.primitive.hardware.get_own_hardware_details()
 
                 if hardware["activeReservation"]:
@@ -125,29 +120,18 @@ class Agent(BaseAction):
                     logger.debug(f"Job Run ID: {job_run['id']}")
                     logger.debug(f"Job Name: {job_run['job']['name']}")
 
-                    git_repo_full_name = job_run["gitCommit"]["repoFullName"]
-                    git_ref = job_run["gitCommit"]["sha"]
-                    logger.debug(
-                        f"Downloading repository {git_repo_full_name} at ref {git_ref}"
-                    )
-
-                    github_access_token = (
-                        self.primitive.jobs.github_access_token_for_job_run(
-                            job_run["id"]
-                        )
+                    runner = Runner(
+                        primitive=self.primitive,
+                        job_run=job_run,
+                        max_log_size=500 * 1024,
                     )
 
                     try:
-                        downloaded_git_repository_dir = (
-                            self.primitive.git.download_git_repository_at_ref(
-                                git_repo_full_name=git_repo_full_name,
-                                git_ref=git_ref,
-                                github_access_token=github_access_token,
-                                destination=cache_dir,
-                            )
-                        )
+                        runner.setup()
                     except Exception as exception:
-                        logger.error(f"Error downloading source: {exception}")
+                        logger.exception(
+                            f"Exception while initializing runner: {exception}"
+                        )
                         self.primitive.jobs.job_run_update(
                             id=job_run["id"],
                             status="request_completed",
@@ -155,40 +139,21 @@ class Agent(BaseAction):
                         )
                         continue
 
-                    source_dir = downloaded_git_repository_dir.joinpath(
-                        job_run["jobSettings"]["rootDirectory"]
-                    )
-
                     try:
-                        # Initialize Runner
-                        runner = AgentRunner(
-                            primitive=self.primitive,
-                            source_dir=source_dir,
-                            job_run=job_run,
-                            max_log_size=500 * 1024,
-                        )
+                        runner.execute()
                     except Exception as exception:
-                        # Log Error
-                        logger.exception(
-                            f"Error initializing agent runner: {exception}"
+                        logger.exception(f"Exception while executing job: {exception}")
+                        self.primitive.jobs.job_run_update(
+                            id=job_run["id"],
+                            status="request_completed",
+                            conclusion="failure",
                         )
-                    else:
-                        try:
-                            # Execute job
-                            runner.execute()
-                        except Exception as exception:
-                            # Log Error
-                            logger.exception(
-                                f"AgentRunner exception while running executing customer job: {exception}"
-                            )
-                            self.primitive.jobs.job_run_update(
-                                id=job_run["id"],
-                                status="request_completed",
-                                conclusion="failure",
-                            )
                     finally:
-                        # Clean up
-                        shutil.rmtree(path=downloaded_git_repository_dir)
+                        runner.cleanup()
+
+                        # NOTE: also run scan here to force upload of artifacts
+                        # This should probably eventuall be another daemon?
+                        uploader.scan()
 
                 sleep(5)
         except KeyboardInterrupt:

primitive-0.2.3/src/primitive/agent/runner.py

@@ -0,0 +1,315 @@
+import os
+import typing
+import re
+import shutil
+from typing import Dict, TypedDict, List
+from abc import abstractmethod
+from enum import IntEnum, Enum
+from pathlib import Path, PurePath
+from loguru import logger
+import yaml
+import asyncio
+from primitive.utils.shell import env_string_to_dict
+from ..utils.cache import get_artifacts_cache, get_sources_cache, get_logs_cache
+
+try:
+    from yaml import CLoader as Loader
+except ImportError:
+    from yaml import Loader
+
+if typing.TYPE_CHECKING:
+    import primitive.client
+
+ENV_VAR_LOOKUP_START = "_ENV_VAR_LOOKUP_START"
+ENV_VAR_LOOKUP_END = "_ENV_VAR_LOOKUP_END"
+
+
+class Task(TypedDict):
+    label: str
+    workdir: str
+    tags: Dict
+    cmd: str
+
+
+class JobConfig(TypedDict):
+    requires: List[str]
+    executes: List[Task]
+    stores: List[str]
+
+
+# NOTE This must match FailureLevel subclass in JobSettings model
+class FailureLevel(IntEnum):
+    ERROR = 1
+    WARNING = 2
+
+
+class LogLevel(Enum):
+    INFO = "INFO"
+    ERROR = "ERROR"
+    WARNING = "WARNING"
+
+
+class Runner:
+    def __init__(
+        self,
+        primitive: "primitive.client.Primitive",
+        job_run: Dict,
+        max_log_size: int = 10 * 1024 * 1024,  # 10MB
+    ) -> None:
+        self.primitive = primitive
+        self.job = job_run["job"]
+        self.job_run = job_run
+        self.job_settings = job_run["jobSettings"]
+        self.config = None
+        self.source_dir = None
+        self.initial_env = {}
+        self.modified_env = {}
+        self.file_logger = None
+
+        logger.enable("primitive")
+
+        # If max_log_size set to <= 0, disable file logging
+        if max_log_size > 0:
+            log_name = f"{self.job['slug']}_{self.job_run['jobRunNumber']}_{{time}}.primitive.log"
+
+            self.file_logger = logger.add(
+                Path(get_logs_cache(self.job_run["id"]) / log_name),
+                rotation=max_log_size,
+                format=Runner.fmt,
+                backtrace=True,
+                diagnose=True,
+            )
+
+    def setup(self) -> None:
+        # Attempt to download the job source code
+        git_repo_full_name = self.job_run["gitCommit"]["repoFullName"]
+        git_ref = self.job_run["gitCommit"]["sha"]
+        logger.info(f"Downloading repository {git_repo_full_name} at ref {git_ref}")
+
+        github_access_token = self.primitive.jobs.github_access_token_for_job_run(
+            self.job_run["id"]
+        )
+
+        downloaded_git_repository_dir = (
+            self.primitive.git.download_git_repository_at_ref(
+                git_repo_full_name=git_repo_full_name,
+                git_ref=git_ref,
+                github_access_token=github_access_token,
+                destination=get_sources_cache(),
+            )
+        )
+
+        self.source_dir = downloaded_git_repository_dir.joinpath(
+            self.job_settings["rootDirectory"]
+        )
+
+        # 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")
+
+        if yaml_file.exists() and yml_file.exists():
+            logger.error(
+                f"Found two job descriptions with the same slug: {self.job['slug']}"
+            )
+            raise FileExistsError
+
+        if yaml_file.exists() or yml_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"]
+            ]
+        else:
+            logger.error(
+                f"No job description with matching slug '{self.job['slug']}' found"
+            )
+            raise FileNotFoundError
+
+        # Setup initial process environment
+        self.initial_env = os.environ
+        self.initial_env["PRIMITIVE_GIT_SHA"] = str(self.job_run["gitCommit"]["sha"])
+        self.initial_env["PRIMITIVE_GIT_BRANCH"] = str(
+            self.job_run["gitCommit"]["branch"]
+        )
+        self.initial_env["PRIMITIVE_GIT_REPO"] = str(
+            self.job_run["gitCommit"]["repoFullName"]
+        )
+
+    def execute(self) -> None:
+        logger.info(f"Executing {self.job['slug']} job")
+        self.primitive.jobs.job_run_update(
+            self.job_run["id"], status="request_in_progress"
+        )
+        self.modified_env = {**self.initial_env}
+
+        task_failed = False
+        for task in self.config["executes"]:
+            with logger.contextualize(label=task["label"]):
+                with asyncio.Runner() as async_runner:
+                    if task_failed := async_runner.run(self.run_task(task)):
+                        break
+
+        if not task_failed:
+            self.primitive.jobs.job_run_update(
+                self.job_run["id"], status="request_completed", conclusion="success"
+            )
+            logger.success(f"Completed {self.job['slug']} job")
+
+    async def run_task(self, task: Task) -> bool:
+        for cmd in task["cmd"].strip().split("\n"):
+            args = [
+                "/bin/bash",
+                "-c",
+                f"{cmd} && echo '{ENV_VAR_LOOKUP_START}' && env && echo '{ENV_VAR_LOOKUP_END}'",
+            ]
+
+            process = await asyncio.create_subprocess_exec(
+                *args,
+                env=self.modified_env,
+                cwd=str(Path(self.source_dir / task.get("workdir", ""))),
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+            )
+
+            stdout_failed, stderr_failed, cancelled = 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", {})
+                ),
+                asyncio.create_task(self.monitor_cmd(process=process)),
+            )
+
+            returncode = await process.wait()
+
+            if cancelled:
+                return True
+
+            if returncode > 0 or stdout_failed or stderr_failed:
+                await self.primitive.jobs.ajob_run_update(
+                    self.job_run["id"], status="request_completed", conclusion="failure"
+                )
+
+                if returncode > 0:
+                    logger.error(
+                        f"Task {task['label']} failed on '{cmd}' with return code {returncode}"
+                    )
+                else:
+                    logger.error(f"Task {task['label']} failed on '{cmd}'")
+
+                return True
+
+        return False
+
+    async def log_cmd(self, process, stream, tags: Dict = {}) -> bool:
+        failure_detected = False
+        while line := await stream.readline():
+            raw_data = line.decode()
+
+            # handle env vars
+            if ENV_VAR_LOOKUP_START in raw_data:
+                env_vars_string = ""
+                while env_line := await stream.readline():
+                    if ENV_VAR_LOOKUP_END in env_line.decode():
+                        break
+                    env_vars_string += env_line.decode()
+
+                self.modified_env = env_string_to_dict(env_vars_string)
+                continue
+
+            # Handle logging
+            parse_logs = self.job_settings["parseLogs"]
+            parse_stderr = self.job_settings["parseStderr"]
+
+            level = LogLevel.INFO
+            tag = None
+            if (parse_logs and "error" in raw_data.lower()) or (
+                parse_stderr and stream is process.stderr
+            ):
+                level = LogLevel.ERROR
+            elif parse_logs and "warning" in raw_data.lower():
+                level = LogLevel.WARNING
+
+            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(raw_data):
+                    tag = tag_key
+                    break
+
+            logger.bind(tag=tag).log(level.value, raw_data.rstrip())
+
+        return failure_detected
+
+    async def monitor_cmd(self, process) -> bool:
+        while process.returncode is None:
+            status = await self.primitive.jobs.aget_job_status(self.job_run["id"])
+            status_value = status.data["jobRun"]["status"]
+            conclusion_value = status.data["jobRun"]["conclusion"]
+
+            if status_value == "completed" and conclusion_value == "cancelled":
+                logger.warning("Job cancelled by user")
+                try:
+                    process.terminate()
+                except ProcessLookupError:
+                    pass
+
+                return True
+
+            await asyncio.sleep(5)
+
+        return False
+
+    def cleanup(self) -> None:
+        logger.remove(self.file_logger)
+
+        if "stores" not in self.config:
+            return
+
+        for glob in self.config["stores"]:
+            path = Path(glob)
+
+            if path.is_dir():
+                files = [str(f) for f in path.rglob("*") if f.is_file()]
+            else:
+                files = [str(f) for f in Path().glob(glob) if f.is_file()]
+
+            for file in files:
+                relative_path = PurePath(file).relative_to(self.source_dir)
+                destination = Path(
+                    get_artifacts_cache(self.job_run["id"]) / relative_path
+                )
+                destination.parent.mkdir(parents=True, exist_ok=True)
+                Path(file).replace(destination)
+
+        shutil.rmtree(path=self.source_dir)
+
+    @abstractmethod
+    def fmt(record) -> str:
+        extra = record["extra"]
+        # Delimiters with empty space MUST exist for LogQL pattern matching
+        label = extra.get("label", None)
+        tag = extra.get("tag", None)
+        context = f"{label} | " if label else " | "
+        context += f"{tag} | " if tag else " | "
+
+        log = (
+            "<green>{time:YYYY-MM-DD HH:mm:ss.SSS!UTC}</green> | "
+            "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | "
+            "<level>{level}</level> | "
+            f"{context}"
+            "<cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - "
+            "<level>{message}</level>\n"
+        )
+
+        return log

{primitive-0.2.1 → primitive-0.2.3}/src/primitive/cli.py

@@ -48,7 +48,7 @@ from .reservations.commands import cli as reservations_commands
 @click.version_option(__version__)
 @click.pass_context
 def cli(context, host, yes, debug, json, verbose):
-    """primitive - a CLI tool for https://primitive.design"""
+    """primitive - a CLI tool for https://primitive.tech"""
     context.ensure_object(dict)
     context.obj["YES"] = yes
     context.obj["DEBUG"] = debug

{primitive-0.2.1 → primitive-0.2.3}/src/primitive/git/actions.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 import shutil
-from subprocess import run, CalledProcessError, DEVNULL
+from subprocess import run, CalledProcessError
 
 from gql import gql
 from loguru import logger
@@ -38,8 +38,17 @@ class Git(BaseAction):
         )
         source_dir = Path(destination).joinpath(git_repo_full_name.split("/")[-1])
 
+        # Clone with throw an exception if the directory already exists
+        if source_dir.exists():
+            shutil.rmtree(path=source_dir)
+
         try:
-            run(["git", "clone", url, source_dir, "--no-checkout"], check=True)
+            run(
+                ["git", "clone", url, source_dir, "--no-checkout"],
+                check=True,
+                # stdout=DEVNULL,
+                # stderr=DEVNULL,
+            )
         except CalledProcessError:
             raise Exception("Failed to download repository")
 
@@ -48,8 +57,8 @@ class Git(BaseAction):
                 ["git", "checkout", git_ref],
                 check=True,
                 cwd=source_dir,
-                stdout=DEVNULL,
-                stderr=DEVNULL,
+                # stdout=DEVNULL,
+                # stderr=DEVNULL,
             )
         except CalledProcessError:
             # Clean up directory if checkout failed

{primitive-0.2.1 → primitive-0.2.3}/src/primitive/jobs/actions.py

@@ -128,6 +128,30 @@ class Jobs(BaseAction):
         )
         return result
 
+    @guard
+    async def ajob_run_update(
+        self,
+        id: str,
+        status: str = None,
+        conclusion: str = None,
+        file_ids: Optional[List[str]] = [],
+    ):
+        mutation = gql(job_run_update_mutation)
+        input = {"id": id}
+        if status:
+            input["status"] = status
+        if conclusion:
+            input["conclusion"] = conclusion
+        if file_ids and len(file_ids) > 0:
+            input["files"] = file_ids
+        variables = {"input": input}
+
+        async with self.primitive.session as session:
+            result = await session.execute(
+                mutation, variable_values=variables, get_execution_result=True
+            )
+        return result
+
     @guard
     def github_access_token_for_job_run(self, job_run_id: str):
         query = gql(github_app_token_for_job_run_query)
@@ -160,3 +184,14 @@ class Jobs(BaseAction):
             query, variable_values=variables, get_execution_result=True
         )
         return result
+
+    @guard
+    async def aget_job_status(self, id: str):
+        query = gql(job_run_status_query)
+        variables = {"id": id}
+
+        async with self.primitive.session as session:
+            result = await session.execute(
+                query, variable_values=variables, get_execution_result=True
+            )
+        return result

{primitive-0.2.1 → primitive-0.2.3}/src/primitive/jobs/graphql/fragments.py

@@ -13,6 +13,7 @@ job_run_fragment = """
 fragment JobRunFragment on JobRun {
   id
   pk
+  jobRunNumber
   createdAt
   updatedAt
   completedAt
@@ -31,6 +32,7 @@ fragment JobRunFragment on JobRun {
     containerArgs
     rootDirectory
     parseLogs
+    parseStderr
     failureLevel
   }
   gitCommit {
@@ -45,5 +47,6 @@ job_run_status_fragment = """
 fragment JobRunStatusFragment on JobRun {
     id
     status
+    conclusion
 }
 """