Merge pull request 'added support for content type when putting object in minio' (#9) from add-support-for-content-type-in-minio into main

Reviewed-on: brian/python-repositories#9

python_repositories/adapters/minio_adapter.py

@@ -3,10 +3,8 @@
 from __future__ import annotations
 import os
 from io import BytesIO
-
+from importlib.util import find_spec
 import structlog
-from minio import Minio, S3Error
-
 from python_utils import check_env
 
 from python_repositories.interfaces import (
@@ -14,6 +12,10 @@ from python_repositories.interfaces import (
     ConnectionAwareInterface,
 )
 
+# Handle optional dependencies
+if find_spec("minio") is not None:
+    import minio
+
 
 class MinioAdapter(
     ContextAwareInterface,
@@ -42,7 +44,7 @@ class MinioAdapter(
             },
         )
         # Prepare internal variables
-        self._client: Minio | None = None
+        self._client: minio.Minio | None = None
         self._bucket_name: str | None = None
 
     def __enter__(self) -> MinioAdapter:
@@ -77,7 +79,7 @@ class MinioAdapter(
         secret_key = str(os.getenv(self.secret_key_env_var_name))
         bucket = str(os.getenv(self.bucket_env_var_name))
         # Connect client
-        client = Minio(
+        client = minio.Minio(
             endpoint=endpoint,
             access_key=access_key,
             secret_key=secret_key,
@@ -107,17 +109,24 @@ class MinioAdapter(
     @property
     def is_connected(self) -> bool:
         """Check if connected to Minio server."""
-        res = bool(isinstance(self._client, Minio))
+        res = bool(isinstance(self._client, minio.Minio))
         self.logger.debug(res)
         return res
 
-    def _put(self, object_name: str, data: BytesIO) -> None:
+    def _put(
+        self,
+        object_name: str,
+        data: BytesIO,
+        content_type: str = "application/octet-stream",
+    ) -> None:
         """Put an object into the Minio bucket."""
         # Check input
         if not isinstance(object_name, str) or len(object_name) == 0:
             raise ValueError("object_name must be a non-empty string")
         if not isinstance(data, BytesIO) or data.getbuffer().nbytes == 0:
             raise ValueError("data must be a non-empty BytesIO object")
+        if not isinstance(content_type, str) or len(content_type) == 0:
+            raise ValueError("content_type must be a non-empty string")
         # Check connection
         if self._client is None or not self.is_connected:
             raise ConnectionError("Not connected to Minio")
@@ -132,6 +141,7 @@ class MinioAdapter(
             data=data,
             length=num_bytes,
             part_size=self.chunk_size,
+            content_type=content_type,
         )
         self.logger.debug(
             f"Put object '{object_name}' into bucket '{self._bucket_name}'"
@@ -161,7 +171,7 @@ class MinioAdapter(
                 f"Got object '{object_name}' from bucket '{self._bucket_name}'"
             )
             return buffer
-        except S3Error as exc:
+        except minio.S3Error as exc:
             if exc.code == "NoSuchKey":
                 self.logger.warning(
                     f"Object '{object_name}' not found in bucket '{self._bucket_name}'"

python_repositories/adapters/redis_adapter.py

@@ -2,13 +2,10 @@
 
 from __future__ import annotations
 from typing import cast
-
+from importlib.util import find_spec
 import os
 import structlog
 
-import redis
-from redis.commands.json.path import Path as RedisPath
-
 from python_utils import check_env
 
 from python_repositories.interfaces import (
@@ -16,6 +13,11 @@ from python_repositories.interfaces import (
     ConnectionAwareInterface,
 )
 
+# Handle optional dependencies
+if find_spec("redis") is not None:
+    import redis
+    from redis.commands.json.path import Path as RedisPath
+
 
 class RedisAdapter(
     ContextAwareInterface,
@@ -24,7 +26,7 @@ class RedisAdapter(
     """Redis adapter exposing basic CRUD functionality."""
 
     uri_env_var_name: str = "REDIS_URI"
-    path: str = RedisPath.root_path()
+    path: str = "."  # JSON root path, updated in __init__
     encoding: str = "UTF-8"
 
     def __init__(self) -> None:
@@ -36,6 +38,7 @@ class RedisAdapter(
         check_env(self.uri_env_var_name)
         # Prepare internal variables
         self._client: redis.Redis | None = None
+        self.path: str = RedisPath.root_path()
 
     def __enter__(self) -> RedisAdapter:
         """Enter the context."""

tests/integration/minio_adapter_test.py

@@ -370,6 +370,20 @@ def test_should_raise_value_error_on_invalid_put_data(
             minio_adapter._put(object_name, data)  # type: ignore
 
 
+def test_should_raise_value_error_on_invalid_put_content_type(
+    data: BytesIO,
+    minio_adapter: MinioAdapter,
+) -> None:
+    """Test that the MinioAdapter raises ValueError when putting with an invalid content type."""
+    # Arrange
+    object_name = "valid_object_name"
+    invalid_content_types = ["", 123, None]
+    # Act & Assert
+    for content_type in invalid_content_types:
+        with pytest.raises(ValueError):
+            minio_adapter._put(object_name, data, content_type)  # type: ignore
+
+
 def test_should_raise_connection_error_on_put_when_not_connected(
     data: BytesIO,
     minio_adapter: MinioAdapter,