primitive 0.1.54__py3-none-any.whl → 0.1.56__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.54"
+__version__ = "0.1.56"

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/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 = {

{primitive-0.1.54.dist-info → primitive-0.1.56.dist-info}/METADATA

@@ -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.dist-info → primitive-0.1.56.dist-info}/RECORD

@@ -1,4 +1,4 @@
-primitive/__about__.py,sha256=xmju9tTiBP_3gkTXO3-jul0M4FsAwKumYeIq-7FHnI4,130
+primitive/__about__.py,sha256=G8f_XIhSuZl81EImSEsDRejrLptiz_CliMVlAJcUxdY,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=VQPSewC6ouGdEG9W1gllawGJTydpOY0Lzg7LURXcqQg,2374
 primitive/client.py,sha256=vSJkifx450czuLvu0f2o-viSCC0p2f1UicA-2P5cJAw,2188
@@ -7,7 +7,7 @@ primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,2
 primitive/agent/process.py,sha256=2ZY3YoJHvoukrsCAZIt-AF2YKY4HEO5_jWji5K3W9fM,2267
 primitive/agent/provision.py,sha256=3EEzOV-ria6zf-pvfNddad1lzzd1QmfKInTIjmwX71Y,1673
 primitive/agent/runner.py,sha256=hDh6ip_Jb0EsvygrB7-GWVTOf-jN8E7H0RgCGOdQnPU,6634
-primitive/agent/uploader.py,sha256=mq8WAcjORHDFNYArvMKNRpvrke9tCMh3ZSTOKp-oUpg,1798
+primitive/agent/uploader.py,sha256=5ZxonvRlMGRVBYx3hPEaWiPio5lMPi_zhtxz64V5S-A,2379
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=2vZEC3LLAXj6eBBmt_2OEDEcBIb3uLkkNjgbZTIaQsY,1095
 primitive/auth/commands.py,sha256=JahUq0E2e7Xa-FX1WEUv7TgM6ieDvNH4VwRRtxAW7HE,2340
@@ -15,7 +15,7 @@ primitive/daemons/actions.py,sha256=Nt3yNtbBhen0jK4sRsH_N7AP3UBuyL48VaUhtC7wYq8,
 primitive/daemons/commands.py,sha256=-Muh-6ib4uAVtPn_67AcMrDwuCwYlCnRQozCi2Xurmk,1726
 primitive/daemons/launch_agents.py,sha256=qovt32gwpjGDd82z_SY5EGCUjaUyNA49pZFajZsw3eE,4796
 primitive/daemons/launch_service.py,sha256=FPB9qKEjhllRfEpct0ng2L9lpIaGJbQwn1JdFT8uBA8,5600
-primitive/files/actions.py,sha256=2X1_rq8A7X1Nf0q9xyAI9ziMkow_VKARPfdnsAoZh9w,2676
+primitive/files/actions.py,sha256=3AOGLEUeplNlkKkyi1QajzxMc93Adh5jRQ8SQHFlJeU,2889
 primitive/files/commands.py,sha256=DDizo3xJnU3KLUBTMeeM72viVpnJinLwxs84tmqKhqo,810
 primitive/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/git/actions.py,sha256=OTuGRXfjop9u1LtNaBen87mEU6ROeoa_MDgBbB2l6ig,1428
@@ -46,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.54.dist-info/METADATA,sha256=6_qZmgPk3T3V14hCWBIUWrKnK7fF7CrCqoVwvFVw7rA,3782
-primitive-0.1.54.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-primitive-0.1.54.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.54.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.54.dist-info/RECORD,,
+primitive-0.1.56.dist-info/METADATA,sha256=2IyWZdGzA3ZYaQUHQby350EkrKE339efkLSJa-bo_VA,3782
+primitive-0.1.56.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+primitive-0.1.56.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.56.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.56.dist-info/RECORD,,