CheeseAPI 2.0.4__tar.gz → 2.0.5b1__tar.gz

{cheeseapi-2.0.4 → cheeseapi-2.0.5b1}/CheeseAPI/response.py

@@ -75,6 +75,10 @@ HTTP_STATUS = {
 }
 NO_BODY_STATUS = (100, 101, 102, 204, 304)
 PREVIEWABLE_TYPES = ('text/plain', 'text/html', 'text/css', 'text/javascript', 'application/json', 'application/xml', 'text/xml', 'image/jpeg', 'image/jpg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp', 'image/bmp', 'video/mp4', 'video/webm', 'video/ogg', 'audio/mpeg', 'audio/ogg', 'audio/wav', 'audio/webm', 'application/pdf')
+MERGE_TYPES = {
+    'audio/x-wav': 'audio/wav',
+    'audio/vnd.wave': 'audio/wav'
+}
 
 class Cookie(TypedDict):
     value: str
@@ -87,7 +91,7 @@ class Cookie(TypedDict):
 class Response:
     __slots__ = ('status', '_proxy', 'body', 'headers', 'cookies', 'high_precision_date', 'compress', 'compress_level')
 
-    def __init__(self, body: dict | list | str | bytes | AsyncIterable | None = None, status: int = 200, headers: dict[str, str] = {}, *, high_precision_date: bool = False, compress: Literal['gzip', 'deflate', 'br', 'zstd'] | None = None, compress_level: int | None = None):
+    def __init__(self, body: dict | list | str | bytes | AsyncIterable | None = None, status: int = 200, headers: dict[str, str] | None = None, *, high_precision_date: bool = False, compress: Literal['gzip', 'deflate', 'br', 'zstd'] | None = None, compress_level: int | None = None):
         '''
         - Args
             - body: 当为 `AsyncIterable` 时，自动使用 chunked 传输编码
@@ -99,7 +103,7 @@ class Response:
 
         self.status: int = status
         self.body: dict | list | str | bytes | AsyncIterable | None = body
-        self.headers: dict[str, str] = headers
+        self.headers: dict[str, str] = headers if headers is not None else {}
         self.cookies: dict[str, Cookie] = {}
         self.high_precision_date: bool = high_precision_date
         self.compress: Literal['gzip', 'deflate', 'br', 'zstd'] | None = compress
@@ -118,7 +122,9 @@ class Response:
         }
 
 class RedirectResponse(Response):
-    def __init__(self, location: str, status: Literal[301, 302, 303, 307, 308] = 302, headers: dict[str, str] = {}, body: bytes | str | list | dict | None = None):
+    def __init__(self, location: str, status: Literal[301, 302, 303, 307, 308] = 302, headers: dict[str, str] | None = None, body: bytes | str | list | dict | None = None):
+        if headers is None:
+            headers = {}
         headers['Location'] = location
 
         super().__init__(status, body, headers)
@@ -126,7 +132,7 @@ class RedirectResponse(Response):
 class FileResponse(Response):
     __slots__ = ('file', 'preview', 'transmission_type', 'chunked_size')
 
-    def __init__(self, file_path_or_file: str | File, *, status: int = 200, headers: dict[str, str] = {}, preview: bool = True, transmission_type: Literal['CONTENT_LENGTH', 'CHUNKED'] = 'CONTENT_LENGTH', chunked_size: int | None = None, compress: Literal['gzip', 'deflate', 'br', 'zstd'] | None = None, compress_level: int | None = None):
+    def __init__(self, file_path_or_file: str | File, *, status: int = 200, headers: dict[str, str] | None = None , preview: bool = True, transmission_type: Literal['CONTENT_LENGTH', 'CHUNKED'] = 'CONTENT_LENGTH', chunked_size: int | None = None, compress: Literal['gzip', 'deflate', 'br', 'zstd'] | None = None, compress_level: int | None = None):
         '''
         - Args
             - preview: 优先预览文件
@@ -225,6 +231,8 @@ class ResponseProxy:
 
             if 'Content-Type' not in headers and 'Content-Disposition' not in headers:
                 mime_type = mimetypes.guess_type(self.response.file.name)[0] or 'application/octet-stream'
+                if mime_type in MERGE_TYPES:
+                    mime_type = MERGE_TYPES[mime_type]
                 headers['Content-Type'] = f'{mime_type}; charset=utf-8'
                 headers['Content-Disposition'] = f'{"inline" if self.response.preview and mime_type in PREVIEWABLE_TYPES else "attachment"}; filename="{self.response.file.name}"'
 
@@ -398,4 +406,4 @@ class ResponseProxy:
             if 'Content-Encoding' in headers:
                 del headers['Content-Encoding']
 
-        return status, headers, body
+        return status, headers, body

{cheeseapi-2.0.4 → cheeseapi-2.0.5b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CheeseAPI
-Version: 2.0.4
+Version: 2.0.5b1
 Summary: 一款web协程框架
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseAPI
 Author-email: Cheese Unknown <cheese@cheese.ren>

{cheeseapi-2.0.4 → cheeseapi-2.0.5b1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "CheeseAPI"
-version = "2.0.4"
+version = "2.0.5-beta.1"
 description = "一款web协程框架"
 readme = "README.md"
 license-files = { paths = [ "LICENSE" ] }