hexkit 3.7.0__tar.gz → 3.8.1__tar.gz

{hexkit-3.7.0/src/hexkit.egg-info → hexkit-3.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hexkit
-Version: 3.7.0
+Version: 3.8.1
 Summary: A Toolkit for Building Microservices using the Hexagonal Architecture
 Author-email: "German Human Genome Phenome Archive (GHGA)" <contact@ghga.de>
 License: Apache 2.0

{hexkit-3.7.0 → hexkit-3.8.1}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
     "Intended Audience :: Developers",
 ]
 name = "hexkit"
-version = "3.7.0"
+version = "3.8.1"
 description = "A Toolkit for Building Microservices using the Hexagonal Architecture"
 dependencies = [
     "pydantic >=2, <3",
@@ -95,6 +95,7 @@ fixable = [
     "UP",
     "I",
     "D",
+    "RUF022",
 ]
 ignore = [
     "E111",
@@ -114,6 +115,7 @@ ignore = [
     "D206",
     "D300",
     "UP040",
+    "PLC0206",
 ]
 select = [
     "C90",

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/protocols/objstorage.py

@@ -22,7 +22,7 @@ import re
 from abc import ABC, abstractmethod
 from typing import NamedTuple, Optional
 
-__all__ = ["PresignedPostURL", "ObjectStorageProtocol"]
+__all__ = ["ObjectStorageProtocol", "PresignedPostURL"]
 
 DEFAULT_URL_EXPIRATION_PERIOD = 24 * 60 * 60  # default expiration time 24 hours
 

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/providers/akafka/config.py

@@ -64,7 +64,7 @@ class KafkaConfig(BaseSettings):
         default="", description="Optional filename containing the client private key."
     )
     kafka_ssl_password: SecretStr = Field(
-        default="",
+        default="",  # type: ignore
         description="Optional password to be used for the client private key.",
     )
     generate_correlation_id: bool = Field(

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/providers/s3/provider.py

@@ -22,6 +22,8 @@ Utilities for testing are located in `./testutils.py`.
 # ruff: noqa: PLR0913
 
 import asyncio
+import logging
+import re
 from functools import lru_cache
 from pathlib import Path
 from typing import Any, Optional
@@ -31,6 +33,7 @@ import botocore.client
 import botocore.config
 import botocore.configloader
 import botocore.exceptions
+import botocore.handlers
 from boto3.s3.transfer import TransferConfig
 from pydantic import Field, SecretStr
 from pydantic_settings import BaseSettings
@@ -39,6 +42,10 @@ from hexkit.protocols.objstorage import ObjectStorageProtocol, PresignedPostURL
 from hexkit.utils import calc_part_size
 
 __all__ = ["ObjectStorageProtocol", "PresignedPostURL"]
+# Allow colon character in bucket names to accommodate Ceph multi tenancy S3
+botocore.handlers.VALID_BUCKET = re.compile(
+    r"^(?:[a-zA-Z0-9_]{1,191}:)?[a-z0-9\-]{3,63}$"
+)
 
 
 class S3Config(BaseSettings):
@@ -116,6 +123,8 @@ def read_aws_config_ini(aws_config_ini: Path) -> botocore.config.Config:
 class S3ObjectStorage(ObjectStorageProtocol):
     """S3-based provider implementing the ObjectStorageProtocol."""
 
+    _re_bucket_id = botocore.handlers.VALID_BUCKET
+
     def __init__(
         self,
         *,
@@ -841,6 +850,17 @@ class S3ObjectStorage(ObjectStorageProtocol):
             bucket_id=dest_bucket_id, object_id=dest_object_id
         )
 
+        underway_operations = await self._list_multipart_upload_for_object(
+            bucket_id=dest_bucket_id, object_id=dest_object_id
+        )
+        if len(underway_operations) > 0:
+            logging.info(
+                "Upload or copy operation already exists for object id '%s' in bucket '%s'.",
+                dest_object_id,
+                dest_bucket_id,
+            )
+            return
+
         part_size = calc_part_size(file_size=file_size)
 
         transfer_config = TransferConfig(

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/providers/testing/eventpub.py

@@ -26,7 +26,7 @@ from typing import NamedTuple, Optional
 from hexkit.custom_types import JsonObject
 from hexkit.protocols.eventpub import EventPublisherProtocol
 
-__all__ = ["InMemEventStore", "InMemEventPublisher", "TopicExhaustedError"]
+__all__ = ["InMemEventPublisher", "InMemEventStore", "TopicExhaustedError"]
 
 
 class TopicExhaustedError(RuntimeError):

{hexkit-3.7.0 → hexkit-3.8.1/src/hexkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hexkit
-Version: 3.7.0
+Version: 3.8.1
 Summary: A Toolkit for Building Microservices using the Hexagonal Architecture
 Author-email: "German Human Genome Phenome Archive (GHGA)" <contact@ghga.de>
 License: Apache 2.0

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/correlation.py

@@ -28,13 +28,13 @@ log = logging.getLogger(__name__)
 correlation_id_var: ContextVar[str] = ContextVar("correlation_id", default="")
 
 __all__ = [
-    "set_correlation_id",
-    "set_new_correlation_id",
+    "CorrelationIdContextError",
+    "InvalidCorrelationIdError",
     "get_correlation_id",
     "new_correlation_id",
+    "set_correlation_id",
+    "set_new_correlation_id",
     "validate_correlation_id",
-    "CorrelationIdContextError",
-    "InvalidCorrelationIdError",
 ]
 
 

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/protocols/dao.py

@@ -35,13 +35,13 @@ from typing_extensions import deprecated
 from hexkit.utils import FieldNotInModelError, validate_fields_in_model
 
 __all__ = [
-    "ResourceNotFoundError",
-    "ResourceAlreadyExistsError",
-    "FindError",
-    "MultipleHitsFoundError",
+    "DaoFactoryProtocol",
     "DaoNaturalId",
     "DaoSurrogateId",
-    "DaoFactoryProtocol",
+    "FindError",
+    "MultipleHitsFoundError",
+    "ResourceAlreadyExistsError",
+    "ResourceNotFoundError",
     "uuid4_id_generator",
 ]
 

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/providers/akafka/__init__.py

@@ -27,8 +27,8 @@ from .provider import (
 )
 
 __all__ = [
+    "KafkaConfig",
     "KafkaEventPublisher",
     "KafkaEventSubscriber",
-    "KafkaConfig",
     "KafkaOutboxSubscriber",
 ]

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/providers/akafka/provider/__init__.py

@@ -29,10 +29,10 @@ from .eventsub import (
 )
 
 __all__ = [
+    "ConsumerEvent",
     "KafkaEventPublisher",
     "KafkaEventSubscriber",
-    "ConsumerEvent",
+    "KafkaOutboxSubscriber",
     "get_header_value",
     "headers_as_dict",
-    "KafkaOutboxSubscriber",
 ]

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/providers/akafka/testutils.py

@@ -53,19 +53,19 @@ __all__ = [
     "EventBase",
     "EventRecorder",
     "ExpectedEvent",
-    "RecordedEvent",
-    "ValidationError",
     "KafkaConfig",
     "KafkaContainerFixture",
     "KafkaEventPublisher",
     "KafkaFixture",
-    "get_kafka_container_fixture",
+    "RecordedEvent",
+    "ValidationError",
+    "clean_kafka_fixture",
     "get_clean_kafka_fixture",
+    "get_kafka_container_fixture",
     "get_persistent_kafka_fixture",
     "kafka_container_fixture",
-    "clean_kafka_fixture",
-    "persistent_kafka_fixture",
     "kafka_fixture",
+    "persistent_kafka_fixture",
 ]
 
 

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/providers/mongodb/testutils.py

@@ -41,13 +41,13 @@ __all__ = [
     "MongoDbContainerFixture",
     "MongoDbDaoFactory",
     "MongoDbFixture",
+    "clean_mongodb_fixture",
+    "get_clean_mongodb_fixture",
     "get_mongodb_container_fixture",
     "get_persistent_mongodb_fixture",
-    "get_clean_mongodb_fixture",
     "mongodb_container_fixture",
-    "clean_mongodb_fixture",
-    "persistent_mongodb_fixture",
     "mongodb_fixture",
+    "persistent_mongodb_fixture",
 ]
 
 

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/providers/s3/testutils/__init__.py

@@ -60,35 +60,35 @@ __all__ = [
     "MEBIBYTE",
     "TEST_FILE_DIR",
     "TEST_FILE_PATHS",
+    "FederatedS3Fixture",
     "FileObject",
     "S3ContainerFixture",
     "S3Fixture",
+    "S3MultiContainerFixture",
     "calc_md5",
+    "check_part_size",
+    "clean_federated_s3_fixture",
     "clean_s3_fixture",
+    "download_and_check_test_file",
+    "federated_s3_fixture",
+    "get_clean_federated_s3_fixture",
     "get_clean_s3_fixture",
+    "get_persistent_federated_s3_fixture",
     "get_persistent_s3_fixture",
     "get_s3_container_fixture",
+    "get_s3_multi_container_fixture",
+    "multipart_upload_file",
+    "persistent_federated_s3_fixture",
     "persistent_s3_fixture",
     "populate_storage",
     "s3_container_fixture",
     "s3_fixture",
+    "s3_multi_container_fixture",
     "temp_file_object",
     "tmp_file",
-    "upload_file",
     "typical_workflow",
-    "check_part_size",
-    "download_and_check_test_file",
-    "multipart_upload_file",
+    "upload_file",
     "upload_part",
     "upload_part_of_size",
     "upload_part_via_url",
-    "FederatedS3Fixture",
-    "S3MultiContainerFixture",
-    "clean_federated_s3_fixture",
-    "federated_s3_fixture",
-    "get_clean_federated_s3_fixture",
-    "get_s3_multi_container_fixture",
-    "get_persistent_federated_s3_fixture",
-    "s3_multi_container_fixture",
-    "persistent_federated_s3_fixture",
 ]

{hexkit-3.7.0 → hexkit-3.8.1}/src/hexkit/providers/s3/testutils/_fixtures.py

@@ -46,21 +46,21 @@ __all__ = [
     "MEBIBYTE",
     "TEST_FILE_DIR",
     "TEST_FILE_PATHS",
-    "upload_file",
-    "populate_storage",
-    "calc_md5",
     "FileObject",
     "S3ContainerFixture",
-    "get_s3_container_fixture",
-    "s3_container_fixture",
     "S3Fixture",
+    "calc_md5",
+    "clean_s3_fixture",
+    "get_clean_s3_fixture",
     "get_persistent_s3_fixture",
+    "get_s3_container_fixture",
     "persistent_s3_fixture",
-    "get_clean_s3_fixture",
-    "clean_s3_fixture",
+    "populate_storage",
+    "s3_container_fixture",
     "s3_fixture",
-    "tmp_file",
     "temp_file_object",
+    "tmp_file",
+    "upload_file",
 ]