fastapi-extra 0.2.5__cp312-cp312-win_amd64.whl → 0.3.0__cp312-cp312-win_amd64.whl

fastapi_extra/__init__.py

@@ -1,13 +1,17 @@
-__version__ = "0.2.5"
+__version__ = "0.3.0"
 
 
 from fastapi import FastAPI
+from fastapi import routing as origin_routing
+from fastapi.dependencies import utils as origin_utils
 
 
 def setup(app: FastAPI) -> None:
     try:
-        from fastapi_extra import routing as native_routing  # type: ignore
-
-        native_routing.install(app)
+        from fastapi_extra import _patch
+        
+        _patch.install_routes(app)
+        origin_routing.solve_dependencies.__globals__['is_sequence_field'] = _patch.is_sequence_field # type: ignore
+        origin_utils.QueryParams.__init__ = _patch.query_params_init # type: ignore
     except ImportError:  # pragma: nocover
         pass

fastapi_extra/_patch.py

@@ -0,0 +1,33 @@
+__author__ = "ziyan.yin"
+__date__ = "2026-01-13"
+
+
+from fastapi import FastAPI
+from fastapi._compat import v2
+from starlette import datastructures
+
+from fastapi_extra import routing
+from fastapi_extra.urlparse import parse_qsl
+
+
+def install_routes(app: FastAPI) -> None:
+    routing.install(app)
+
+
+def is_sequence_field(field: v2.ModelField) -> bool:
+    if not hasattr(field, "_is_sequence"):
+        setattr(field, "_is_sequence", v2.is_sequence_field(field))
+    return getattr(field, "_is_sequence")
+
+
+def query_params_init(obj: datastructures.QueryParams, *args, **kwargs) -> None:
+    value = args[0] if args else []
+
+    if isinstance(value, bytes):
+        super(datastructures.QueryParams, obj).__init__(parse_qsl(value, keep_blank_values=True), **kwargs)
+    elif isinstance(value, str):
+        super(datastructures.QueryParams, obj).__init__(parse_qsl(value.encode("latin-1"), keep_blank_values=True), **kwargs)
+    else:
+        super(datastructures.QueryParams, obj).__init__(*args, **kwargs)  # type: ignore[arg-type]
+        obj._list = [(str(k), str(v)) for k, v in obj._list]
+        obj._dict = {str(k): str(v) for k, v in obj._dict.items()}

fastapi_extra/native/urlparse.pyx

@@ -0,0 +1,50 @@
+__author__ = "ziyan.yin"
+__describe__ = ""
+
+
+from libc.stdlib cimport strtol
+from libc.string cimport memmove, strlen
+
+
+cdef inline size_t _unquote(char* c_string, bint change_plus):
+    cdef:
+        int i = 0
+        char[2] quote
+        size_t n = strlen(c_string)
+
+    while i < n:
+        if c_string[i] == '+' and change_plus:
+            c_string[i] = ' '
+        elif c_string[i] == '%':
+            quote[0] = c_string[i + 1]
+            quote[1] = c_string[i + 2]
+            c_string[i] = strtol(quote, NULL, 16)
+            memmove(c_string + i + 1,  c_string + i + 3, n - i - 2)
+            n -= 2
+        i += 1
+    return n
+
+
+def unquote(val: bytes, encoding: str = "utf-8") -> str:
+    return val[:_unquote(val, 0)].decode(encoding)
+
+
+def unquote_plus(val: bytes, encoding: str = "utf-8") -> str:
+    return val[:_unquote(val, 1)].decode(encoding)
+
+
+def parse_qsl(qs: bytes, keep_blank_values: bool = False) -> list[tuple[str, str]]:
+    query_args = qs.split(b'&') if qs else []
+    r = []
+    for name_value in query_args:
+        if not name_value:
+            continue
+        nv = name_value.split(b'=')
+        if len(nv) < 2:
+            if not keep_blank_values:
+                continue
+            nv.append(b'')
+        name = unquote_plus(nv[0])
+        value = unquote_plus(nv[1])
+        r.append((name, value))
+    return r

fastapi_extra/response.py

@@ -3,7 +3,7 @@ __date__ = "2024-12-24"
 
 
 from enum import Enum
-from typing import TYPE_CHECKING, Generic
+from typing import TYPE_CHECKING, Generic, Mapping
 
 from fastapi.responses import JSONResponse
 from pydantic import BaseModel, Field
@@ -220,6 +220,20 @@ class APIResponse(JSONResponse):
             exclude_none=False,
             exclude_unset=False,
         )
+        
+    def init_headers(self, headers: Mapping[str, str] | None = None) -> None:
+        self.raw_headers = [
+            (b"content-length", str(len(self.body)).encode("latin-1")),
+            (b"content-type", b"application/json; charset=utf-8"),
+        ]
+        if headers:
+            raw_headers = [
+                (k.lower().encode("latin-1"), v.encode("latin-1")) 
+                for k, v in headers.items() if k not in ("content-length", "content-type") 
+        ]
+        self.raw_headers.extend(raw_headers)
+
+
 
 
 class APIError(Exception):

fastapi_extra/urlparse.pyi

@@ -0,0 +1,11 @@
+__author__ = "ziyan.yin"
+__describe__ = ""
+
+
+def unquote(val: bytes, encoding: str = "utf-8") -> str: ...
+
+
+def unquote_plus(val: bytes, encoding: str = "utf-8") -> str: ...
+
+
+def parse_qsl(qs: bytes, keep_blank_values: bool = False) -> list[tuple[str, str]]: ...

