fixed types

other/transfer_images_minio_subfolder.py

@@ -1,11 +1,12 @@
 """Script to move minio images to subfolder."""
 
+import os
 from pathlib import Path
 
 from dotenv import load_dotenv
 from PIL import Image
 
-from shared.datastore import connect_minio, get, put_image
+from shared.datastore import Datastore
 from shared.utils import setup_logging
 
 if __name__ == '__main__':
@@ -16,24 +17,26 @@ if __name__ == '__main__':
     # setup logging
     setup_logging()
     # connect to minio
-    minio_client = connect_minio()
+    datastore = Datastore()
+    datastore.connect()
+    assert datastore._client is not None
     # list images in bucket
-    BUCKET_NAME = 'visual-critical-discourse-analysis'
-    obj_list = minio_client.list_objects(
+    BUCKET_NAME = os.getenv(
+        'MINIO_BUCKET_NAME',
+        default='visual-critical-discourse-analysis',
+    )
+    obj_list = datastore._client.list_objects(
         bucket_name=BUCKET_NAME,
     )
     # begin moving images
     for obj in obj_list:
         # get image from minio
-        buffer = get(
-            client=minio_client,
-            bucket_name=BUCKET_NAME,
+        buffer = datastore._get(
             object_name=obj.object_name,
         )
         # convert data to image
         image = Image.open(buffer)
         # put image into minio subfolder
-        put_image(
-            client=minio_client,
+        _ = datastore.put_image(
             image=image,
         )

other/transfer_images_mongo_minio.py

@@ -9,7 +9,7 @@ from bson import ObjectId
 from dotenv import load_dotenv
 from pymongo.collection import Collection
 
-from shared.datastore import connect_minio, put_image
+from shared.datastore import Datastore
 from shared.mongodb import connect_mongodb
 from shared.mongodb.src.classes import VisualCommunication
 from shared.utils import check_env, setup_logging
@@ -81,7 +81,9 @@ if __name__ == '__main__':
     # setup logging
     setup_logging()
     # connect to minIO
-    minio_client = connect_minio()
+    datastore = Datastore()
+    datastore.connect()
+    assert datastore._client is not None
     # connect to MongoDB
     collection, db, client = connect_mongodb()
     # list documents in mongoDB
@@ -97,11 +99,10 @@ if __name__ == '__main__':
         try:
             # get image
             image = vis_com.get_image(
-                minio_client=minio_client,
+                minio_client=datastore._client,
             )
             # put buffer in minio
-            object_name = put_image(
-                client=minio_client,
+            object_name = datastore.put_image(
                 image=image,
             )
         except Exception as exc: