utf-queue-client 1.19.4b5__tar.gz → 1.19.4b7__tar.gz

{utf_queue_client-1.19.4b5 → utf_queue_client-1.19.4b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utf-queue-client
-Version: 1.19.4b5
+Version: 1.19.4b7
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF

{utf_queue_client-1.19.4b5 → utf_queue_client-1.19.4b7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "utf-queue-client"
-version = "1.19.4b5"
+version = "1.19.4b7"
 description = "No description provided"
 authors = [
     { name = "Joe Savage", email = "joe.savage@silabs.com" }

{utf_queue_client-1.19.4b5 → utf_queue_client-1.19.4b7}/test/test_publish_test_results.py

@@ -1,3 +1,4 @@
+import json
 import os
 import subprocess
 import sys
@@ -7,6 +8,8 @@ from uuid import UUID, uuid4
 import pytest
 from otel_extensions import inject_context_to_env, instrumented
 
+from utf_queue_client.scripts.publish_test_results_cli import normalize_to_json
+
 
 @pytest.fixture
 def session_start_data():
@@ -191,3 +194,26 @@ def test_app_build_results_data(request, app_build_results_data):
         assert process.poll() == 0
 
     call_cli_script()
+
+
+def test_normalize_json():
+    package_info = """
+    version = 2
+
+    [dependency]
+    base_sdk = [
+      { installer = "conan", ref = "base_sdk/0.0.6", type = "sdk", version = "0.0.6" }
+      { installer = "conan", ref = "base_sdk/0.0.5", type = "sdk", version = "0.0.5" },
+    ]
+
+    gcc_arm_none_eabi = [
+      { installer = "conan", ref = "gcc-arm-none-eabi/12.2.rel1", type = "toolchain", version = "12.2.rel1" }
+    ]
+
+    java21 = [
+      { installer = "archive", type = "tools", version = "21.0.5" }
+    ]
+    """
+    parsed = normalize_to_json(raw=package_info)
+    parsed_json = json.loads(parsed)
+    assert parsed_json["version"] == 2

{utf_queue_client-1.19.4b5 → utf_queue_client-1.19.4b7}/utf_queue_client/scripts/publish_test_results_cli.py

@@ -1,3 +1,4 @@
+import json
 import os
 from typing import Iterable, Tuple
 
@@ -97,6 +98,10 @@ def publish_test_results_through_queue(url, data_type: str, data_dict: dict):
     elif data_type.upper() == "SESSION_STOP":
         test_result_producer.publish_test_session_stop(prepare_session_data(data_dict))
     elif data_type.upper() == "BUILD_RESULT":
+        package_info = "{}"
+        if data_dict.get("package_info"):
+            package_info = normalize_to_json(data_dict["package_info"])
+
         app_build_result = SqaAppBuildResult(
             session_pk_id=data_dict.get("session_pk_id"),
             app_name=data_dict.get("app_name"),
@@ -114,7 +119,7 @@ def publish_test_results_through_queue(url, data_type: str, data_dict: dict):
             tool_chain=data_dict.get("tool_chain"),
             notes=data_dict.get("notes"),
             test_duration_sec=data_dict.get("test_duration_sec"),
-            package_info=data_dict.get("test_duration_sec"),
+            package_info=package_info,
             artifact_id=data_dict.get("artifact_id"),
             app_version=data_dict.get("app_version"),
         )
@@ -125,6 +130,14 @@ def publish_test_results_through_queue(url, data_type: str, data_dict: dict):
         )
 
 
+def normalize_to_json(raw: str) -> str:
+    try:
+        obj = json.loads(raw)
+        return json.dumps(obj, ensure_ascii=False)
+    except json.JSONDecodeError:
+        raise ValueError(f"Package info is not a valid JSON")
+
+
 def prepare_session_data(data_dict: dict):
     return SqaTestSession(
         PK_ID=data_dict.get("PK_ID"),

{utf_queue_client-1.19.4b5 → utf_queue_client-1.19.4b7}/utf_queue_client/scripts/ubai_upload_cli.py

@@ -53,7 +53,7 @@ def cli_entrypoint(
     retries: int,
     queue: bool,
 ):
-    cli(file_path, metadata, username, password, client_id, retries, queue)
+    return cli(file_path, metadata, username, password, client_id, retries, queue)
 
 
 def cli(
@@ -79,9 +79,9 @@ def cli(
             if queue:
                 upload_artifact_through_queue(url, client_id, file_path, metadata_dict)
             else:
-                upload_artifact_direct(file_path, metadata_dict)
+                return upload_artifact_direct(file_path, metadata_dict)
 
-        retry_wrapper()
+        return retry_wrapper()
 
 
 @instrumented
@@ -122,6 +122,7 @@ def upload_artifact_direct(file_path, metadata_dict):
             )
             if resp.status_code != 200 and resp.status_code != 201:
                 raise RuntimeError(resp.content)
+            return resp.json().get("id")
     else:
         span.set_attribute("multipart_upload", False)
         UbaiArtifactUploadRequestProducer.upload_artifact_direct(

{utf_queue_client-1.19.4b5 → utf_queue_client-1.19.4b7}/utf_queue_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utf-queue-client
-Version: 1.19.4b5
+Version: 1.19.4b7
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF