utf-queue-client 1.17.2b1__tar.gz → 1.17.2b2__tar.gz

{utf-queue-client-1.17.2b1 → utf-queue-client-1.17.2b2}/MANIFEST.in

@@ -1,7 +1,5 @@
-# Include all Python files
-include *.py
-
-# Include all JSON files in a specific folder
+# Recursively include a directory and all of its contents
+graft utf_queue_client/models/schemas/utf_queue_models/models/python
 graft utf_queue_client/models/schemas/utf_queue_models/schema
 
 # Exclude all compiled Python files
@@ -9,12 +7,12 @@ graft utf_queue_client/models/schemas/utf_queue_models/schema
 # global-exclude *.pyo
 
 # Exclude specific directories
-prune __pycache__
-prune tests/
-prune test/
+# prune __pycache__
+# prune tests/
+# prune test/
 
 # Include specific text files
 # include *.txt
 
 # Exclude all files in a particular directory
-# recursive-exclude unwanted_directory *
+recursive-exclude test *

{utf-queue-client-1.17.2b1 → utf-queue-client-1.17.2b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utf-queue-client
-Version: 1.17.2b1
+Version: 1.17.2b2
 Home-page: 
 Author: Joe Savage
 Author-email: joe.savage@silabs.com

{utf-queue-client-1.17.2b1 → utf-queue-client-1.17.2b2}/setup.py

@@ -2,10 +2,11 @@
 
 """
 
+
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "utf-queue-client"
-VERSION = "1.17.2b1"
+VERSION = "1.17.2b2"
 # To install the library, run the following
 #
 # python setup.py install
@@ -39,7 +40,7 @@ setup(
     keywords=["UTF", ""],
     python_requires=">=3.6",
     install_requires=REQUIRES,
-    packages=find_packages(),
+    packages=find_packages(exclude=["test", "tests"]),
     package_data={
         "utf_queue_client": [
             "models/schemas/utf_queue_models/models/python/*.py",

{utf-queue-client-1.17.2b1 → utf-queue-client-1.17.2b2}/utf_queue_client/clients/async_consumer.py

@@ -6,7 +6,7 @@ import pika.frame
 from pika.exchange_type import ExchangeType
 from . import Loggable
 from typing import Optional, Union, Callable
-# import regex
+import regex
 from enum import Enum
 
 

{utf-queue-client-1.17.2b1 → utf-queue-client-1.17.2b2}/utf_queue_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utf-queue-client
-Version: 1.17.2b1
+Version: 1.17.2b2
 Home-page: 
 Author: Joe Savage
 Author-email: joe.savage@silabs.com

{utf-queue-client-1.17.2b1 → utf-queue-client-1.17.2b2}/utf_queue_client.egg-info/SOURCES.txt

@@ -2,23 +2,6 @@ MANIFEST.in
 README.md
 setup.cfg
 setup.py
-test/test_amqp_connections.py
-test/test_async_consumer.py
-test/test_connection_retry.py
-test/test_data_lake_data_producer.py
-test/test_http_producer.py
-test/test_legacy_base_model.py
-test/test_models.py
-test/test_opentelemetry_data_producer.py
-test/test_publish_release_info.py
-test/test_publish_test_results.py
-test/test_rail_data_producer_tests.py
-test/test_sqa_test_result_producer.py
-test/test_ubai_copy.py
-test/test_ubai_search.py
-test/test_ubai_update_retention.py
-test/test_ubai_upload.py
-test/test_utils.py
 utf_queue_client/__init__.py
 utf_queue_client.egg-info/PKG-INFO
 utf_queue_client.egg-info/SOURCES.txt
@@ -42,6 +25,8 @@ utf_queue_client/models/model_factory.py
 utf_queue_client/models/schemas/__init__.py
 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/__pycache__/__init__.cpython-39.pyc
+utf_queue_client/models/schemas/utf_queue_models/models/python/__pycache__/generated_models.cpython-39.pyc
 utf_queue_client/models/schemas/utf_queue_models/schema/queue_message.json
 utf_queue_client/models/schemas/utf_queue_models/schema/queue_message.ts
 utf_queue_client/scripts/__init__.py

utf-queue-client-1.17.2b1/test/test_amqp_connections.py

@@ -1,46 +0,0 @@
-import os
-from utf_queue_client.clients.base_producer import BlockingProducer
-import pytest
-import logging
-import pika
-import time
-from utf_queue_client.utils import UTF_QUEUE_REGION_MAP
-from urllib.parse import quote
-
-
-regions = list(UTF_QUEUE_REGION_MAP.values())
-servers = [f"utf-queue-{region}" for region in regions]
-
-
-@pytest.fixture(params=servers)
-def queue_server(request):
-    yield request.param
-
-
-@pytest.mark.parametrize(
-    "username, password",
-    [
-        (os.environ["UTF_QUEUE_USERNAME_LDAP"], os.environ["UTF_QUEUE_PASSWORD_LDAP"]),
-        (os.environ["UTF_QUEUE_USERNAME"], os.environ["UTF_QUEUE_PASSWORD"]),
-    ],
-)
-def test_producer(queue_server, username, password):
-    suffix = ".silabs.net"
-    queue_server = f"{queue_server}{suffix}"
-    l = logging.getLogger("test_producer")
-    l.info("Creating producer...")
-    p = BlockingProducer(
-        url=f"amqps://{username}:{quote(password)}@{queue_server}:443/testing?stack_timeout=30",
-    )
-    l.info(f"{queue_server}: Created producer")
-    params = pika.URLParameters(p.url)
-    l.info(f"stack timeout: {params.stack_timeout}")
-    begin = time.time()
-    for _ in range(0, 10):
-        l.info(f"{queue_server}: declaring queue...")
-        start = time.time()
-        p.queue_declare("default", durable=True)
-        stop = time.time()
-        l.info(
-            f"{queue_server}: done declaring queue in {stop - start} sec.  Total time: {stop - begin}"
-        )

utf-queue-client-1.17.2b1/test/test_async_consumer.py

@@ -1,12 +0,0 @@
-from utf_queue_client.clients.async_consumer import AsyncConsumerBase
-
-
-
-def test_sanitize_url():
-    params = [
-        ("amqp://www.ni.com", "amqp://www.ni.com"),
-        ("amqps://utfsilabs:password1234@www.ni.com", "amqps://utfsilabs:******@www.ni.com"),
-    ]
-    for url, display_url in params:
-        sanitized_url = AsyncConsumerBase.sanitize_url_for_display(url)
-        assert sanitized_url == display_url

utf-queue-client-1.17.2b1/test/test_connection_retry.py

@@ -1,40 +0,0 @@
-import logging
-import logging.handlers
-
-import pytest
-from utf_queue_client.clients.sqa_test_result_producer import (
-    SqaTestResultProducer,
-)
-from utf_queue_client.clients.base_producer import ConnectionError
-
-
-@pytest.fixture()
-def pika_logging_handler():
-    """Add a handler to the pika logger to capture its output."""
-    pika_logger = logging.getLogger("pika.adapters.utils.connection_workflow")
-    handler = logging.handlers.BufferingHandler(capacity=100)
-    pika_logger.addHandler(handler)
-    yield handler
-    pika_logger.removeHandler(handler)
-
-
-@pytest.mark.parametrize(
-    "set_environment_variable",
-    [("UTF_QUEUE_SERVER_URL", "amqps://utfsilabs:utfsilabs@12.34.56.78:5671/%2f")],
-    indirect=True,
-)
-def test_result_producer_connection_retry(
-    set_environment_variable, mocker, pika_logging_handler
-):
-    """Test that the connection retry logic works as expected."""
-    mocker.patch("utf_queue_client.clients.base_producer.NUM_CONNECTION_TRIES", 2)
-    with pytest.raises(ConnectionError):
-        _ = SqaTestResultProducer()
-    error_records = [
-        record
-        for record in pika_logging_handler.buffer
-        if record.levelno == logging.ERROR
-    ]
-    # The assertion below depends on the logging output of the pika library (version 1.3.2 as of this writing)
-    # so if that changes, the message below may need to be updated.
-    assert "2 exceptions in all" in error_records[-1].message

utf-queue-client-1.17.2b1/test/test_data_lake_data_producer.py

@@ -1,57 +0,0 @@
-import json
-import uuid
-
-from utf_queue_client.clients.data_lake_data_producer import (
-    DataLakeDataProducer,
-    DataLakeDataProducerFactory,
-)
-import pytest
-import os
-import ndjson
-
-
-def test_data_lake_producer_empty_url():
-    with pytest.raises(RuntimeError):
-        _ = DataLakeDataProducer("dummy tenant")
-
-
-@pytest.mark.parametrize("use_object_id", [True, False])
-def test_data_lake_producer_central_queue(
-    request,
-    data_lake_tenant_key,
-    csv_file_path,
-    json_file_path,
-    parquet_file_path,
-    ndjson_file_path,
-    amqp_url,
-    queue_consumer,
-    use_object_id,
-):
-    os.environ["UTF_PRODUCER_APP_ID"] = request.node.name
-    producer = DataLakeDataProducerFactory.create_producer(
-        data_lake_tenant_key, amqp_url
-    )
-    producer.publish_data_lake_csv_file(
-        csv_file_path, object_id=str(uuid.uuid4()) if use_object_id else None
-    )
-    queue_consumer.expect_messages(1)
-    producer.publish_data_lake_json_file(
-        json_file_path, object_id=str(uuid.uuid4()) if use_object_id else None
-    )
-    queue_consumer.expect_messages(2)
-    with open(json_file_path, "rb") as f:
-        producer.publish_data_lake_json(json.load(f))
-    producer.publish_data_lake_parquet_file(
-        parquet_file_path, object_id=str(uuid.uuid4()) if use_object_id else None
-    )
-    queue_consumer.expect_messages(3)
-    producer.publish_data_lake_ndjson_file(
-        ndjson_file_path, object_id=str(uuid.uuid4()) if use_object_id else None
-    )
-    queue_consumer.expect_messages(4)
-    with open(ndjson_file_path) as f:
-        data = ndjson.load(f)
-        producer.publish_data_lake_ndjson(
-            data, object_id=str(uuid.uuid4()) if use_object_id else None
-        )
-    queue_consumer.expect_messages(5)

utf-queue-client-1.17.2b1/test/test_http_producer.py

@@ -1,90 +0,0 @@
-import pytest
-from utf_queue_client.clients.base_producer import (
-    ConnectionError as QueueServerConnectionError,
-)
-from utf_queue_client.clients.http_producer import (
-    HTTPProducer,
-    HTTPChannel,
-    CompositeHTTPProducer,
-)
-from pika.spec import BasicProperties, PERSISTENT_DELIVERY_MODE
-from unittest.mock import patch
-import utf_queue_client.clients.http_producer
-
-FAKE_CREDS = "notarealusername:notarealpassword"
-
-
-def test_basic_properties_to_json():
-    assert HTTPChannel.basic_properties_to_json(BasicProperties(app_id="foo")) == {
-        "app_id": "foo"
-    }
-    assert HTTPChannel.basic_properties_to_json(
-        BasicProperties(app_id="foo", delivery_mode=PERSISTENT_DELIVERY_MODE)
-    ) == {"app_id": "foo", "delivery_mode": 2}
-    assert HTTPChannel.basic_properties_to_json(None) == {}
-
-
-def test_http_channel_connection_error():
-    channel = HTTPChannel(
-        "https://localshmost", ("user", "pass"), "/", retries=0, retry_delay=0
-    )
-    with pytest.raises(QueueServerConnectionError):
-        channel.queue_declare("queue")
-    with pytest.raises(QueueServerConnectionError):
-        channel.basic_publish("exchange", "routing_key", b"foo", None)
-
-
-def test_composite_producer_errors():
-    with patch.object(
-        utf_queue_client.clients.http_producer, "DEFAULT_NUM_CONNECTION_RETRIES", 0
-    ):
-        composite_producer = CompositeHTTPProducer(
-            f"amqps://{FAKE_CREDS}@localshmost:443/%2F", "app_id"
-        )
-        composite_producer.producers.append(composite_producer.producers[0])
-        with pytest.raises(QueueServerConnectionError):
-            composite_producer.queue_declare("queue")
-        with pytest.raises(QueueServerConnectionError):
-            composite_producer.publish("exchange", "routing_key", {"foo": "bar"}, True)
-
-
-@pytest.mark.parametrize(
-    ("amqp_url", "expected_http_urls"),
-    [
-        (
-            f"amqps://{FAKE_CREDS}@localshmost:443/%2F",
-            ["https://localshmost-admin:443"],
-        ),
-        (
-            f"amqps://{FAKE_CREDS}@utf-queue-central:443/%2F",
-            ["https://utf-queue-central-admin:443"],
-        ),
-        (
-            f"amqps://{FAKE_CREDS}@utf-queue-central.silabs.net:443/%2F",
-            [
-                "https://utf-queue-central-admin.silabs.net:443",
-                "https://utf-queue-aus-admin.silabs.net:443",
-                "https://utf-queue-bos-admin.silabs.net:443",
-                "https://utf-queue-bud-admin.silabs.net:443",
-                "https://utf-queue-hyd-admin.silabs.net:443",
-                "https://utf-queue-yul-admin.silabs.net:443",
-            ],
-        ),
-        (
-            f"amqps://{FAKE_CREDS}@utf-queue-aus.silabs.net:443/%2F",
-            [
-                "https://utf-queue-central-admin.silabs.net:443",
-                "https://utf-queue-aus-admin.silabs.net:443",
-                "https://utf-queue-bos-admin.silabs.net:443",
-                "https://utf-queue-bud-admin.silabs.net:443",
-                "https://utf-queue-hyd-admin.silabs.net:443",
-                "https://utf-queue-yul-admin.silabs.net:443",
-            ],
-        ),
-    ],
-)
-def test_composite_producer_creation(amqp_url, expected_http_urls):
-    composite_producer = CompositeHTTPProducer(amqp_url, "app_id")
-    assert len(composite_producer.producers) == len(expected_http_urls)
-    for index, value in enumerate(expected_http_urls):
-        assert composite_producer.producers[index].channel.url == value

utf-queue-client-1.17.2b1/test/test_legacy_base_model.py

@@ -1,47 +0,0 @@
-from utf_queue_client.models.base_model import LegacyBaseModel as BaseModel
-import pytest
-
-
-def test_base_model():
-
-    test_dict = {
-        "key1": "value1",
-        "key2": 2,
-        "key3": {"subkey1": "subvalue1"},
-        "key4": ["apple", "orange"],
-        "key5": [{"nested_dict_key": 1}, ["nested_list_val1", "nested_list_val2"]],
-    }
-    dot_dict_1 = BaseModel.convert_dict_to_model(test_dict)
-
-    def check_values(dot_dict: BaseModel):
-        assert dot_dict.key1 == "value1"
-        assert dot_dict.key2 == 2
-        assert dot_dict.key3.subkey1 == "subvalue1"
-        assert len(dot_dict.key4) == 2
-        assert dot_dict.key4[0] == "apple" and dot_dict.key4[1] == "orange"
-        assert len(dot_dict.key5) == 2
-        assert isinstance(dot_dict.key5[0], BaseModel)
-        assert dot_dict.key5[0].nested_dict_key == 1
-        assert isinstance(dot_dict.key5[1], list)
-        assert len(dot_dict.key5[1]) == 2
-        assert dot_dict.key5[1][0] == "nested_list_val1"
-        assert dot_dict.key5[1][1] == "nested_list_val2"
-
-    check_values(dot_dict_1)
-    dot_dict_copy = dot_dict_1.copy()
-    check_values(dot_dict_copy)
-    assert dot_dict_1 == dot_dict_copy
-
-    # test that apply returns true when a value is changed
-    apply_from = {"key1": "newvalue1", "new_key": "newvalue2"}
-    assert dot_dict_1.apply(apply_from)
-    assert dot_dict_1.key1 == "newvalue1"
-    assert dot_dict_1 != dot_dict_copy
-    assert not hasattr(dot_dict_1, "new_key")
-    # nothing changed so apply returns False
-    assert not dot_dict_1.apply(apply_from)
-
-    # apply should raise valueError if a type is changed
-    apply_from = {"key1": 2}
-    with pytest.raises(ValueError):
-        dot_dict_1.apply(apply_from)

utf-queue-client-1.17.2b1/test/test_models.py

@@ -1,125 +0,0 @@
-from utf_queue_client.models import (
-    SqaAppBuildResult,
-    SqaTestResult,
-    SqaTestSession,
-    QueueMessage,
-    QueueMessageV1,
-    ArtifactUploadRequest,
-    ArtifactMetadata,
-    ArtifactBuildMetadata,
-)
-from utf_queue_client.exceptions import SchemaValidationError, ValidationError
-from utf_queue_client.models.model_factory import (
-    create_model_with_defaults,
-)
-import pytest
-
-
-def test_model_factory_no_args_valid():
-    # these types support empty initializer
-    types_supporting_defaults_or_no_args = [
-        ArtifactMetadata,
-        ArtifactBuildMetadata,
-    ]
-    for model_type in types_supporting_defaults_or_no_args:
-        create_model_with_defaults(model_type)
-
-
-def test_model_factory_no_args_invalid():
-    # these types do not support creation with empty initializer
-    types_requiring_args = [
-        QueueMessage,
-        QueueMessageV1,
-        ArtifactUploadRequest,
-        SqaTestSession,
-    ]
-    for model_type in types_requiring_args:
-        with pytest.raises(ValidationError):
-            create_model_with_defaults(model_type)
-
-
-
-
-
-def test_sqa_appbuild_results_record_model_creation(sqa_app_build_result):
-    init_dict = {**sqa_app_build_result.dict(), "invalid_attr": True}
-
-    # kwarg creation
-    model = SqaAppBuildResult(**init_dict)
-    assert "invalid_attr" not in model.dict()
-
-    # dict creation
-    model = SqaAppBuildResult(init_dict)
-    assert "invalid_attr" not in model.dict()
-
-    with pytest.raises(ValidationError):
-        SqaAppBuildResult(dict(invalid_attr=True))
-
-
-def test_sqa_test_results_record_schema_validation(sqa_test_result):
-    model = SqaTestResult(sqa_test_result.dict())
-    model.validate_schema()
-    model.test_result = "fail"
-    model.validate_schema()
-
-    model = SqaTestResult(sqa_test_result.dict())
-    model.test_case_id = 4
-    with pytest.raises(SchemaValidationError):
-        model.validate_schema()
-
-    model = SqaTestResult(sqa_test_result.dict())
-    model.test_result = "PASS"
-    with pytest.raises(SchemaValidationError):
-        model.validate_schema()
-
-    model = SqaTestResult(sqa_test_result.dict())
-    model.test_case_id = "=" * 513
-    with pytest.raises(SchemaValidationError):
-        model.validate_schema()
-
-
-def test_sqa_test_session_creation(sqa_test_session):
-    with pytest.raises(ValidationError):
-        _ = SqaTestSession(eventType="TEST_RESULT", invalid_attr=True)
-
-
-@pytest.fixture()
-def artifact_upload_request():
-    yield ArtifactUploadRequest(
-        name="foop",
-        extension=".py",
-        metadata={},
-        base64Content="6",
-        validateMetadata=False,
-    )
-
-
-def test_artifact_upload_request(artifact_upload_request):
-    model = artifact_upload_request
-    model.validate_schema()
-    with pytest.raises(SchemaValidationError):
-        model.base64Content = 6
-        model.validate_schema()
-
-
-def test_deserialize_queue_message_v1(artifact_upload_request):
-    message = {
-        "payload": artifact_upload_request.dict(),
-        "recordType": "ARTIFACT_UPLOAD_REQUEST",
-        "timestamp": 1649882203,
-    }
-    queue_message = QueueMessageV1(message)
-    if queue_message.recordType == "ARTIFACT_UPLOAD_REQUEST":
-        _ = ArtifactUploadRequest(queue_message.payload.dict())
-
-
-def test_deserialize_queue_message_v2(artifact_upload_request):
-    message = {
-        "payload": artifact_upload_request.dict(),
-        "recordType": "ARTIFACT_UPLOAD_REQUEST",
-        "tenantKey": "12345678",
-        "recordTimestamp": "2022-03-10T18:50:05Z",
-    }
-    queue_message = QueueMessage(message)
-    if queue_message.recordType == "ARTIFACT_UPLOAD_REQUEST":
-        _ = ArtifactUploadRequest(queue_message.payload.dict())