add exclude conversion formats (#22)

Co-authored-by: Tatyana Bezmenova <Tatyana.BEZMENOVA@raiffeisen.ru>

Author: TatianaBezmenova

safe_s3_storage/file_validator.py

@@ -46,6 +46,7 @@ class FileValidator:
     max_image_size_bytes: int = 50 * 1024 * 1024  # 50 MB
     image_conversion_format: ImageConversionFormat = ImageConversionFormat.webp
     image_quality: int = 85
+    excluded_conversion_formats: list[str] | None = None
 
     def _validate_mime_type(self, *, file_name: str, file_content: bytes) -> str:
         mime_type_prediction: typing.Final = Magika().identify_bytes(file_content)
@@ -71,10 +72,20 @@ def _validate_file_size(self, *, file_name: str, file_content: bytes, mime_type:
             )
         return content_size
 
+    def _should_convert_file(self, file_name: str) -> bool:
+        if not self.excluded_conversion_formats:
+            return True
+
+        _, extension = _split_file_base_name_and_extensions(file_name=file_name)
+        return extension not in self.excluded_conversion_formats
+
     def _convert_image(self, validated_file: ValidatedFile) -> ValidatedFile:
         if not _is_image(validated_file.mime_type):
             return validated_file
 
+        if not self._should_convert_file(validated_file.file_name):
+            return validated_file
+
         target_mime_type, target_extension = _IMAGE_CONVERSION_FORMAT_TO_MIME_TYPE_AND_EXTENSION_MAP[
             self.image_conversion_format
         ]

tests/test_file_validator.py

@@ -196,3 +196,19 @@ async def test_antivirus_no_connection(self, faker: faker.Faker, png_file: bytes
         )
         with pytest.raises(KasperskyScanEngineConnectionStatusError):
             await kasper.scan_memory(file_name=faker.file_name(), file_content=png_file)
+
+    @pytest.mark.parametrize("image_conversion_format", list(ImageConversionFormat))
+    async def test_excluded_conversion_formats(
+        self, faker: faker.Faker, png_file: bytes, image_conversion_format: ImageConversionFormat
+    ) -> None:
+        file_base_name: typing.Final = faker.pystr()
+        file_extension: typing.Final = faker.file_extension()
+        validated_file: typing.Final = await FileValidator(
+            allowed_mime_types=["image/png"],
+            image_conversion_format=image_conversion_format,
+            excluded_conversion_formats=[file_extension],
+        ).validate_file(file_name=f"{file_base_name}.{file_extension}", file_content=png_file)
+
+        assert validated_file.file_name == f"{file_base_name}.{file_extension}"
+        assert validated_file.file_content == png_file
+        assert validated_file.file_size == len(validated_file.file_content)