primitive 0.2.6__tar.gz → 0.2.8__tar.gz

{primitive-0.2.6 → primitive-0.2.8}/PKG-INFO

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

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

{primitive-0.2.6 → primitive-0.2.8}/src/primitive/agent/runner.py

@@ -9,6 +9,7 @@ from pathlib import Path, PurePath
 from loguru import logger
 import yaml
 import asyncio
+import time
 from ..utils.cache import get_artifacts_cache, get_sources_cache, get_logs_cache
 from ..utils.shell import env_to_dict
 
@@ -155,18 +156,22 @@ class Runner:
         self.modified_env = {**self.initial_env}
 
         task_failed = False
+        conclusion = "success"
         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"
-            )
+        if task_failed:
+            conclusion = "failure"
+        else:
             logger.success(f"Completed {self.job['slug']} job")
 
+        self.primitive.jobs.job_run_update(
+            self.job_run["id"], status="request_completed", conclusion=conclusion
+        )
+
     async def run_task(self, task: Task) -> bool:
         for cmd in task["cmd"].strip().split("\n"):
             # Adding an additional echo and utilizing stdbuf to force line buffering
@@ -191,6 +196,9 @@ class Runner:
                 stderr=asyncio.subprocess.PIPE,
             )
 
+            loop = asyncio.get_running_loop()
+            monitor_task = loop.run_in_executor(None, self.monitor_cmd, process)
+
             stdout_failed, stderr_failed, cancelled = await asyncio.gather(
                 self.log_cmd(
                     process=process, stream=process.stdout, tags=task.get("tags", {})
@@ -198,31 +206,22 @@ class Runner:
                 self.log_cmd(
                     process=process, stream=process.stderr, tags=task.get("tags", {})
                 ),
-                asyncio.create_task(self.monitor_cmd(process=process)),
+                monitor_task,
             )
 
             returncode = await process.wait()
 
             if cancelled:
+                logger.warning("Job cancelled by user")
                 return True
 
-            if returncode > 0 or stdout_failed or stderr_failed:
-                import time
-
-                start_time = time.monotonic()
-                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}"
                 )
-                end_time = time.monotonic()
-                logger.warning(f"JOB RUN UPDATE {end_time - start_time:.2f} seconds")
-
-                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
+            elif stdout_failed or stderr_failed:
+                logger.error(f"Task {task['label']} failed on '{cmd}'")
                 return True
 
         return False
@@ -303,20 +302,14 @@ class Runner:
 
         return [line for line in lines if len(line) > 0]
 
-    async def monitor_cmd(self, process) -> bool:
+    def monitor_cmd(self, process) -> bool:
         while process.returncode is None:
-            import time
-
-            start_time = time.monotonic()
-            status = await self.primitive.jobs.aget_job_status(self.job_run["id"])
-            end_time = time.monotonic()
-            logger.warning(f"GET JOB STATUS {end_time - start_time:.2f} seconds")
+            status = self.primitive.jobs.get_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:
@@ -324,7 +317,7 @@ class Runner:
 
                 return True
 
-            await asyncio.sleep(5)
+            time.sleep(10)
 
         return False
 

{primitive-0.2.6 → primitive-0.2.8}/src/primitive/graphql/sdk.py

@@ -30,7 +30,7 @@ def create_session(
     session = Client(
         transport=transport,
         fetch_schema_from_transport=fetch_schema_from_transport,
-        execute_timeout=None,  # TODO: Change this after debugging?
+        execute_timeout=None,  # Prevents timeout errors on async transports
     )
     return session
 

{primitive-0.2.6 → primitive-0.2.8}/src/primitive/jobs/actions.py

@@ -128,30 +128,6 @@ 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)
@@ -184,14 +160,3 @@ 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