Skip to content

Change puremagic to python-magic #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 12, 2025
Merged

Change puremagic to python-magic #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bde2b07
init
LsHanaha Sep 11, 2025
d8c088f
add magika
LsHanaha Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies = [
"pydantic",
"pyvips",
"pyvips-binary",
"puremagic",
"magika",
]

[dependency-groups]
Expand Down
14 changes: 3 additions & 11 deletions safe_s3_storage/file_validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import enum
import typing

import puremagic
import pyvips # type: ignore[import-untyped]
from magika import Magika

from safe_s3_storage import exceptions
from safe_s3_storage.kaspersky_scan_engine import KasperskyScanEngineClient
Expand Down Expand Up @@ -48,16 +48,8 @@ class FileValidator:
image_quality: int = 85

def _validate_mime_type(self, *, file_name: str, file_content: bytes) -> str:
try:
mime_type = puremagic.from_string(file_content, mime=True)
except puremagic.PureError:
# unlike python-magic, puremagic doesn't recognize if text is binary
try:
file_content.decode()
except UnicodeDecodeError:
mime_type = "application/octet-stream"
else:
mime_type = "text/plain"
mime_type_prediction: typing.Final = Magika().identify_bytes(file_content)
mime_type: typing.Final = mime_type_prediction.prediction.dl.mime_type
if self.allowed_mime_types is None or mime_type in self.allowed_mime_types:
return mime_type

Expand Down