primitive 0.1.48__py3-none-any.whl → 0.1.49__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.48"
+__version__ = "0.1.49"

primitive/agent/actions.py

@@ -1,5 +1,4 @@
 import sys
-import shutil
 from time import sleep
 from primitive.utils.actions import BaseAction
 from loguru import logger
@@ -130,7 +129,7 @@ class Agent(BaseAction):
                     runner.execute()
 
                     # Clean up
-                    shutil.rmtree(path=downloaded_git_repository_dir)
+                    # shutil.rmtree(path=downloaded_git_repository_dir)
 
                 sleep(5)
         except KeyboardInterrupt:

primitive/agent/process.py

@@ -8,9 +8,11 @@ class Process:
     def __init__(
         self,
         cmd,
+        env,
         workdir: str = ".",
     ):
         self.cmd = shlex.split(cmd)
+        self.env = env
         self.workdir = workdir
         self.process = None
         self.stdout_thread = None
@@ -22,7 +24,12 @@ class Process:
         logger.info(f"cmd: {self.cmd}")
         logger.info(f"workdir: {self.workdir}")
         self.process = Popen(
-            self.cmd, cwd=self.workdir, stdout=PIPE, stderr=PIPE, text=True
+            self.cmd,
+            env=self.env,
+            cwd=self.workdir,
+            stdout=PIPE,
+            stderr=PIPE,
+            text=True,
         )
 
         # Function to read and log output from a pipe

primitive/agent/provision.py

@@ -0,0 +1,50 @@
+import sys
+from subprocess import Popen, PIPE
+from pathlib import Path
+from typing import Dict
+
+
+class ProvisionPython:
+    def __init__(self, source_dir: Path, requirements_path: Path):
+        self.source_dir = source_dir
+        self.requirements_path = requirements_path
+
+    def create_env(self) -> Dict:
+        cmd = f"{sys.executable} -m ensurepip"
+        proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True, text=True)
+        proc.wait()
+
+        cmd = f"{sys.executable} -m pip install virtualenv"
+        proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True, text=True)
+        proc.wait()
+
+        cmd = f"{sys.executable} -m virtualenv {self.source_dir / "venv"}"
+        proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True, text=True)
+        proc.wait()
+
+        cmd = f"source {self.source_dir / "venv" / "bin" / "activate"} && env"
+        proc = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=True, text=True)
+        proc.wait()
+
+        # Read the output and decode it
+        output, _ = proc.communicate()
+
+        # Split the output into lines and parse it into a dictionary
+        env_vars = {}
+
+        for line in output.splitlines():
+            key, value = line.split("=", 1)
+            env_vars[key] = value
+
+        cmd = f"python -m pip install -r {self.requirements_path}"
+        proc = Popen(
+            cmd,
+            env=env_vars,
+            stdout=PIPE,
+            stderr=PIPE,
+            shell=True,
+            text=True,
+        )
+        proc.wait()
+
+        return env_vars

primitive/agent/runner.py

@@ -1,11 +1,13 @@
 import yaml
 import sys
 import typing
+import os
 from time import sleep
-from typing import TypedDict, Iterable, List
+from typing import TypedDict, Iterable, List, Optional, Dict
 from pathlib import Path, PurePath
 from loguru import logger
 from .process import Process
+from .provision import ProvisionPython
 from ..utils.cache import get_artifacts_cache
 from ..utils.files import find_files_for_extension
 
@@ -32,6 +34,7 @@ class JobStep(TypedDict):
 
 class JobDescription(TypedDict):
     name: str
+    provision: str
     steps: List[JobStep]
 
 
@@ -92,6 +95,16 @@ class AgentRunner:
         logger.info(f"Executing {self.job_slug} job")
         self.primitive.jobs.job_run_update(self.job_id, status="request_in_progress")
 
+        # Initial environment is the system env
+        environment = os.environ
+        if "provision" in self.job:
+            logger.info(f"Provisioning for {self.job['provision']} environment")
+            environment = self.provision()
+
+            if not environment:
+                self.conclude("failure")
+                return
+
         conclusion = None
         total_errors = 0
         for step in self.steps():
@@ -100,7 +113,11 @@ class AgentRunner:
             # Define step proc
             logger.info(f"first cmd: {step['cmd']}")
             logger.info(f"first workdir: {Path(self.source_dir / step['workdir'])}")
-            proc = Process(step["cmd"], workdir=Path(self.source_dir / step["workdir"]))
+            proc = Process(
+                step["cmd"],
+                workdir=Path(self.source_dir / step["workdir"]),
+                env=environment,
+            )
 
             # Try to start
             try:
