primitive 0.1.54__tar.gz → 0.1.56__tar.gz

{primitive-0.1.54 → primitive-0.1.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: primitive
-Version: 0.1.54
+Version: 0.1.56
 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.54 → primitive-0.1.56}/src/primitive/__about__.py

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

{primitive-0.1.54 → primitive-0.1.56}/src/primitive/agent/uploader.py

@@ -1,5 +1,6 @@
 import typing
 import shutil
+import os
 from loguru import logger
 from pathlib import Path, PurePath
 from ..utils.cache import get_artifacts_cache
@@ -15,8 +16,10 @@ class Uploader:
     ):
         self.primitive = primitive
 
-    def upload_file(self, path: Path, prefix: str) -> str:
-        file_upload_response = self.primitive.files.file_upload(path, key_prefix=prefix)
+    def upload_file(self, path: Path, prefix: str, job_run_id: str) -> str:
+        file_upload_response = self.primitive.files.file_upload(
+            path, key_prefix=prefix, job_run_id=job_run_id
+        )
         return file_upload_response.json()["data"]["fileUpload"]["id"]
 
     def scan(self) -> None:
@@ -31,20 +34,33 @@ class Uploader:
         for job_cache in subdirs:
             job_run_id = job_cache.name
 
-            files = sorted(
-                [
-                    w_path / file
-                    for w_path, _, w_files in job_cache.walk()
-                    for file in w_files
-                ],
-                key=lambda p: p.stat().st_size,
-            )
+            files = None
+            has_walk = getattr(job_cache, "walk", None)
+            if has_walk:
+                files = sorted(
+                    [
+                        w_path / file
+                        for w_path, _, w_files in job_cache.walk()
+                        for file in w_files
+                    ],
+                    key=lambda p: p.stat().st_size,
+                )
+            else:
+                files = sorted(
+                    [
+                        Path(Path(w_path) / file)
+                        for w_path, _, w_files in os.walk(job_cache)
+                        for file in w_files
+                    ],
+                    key=lambda p: p.stat().st_size,
+                )
 
             file_ids = []
             for file in files:
                 upload_id = self.upload_file(
                     file,
                     prefix=str(PurePath(file).relative_to(job_cache.parent).parent),
+                    job_run_id=job_run_id,
                 )
 
                 if upload_id:

{primitive-0.1.54 → primitive-0.1.56}/src/primitive/files/actions.py

@@ -43,7 +43,13 @@ class Files(BaseAction):
         return result
 
     @guard
-    def file_upload(self, path: Path, is_public: bool = False, key_prefix: str = ""):
+    def file_upload(
+        self,
+        path: Path,
+        is_public: bool = False,
+        key_prefix: str = "",
+        job_run_id: str = "",
+    ):
         file_path = str(path.resolve())
         if path.exists() is False:
             raise FileNotFoundError(f"File not found at {file_path}")
@@ -54,6 +60,8 @@ class Files(BaseAction):
                 + file_path
                 + """\", "keyPrefix": \""""
                 + key_prefix
+                + """\", "jobRunId": \""""
+                + job_run_id
                 + """\" } } }"""
             )  # noqa
 
@@ -63,6 +71,8 @@ class Files(BaseAction):
                 + file_path
                 + """\", "keyPrefix": \""""
                 + key_prefix
+                + """\", "jobRunId": \""""
+                + job_run_id
                 + """\" } } }"""
             )  # noqa
         body = {