primitive 0.1.19__py3-none-any.whl → 0.1.21__py3-none-any.whl

primitive/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Dylan Stein <dylan@steins.studio>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.1.19"
+__version__ = "0.1.21"

primitive/agent/actions.py

@@ -65,6 +65,14 @@ class Agent(BaseAction):
                         )
                     )
 
+                    source_dir = downloaded_git_repository_dir.joinpath(
+                        job_run["jobSettings"]["rootDirectory"]
+                    )
+
+                    cmd = ("make",)
+                    if containerArgs := job_run["jobSettings"]["containerArgs"]:
+                        cmd = tuple(containerArgs.split(" "))
+
                     match job_run["job"]["slug"]:
                         case "lint":
                             logger.debug("Executing Lint Job")
@@ -74,7 +82,7 @@ class Agent(BaseAction):
                             )
 
                             result, message = self.primitive.lint.execute(
-                                source=downloaded_git_repository_dir
+                                source=source_dir
                             )
                             if result:
                                 conclusion = "success"
@@ -96,16 +104,14 @@ class Agent(BaseAction):
                             )
 
                             result, message = self.primitive.sim.execute(
-                                source=downloaded_git_repository_dir,
-                                cmd=(
-                                    "make",
-                                    "all",
-                                ),  # TODO: Change this to use container args container cmd
+                                source=source_dir, cmd=cmd
                             )
 
                             # Attempt artifact collection
                             self.primitive.sim.collect_artifacts(
-                                source=downloaded_git_repository_dir
+                                source=source_dir,
+                                job_run_id=job_run["id"],
+                                organization_id=job_run["organization"]["id"],
                             )
 
                             if result:

primitive/jobs/actions.py

