utf-queue-client 1.18.0a0__tar.gz → 1.18.0a1__tar.gz

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/Jenkinsfile

@@ -122,11 +122,11 @@ pipeline {
                            python3 -m venv venv
                         fi
                         . venv/bin/activate
-                        pip3 install wheel && pip3 install -r test-requirements.txt
+                        pip3 install wheel && pip3 install -r test-requirements.txt build
                         rm -rf build
                         rm -rf dist
                         rm -rf utf_queue_client.egg-info
-                        python3 setup.py sdist bdist_wheel
+                        python3 -m build
 
                         twine upload dist/*
                     '''

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: utf-queue-client
-Version: 1.18.0a0
+Version: 1.18.0a1
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/pyproject.toml

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

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/test/Dockerfile.script_test

@@ -1,4 +1,4 @@
-from python:3.6
+FROM python:3.8
 
 RUN apt update && apt install -y curl
 WORKDIR /usr/local/share/ca-certificates

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/test/test_models.py

@@ -112,14 +112,18 @@ def test_deserialize_queue_message_v1(artifact_upload_request):
         _ = ArtifactUploadRequest(payload)
 
 
-def test_deserialize_queue_message_v2(artifact_upload_request):
+@pytest.mark.parametrize("messageId", [None, "12345678910"])
+def test_deserialize_queue_message_v2(artifact_upload_request, messageId):
     message = {
         "payload": artifact_upload_request.as_dict(),
         "recordType": "ARTIFACT_UPLOAD_REQUEST",
         "tenantKey": "12345678",
         "recordTimestamp": "2022-03-10T18:50:05Z",
     }
+    if messageId:
+        message["messageId"] = messageId
     queue_message = QueueMessage(message)
+    assert queue_message.messageId == messageId
     if queue_message.recordType == "ARTIFACT_UPLOAD_REQUEST":
         payload = queue_message.payload.as_dict()
         _ = ArtifactUploadRequest(payload)

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/test/test_sqa_test_result_producer.py

@@ -1,4 +1,6 @@
 import os
+import uuid
+import datetime
 
 import pytest
 
@@ -46,3 +48,37 @@ def test_dummy_producer(sqa_app_build_result, sqa_test_result, sqa_test_session)
     producer.publish_test_session_start(sqa_test_session)
     producer.publish_test_session_stop(sqa_test_session)
     producer.publish_test_result(sqa_test_result)
+
+
+def test_result_producer_dev(
+    sqa_app_build_result,
+    sqa_test_result,
+    sqa_test_session,
+):
+    os.environ["UTF_PRODUCER_APP_ID"] = "test_result_producer_dev"
+    os.environ["UTF_QUEUE_USE_HTTP_PRODUCER"] = "true"
+    os.environ["UTF_QUEUE_SERVER_URL"] = (
+        "amqps://mwlabuser-jenkins:Lab10Rocks%3f%3f@utf-queue-central.dev.silabs.net:443/%2f"
+    )
+    producer = SqaTestResultProducerFactory.create_producer(use_http_producer=True)
+    producer.queue_name = "sqa_test_results_dev"
+    for _ in range(0, 1):
+        sqa_test_session.PK_ID = str(uuid.uuid4())
+        sqa_test_session.startTime = datetime.datetime.now(tz=datetime.UTC).isoformat()
+        sqa_test_session.stopTime = None
+        print("Session PKID = ", sqa_test_session.PK_ID)
+        sqa_app_build_result.session_pk_id = sqa_test_session.PK_ID
+
+        producer.publish_test_session_start(sqa_test_session)
+        sqa_test_session.PASS_cnt = 100
+        sqa_test_session.FAIL_cnt = 0
+        sqa_test_session.SKIP_cnt = 0
+        for i in range(0, 5):
+            sqa_app_build_result.test_duration_sec = i
+            sqa_app_build_result.app_description = "app description " + str(i + 1)
+            producer.publish_app_build_result(sqa_app_build_result)
+        sqa_test_session.stopTime = datetime.datetime.now(tz=datetime.UTC).isoformat()
+        producer.publish_test_session_stop(sqa_test_session)
+
+
+# ede5e03b-e8d0-4604-8dd5-ed4c6c5a2686

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/utf_queue_client/clients/data_lake_data_producer.py

@@ -6,6 +6,7 @@ from datetime import datetime
 from io import BytesIO
 from socket import gethostname
 from typing import List, Optional, Tuple, Union
+from uuid import uuid4
 
 import ndjson
 from otel_extensions import instrumented
@@ -89,6 +90,7 @@ class DataLakeDataProducer:
             recordType="DATALAKE_DATA",
             tenantKey=self.tenant_key,
             recordTimestamp=datetime.now().isoformat(),
+            messageId=str(uuid4()),
         )
         self.__client.publish(
             exchange="",

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/utf_queue_client/clients/opentelemetry_data_producer.py

@@ -2,6 +2,7 @@ import base64
 from datetime import datetime
 from socket import gethostname
 from typing import Optional
+from uuid import uuid4
 
 from ..models import QueueMessage, TelemetryData
 from .base_producer import BlockingProducer
@@ -34,6 +35,7 @@ class OpenTelemetryDataProducer:
             recordType="OPENTELEMETRY_DATA",
             tenantKey=self.producer_app_id,
             recordTimestamp=datetime.now().isoformat(),
+            messageId=str(uuid4()),
         )
         self.__client.publish(
             exchange="",

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/utf_queue_client/clients/sqa_test_result_producer.py

@@ -4,6 +4,7 @@ from abc import ABC, abstractmethod
 from datetime import datetime
 from socket import gethostname
 from typing import Optional
+from uuid import uuid4
 
 from otel_extensions import instrumented
 
@@ -75,6 +76,7 @@ class SqaTestResultProducer(BaseSqaTestResultProducer):
             recordSubType="TEST_RESULT",
             tenantKey=self.producer_app_id,
             recordTimestamp=datetime.now().isoformat(),
+            messageId=str(uuid4()),
         )
         self._publish_message(queue_message)
 
@@ -86,6 +88,7 @@ class SqaTestResultProducer(BaseSqaTestResultProducer):
             recordSubType=subtype,
             tenantKey=self.producer_app_id,
             recordTimestamp=datetime.now().isoformat(),
+            messageId=str(uuid4()),
         )
         self._publish_message(queue_message)
 
@@ -108,6 +111,7 @@ class SqaTestResultProducer(BaseSqaTestResultProducer):
             recordSubType="BUILD_RESULT",
             tenantKey=self.producer_app_id,
             recordTimestamp=datetime.now().isoformat(),
+            messageId=str(uuid4()),
         )
         self._publish_message(queue_message)
 

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/utf_queue_client/clients/test_rail_data_producer.py

@@ -3,6 +3,7 @@ from abc import ABC, abstractmethod
 from datetime import datetime
 from socket import gethostname
 from typing import Optional
+from uuid import uuid4
 
 from otel_extensions import instrumented
 
@@ -50,6 +51,7 @@ class TestRailDataProducer(BaseTestRailDataProducer):
             recordSubType="TEST_RESULT",
             tenantKey=self.producer_app_id,
             recordTimestamp=datetime.now().isoformat(),
+            messageId=str(uuid4()),
         )
         self.__producer_client.publish(
             exchange="",

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/utf_queue_client/clients/ubai_artifact_upload_request_producer.py

@@ -4,6 +4,7 @@ import os.path
 from datetime import datetime
 from socket import gethostname
 from typing import Optional
+from uuid import uuid4
 
 from otel_extensions import instrumented
 from ubai_client.apis import ArtifactApi
@@ -68,6 +69,7 @@ class UbaiArtifactUploadRequestProducer:
             recordType="ARTIFACT_UPLOAD_REQUEST",
             tenantKey=self.producer_app_id,
             recordTimestamp=datetime.now().isoformat(),
+            messageId=str(uuid4()),
         )
 
         self.__client.publish(

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/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-01-20T20:20:05+00:00
+#   timestamp: 2025-01-27T23:29:08+00:00
 
 from __future__ import annotations
 
@@ -251,6 +251,7 @@ class QueueMessage(BaseModel):
         ...,
         description="Record Payload.\nThis is flexible to allow different fields for different record types and DB tables",
     )
+    messageId: Optional[str] = Field(None, description="Unique client-generated UUID")
 
 
 class QueueMessageV1(BaseModel):

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/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-01-20T20:20:06+00:00
+#   timestamp: 2025-01-27T23:29:08+00:00
 
 from __future__ import annotations
 
@@ -255,6 +255,7 @@ class QueueMessage(BaseModel):
         ...,
         description="Record Payload.\nThis is flexible to allow different fields for different record types and DB tables",
     )
+    messageId: Optional[str] = Field(None, description="Unique client-generated UUID")
 
 
 class QueueMessageV1(BaseModel):

utf_queue_client-1.18.0a1/utf_queue_client/models/schemas/utf_queue_models/models/python/model_test.py

@@ -0,0 +1,23 @@
+from pydantic import BaseModel, TypeAdapter
+import json
+
+
+class PayloadBase(BaseModel):
+    class Config:
+        extra = "allow"
+
+
+class PayloadResult(PayloadBase):
+    value: str
+    is_error: bool
+
+
+adapter = TypeAdapter(PayloadResult)
+
+print(PayloadResult.model_json_schema())
+print(
+    json.dumps(
+        adapter.json_schema(ref_template="#/components/schemas/{model}"),
+        indent=2,
+    )
+)

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/utf_queue_client/models/schemas/utf_queue_models/schema/queue_message.json

@@ -38,6 +38,10 @@
         "payload": {
           "$ref": "#/definitions/QueueRecord",
           "description": "Record Payload.\nThis is flexible to allow different fields for different record types and DB tables"
+        },
+        "messageId": {
+          "description": "Unique client-generated UUID",
+          "type": "string"
         }
       },
       "required": [

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/utf_queue_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: utf-queue-client
-Version: 1.18.0a0
+Version: 1.18.0a1
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF

{utf_queue_client-1.18.0a0 → utf_queue_client-1.18.0a1}/utf_queue_client.egg-info/SOURCES.txt

@@ -70,6 +70,7 @@ utf_queue_client/models/schemas/utf_queue_models/models/python/__init__.py
 utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models.py
 utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models_pydantic_v1.py
 utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models_pydantic_v2.py
+utf_queue_client/models/schemas/utf_queue_models/models/python/model_test.py
 utf_queue_client/models/schemas/utf_queue_models/schema/queue_message.json
 utf_queue_client/scripts/__init__.py
 utf_queue_client/scripts/publish_release_info_cli.py