primitive 0.1.23__py3-none-any.whl → 0.1.25__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.23"
+__version__ = "0.1.25"

primitive/agent/actions.py

@@ -188,9 +188,7 @@ class Agent(BaseAction):
 
                             # Attempt artifact collection
                             self.primitive.sim.collect_artifacts(
-                                source=source_dir,
-                                job_run_id=job_run["id"],
-                                organization_id=job_run["organization"]["id"],
+                                source=source_dir, job_run_id=job_run["id"]
                             )
 
                             if result:

primitive/sim/actions.py

@@ -9,6 +9,7 @@ from .vcd import TokenKind, tokenize
 import io
 from collections import defaultdict
 import json
+import xml.etree.ElementTree as ET
 
 
 class Sim(BaseAction):
@@ -48,15 +49,16 @@ class Sim(BaseAction):
         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: Path, job_run_id: str, organization_id: str
-    ) -> None:
-        # Split VCD artifacts
+    def collect_artifacts(self, source: Path, job_run_id: str) -> None:
+        # Parse VCD artifacts
         files = find_files_for_extension(source, ".vcd")
         for file in files:
-            self.split_vcd(
-                path=file, job_run_id=job_run_id, organization_id=organization_id
-            )
+            self.parse_vcd(path=file)
+
+        # Parse XML artifacts
+        files = find_files_for_extension(source, ".xml")
+        for file in files:
+            self.parse_xml(path=file)
 
         logger.debug("Uploading additional artifacts...")
         # TODO: Figure out how to track ".log", ".history" files w/ analog stuff involved
@@ -80,7 +82,51 @@ class Sim(BaseAction):
             )
             logger.success(job_run_update_response)
 
-    def split_vcd(self, path: Path, job_run_id: str, organization_id: str) -> None:
+    def parse_xml(self, path: Path) -> None:
+        results = ET.parse(path)
+        testsuites = results.getroot()
+
+        parsed_results = {}
+        testsuites_name = testsuites.attrib["name"]
+        parsed_results[testsuites_name] = {}
+
+        for testsuite in testsuites.findall("testsuite"):
+            testsuite_name = testsuite.attrib["name"]
+            parsed_results[testsuites_name][testsuite_name] = {
+                "properties": {},
+                "testcases": {},
+            }
+            props = parsed_results[testsuites_name][testsuite_name]["properties"]
+            testcases = parsed_results[testsuites_name][testsuite_name]["testcases"]
+
+            for prop in testsuite.findall("property"):
+                props[prop.attrib["name"]] = prop.attrib["value"]
+
+            for testcase in testsuite.findall("testcase"):
+                testcases[testcase.attrib["name"]] = {
+                    attr_key: attr_val for attr_key, attr_val in testcase.attrib.items()
+                }
+
+                failures = testcase.findall("failure")
+
+                if len(failures) > 0:
+                    for failure in failures:
+                        testcases[testcase.attrib["name"]]["status"] = {
+                            "conclusion": "failure",
+                            "message": failure.attrib["message"],
+                        }
+                else:
+                    testcases[testcase.attrib["name"]]["status"] = {
+                        "conclusion": "success",
+                        "message": "",
+                    }
+
+        # Write parsed file
+        data_path = path.parent / f"{path.name}.json"
+        with open(data_path, "w") as f:
+            f.write(json.dumps(parsed_results))
+
+    def parse_vcd(self, path: Path) -> None:
         logger.debug("Parsing VCD file...")
         with open(path, "rb") as f:
             tokens = tokenize(io.BytesIO(f.read()))
@@ -142,9 +188,9 @@ class Sim(BaseAction):
         # Write header file
         header_path = path.parent / f"{file_name}.header.vcd.json"
         with open(header_path, "w") as f:
-            f.write(json.dumps(metadata))
+            f.write(json.dumps(header))
 
         # Write data file
         data_path = path.parent / f"{file_name}.data.vcd.json"
         with open(data_path, "w") as f:
-            f.write(json.dumps(metadata))
+            f.write(json.dumps(data))

{primitive-0.1.23.dist-info → primitive-0.1.25.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
-primitive/__about__.py,sha256=t_yxgDK5E5ZXzNOixMhkLwEWmOymxLER3wGKqe2Kdg4,129
+primitive/__about__.py,sha256=i0NlPJ8V0aw-MeG6oFFKWul3Sxet8naZe6kx_IfGXqM,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=ZGnkjieQ6i61HhZuBt8TYjA6CgEJ5R4a6kEUqWIRSMM,8744
+primitive/agent/actions.py,sha256=fAuQmd5Z8FX3w1AiwLd4a_PPuBynzmdiWRmWA9ftn-8,8632
 primitive/agent/commands.py,sha256=-dVDilELfkGfbZB7qfEPs77Dm1oT62qJj4tsIk4KoxI,254
 primitive/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/actions.py,sha256=N2bGcwXNsB89pzs66gF9A5_WzUScY5fhfOyWixqo2y8,1054
@@ -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=VT3PgMt_lC-zz_nx9kI8vWMclsOOkVaJmrYegQu31AM,5513
+primitive/sim/actions.py,sha256=xLhXQKYwJ9MJH_FAexvUapdHO3VqEaRh6t5kQFR_x0U,7277
 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
@@ -42,8 +42,8 @@ primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,37
 primitive/utils/shell.py,sha256=-7UjQaBqSGHzEEyX8pNjeYFFP0P3lVnDV0OkgPz1qHU,1050
 primitive/utils/verible.py,sha256=QYczN1IvxODfj4jeq0nqjFuF0Oi0Zdx-Q32ySOJgcw8,2205
 primitive/utils/yaml.py,sha256=4UP_9MXHoNb9_SCeUDm9xqYg9sHltqpVhNgsY6GNfb8,527
-primitive-0.1.23.dist-info/METADATA,sha256=HxzprzDhPdTYFNxtEACxa57jBgn-ZJcGNfQtELXfKuE,1840
-primitive-0.1.23.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-primitive-0.1.23.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.1.23.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.1.23.dist-info/RECORD,,
+primitive-0.1.25.dist-info/METADATA,sha256=5NMhuWAXJ8_TyFlU18X_tye-uGgziJhnodXBhRCviQg,1840
+primitive-0.1.25.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+primitive-0.1.25.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.1.25.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.1.25.dist-info/RECORD,,