@@ -125,10 +125,13 @@ fragment JobRunFragment on JobRun {
     name
     createdAt
     updatedAt
-  } 
+  }
+  organization {
+    id
+  }
   jobSettings {
     containerArgs
-    containerCommand
+    rootDirectory
   }
   gitCommit {
     sha
@@ -222,6 +225,9 @@ query jobRuns(
                     branch
                     repoFullName
                 }
+                organization {
+                    id
+                }
             }
 
             query jobRun($id: GlobalID!) {

primitive/sim/actions.py

@@ -46,37 +46,45 @@ class Sim(BaseAction):
 
         return True, message
 
-    def upload_file(self, path: Path) -> str:
-        file_upload_response = self.primitive.files.file_upload(
-            path, key_prefix=f"{self.job_run_id}/{str(path.parent)}"
-        )
+    def upload_file(self, path: Path, prefix: str) -> str:
+        file_upload_response = self.primitive.files.file_upload(path, key_prefix=prefix)
         return file_upload_response.json()["data"]["fileUpload"]["id"]
 
-    def collect_artifacts(self, source) -> None:
+    def collect_artifacts(
+        self, source: Path, job_run_id: str, organization_id: str
+    ) -> None:
         file_ids = []
 
         # Look for VCD artifacts
         files = find_files_for_extension(source, ".vcd")
         for file in files:
-            trace_file_ids = self.generate_timeseries(path=file)
+            trace_file_ids = self.generate_timeseries(
+                path=file, job_run_id=job_run_id, organization_id=organization_id
+            )
             file_ids.extend(trace_file_ids)
 
         logger.debug("Uploading additional artifacts...")
         files = find_files_for_extension(source, (".xml", ".vcd", ".log", ".history"))
         for file_path in files:
             try:
-                file_ids.append(self.upload_file(file_path))
+                file_ids.append(
+                    self.upload_file(
+                        file_path, prefix=f"{job_run_id}/{str(file_path.parent)}"
+                    )
+                )
             except FileNotFoundError:
                 logger.warning(f"{file_path} not found...")
 
         logger.debug("Updating job run...")
         if len(file_ids) > 0:
             job_run_update_response = self.primitive.jobs.job_run_update(
-                id=self.job_run_id, file_ids=file_ids
+                id=job_run_id, file_ids=file_ids
             )
             logger.success(job_run_update_response)
 
-    def generate_timeseries(self, path: Path) -> List[str]:
+    def generate_timeseries(
+        self, path: Path, job_run_id: str, organization_id: str
+    ) -> List[str]:
         logger.debug("Parsing VCD file...")
         with open(path, "rb") as f:
             tokens = tokenize(io.BytesIO(f.read()))
@@ -128,7 +136,9 @@ class Sim(BaseAction):
             with open(file_path, "w") as f:
                 f.write(json.dumps(timeseries))
 
-            trace_file_id = self.upload_file(file_path)
+            trace_file_id = self.upload_file(
+                file_path, prefix=f"{job_run_id}/{str(file_path.parent)}"
+            )
             trace_file_ids.append(trace_file_id)
 
             self.trace_create(
@@ -140,9 +150,9 @@ class Sim(BaseAction):
                 bit_index=metadata[id_code]["bit_index"],
                 timescale_unit=timescale_unit,
                 timescale_magnitude=timescale_magnitude,
-                organization=self.organization_id,
+                organization=organization_id,
                 file=trace_file_id,
-                job_run=self.job_run_id,
+                job_run=job_run_id,
             )
 
         return trace_file_ids

{primitive-0.1.19.dist-info → primitive-0.1.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: primitive
-Version: 0.1.19
+Version: 0.1.21
 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.19.dist-info → primitive-0.1.21.dist-info}/RECORD

@@ -1,8 +1,8 @@
-primitive/__about__.py,sha256=9dXOTxTNMMcNC0K6IeUeGG7Kev4SiT898wdCpa6IZQc,129
+primitive/__about__.py,sha256=JiIZ_OJnMBk7JQxWOZ-Ln2mvyV5v9BfpDzkeFWd4wQ0,129
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=VQPSewC6ouGdEG9W1gllawGJTydpOY0Lzg7LURXcqQg,2374
 primitive/client.py,sha256=SFPG4H2wJao8euGdnYp-l7dk_fDpWeVn2aT2WNJUAqo,2370
-primitive/agent/actions.py,sha256=DQ1sADklDPEs5HZTqDZfAHRIKB-rEQM9Y0h1vfmC110,5195
+primitive/agent/actions.py,sha256=CFb44aKPG2IF4c2Jqb0sBj4iA7VCtojcaGHgWdrtLYE,5407
 primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,254
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=N2bGcwXNsB89pzs66gF9A5_WzUScY5fhfOyWixqo2y8,1054
@@ -20,7 +20,7 @@ primitive/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 primitive/graphql/sdk.py,sha256=BhCGmDtc4sNnH8CxbQSJyFwOZ-ZSqMtjsxMB3JRBhPw,1456
 primitive/hardware/actions.py,sha256=Ea3_2E3F_3WapV60g_mOIcpXhadoknwihR7slXyUWtk,18840
 primitive/hardware/commands.py,sha256=QE7LLeFdfOqlvz3JwdwJJRZAY3fHI1zB9kYmmDajpq0,1477
-primitive/jobs/actions.py,sha256=JsoVh7XVPX7AVb73fKwxY_UsMcFt4YWgMhveyJf56oc,7622
+primitive/jobs/actions.py,sha256=1Mc-bg4nCd5qiKC-hPODveTPZwwo0Kztl5BuidLr-Sc,7718
 primitive/jobs/commands.py,sha256=MxPCkBEYW_eLNqgCRYeyj7ZcLOFAWfpVZlqDR2Y_S0o,830
 primitive/lint/actions.py,sha256=fGnNlcD_B-E0SvRUTvTdSlTm2kCQUTrlBLB0mt1sXKM,2268
 primitive/lint/commands.py,sha256=3CZvkOEMpJspJWmaQzA5bpPKx0_VCijQIXA9l-eTnZE,487
@@ -30,7 +30,7 @@ primitive/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 primitive/projects/actions.py,sha256=xhebDUMN9DXWvngWJyJkiijghbZwffy-JIPSsOg8agE,2061
 primitive/projects/commands.py,sha256=Fqqgpi4cm6zOgkHK--0F0hiiIj32BmgZ-h1MydmWwdE,464
 primitive/sim/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/sim/actions.py,sha256=TMxVubn5prAcp2qmKANZMfNIbzYapJGuIUliWyFWbjM,6513
+primitive/sim/actions.py,sha256=vmhiFH8WhQgVEeIHG9r2Gxb5ZZMdk19JYiz5r2F21cg,6864
 primitive/sim/commands.py,sha256=8PaOfL1MO6qxTn7mNVRnBU1X2wa3gk_mlbAhBW6MnI0,591
 primitive/sim/vcd.py,sha256=mAbGnKWM0qzIUMkuSmO0p3sU25kOqbl31mvCsDSrXeM,22221
 primitive/utils/actions.py,sha256=HOFrmM3-0A_A3NS84MqrZ6JmQEiiPSoDqEeuu6b_qfQ,196
@@ -41,8 +41,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=QYczN1IvxODfj4jeq0nqjFuF0Oi0Zdx-Q32ySOJgcw8,2205
-primitive-0.1.19.dist-info/METADATA,sha256=c5jwM4Igt3WrfsnhxnQwsbfmvU4QdhUBP9CLJ2NlWzo,1818
-primitive-0.1.19.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-primitive-0.1.19.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.19.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.19.dist-info/RECORD,,
+primitive-0.1.21.dist-info/METADATA,sha256=MherRu1tZf7ePM5Inx7ebfvihZOrYKJlxMgSYQrTt80,1818
+primitive-0.1.21.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+primitive-0.1.21.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.21.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.21.dist-info/RECORD,,