PyPI - utf-queue-client - Versions diffs - 1.19.4b9__tar.gz → 1.19.4b11__tar.gz - Mend

@@ -1,5 +1,7 @@
 import json
 import os
+import base64
 from typing import Iterable, Tuple
 import click
@@ -100,7 +102,7 @@ def publish_test_results_through_queue(url, data_type: str, data_dict: dict):
     elif data_type.upper() == "BUILD_RESULT":
         package_info = "{}"
         if data_dict.get("package_info"):
-            package_info = normalize_to_json(data_dict["package_info"])
+            package_info = normalize_to_json(str(data_dict["package_info"]))
         app_build_result = SqaAppBuildResult(
             session_pk_id=data_dict.get("session_pk_id"),
@@ -132,22 +134,10 @@ 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)
+        json_obj = json.loads(raw)
+        return json.dumps(json_obj)
     except json.JSONDecodeError:
-        pass
-    # Try TOML as fallback
-    try:
-        import tomllib  # Python 3.11+
-    except ModuleNotFoundError:
-        import tomli as tomllib  # pip install tomli
-    try:
-        obj = tomllib.loads(raw)
-        return json.dumps(obj, ensure_ascii=False)
-    except Exception as e:
-        raise ValueError(f"Package info is neither JSON nor TOML: {e}")
+        raise ValueError(f"Package info is not a valid JSON")
 def prepare_session_data(data_dict: dict):

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utf-queue-client
-Version: 1.19.4b9
+Version: 1.19.4b11
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF
@@ -18,4 +18,3 @@ Requires-Dist: otel-extensions>=0.1.2
 Requires-Dist: retry>=0.9.2
 Requires-Dist: requests
 Requires-Dist: ndjson~=0.3
-Requires-Dist: tomli>=2.0.1; python_version < "3.11"

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "utf-queue-client"
-version = "1.19.4b9"
+version = "1.19.4b11"
 description = "No description provided"
 authors = [
     { name = "Joe Savage", email = "joe.savage@silabs.com" }
@@ -24,7 +24,6 @@ dependencies = [
     "retry>=0.9.2",
     "requests",
     "ndjson~=0.3",
-    "tomli>=2.0.1; python_version < '3.11'"
 ]
 keywords = ["UTF"]

@@ -11,5 +11,4 @@ opentelemetry-distro[otlp]
 otel-extensions>=0.2.4
 retry>=0.9.2
 requests
-ndjson~=0.3
-tomli>=2.0.1; python_version < "3.11"
+ndjson~=0.3

@@ -197,23 +197,7 @@ def test_app_build_results_data(request, app_build_results_data):
 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" }
-    ]
-    """
+    package_info = '{"name": "cypher", "ref": "gcc"}'
     parsed = normalize_to_json(raw=package_info)
-    parsed_json = json.loads(parsed)
-    assert parsed_json["version"] == 2
+    parsed_json_lock = json.loads(parsed)
+    assert parsed_json_lock["version"] == 2

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utf-queue-client
-Version: 1.19.4b9
+Version: 1.19.4b11
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF
@@ -18,4 +18,3 @@ Requires-Dist: otel-extensions>=0.1.2
 Requires-Dist: retry>=0.9.2
 Requires-Dist: requests
 Requires-Dist: ndjson~=0.3
-Requires-Dist: tomli>=2.0.1; python_version < "3.11"

@@ -11,8 +11,5 @@ retry>=0.9.2
 requests
 ndjson~=0.3
-[:python_version < "3.11"]
-tomli>=2.0.1
 [:python_version < "3.8"]
 typing_extensions

utf-queue-client 1.19.4b9__tar.gz → 1.19.4b11__tar.gz