From 5a725077753fad1bf91557546b1397800ac4c2dd Mon Sep 17 00:00:00 2001 From: Brian Bjarke Jensen Date: Mon, 15 Sep 2025 00:53:38 +0200 Subject: [PATCH] ruff format --- python_repositories/adapters/minio_adapter.py | 26 +++++++++++----- tests/integration/conftest.py | 2 +- tests/integration/minio_adapter_test.py | 31 ++++++++++++++++--- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/python_repositories/adapters/minio_adapter.py b/python_repositories/adapters/minio_adapter.py index f78f535..560ca2c 100644 --- a/python_repositories/adapters/minio_adapter.py +++ b/python_repositories/adapters/minio_adapter.py @@ -25,7 +25,7 @@ class MinioAdapter( access_key_env_var_name: str = "MINIO_ACCESS_KEY" secret_key_env_var_name: str = "MINIO_SECRET_KEY" bucket_env_var_name: str = "MINIO_BUCKET" - chunk_size: int = 5*2**20 # 5 MiB + chunk_size: int = 5 * 2**20 # 5 MiB def __init__(self) -> None: # Setup logger @@ -133,7 +133,9 @@ class MinioAdapter( length=num_bytes, part_size=self.chunk_size, ) - self.logger.debug(f"Put object '{object_name}' into bucket '{self._bucket_name}'") + self.logger.debug( + f"Put object '{object_name}' into bucket '{self._bucket_name}'" + ) def _get(self, object_name: str) -> BytesIO | None: """Get an object from the Minio bucket.""" @@ -155,11 +157,15 @@ class MinioAdapter( while chunk := response.read(self.chunk_size): buffer.write(chunk) buffer.seek(0) - self.logger.debug(f"Got object '{object_name}' from bucket '{self._bucket_name}'") + self.logger.debug( + f"Got object '{object_name}' from bucket '{self._bucket_name}'" + ) return buffer except S3Error as exc: if exc.code == "NoSuchKey": - self.logger.warning(f"Object '{object_name}' not found in bucket '{self._bucket_name}'") + self.logger.warning( + f"Object '{object_name}' not found in bucket '{self._bucket_name}'" + ) else: self.logger.error(repr(exc)) except Exception as exc: # pylint: disable=broad-except @@ -180,7 +186,9 @@ class MinioAdapter( bucket_name=self._bucket_name, object_name=object_name, ) - self.logger.debug(f"Deleted object '{object_name}' from bucket '{self._bucket_name}'") + self.logger.debug( + f"Deleted object '{object_name}' from bucket '{self._bucket_name}'" + ) def _list_objects(self, prefix: str = "") -> list[str]: """List objects in the Minio bucket with an optional prefix.""" @@ -197,6 +205,10 @@ class MinioAdapter( prefix=prefix, recursive=True, ) - object_names = [obj.object_name for obj in objects if obj.object_name is not None] - self.logger.debug(f"Listed {len(object_names)} object(s) in bucket '{self._bucket_name}' with prefix '{prefix}'") + object_names = [ + obj.object_name for obj in objects if obj.object_name is not None + ] + self.logger.debug( + f"Listed {len(object_names)} object(s) in bucket '{self._bucket_name}' with prefix '{prefix}'" + ) return object_names diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 208357c..a1efc3b 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -138,4 +138,4 @@ def raw_minio_client(minio_container: dict[str, str]) -> Generator[Minio]: # Cleanup objects = client.list_objects(bucket_name, recursive=True) for obj in objects: - client.remove_object(bucket_name, obj.object_name) \ No newline at end of file + client.remove_object(bucket_name, obj.object_name) diff --git a/tests/integration/minio_adapter_test.py b/tests/integration/minio_adapter_test.py index a9a4752..4dc9821 100644 --- a/tests/integration/minio_adapter_test.py +++ b/tests/integration/minio_adapter_test.py @@ -31,14 +31,14 @@ def same_data( # compare size if len(data_a_bytes) != len(data_b_bytes): logging.error( - 'data has different length: %s and %s', + "data has different length: %s and %s", len(data_a_bytes), len(data_b_bytes), ) return False # compare content if data_a_bytes != data_b_bytes: - logging.error('data has different bytes') + logging.error("data has different bytes") return False return True @@ -235,7 +235,16 @@ def test_should_log_warning_when_getting_nonexistent_object( # Arrange adapter = MinioAdapter() adapter._client = MagicMock(spec=Minio) - adapter._client.get_object.side_effect = S3Error(code="NoSuchKey", message="", resource="", request_id="", host_id="", response="", bucket_name="test-bucket", object_name="missing-object") + adapter._client.get_object.side_effect = S3Error( + code="NoSuchKey", + message="", + resource="", + request_id="", + host_id="", + response="", + bucket_name="test-bucket", + object_name="missing-object", + ) adapter._bucket_name = "test-bucket" object_name = "missing-object" # Act @@ -243,7 +252,10 @@ def test_should_log_warning_when_getting_nonexistent_object( result = adapter._get(object_name) # Assert assert result is None - assert f"Object '{object_name}' not found in bucket '{adapter._bucket_name}'" in caplog.text + assert ( + f"Object '{object_name}' not found in bucket '{adapter._bucket_name}'" + in caplog.text + ) def test_should_log_error_when_getting_with_s3error_other_than_no_such_key( @@ -253,7 +265,16 @@ def test_should_log_error_when_getting_with_s3error_other_than_no_such_key( # Arrange adapter = MinioAdapter() adapter._client = MagicMock(spec=Minio) - other_s3error = S3Error(code="UnhandledError", message="", resource="", request_id="", host_id="", response="", bucket_name="test-bucket", object_name="missing-object") + other_s3error = S3Error( + code="UnhandledError", + message="", + resource="", + request_id="", + host_id="", + response="", + bucket_name="test-bucket", + object_name="missing-object", + ) adapter._client.get_object.side_effect = other_s3error adapter._bucket_name = "test-bucket" object_name = "missing-object"