mypy fixes
This commit is contained in:
@@ -60,6 +60,10 @@ namespace_packages = true # enable namespace packages
|
|||||||
module = "testcontainers.*"
|
module = "testcontainers.*"
|
||||||
ignore_missing_imports = true
|
ignore_missing_imports = true
|
||||||
|
|
||||||
|
[[tool.mypy.overrides]]
|
||||||
|
module = "minio.*"
|
||||||
|
ignore_missing_imports = true
|
||||||
|
|
||||||
[dependency-groups]
|
[dependency-groups]
|
||||||
dev = [
|
dev = [
|
||||||
"mypy>=1.17.1",
|
"mypy>=1.17.1",
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ class MinioAdapter(
|
|||||||
# Send data to bucket
|
# Send data to bucket
|
||||||
# N.B. bucket name is set when connecting
|
# N.B. bucket name is set when connecting
|
||||||
self._client.put_object(
|
self._client.put_object(
|
||||||
bucket_name=self._bucket_name, # type: ignore
|
bucket_name=self._bucket_name,
|
||||||
object_name=object_name,
|
object_name=object_name,
|
||||||
data=data,
|
data=data,
|
||||||
length=num_bytes,
|
length=num_bytes,
|
||||||
@@ -147,7 +147,7 @@ class MinioAdapter(
|
|||||||
# N.B. bucket name is set when connecting
|
# N.B. bucket name is set when connecting
|
||||||
try:
|
try:
|
||||||
response = self._client.get_object(
|
response = self._client.get_object(
|
||||||
bucket_name=self._bucket_name, # type: ignore
|
bucket_name=self._bucket_name,
|
||||||
object_name=object_name,
|
object_name=object_name,
|
||||||
)
|
)
|
||||||
# Get buffered data
|
# Get buffered data
|
||||||
@@ -177,7 +177,7 @@ class MinioAdapter(
|
|||||||
# Delete object from bucket
|
# Delete object from bucket
|
||||||
# N.B. bucket name is set when connecting
|
# N.B. bucket name is set when connecting
|
||||||
self._client.remove_object(
|
self._client.remove_object(
|
||||||
bucket_name=self._bucket_name, # type: ignore
|
bucket_name=self._bucket_name,
|
||||||
object_name=object_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}'")
|
||||||
@@ -193,7 +193,7 @@ class MinioAdapter(
|
|||||||
raise ConnectionError("Not connected to Minio")
|
raise ConnectionError("Not connected to Minio")
|
||||||
# List objects in bucket
|
# List objects in bucket
|
||||||
objects = self._client.list_objects(
|
objects = self._client.list_objects(
|
||||||
bucket_name=self._bucket_name, # type: ignore
|
bucket_name=self._bucket_name,
|
||||||
prefix=prefix,
|
prefix=prefix,
|
||||||
recursive=True,
|
recursive=True,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -187,7 +187,7 @@ def test_should_get_data(
|
|||||||
# Arrange
|
# Arrange
|
||||||
object_name, expected_data = data_in_minio
|
object_name, expected_data = data_in_minio
|
||||||
# Act
|
# Act
|
||||||
received_data = minio_adapter._get(object_name) # type: ignore
|
received_data = minio_adapter._get(object_name)
|
||||||
# Assert
|
# Assert
|
||||||
assert received_data is not None
|
assert received_data is not None
|
||||||
assert same_data(expected_data, received_data)
|
assert same_data(expected_data, received_data)
|
||||||
@@ -200,7 +200,7 @@ def test_should_get_none_for_nonexistent_object(
|
|||||||
# Arrange
|
# Arrange
|
||||||
object_name = "nonexistent_object"
|
object_name = "nonexistent_object"
|
||||||
# Act
|
# Act
|
||||||
received_data = minio_adapter._get(object_name) # type: ignore
|
received_data = minio_adapter._get(object_name)
|
||||||
# Assert
|
# Assert
|
||||||
assert received_data is None
|
assert received_data is None
|
||||||
|
|
||||||
@@ -225,7 +225,7 @@ def test_should_raise_connection_error_on_get_when_not_connected(
|
|||||||
adapter = MinioAdapter() # not connected
|
adapter = MinioAdapter() # not connected
|
||||||
# Act & Assert
|
# Act & Assert
|
||||||
with pytest.raises(ConnectionError):
|
with pytest.raises(ConnectionError):
|
||||||
adapter._get("some_object") # type: ignore
|
adapter._get("some_object")
|
||||||
|
|
||||||
|
|
||||||
def test_should_log_warning_when_getting_nonexistent_object(
|
def test_should_log_warning_when_getting_nonexistent_object(
|
||||||
@@ -291,17 +291,17 @@ def test_should_put_data(
|
|||||||
"""Test that the MinioAdapter can put data into a bucket."""
|
"""Test that the MinioAdapter can put data into a bucket."""
|
||||||
# Arrange
|
# Arrange
|
||||||
object_name = "new_test_object"
|
object_name = "new_test_object"
|
||||||
received_data = minio_adapter._get(object_name) # type: ignore
|
received_data = minio_adapter._get(object_name)
|
||||||
assert received_data is None # ensure object does not exist yet
|
assert received_data is None # ensure object does not exist yet
|
||||||
# Act
|
# Act
|
||||||
minio_adapter._put(object_name, data) # type: ignore
|
minio_adapter._put(object_name, data)
|
||||||
# Assert
|
# Assert
|
||||||
received_data = minio_adapter._get(object_name) # type: ignore
|
received_data = minio_adapter._get(object_name)
|
||||||
assert received_data is not None
|
assert received_data is not None
|
||||||
assert same_data(data, received_data)
|
assert same_data(data, received_data)
|
||||||
# Cleanup
|
# Cleanup
|
||||||
bucket_name = str(os.getenv("MINIO_BUCKET"))
|
bucket_name = str(os.getenv("MINIO_BUCKET"))
|
||||||
minio_adapter._client.remove_object(bucket_name, object_name)
|
minio_adapter._client.remove_object(bucket_name, object_name) # type: ignore
|
||||||
|
|
||||||
|
|
||||||
def test_should_update_data(
|
def test_should_update_data(
|
||||||
@@ -312,13 +312,13 @@ def test_should_update_data(
|
|||||||
# Arrange
|
# Arrange
|
||||||
object_name, _ = data_in_minio
|
object_name, _ = data_in_minio
|
||||||
new_data = BytesIO(random.randbytes(2**21)) # 2 MiB
|
new_data = BytesIO(random.randbytes(2**21)) # 2 MiB
|
||||||
received_data = minio_adapter._get(object_name) # type: ignore
|
received_data = minio_adapter._get(object_name)
|
||||||
assert received_data is not None
|
assert received_data is not None
|
||||||
assert not same_data(received_data, new_data)
|
assert not same_data(received_data, new_data)
|
||||||
# Act
|
# Act
|
||||||
minio_adapter._put(object_name, new_data) # type: ignore
|
minio_adapter._put(object_name, new_data)
|
||||||
# Assert
|
# Assert
|
||||||
received_data = minio_adapter._get(object_name) # type: ignore
|
received_data = minio_adapter._get(object_name)
|
||||||
assert received_data is not None
|
assert received_data is not None
|
||||||
assert same_data(new_data, received_data)
|
assert same_data(new_data, received_data)
|
||||||
|
|
||||||
@@ -358,7 +358,7 @@ def test_should_raise_connection_error_on_put_when_not_connected(
|
|||||||
adapter = MinioAdapter() # not connected
|
adapter = MinioAdapter() # not connected
|
||||||
# Act & Assert
|
# Act & Assert
|
||||||
with pytest.raises(ConnectionError):
|
with pytest.raises(ConnectionError):
|
||||||
adapter._put("some_object", data) # type: ignore
|
adapter._put("some_object", data)
|
||||||
|
|
||||||
|
|
||||||
def test_should_delete_object(
|
def test_should_delete_object(
|
||||||
@@ -368,12 +368,12 @@ def test_should_delete_object(
|
|||||||
"""Test that the MinioAdapter can delete an object from a bucket."""
|
"""Test that the MinioAdapter can delete an object from a bucket."""
|
||||||
# Arrange
|
# Arrange
|
||||||
object_name, _ = data_in_minio
|
object_name, _ = data_in_minio
|
||||||
received_data = minio_adapter._get(object_name) # type: ignore
|
received_data = minio_adapter._get(object_name)
|
||||||
assert received_data is not None # ensure object exists
|
assert received_data is not None # ensure object exists
|
||||||
# Act
|
# Act
|
||||||
minio_adapter._delete(object_name) # type: ignore
|
minio_adapter._delete(object_name)
|
||||||
# Assert
|
# Assert
|
||||||
received_data = minio_adapter._get(object_name) # type: ignore
|
received_data = minio_adapter._get(object_name)
|
||||||
assert received_data is None
|
assert received_data is None
|
||||||
|
|
||||||
|
|
||||||
@@ -397,7 +397,7 @@ def test_should_raise_connection_error_on_delete_when_not_connected(
|
|||||||
adapter = MinioAdapter() # not connected
|
adapter = MinioAdapter() # not connected
|
||||||
# Act & Assert
|
# Act & Assert
|
||||||
with pytest.raises(ConnectionError):
|
with pytest.raises(ConnectionError):
|
||||||
adapter._delete("some_object") # type: ignore
|
adapter._delete("some_object")
|
||||||
|
|
||||||
|
|
||||||
def test_should_list_objects(
|
def test_should_list_objects(
|
||||||
@@ -409,9 +409,9 @@ def test_should_list_objects(
|
|||||||
object_name, _ = data_in_minio
|
object_name, _ = data_in_minio
|
||||||
new_data = BytesIO(random.randbytes(2**21)) # 2 MiB
|
new_data = BytesIO(random.randbytes(2**21)) # 2 MiB
|
||||||
new_data_name = "another_test_object"
|
new_data_name = "another_test_object"
|
||||||
minio_adapter._put(new_data_name, new_data) # type: ignore
|
minio_adapter._put(new_data_name, new_data)
|
||||||
# Act
|
# Act
|
||||||
objects = minio_adapter._list_objects() # type: ignore
|
objects = minio_adapter._list_objects()
|
||||||
# Assert
|
# Assert
|
||||||
assert isinstance(objects, list)
|
assert isinstance(objects, list)
|
||||||
assert len(objects) == 2
|
assert len(objects) == 2
|
||||||
@@ -428,10 +428,10 @@ def test_should_list_objects_with_prefix(
|
|||||||
object_name, _ = data_in_minio
|
object_name, _ = data_in_minio
|
||||||
new_data = BytesIO(random.randbytes(2**21)) # 2 MiB
|
new_data = BytesIO(random.randbytes(2**21)) # 2 MiB
|
||||||
new_data_name = "prefix_test_object"
|
new_data_name = "prefix_test_object"
|
||||||
minio_adapter._put(new_data_name, new_data) # type: ignore
|
minio_adapter._put(new_data_name, new_data)
|
||||||
prefix = "prefix_"
|
prefix = "prefix_"
|
||||||
# Act
|
# Act
|
||||||
objects = minio_adapter._list_objects(prefix) # type: ignore
|
objects = minio_adapter._list_objects(prefix)
|
||||||
# Assert
|
# Assert
|
||||||
assert isinstance(objects, list)
|
assert isinstance(objects, list)
|
||||||
assert len(objects) == 1
|
assert len(objects) == 1
|
||||||
@@ -459,7 +459,7 @@ def test_should_raise_connection_error_on_list_objects_when_not_connected(
|
|||||||
adapter = MinioAdapter() # not connected
|
adapter = MinioAdapter() # not connected
|
||||||
# Act & Assert
|
# Act & Assert
|
||||||
with pytest.raises(ConnectionError):
|
with pytest.raises(ConnectionError):
|
||||||
adapter._list_objects() # type: ignore
|
adapter._list_objects()
|
||||||
|
|
||||||
|
|
||||||
# allows local debugging by running file as script
|
# allows local debugging by running file as script
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ def test_should_get_value(
|
|||||||
# Arrange
|
# Arrange
|
||||||
key, data = data_in_redis
|
key, data = data_in_redis
|
||||||
# Act
|
# Act
|
||||||
value = redis_adapter._get(key) # type: ignore
|
value = redis_adapter._get(key)
|
||||||
# Assert
|
# Assert
|
||||||
assert value is not None
|
assert value is not None
|
||||||
assert value == data
|
assert value == data
|
||||||
@@ -145,7 +145,7 @@ def test_should_get_none_for_missing_key(
|
|||||||
) -> None:
|
) -> None:
|
||||||
"""Test that getting a non-existent key returns None."""
|
"""Test that getting a non-existent key returns None."""
|
||||||
# Act
|
# Act
|
||||||
value = redis_adapter._get("nonexistent_key") # type: ignore
|
value = redis_adapter._get("nonexistent_key")
|
||||||
# Assert
|
# Assert
|
||||||
assert value is None
|
assert value is None
|
||||||
|
|
||||||
@@ -180,12 +180,12 @@ def test_should_set_value(
|
|||||||
"""Test that the RedisAdapter can set a value."""
|
"""Test that the RedisAdapter can set a value."""
|
||||||
# Arrange
|
# Arrange
|
||||||
key = "test_key"
|
key = "test_key"
|
||||||
received_data = redis_adapter._get(key) # type: ignore
|
received_data = redis_adapter._get(key)
|
||||||
assert received_data is None # Ensure key does not exist
|
assert received_data is None # Ensure key does not exist
|
||||||
# Act
|
# Act
|
||||||
redis_adapter._set(key, data)
|
redis_adapter._set(key, data)
|
||||||
# Assert
|
# Assert
|
||||||
received_data = redis_adapter._get(key) # type: ignore
|
received_data = redis_adapter._get(key)
|
||||||
assert received_data is not None
|
assert received_data is not None
|
||||||
assert received_data == data
|
assert received_data == data
|
||||||
|
|
||||||
@@ -198,7 +198,7 @@ def test_should_update_value(
|
|||||||
# Arrange
|
# Arrange
|
||||||
key, _ = data_in_redis
|
key, _ = data_in_redis
|
||||||
new_data = {"new_key": "new_value"}
|
new_data = {"new_key": "new_value"}
|
||||||
received_data = redis_adapter._get(key) # type: ignore
|
received_data = redis_adapter._get(key)
|
||||||
assert received_data is not None
|
assert received_data is not None
|
||||||
assert received_data != new_data
|
assert received_data != new_data
|
||||||
# Act
|
# Act
|
||||||
@@ -253,7 +253,7 @@ def test_should_delete_key(
|
|||||||
"""Test that deleting a key removes it from Redis."""
|
"""Test that deleting a key removes it from Redis."""
|
||||||
# Arrange
|
# Arrange
|
||||||
key, _ = data_in_redis
|
key, _ = data_in_redis
|
||||||
received_data = redis_adapter._get(key) # type: ignore
|
received_data = redis_adapter._get(key)
|
||||||
assert received_data is not None # Ensure key exists
|
assert received_data is not None # Ensure key exists
|
||||||
# Act
|
# Act
|
||||||
redis_adapter._delete(key)
|
redis_adapter._delete(key)
|
||||||
|
|||||||
Reference in New Issue
Block a user