utf-queue-client 1.19.4b11__tar.gz → 1.20.1b1__tar.gz

{utf_queue_client-1.19.4b11 → utf_queue_client-1.20.1b1}/PKG-INFO

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

{utf_queue_client-1.19.4b11 → utf_queue_client-1.20.1b1}/pyproject.toml

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

{utf_queue_client-1.19.4b11 → utf_queue_client-1.20.1b1}/test/test_publish_test_results.py

@@ -3,12 +3,16 @@ import os
 import subprocess
 import sys
 from datetime import datetime
+from unittest import mock
 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
+from utf_queue_client.scripts.publish_test_results_cli import (
+    normalize_to_json,
+    publish_test_results_through_queue,
+)
 
 
 @pytest.fixture
@@ -197,7 +201,56 @@ def test_app_build_results_data(request, app_build_results_data):
 
 
 def test_normalize_json():
-    package_info = '{"name": "cypher", "ref": "gcc"}'
+    package_info = '{"dependency":{"security_sxsymcrypt":"test"},"version":2}'
     parsed = normalize_to_json(raw=package_info)
     parsed_json_lock = json.loads(parsed)
     assert parsed_json_lock["version"] == 2
+
+
+@pytest.mark.parametrize(
+    "package_info, expected_pacakge_info",
+    [('{"foo": "bar"}', '{"foo": "bar"}'), ("", "{}")],
+)
+@mock.patch(
+    "utf_queue_client.scripts.publish_test_results_cli.SqaTestResultProducerFactory"
+)
+def test_publish_build_result_with_package_info(
+    mock_factory, app_build_results_data, package_info, expected_pacakge_info
+):
+    mock_producer = mock.Mock()
+    mock_factory.create_producer.return_value = mock_producer
+    url = "amqp://test"
+    data_type = "BUILD_RESULT"
+    data_dict = {
+        "session_pk_id": "A464578D-E940-4541-B666-DE164654CABC",
+        "package_info": package_info,
+    }
+    for k, v in app_build_results_data:
+        data_dict[k] = v
+    publish_test_results_through_queue(url, data_type, data_dict)
+    assert os.environ["UTF_QUEUE_SERVER_URL"] == url
+    assert os.environ["UTF_PRODUCER_APP_ID"]
+    mock_producer.publish_app_build_result.assert_called_once()
+    args, kwargs = mock_producer.publish_app_build_result.call_args
+    assert args[0].app_name == "queue_client"
+    assert args[0].package_info == expected_pacakge_info
+
+
+@mock.patch(
+    "utf_queue_client.scripts.publish_test_results_cli.SqaTestResultProducerFactory"
+)
+def test_publish_build_result_with_invalid_package_info(
+    mock_factory, app_build_results_data
+):
+    mock_producer = mock.Mock()
+    mock_factory.create_producer.return_value = mock_producer
+    url = "amqp://test"
+    data_type = "BUILD_RESULT"
+    data_dict = {
+        "session_pk_id": "A464578D-E940-4541-B666-DE164654CABC",
+        "package_info": "not a json",
+    }
+    for k, v in app_build_results_data:
+        data_dict[k] = v
+    with pytest.raises(RuntimeError, match="Package info is not a valid JSON"):
+        publish_test_results_through_queue(url, data_type, data_dict)

{utf_queue_client-1.19.4b11 → utf_queue_client-1.20.1b1}/utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models_pydantic_v1.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  queue_message.json
-#   timestamp: 2025-08-07T19:36:24+00:00
+#   timestamp: 2025-09-03T08:25:25+00:00
 
 from __future__ import annotations
 
@@ -263,7 +263,10 @@ class XrayIteration(BaseModel):
     name: Optional[str] = None
     id: Optional[int] = None
     parameters: List[XrayParameter]
-    status: Literal["ABORTED", "BLOCK", "EXECUTING", "FAIL", "PASS", "SKIP", "TODO"]
+    status: constr(regex=r"^[A-Z_]+$") = Field(
+        ...,
+        description="Status for the iteration (examples: PASS, FAIL, SKIP, BLOCK, BROKEN, REGRESSION)",
+    )
 
 
 class XrayTestInfo(BaseModel):
@@ -278,7 +281,10 @@ class XrayTestInfo(BaseModel):
 
 class XrayTestExecUpdate(BaseModel):
     test_key: str
