From 14ccaace95dcdb8bab556c6c707713acb7f1def0 Mon Sep 17 00:00:00 2001 From: brian Date: Sat, 19 Oct 2024 20:03:54 +0000 Subject: [PATCH] mypy fixed types --- shared/data_store/connect_minio.py | 8 ++++---- shared/data_store/delete.py | 5 +++-- shared/data_store/get.py | 5 ++--- shared/data_store/get_image.py | 4 ++-- shared/data_store/put.py | 5 +++-- shared/data_store/put_image.py | 4 ++-- shared/data_store/put_model.py | 4 ++-- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/shared/data_store/connect_minio.py b/shared/data_store/connect_minio.py index 429492e..c0bd3f5 100644 --- a/shared/data_store/connect_minio.py +++ b/shared/data_store/connect_minio.py @@ -23,10 +23,10 @@ def connect_minio() -> Minio: env_var }" # prepare arguments - minio_endpoint = os.getenv('MINIO_ENDPOINT') - minio_access_key = os.getenv('MINIO_ACCESS_KEY') - minio_secret_key = os.getenv('MINIO_SECRET_KEY') - minio_bucket_name = os.getenv('MINIO_BUCKET_NAME') + minio_endpoint = os.getenv('MINIO_ENDPOINT', default='') + minio_access_key = os.getenv('MINIO_ACCESS_KEY', default='') + minio_secret_key = os.getenv('MINIO_SECRET_KEY', default='') + minio_bucket_name = os.getenv('MINIO_BUCKET_NAME', default='') # connect client client = Minio( endpoint=minio_endpoint, diff --git a/shared/data_store/delete.py b/shared/data_store/delete.py index b5f21d9..f3cd179 100644 --- a/shared/data_store/delete.py +++ b/shared/data_store/delete.py @@ -1,4 +1,5 @@ """Definition of delete function.""" + from __future__ import annotations import logging @@ -14,8 +15,8 @@ def delete( """Delete object from MinIO.""" assert isinstance(client, Minio) assert isinstance(object_name, str) - bucket_name = os.getenv('MINIO_BUCKET_NAME', default=None) - assert isinstance(bucket_name, str) + bucket_name = os.getenv('MINIO_BUCKET_NAME', default='') + assert len(bucket_name) > 0 # remove object try: client.remove_object( diff --git a/shared/data_store/get.py b/shared/data_store/get.py index f975cf6..b41ef63 100644 --- a/shared/data_store/get.py +++ b/shared/data_store/get.py @@ -15,12 +15,11 @@ def get( """Get buffer from bucket in MinIO.""" assert isinstance(client, Minio) assert isinstance(object_name, str) - assert 'MINIO_BUCKET_NAME' in os.environ - bucket_name = os.getenv('MINIO_BUCKET_NAME') + bucket_name = os.getenv('MINIO_BUCKET_NAME', default='') # get buffer try: response = client.get_object( - bucket_name=bucket_name, # type: ignore + bucket_name=bucket_name, object_name=object_name, ) assert response.status == 200 diff --git a/shared/data_store/get_image.py b/shared/data_store/get_image.py index 9369f12..8f92f7d 100644 --- a/shared/data_store/get_image.py +++ b/shared/data_store/get_image.py @@ -18,13 +18,13 @@ def get_image( assert len(object_name) > 0 # prepare arguments assert 'MINIO_BUCKET_NAME' in os.environ - bucket_name = os.getenv('MINIO_BUCKET_NAME') + bucket_name = os.getenv('MINIO_BUCKET_NAME', default='') subfolder = 'images' # get object from bucket object_name = f'{subfolder}/{object_name}' try: response = client.get_object( - bucket_name=bucket_name, # type: ignore + bucket_name=bucket_name, object_name=object_name, ) buffer = BytesIO(response.data) diff --git a/shared/data_store/put.py b/shared/data_store/put.py index a9dac0c..fdd64c3 100644 --- a/shared/data_store/put.py +++ b/shared/data_store/put.py @@ -1,4 +1,5 @@ """Definition of put function.""" + from __future__ import annotations import logging @@ -16,8 +17,8 @@ def put( """Put buffer in bucket in MinIO and return MD5 checksum as object name.""" assert isinstance(client, Minio) assert isinstance(buffer, BytesIO) - bucket_name = os.getenv('MINIO_BUCKET_NAME', default=None) - assert isinstance(bucket_name, str) + bucket_name = os.getenv('MINIO_BUCKET_NAME', default='') + assert len(bucket_name) > 0 # get md5 of image checksum = md5(buffer.getbuffer()).hexdigest() # prepare for saving diff --git a/shared/data_store/put_image.py b/shared/data_store/put_image.py index 4bdab4c..0865fa7 100644 --- a/shared/data_store/put_image.py +++ b/shared/data_store/put_image.py @@ -17,8 +17,8 @@ def put_image( used as object name.""" assert isinstance(client, Minio) assert isinstance(image, Image.Image) - bucket_name = os.getenv('MINIO_BUCKET_NAME', default=None) - assert isinstance(bucket_name, str) + bucket_name = os.getenv('MINIO_BUCKET_NAME', default='') + assert len(bucket_name) > 0 subfolder = 'images' # save image to buffer buffer = BytesIO() diff --git a/shared/data_store/put_model.py b/shared/data_store/put_model.py index 8ff416e..164b499 100644 --- a/shared/data_store/put_model.py +++ b/shared/data_store/put_model.py @@ -18,8 +18,8 @@ def put_model( used as object name.""" assert isinstance(client, Minio) assert isinstance(model, Module) - assert 'MINIO_BUCKET_NAME' in os.environ - bucket_name = os.getenv('MINIO_BUCKET_NAME') + bucket_name = os.getenv('MINIO_BUCKET_NAME', default='') + assert len(bucket_name) > 0 subfolder = 'models' # save image to buffer buffer = BytesIO()