primitive 0.1.18__tar.gz → 0.1.20__tar.gz

{primitive-0.1.18 → primitive-0.1.20}/PKG-INFO

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

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

{primitive-0.1.18 → primitive-0.1.20}/src/primitive/agent/actions.py

@@ -95,17 +95,19 @@ class Agent(BaseAction):
                                 job_run["id"], status="request_in_progress"
                             )
 
+                            cmd = ("make",)
+                            if containerArgs := job_run["jobSettings"]["containerArgs"]:
+                                cmd = tuple(containerArgs.split(" "))
+
                             result, message = self.primitive.sim.execute(
-                                source=downloaded_git_repository_dir,
-                                cmd=(
-                                    "make",
-                                    "all",
-                                ),  # TODO: Change this to use container args container cmd
+                                source=downloaded_git_repository_dir, cmd=cmd
                             )
 
                             # Attempt artifact collection
                             self.primitive.sim.collect_artifacts(
-                                source=downloaded_git_repository_dir
+                                source=downloaded_git_repository_dir,
+                                job_run_id=job_run["id"],
+                                organization_id=job_run["organization"]["id"],
                             )
 
                             if result:

{primitive-0.1.18 → primitive-0.1.20}/src/primitive/jobs/actions.py

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

{primitive-0.1.18 → primitive-0.1.20}/src/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)
-        file_ids.extend(trace_file_ids)
+            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