-    status: Literal["ABORTED", "BLOCK", "EXECUTING", "FAIL", "PASS", "SKIP", "TODO"]
+    status: constr(regex=r"^[A-Z_]+$") = Field(
+        ...,
+        description="Test run status (examples: PASS, FAIL, SKIP, BLOCK, BROKEN, REGRESSION)",
+    )
     test_info: Optional[XrayTestInfo] = None
     test_version: Optional[str] = None
     start: Optional[str] = None

{utf_queue_client-1.19.4b11 → utf_queue_client-1.20.1b1}/utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models_pydantic_v2.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  queue_message.json
-#   timestamp: 2025-08-07T19:36:24+00:00
+#   timestamp: 2025-09-03T08:25:26+00:00
 
 from __future__ import annotations
 
@@ -260,7 +260,10 @@ class XrayIteration(BaseModel):
     name: Optional[str] = None
     id: Optional[int] = None
     parameters: List[XrayParameter]
-    status: Literal["ABORTED", "BLOCK", "EXECUTING", "FAIL", "PASS", "SKIP", "TODO"]
+    status: constr(pattern=r"^[A-Z_]+$") = Field(
+        ...,
+        description="Status for the iteration (examples: PASS, FAIL, SKIP, BLOCK, BROKEN, REGRESSION)",
+    )
 
 
 class XrayTestInfo(BaseModel):
@@ -275,7 +278,10 @@ class XrayTestInfo(BaseModel):
 
 class XrayTestExecUpdate(BaseModel):
     test_key: str
-    status: Literal["ABORTED", "BLOCK", "EXECUTING", "FAIL", "PASS", "SKIP", "TODO"]
+    status: constr(pattern=r"^[A-Z_]+$") = Field(
+        ...,
+        description="Test run status (examples: PASS, FAIL, SKIP, BLOCK, BROKEN, REGRESSION)",
+    )
     test_info: Optional[XrayTestInfo] = None
     test_version: Optional[str] = None
     start: Optional[str] = None

{utf_queue_client-1.19.4b11 → utf_queue_client-1.20.1b1}/utf_queue_client/models/schemas/utf_queue_models/schema/queue_message.json

@@ -794,15 +794,8 @@
           }
         },
         "status": {
-          "enum": [
-            "ABORTED",
-            "BLOCK",
-            "EXECUTING",
-            "FAIL",
-            "PASS",
-            "SKIP",
-            "TODO"
-          ],
+          "description": "Status for the iteration (examples: PASS, FAIL, SKIP, BLOCK, BROKEN, REGRESSION)",
+          "pattern": "^[A-Z_]+$",
           "type": "string"
         }
       },
@@ -856,15 +849,8 @@
           "type": "string"
         },
         "status": {
-          "enum": [
-            "ABORTED",
-            "BLOCK",
-            "EXECUTING",
-            "FAIL",
-            "PASS",
-            "SKIP",
-            "TODO"
-          ],
+          "description": "Test run status (examples: PASS, FAIL, SKIP, BLOCK, BROKEN, REGRESSION)",
+          "pattern": "^[A-Z_]+$",
           "type": "string"
         },
         "test_info": {

{utf_queue_client-1.19.4b11 → utf_queue_client-1.20.1b1}/utf_queue_client/scripts/publish_test_results_cli.py

@@ -1,7 +1,5 @@
 import json
 import os
-import base64
-
 from typing import Iterable, Tuple
 
 import click
@@ -136,8 +134,8 @@ def normalize_to_json(raw: str) -> str:
     try:
         json_obj = json.loads(raw)
         return json.dumps(json_obj)
-    except json.JSONDecodeError:
-        raise ValueError(f"Package info is not a valid JSON")
+    except json.JSONDecodeError as e:
+        raise RuntimeError("Package info is not a valid JSON") from e
 
 
 def prepare_session_data(data_dict: dict):

{utf_queue_client-1.19.4b11 → utf_queue_client-1.20.1b1}/utf_queue_client/scripts/ubai_upload_cli.py

@@ -53,7 +53,7 @@ def cli_entrypoint(
     retries: int,
     queue: bool,
 ):
-    return cli(file_path, metadata, username, password, client_id, retries, queue)
+    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:
-                return upload_artifact_direct(file_path, metadata_dict)
+                upload_artifact_direct(file_path, metadata_dict)
 
-        return retry_wrapper()
+        retry_wrapper()
 
 
 @instrumented
@@ -122,7 +122,6 @@ 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.4b11 → utf_queue_client-1.20.1b1}/utf_queue_client.egg-info/PKG-INFO

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