primitive 0.2.4__py3-none-any.whl → 0.2.5__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.2.4"
+__version__ = "0.2.5"

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
@@ -324,20 +324,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/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.dist-info → primitive-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.4
+Version: 0.2.5
 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.dist-info → primitive-0.2.5.dist-info}/RECORD

@@ -1,12 +1,12 @@
-primitive/__about__.py,sha256=HLGxeolXf3nrn1VSeZ6pPXWXzGZDo1pcN7BQwazigE8,129
+primitive/__about__.py,sha256=VaGq4MBVsV7xkxuZp0WfNnVmej-BHjSD2cj2U5-nyt0,129
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=58fn6ayVSC1f4hLKx3FUNT9CkuPLva8dFQg0_YUwpio,2410
 primitive/client.py,sha256=PPyIQRvKKSqCF9RRF5mJJ4Vqqolpzy1YXqffNLKIvAA,2390
 primitive/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/agent/actions.py,sha256=5Lmqxsf24eH6BDEesbJbn1Xj-8ifVlQ_Y3QR8xpkFtM,6869
 primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,254
-primitive/agent/runner.py,sha256=20ZaX7SuTYeqLCz59IUsIG4kqQu4jDf_iFOp2z-rcyA,12332
-primitive/agent/uploader.py,sha256=OkgwXhWKoECOJnW_ZmpzmUS_cpb-orC_uebNcmf5byw,2948
+primitive/agent/runner.py,sha256=dh1aoPvSg_lUoFnoaVo2TQb9m5TwTDPRB7su9yc2D8Q,12159
+primitive/agent/uploader.py,sha256=6pjUyb1LyUCpHBE6p13pRpXxy6iDxu14qJGvE3R6cVo,3155
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=MPsG9LcKcOPwA7gZ9Ewk0PZJhTQvIrGfODdz4GxSzgA,999
 primitive/auth/commands.py,sha256=2z5u5xX64n0yILucx9emtWh3uQXLvs2QQQQIldZGr94,2341
@@ -88,8 +88,8 @@ primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIU
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=jWzb7ky7p987dJas6ZvarK3IJNZ5cwBXcryRWb9Uh6U,2072
 primitive/utils/text.py,sha256=XiESMnlhjQ534xE2hMNf08WehE1SKaYFRNih0MmnK0k,829
-primitive-0.2.4.dist-info/METADATA,sha256=4UmGnjVB4WYBQYp5taXS1fY6nTcAKT7If2XltbDFjyc,3669
-primitive-0.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.2.4.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.2.4.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.2.4.dist-info/RECORD,,
+primitive-0.2.5.dist-info/METADATA,sha256=MAd0YCdGsnfn8dme11Jl8ZQHRi0pvZ169alY6b5luNc,3669
+primitive-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.5.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.5.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.5.dist-info/RECORD,,