primitive 0.2.4__tar.gz → 0.2.6__tar.gz

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

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

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

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

@@ -72,7 +72,7 @@ class Runner:
         self.job_run = job_run
         self.job_settings = job_run["jobSettings"]
         self.config = None
-        self.source_dir = None
+        self.source_dir: Path = None
         self.initial_env = {}
         self.modified_env = {}
         self.file_logger = None
@@ -207,9 +207,14 @@ class Runner:
                 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"
                 )
+                end_time = time.monotonic()
+                logger.warning(f"JOB RUN UPDATE {end_time - start_time:.2f} seconds")
 
                 if returncode > 0:
                     logger.error(
@@ -300,7 +305,13 @@ class Runner:
 
     async 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_value = status.data["jobRun"]["status"]
             conclusion_value = status.data["jobRun"]["conclusion"]
 
@@ -324,20 +335,14 @@ class Runner:
             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)
+            # Glob relative to the source directory
+            matches = self.source_dir.rglob(glob)
+
+            for match in matches:
+                relative_path = PurePath(match).relative_to(self.source_dir)
+                dest = Path(get_artifacts_cache(self.job_run["id"]) / relative_path)
+                dest.parent.mkdir(parents=True, exist_ok=True)
+                Path(match).replace(dest)
 
         shutil.rmtree(path=self.source_dir)
 

{primitive-0.2.4 → primitive-0.2.6}/src/primitive/agent/uploader.py

@@ -45,10 +45,16 @@ class Uploader:
             )
 
         for file in files:
-            result = self.primitive.files.upload_file_direct(
-                path=file,
-                key_prefix=str(PurePath(file).relative_to(cache.parent).parent),
-            )
+            try:
+                result = self.primitive.files.upload_file_direct(
+                    path=file,
+                    key_prefix=str(PurePath(file).relative_to(cache.parent).parent),
+                )
+            except Exception as e:
+                if "is empty" in str(e):
+                    logger.warning(f"{file} is empty, skipping upload")
+                continue
+
             upload_id = result.data["fileUpdate"]["id"]
 
             if upload_id:

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

@@ -30,6 +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?
     )
     return session