{fastapi_extra-0.2.5.dist-info → fastapi_extra-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-extra
-Version: 0.2.5
+Version: 0.3.0
 Summary: extra package for fastapi.
 Author-email: Ziyan Yin <408856732@qq.com>
 License: BSD-3-Clause
@@ -18,9 +18,9 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: fastapi<0.116.0,>=0.115.0
+Requires-Dist: fastapi<0.129.0,>=0.128.0
 Requires-Dist: httpx<0.29.0,>=0.28.0
-Requires-Dist: pydantic-settings>=2.7.0
+Requires-Dist: pydantic-settings>=2.12.0
 Requires-Dist: sqlmodel>=0.0.22
 Provides-Extra: redis
 Requires-Dist: redis; extra == "redis"

{fastapi_extra-0.2.5.dist-info → fastapi_extra-0.3.0.dist-info}/RECORD

@@ -1,14 +1,17 @@
-fastapi_extra/__init__.py,sha256=rJP0eaJqATS_5xgXXgckRpXjww5v96IXUmNxlbb3J8Y,278
-fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=SsGGCZqd7fnrd8sp9r75yTdO5D8IRckLBndnegrgneA,53760
+fastapi_extra/__init__.py,sha256=wgNT6dUITkXf69b2m5-YVabRIJRzirouJfBh3nLnQKg,556
+fastapi_extra/_patch.py,sha256=WpuAsjBRKgU5fgmGPhAdm68jc_QAArsZyKuYzO1LTuI,1194
+fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=yb4XpcrI2yyiV0s8MjYO8wIZlTwxeLv8GynyTHg6fnA,52224
 fastapi_extra/cursor.pyi,sha256=9VRlz_g1lPEqn_03thmwJga7aELGp--jvqySN7f_4iM,158
 fastapi_extra/dependency.py,sha256=cnmZjoL9DVZq8qHAkLVhDX3RIvCWUMdxN0dB7obZruc,2106
 fastapi_extra/form.py,sha256=jwaMfHiILp_wUlP-BRA-Gp3zp42T5mrZjJp0CALU5So,1275
 fastapi_extra/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastapi_extra/response.py,sha256=L8Q6fQtOSmHPClPdc4d2_LcOb5oiKQCpaYQLR1Zxp8Q,10274
-fastapi_extra/routing.cp312-win_amd64.pyd,sha256=JKhBvG07s24uHvUxS0HrkNzHaF4uso-5qXQ05yuKbaM,91648
+fastapi_extra/response.py,sha256=xLZs0oVf3fs1BF613UpDSx5XsrLmsCTfPibWujfqM9s,10827
+fastapi_extra/routing.cp312-win_amd64.pyd,sha256=kjqn56w9U2xrJB2mEfcJ8PwlvVF3n8j2_RLR_3H0hH8,90112
 fastapi_extra/routing.pyi,sha256=0HdMRqaeAtT7kM9GFMkffOeNeNwKPK1YqtQ40SDMKew,223
 fastapi_extra/settings.py,sha256=PsjsdDvGR55spOFB6VUArzvwO7GsgZEwYKat-NXnN9s,1452
 fastapi_extra/types.py,sha256=8uG5vwWsYh5Wq7KORKmK31F4cw11ReCD9Nx6Tv2D_MU,825
+fastapi_extra/urlparse.cp312-win_amd64.pyd,sha256=oowDmGfQpXJg2Rr9FpC6Tj0AURyb9aRgAcooX8Ip_d8,44544
+fastapi_extra/urlparse.pyi,sha256=1FDp46XKqTrlJHlnbqK_NyzBkCYRpHEINERtNsMyvWI,275
 fastapi_extra/utils.py,sha256=tsPX3kpF_P5D9Bd3gnlG6rkVsLkv5gbxjml-s6ZL_6I,346
 fastapi_extra/cache/__init__.py,sha256=Kq5eCF53aGIFch14xDj_SCiK5IvY7A0jX28st-ergls,114
 fastapi_extra/cache/redis.py,sha256=Zcoyn98d7uyp6p07sssjjo_TcG-kyjPj-D-zr4C8liU,1624
@@ -18,8 +21,9 @@ fastapi_extra/database/service.py,sha256=uc_1VlExIapSoQMpLUhckA_gBLW1bGXLVwTy2uz
 fastapi_extra/database/session.py,sha256=fIC5Pk7C-kiF2alFJpW02_P5aoFZrAP3LtJwSelHj4Y,2011
 fastapi_extra/native/cursor.pyx,sha256=GchJIPY6e5scuyl1BbA-Et0CdRcHOI3xgsTvDem0B70,1141
 fastapi_extra/native/routing.pyx,sha256=NisJ9YaxzceDVWJnF3EeVXWT8rv_6WRDuIfLEK0eWbc,6233
-fastapi_extra-0.2.5.dist-info/licenses/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
-fastapi_extra-0.2.5.dist-info/METADATA,sha256=YXgH8WXpZGYrCqupM911xt_BWTTW_2PRKz1haV9a7PM,1371
-fastapi_extra-0.2.5.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
-fastapi_extra-0.2.5.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
-fastapi_extra-0.2.5.dist-info/RECORD,,
+fastapi_extra/native/urlparse.pyx,sha256=LJWPyZlajYkjBoin65NgeOjrdR9wKabrB5Lpr8edgIU,1406
+fastapi_extra-0.3.0.dist-info/licenses/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
+fastapi_extra-0.3.0.dist-info/METADATA,sha256=wAmRDRVtVIKTgpyr6Mbb0ulTn-brtEN4Ug7jSBj2_Ew,1372
+fastapi_extra-0.3.0.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
+fastapi_extra-0.3.0.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
+fastapi_extra-0.3.0.dist-info/RECORD,,