- Added Env variables transfer into tests.yml

- Changed image files support
- Changed image_compress

.github/workflows/tests.yml

@@ -14,6 +14,10 @@ jobs:
     env:
       AUTH_SECRET_KEY: ${{ secrets.AUTH_SECRET_KEY }}
       DB_HOST: ${{ secrets.DB_HOST }}
+      S3_API_ENDPOINT: ${{ env.S3_API_ENDPOINT }}
+      S3_IPFS_URL: ${{ env.S3_IPFS_URL }}
+      S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+      S3_SECRET_ACCESS_KEY_ID: ${{ secrets.S3_SECRET_ACCESS_KEY_ID }}
 
     steps:
     - name: Checkout code

src/config.py

@@ -15,8 +15,6 @@
 
 SERVER_URL: str = os.getenv("SERVER_URL", "http://127.0.0.1:8000")
 
-DB_USER: str = os.getenv("DB_USER", "admin")
-DB_PASSWORD: str = os.getenv("DB_PASSWORD", "secretmongo")
 DB_NAME: str = os.getenv("DB_NAME", "iamnotalone")
 DB_HOST: str = os.getenv("DB_HOST", "localhost")
 

src/photos/config.py

@@ -9,7 +9,7 @@
     IMAGE_FILES_LOCAL_PATH.mkdir()
 
 SERVER_STATIC_IMAGES_URL = f'{global_config.SERVER_URL}/static/images'
-SUPPORTED_IMAGE_FORMATS = ('jpeg', 'jpg', 'bmp', 'png')
+SUPPORTED_IMAGE_FORMATS = ('jpeg', 'jpg')
 SUPPORTED_IMAGE_MEDIA_TYPES = tuple(f'image/{img_format}' for img_format in SUPPORTED_IMAGE_FORMATS)
 FILE_TOKEN_LENGTH = 24
 FILE_IMAGE_COMPRESSION_PERCENT: int = 50

src/photos/helpers.py

@@ -10,17 +10,14 @@
 from pydantic import HttpUrl, Json
 from pydantic_core import Url
 
-
 from photos import config
 
 
 log = logging.getLogger(__file__)
 
 
-def filename_token_encode(filename: str, **additional_data: Json) -> str:
-    additional_data.update(filename=filename)
+def filename_token_encode(extension: str, **additional_data: Json) -> str:
     data = json.dumps(additional_data, ensure_ascii=True)
-    extension = filename.split(".")[-1]
     return f'{base64.b64encode(data.encode(encoding="ascii")).decode("ascii")}.{extension}'
 
 
@@ -55,15 +52,14 @@ def check_image_is_valid(file: typing.BinaryIO) -> bool:
 
 
 def image_compress(
-            file: typing.BinaryIO, *,
-            percent: int = config.FILE_IMAGE_COMPRESSION_PERCENT,
-            max_pixel_size: int = config.FILE_IMAGE_MAX_PIXEL_SIZE,
-    ) -> TemporaryFile:
-
-    """ Creates a temporary file with compressed image """
+        file: typing.BinaryIO, *,
+        percent: int = config.FILE_IMAGE_COMPRESSION_PERCENT,
+        max_pixel_size: int = config.FILE_IMAGE_MAX_PIXEL_SIZE,
+    ) -> typing.BinaryIO:
+    """ Creates a temporary file with compressed JPEG image """
 
     original_image: Image = Image.open(file)
-    temp_file = TemporaryFile(suffix=f'.{original_image.format.lower()}')
+    temp_file = TemporaryFile(suffix=f'.jpg')
 
     if max_pixel_size:
         width, height = original_image.size
@@ -84,7 +80,7 @@ def image_compress(
             original_image = original_image.resize((int(width * reduce_factor), int(height * reduce_factor)))
 
     quality: int = 100 - percent
-    original_image.save(temp_file, original_image.format, quality=quality, optimize=True)
+    original_image.save(temp_file, format="jpeg", quality=quality, optimize=True)
     original_image.close()
     temp_file.seek(0)
     return temp_file

src/photos/routers.py

@@ -38,9 +38,10 @@ def update_profile_photo(
         )
 
     compressed_image = helpers.image_compress(photo.file)
+    extension: str = photo.filename.split(".")[-1]
     image_url = service.get_bucket().upload(
         compressed_image,
-        filename=helpers.filename_token_encode(photo.filename, user_id=str(current_user.id), index=list_index),
+        filename=helpers.filename_token_encode(extension, user_id=str(current_user.id), index=list_index),
         ContentType=photo.content_type
     )
 

tests/test_photos/test_helpers.py

@@ -10,7 +10,7 @@
 )
 def test_token_encoding(filename):
     data = {"filename": filename, "num": 322}
-    encoded_filename = helpers.filename_token_encode(**data)
+    encoded_filename = helpers.filename_token_encode("jpg", **data)
     decoded_data = helpers.filename_token_decode(encoded_filename)
     assert data == decoded_data