python-trueconf-bot 1.2.0b2__tar.gz → 1.2.0b3__tar.gz

{python_trueconf_bot-1.2.0b2 → python_trueconf_bot-1.2.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-trueconf-bot
-Version: 1.2.0b2
+Version: 1.2.0b3
 Summary: Lightweight and powerful framework for the TrueConf Server Chatbot API
 Author-email: TrueConf LLC <info@trueconf.com>, Anton Baadzhi <baadzhianton@gmail.com>
 License-Expression: BSD-3-Clause-Clear
@@ -32,7 +32,8 @@ Requires-Dist: aiohttp
 Requires-Dist: async-property
 Requires-Dist: typing_extensions>=4.15.0
 Requires-Dist: python-magic>=0.4.27; sys_platform != "win32"
-Requires-Dist: python-magic-bin>=0.4.27; sys_platform == "win32"
+Requires-Dist: python-magic-bin==0.4.14; sys_platform == "win32"
+Requires-Dist: filetype
 Dynamic: license-file
 
 <p align="center">

{python_trueconf_bot-1.2.0b2 → python_trueconf_bot-1.2.0b3}/pyproject.toml

@@ -50,7 +50,8 @@ dependencies = [
     "async-property",
     "typing_extensions>=4.15.0",
     "python-magic>=0.4.27 ; sys_platform != 'win32'",
-    "python-magic-bin>=0.4.27 ; sys_platform == 'win32'",
+    "python-magic-bin==0.4.14 ; sys_platform == 'win32'",
+    "filetype"
 ]
 
 [tool.setuptools]

{python_trueconf_bot-1.2.0b2 → python_trueconf_bot-1.2.0b3}/python_trueconf_bot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-trueconf-bot
-Version: 1.2.0b2
+Version: 1.2.0b3
 Summary: Lightweight and powerful framework for the TrueConf Server Chatbot API
 Author-email: TrueConf LLC <info@trueconf.com>, Anton Baadzhi <baadzhianton@gmail.com>
 License-Expression: BSD-3-Clause-Clear
@@ -32,7 +32,8 @@ Requires-Dist: aiohttp
 Requires-Dist: async-property
 Requires-Dist: typing_extensions>=4.15.0
 Requires-Dist: python-magic>=0.4.27; sys_platform != "win32"
-Requires-Dist: python-magic-bin>=0.4.27; sys_platform == "win32"
+Requires-Dist: python-magic-bin==0.4.14; sys_platform == "win32"
+Requires-Dist: filetype
 Dynamic: license-file
 
 <p align="center">

{python_trueconf_bot-1.2.0b2 → python_trueconf_bot-1.2.0b3}/python_trueconf_bot.egg-info/requires.txt

@@ -6,9 +6,10 @@ magic-filter
 aiohttp
 async-property
 typing_extensions>=4.15.0
+filetype
 
 [:sys_platform != "win32"]
 python-magic>=0.4.27
 
 [:sys_platform == "win32"]
-python-magic-bin>=0.4.27
+python-magic-bin==0.4.14

{python_trueconf_bot-1.2.0b2 → python_trueconf_bot-1.2.0b3}/trueconf/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.2.0b2'
-__version_tuple__ = version_tuple = (1, 2, 0, 'b2')
+__version__ = version = '1.2.0b3'
+__version_tuple__ = version_tuple = (1, 2, 0, 'b3')
 
-__commit_id__ = commit_id = 'g9480296c8'
+__commit_id__ = commit_id = 'g10fd0ed7a'

{python_trueconf_bot-1.2.0b2 → python_trueconf_bot-1.2.0b3}/trueconf/types/input_file.py

@@ -4,12 +4,13 @@ import io
 import re
 import os
 import aiofiles
+import filetype
 from urllib.parse import urlparse, unquote
 from abc import ABC, abstractmethod
 from pathlib import Path
 from typing import Any, Dict, Optional
 from typing_extensions import Self
-from mimetypes import guess_type
+from mimetypes import guess_type, guess_extension
 from trueconf import loggers
 from httpx import AsyncClient
 import warnings
@@ -32,8 +33,14 @@ except ImportError as e:
     ) from e
 
 def detect_mime_type(data: bytes, file_name: str = "") -> str:
-    mime_type = guess_type(file_name or "")[0]
-    if not mime_type and magic:
+    mime_type, _ = guess_type(file_name) if file_name else (None, None)
+
+    if not mime_type or mime_type == "application/octet-stream":
+        kind = filetype.guess(data)
+        if kind:
+            mime_type = kind.mime
+
+    if (not mime_type or mime_type == "application/octet-stream") and magic:
         try:
             mime_type = magic.from_buffer(data, mime=True)
         except Exception as error:
@@ -90,6 +97,11 @@ class InputFile(ABC):
             file_size: int | None = None,
             mime_type: str | None = None,
     ):
+
+        if not guess_type(file_name)[0]:
+            if ext := guess_extension(mime_type):
+                file_name = file_name+ext
+
         self.file_name = file_name
         self.file_size = file_size
         self.mime_type = mime_type