@@ -114,7 +131,14 @@ class AgentRunner:
             while proc.is_running():
                 status = self.primitive.jobs.get_job_status(self.job_id)
 
-                logger.info(f"Step status: {status}")
+                status_value = status["jobRun"]["status"]
+
+                # TODO: Should probably use request_cancelled or something
+                # once we change it, we'll have to call conclude w/ cancelled status
+                if status_value == "completed":
+                    logger.warning("Job cancelled by user")
+                    proc.terminate()
+                    return
 
                 sleep(5)
 
@@ -136,6 +160,9 @@ class AgentRunner:
             logger.error(f"Job failed with {total_errors} errors.")
             conclusion = "failure"
 
+        self.conclude(conclusion)
+
+    def conclude(self, conclusion: str) -> None:
         self.primitive.jobs.job_run_update(
             self.job_id, status="request_completed", conclusion=conclusion
         )
@@ -143,6 +170,20 @@ class AgentRunner:
         logger.info(f"Completed {self.job_slug} job")
         logger.remove(self.logger_handle)
 
+    def provision(self) -> Optional[Dict]:
+        match self.job["provision"]:
+            case "python":
+                requirements_glob = self.source_dir.rglob("requirements.txt")
+
+                requirements_path = next(requirements_glob, None)
+
+                if not requirements_path:
+                    logger.error("Unable to locate requirements.txt")
+                    return None
+
+                prov = ProvisionPython(self.source_dir, requirements_path)
+                return prov.create_env()
+
     def collect_artifacts(self, step: JobStep) -> None:
         # str(PurePath(file_path).relative_to(Path(source))
 

{primitive-0.1.48.dist-info → primitive-0.1.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: primitive
-Version: 0.1.48
+Version: 0.1.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

{primitive-0.1.48.dist-info → primitive-0.1.49.dist-info}/RECORD

@@ -1,11 +1,12 @@
-primitive/__about__.py,sha256=SyUvBWaydpIhAgoSQiQhzs0YgMe3ddiXcykw6bCIZ9o,130
+primitive/__about__.py,sha256=aO6YNrTRSljxoBea_ti6ZOsiQThBvDI_TcvwjL4xAjQ,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=VQPSewC6ouGdEG9W1gllawGJTydpOY0Lzg7LURXcqQg,2374
 primitive/client.py,sha256=vSJkifx450czuLvu0f2o-viSCC0p2f1UicA-2P5cJAw,2188
-primitive/agent/actions.py,sha256=d_garPm3rl5uMEu-g681yMYEnBqfUDeEPeeKl_VEd64,5489
+primitive/agent/actions.py,sha256=R5ZvXD75H5XWdTvpmL5PDoSYnj7MCcfaDNQC0cqW-FU,5477
 primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,254
-primitive/agent/process.py,sha256=p9YkB1Emf9x3JJFcGtqN70om8_I2r0jmn5bkrQq_ggE,2340
-primitive/agent/runner.py,sha256=rB9DlTDdVo7ks-vagGZbCC4SunJEUQKlMaTUpLk1fRY,5051
+primitive/agent/process.py,sha256=rbRB8MOxhTtMax-182Cwy_KP2I1fPyXLiu9p_GIE15Y,2451
+primitive/agent/provision.py,sha256=L0N0uxyhToK4yklYO4exdlJRUk3SpK5h4DJ9egB35w4,1531
+primitive/agent/runner.py,sha256=tYjzQyfd1rEAmkBQ5C8ghryR2weH9J0hTXSPS5ijapM,6490
 primitive/agent/uploader.py,sha256=ngbynmQzxKVNMp7VWkTWW7vZIN_rnnRzYC6OAL21n1k,1378
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=2vZEC3LLAXj6eBBmt_2OEDEcBIb3uLkkNjgbZTIaQsY,1095
@@ -45,8 +46,8 @@ primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIU
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=-7UjQaBqSGHzEEyX8pNjeYFFP0P3lVnDV0OkgPz1qHU,1050
 primitive/utils/verible.py,sha256=r7c_hfqvL0UicMmIzK3Cy_BfZI1ZpcfBeLqKEWFWqJo,2252
-primitive-0.1.48.dist-info/METADATA,sha256=oJ3kcQ2ZOES15E4ErusuGrqgIbr_qNk8H56WAUw94MI,3782
-primitive-0.1.48.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-primitive-0.1.48.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.48.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.48.dist-info/RECORD,,
+primitive-0.1.49.dist-info/METADATA,sha256=Jc5CpG79Qfsp2IhMbRdrcm_Lg_RxUOLLOoqs2HaHJ8E,3782
+primitive-0.1.49.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+primitive-0.1.49.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.49.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.49.dist-info/RECORD,,