fastapi-extra 0.3.5__tar.gz → 0.4.0__tar.gz

{fastapi_extra-0.3.5 → fastapi_extra-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-extra
-Version: 0.3.5
+Version: 0.4.0
 Summary: extra package for fastapi.
 Author-email: Ziyan Yin <408856732@qq.com>
 License: BSD-3-Clause

{fastapi_extra-0.3.5 → fastapi_extra-0.4.0}/fastapi_extra/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.5"
+__version__ = "0.4.0"
 
 
 from fastapi import FastAPI

{fastapi_extra-0.3.5 → fastapi_extra-0.4.0}/fastapi_extra/database/service.py

@@ -2,13 +2,18 @@ __author__ = "ziyan.yin"
 __date__ = "2025-01-12"
 
 from contextvars import ContextVar
-from typing import Any, Generic, TypeVar
+from typing import Any, Generic, Sequence, TypeVar
+
+from sqlalchemy import ColumnExpressionArgument
+from sqlmodel import select
 
 from fastapi_extra.database.model import SQLModel
 from fastapi_extra.database.session import AsyncSession, DefaultSession
 from fastapi_extra.dependency import AbstractService
 
 Model = TypeVar("Model", bound=SQLModel)
+ID = int | str
+PK = ID | tuple[ID] | dict[str, ID]
 
 
 class ModelService(AbstractService, Generic[Model], abstract=True):
@@ -40,14 +45,24 @@ class ModelService(AbstractService, Generic[Model], abstract=True):
         assert _session is not None, "Session is not initialized"
         return _session
 
-    async def get(self, ident: int | str, **kwargs: Any) -> Model | None:
+    async def get(self, ident: PK, **kwargs: Any) -> Model | None:
         return await self.session.get(self.__model__, ident, **kwargs)
+    
+    async def get_list(self, *clause: ColumnExpressionArgument[bool] | bool) -> Sequence[Model]:
+        return (await self.session.exec(select(self.__model__).where(*clause))).all()
 
     async def create_model(self, **kwargs: Any) -> Model:
         model = self.__model__.model_validate(kwargs)
         self.session.add(model)
         await self.session.flush()
         return model
+    
+    async def update_model(self, model: Model, **kwargs: Any) -> Model:
+        for key, value in kwargs.items():
+            if key in model.__fields__:
+                setattr(model, key, value)
+        await self.session.flush()
+        return model
 
     async def delete(self, model: Model) -> None:
         return await self.session.delete(model)

fastapi_extra-0.4.0/fastapi_extra/database/sqlmap.py

@@ -0,0 +1,154 @@
+__author__ = "ziyan.yin"
+__date__ = "2026-05-14"
+
+
+import inspect
+from collections.abc import Sequence
+from pathlib import Path
+from typing import (Any, Callable, Protocol, get_args, get_origin,
+                    get_type_hints)
+
+from pydantic import BaseModel, Field
+from sqlmodel import text
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+from fastapi_extra.settings import Settings
+from fastapi_extra.types import NoneType, P, T
+
+
+class SQLTemplateConfig(BaseModel):
+    path: str = Field(default="./template/sql")
+    suffix: str = Field(default=".sql")
+
+
+class SQLTemplateSettings(Settings):
+    sqlmap: SQLTemplateConfig = Field(alias="sqlmap")
+
+
+_settings = SQLTemplateSettings() # type: ignore
+_templates = {}
+
+
+def install() -> None:
+    path = Path(_settings.sqlmap.path)
+    if not path.exists():
+        return
+    for file in path.glob(f"*{_settings.sqlmap.suffix}"):
+        _templates[file.stem] = text(file.read_text(encoding="utf-8"))
+
+
+def _is_base_model(cls: Any) -> bool:
+    """安全判断是否为 Pydantic BaseModel"""
+    try:
+        return isinstance(cls, type) and issubclass(cls, BaseModel)
+    except TypeError:
+        return False
+
+
+class SessionService(Protocol):
+    session: AsyncSession
+
+
+def Mapped(func: Callable[P, T]) -> Callable[P, T]:
+    func_name = func.__name__
+    
+    sig = inspect.signature(func)
+    hints = get_type_hints(func)
+    return_hint = hints.get("return", NoneType)
+    
+    origin = get_origin(return_hint)
+    args = get_args(return_hint)
+
+    # 1. 预校验 SQL 模板是否存在
+    if func_name not in _templates:
+        # 这里可以选择抛异常或者在运行时加载
+        pass
+    
+    # 处理 NoneType / 返回为空
+    if return_hint is NoneType:
+        async def execute_only(self: SessionService, *args: Any, **kwargs: Any) -> None:
+            bound_args = sig.bind(self, *args, **kwargs)
+            bound_args.apply_defaults()
+        
+            # 3. 构造 SQL 参数字典
+            # 排除掉第一个参数 (self 或 service)，剩下的传给 SQL execute
+            all_params = bound_args.arguments
+            param_names = list(all_params.keys())
+            if param_names:
+                sql_params = {k: all_params[k] for k in param_names[1:]}
+            else:
+                sql_params = {}
+            
+            await self.session.execute(_templates[func_name], params=sql_params)
+        
+        execute_only.__signature__ = sig
+        return execute_only # type: ignore
+    
+    # 2. 解析返回逻辑
+    # 处理列表/序列返回: List[User], Sequence[User]
+    if origin is not None and issubclass(origin, Sequence):
+        inner_type = args[0] if args else Any
+        is_model = _is_base_model(inner_type)
+
+        async def fetch_all(self: SessionService, *args: Any, **kwargs: Any) -> Sequence:
+            bound_args = sig.bind(self, *args, **kwargs)
+            bound_args.apply_defaults()
+        
+            # 3. 构造 SQL 参数字典
+            # 排除掉第一个参数 (self 或 service)，剩下的传给 SQL execute
+            all_params = bound_args.arguments
+            param_names = list(all_params.keys())
+            if param_names:
+                sql_params = {k: all_params[k] for k in param_names[1:]}
+            else:
+                sql_params = {}
+            
+            sql = _templates[func_name]
+            result = await self.session.execute(sql, params=sql_params)
+            # 使用 scalars() 获取单列结果，如果是多列会自动映射到 Row
+            items = result.all() if is_model else result.scalars().all()
+            if is_model:
+                return [inner_type.model_validate(row, from_attributes=True) for row in items] # type: ignore
+            return items
+        
+        fetch_all.__signature__ = sig
+        return fetch_all # type: ignore
+    
+    # 处理单体返回 (Optional[User] 或 User)
+    is_nullable = NoneType in args
+    # 提取实际类型 (处理 Optional[User] 拿到 User)
+    actual_type = next((a for a in args if a is not NoneType), return_hint)
+    is_model = _is_base_model(actual_type)
+
+    async def fetch_one(self: SessionService, *args: Any, **kwargs: Any) -> Any:
+        bound_args = sig.bind(self, *args, **kwargs)
+        bound_args.apply_defaults()
+        
+         # 3. 构造 SQL 参数字典
+        # 排除掉第一个参数 (self 或 service)，剩下的传给 SQL execute
+        all_params = bound_args.arguments
+        param_names = list(all_params.keys())
+        if param_names:
+            sql_params = {k: all_params[k] for k in param_names[1:]}
+        else:
+            sql_params = {}
+        
+        sql = _templates[func_name]
+        result = await self.session.execute(sql, params=sql_params)
+        
+        # 根据是否是模型决定取 row 还是 scalar
+        data = result.first() if is_model else result.scalar_one_or_none()
+        
+        if data is None:
+            if is_nullable: 
+                return None
+            raise ValueError(f"Query {func_name} expected a result but got None")
+            
+        if is_model:
+            # 将 Row 转为 dict 再校验
+            return actual_type.model_validate(data, from_attributes=True)
+        return data
+    
+    fetch_one.__signature__ = sig
+    return fetch_one # type: ignore
+    

{fastapi_extra-0.3.5 → fastapi_extra-0.4.0}/fastapi_extra/native/cursor.pyx

@@ -1,7 +1,12 @@
-cimport cython
-from cpython cimport time
+# cython: language_level=3
+# cython: boundscheck=False
+# cython: wraparound=False
+# cython: initializedcheck=False
+# cython: nonecheck=False
+
 
-import datetime
+cimport cython
+from cpython cimport datetime, time
 
 
 cdef int _sequence_length = 10
@@ -17,16 +22,19 @@ cdef class Cursor:
         long long last_point
 
     def __init__(self, seed: int):
-        self.seed = seed
-        if self.seed > 16:
-            self.seed %= 16
+        self.seed = seed % 16 
         self.cursor = 0
         self.last_point = 0
 
     cdef inline long long fetch(self) nogil:
         cdef:
             long long count = 0
-            long long point = int((time.time() - _start_point) * 100)
+            # 使用 10ms 作为刻度 
+            long long point = <long long>((time.time() - _start_point) * 100)
+        
+        # 简单的时钟回拨处理
+        if point < self.last_point:
+            point = self.last_point
 
         if self.last_point == point:
             count = self.cursor + 1
@@ -34,10 +42,14 @@ cdef class Cursor:
                 return 0
         else:
             self.last_point = point
-        self.cursor = count
+        
+        self.cursor = <int>count
+        # ID 组成: 时间戳(高位) + 种子(4位) + 序列号(10位) 
         return (point << (_sequence_length + 4)) + (self.seed << _sequence_length) + count
 
     def next_val(self) -> int:
+        cdef long long index
+
         index = self.fetch()
         while index == 0:
             index = self.fetch()

fastapi_extra-0.4.0/fastapi_extra/native/routing.pyx

@@ -0,0 +1,196 @@
+# cython: language_level=3
+# cython: boundscheck=False
+# cython: wraparound=False
+# cython: initializedcheck=False
+# cython: nonecheck=False
+
+
+__author__ = "ziyan.yin"
+__describe__ = ""
+
+cimport cython
+
+from starlette import _utils as starlette_utils
+from starlette.datastructures import URL
+from starlette.responses import RedirectResponse
+
+# 使用 Fast Enum 思想定义常量，减少属性查找
+DEF MATCH_NONE = 0
+DEF MATCH_PARTIAL = 1
+DEF MATCH_FULL = 2
+
+
+cdef int find_params(unicode path):
+    cdef Py_UCS4 ch
+    cdef int i
+    for i, ch in enumerate(path):
+        if ch == "{":
+            return i
+    return -1
+
+
+cdef int get_longest_common_prefix(unicode path, unicode node_path):
+    cdef int i
+    cdef int path_len = len(path)
+    cdef int node_len = len(node_path)
+    cdef int max_len = path_len if path_len < node_len else node_len
+    
+    for i in range(max_len):
+        if path[i] != node_path[i]:
+            return i
+    return max_len
+
+
+@cython.no_gc
+cdef class RouteNode:
+
+    cdef readonly:
+        unicode prefix
+        list params_routes
+        list static_routes
+        dict children
+    
+    cdef public object parent
+
+    def __init__(self, prefix: str):
+        self.prefix = prefix
+        self.params_routes = []
+        self.static_routes = []
+        self.children = {}
+        self.parent = None
+    
+    def add_route(self, fullpath: str, handler: object):
+        cdef int index = find_params(fullpath)
+        cdef bint wild_child = index >= 0
+        cdef unicode path = fullpath[:index] if wild_child else fullpath
+        insert_route(self, path, wild_child, handler)
+
+
+cdef void insert_route(RouteNode node, unicode path, bint wild_child, object handler):
+    if node.prefix == path:
+        if wild_child:
+            node.params_routes.append(handler)
+        else:
+            node.static_routes.append(handler)
+        return
+
+    # 性能优化：避免 removeprefix 产生新字符串
+    cdef int prefix_len = len(node.prefix)
+    cdef Py_UCS4 key = path[prefix_len]
+
+    if key not in node.children:
+        child = RouteNode(path)
+        child.parent = node
+        if wild_child:
+            child.params_routes.append(handler)
+        else:
+            child.static_routes.append(handler)
+        node.children[key] = child
+        return
+
+    cdef RouteNode child_node = node.children[key]
+    cdef int i = get_longest_common_prefix(child_node.prefix, path)
+    
+
+    if i == len(child_node.prefix):
+        insert_route(node.children[key], path, wild_child, handler)
+        return
+    longest_prefix = child_node.prefix[:i]
+    new_mid_node = RouteNode(longest_prefix)
+    new_mid_node.parent = node
+        
+    node.children[key] = new_mid_node
+        
+    # 将旧子节点挂在新节点下
+    cdef Py_UCS4 old_key = child_node.prefix[i]
+    new_mid_node.children[old_key] = child_node
+    child_node.parent = new_mid_node
+        
+    # 递归插入新路由
+    insert_route(new_mid_node, path, wild_child, handler)
+
+
+cdef RouteNode search_node(unicode url):
+    cdef RouteNode current_node = ROOT
+    cdef int n = len(url)
+    cdef int i = get_longest_common_prefix(url, current_node.prefix)
+    cdef Py_UCS4 key
+
+    while i < n:
+        key = url[i]
+        if key not in current_node.children:
+            break
+        current_node = <RouteNode>current_node.children[key]
+        i = get_longest_common_prefix(url, current_node.prefix)
+    return current_node
+
+
+async def handle(scope, receive, send):
+    cdef unicode route_path
+    cdef RouteNode leaf_node, current_node
+    cdef object route, match, child_scope
+    cdef object partial = None
+    cdef object partial_scope = None
+
+    cdef object router = scope["app"].router
+
+    if "router" not in scope:
+        scope["router"] = router
+
+    if scope["type"] == "lifespan":
+        await router.lifespan(scope, receive, send)
+        return
+
+    scope["path"] = route_path = starlette_utils.get_route_path(scope)
+    leaf_node = search_node(route_path)
+
+    # 1. 静态路由精确匹配
+    if leaf_node.prefix == route_path:
+        for route in leaf_node.static_routes:
+            match, child_scope = route.matches(scope)
+            if match.value == MATCH_FULL:
+                scope.update(child_scope)
+                await route.handle(scope, receive, send)
+                return
+            elif match.value == MATCH_PARTIAL and partial is None:
+                partial, partial_scope = route, child_scope
+    
+    # 2. 参数路由/通配符路由（向上回溯）
+    current_node = leaf_node
+    while current_node is not None:
+        if current_node.params_routes:
+            for route in current_node.params_routes:
+                match, child_scope = route.matches(scope)
+                if match.value == MATCH_FULL:
+                    scope.update(child_scope)
+                    await route.handle(scope, receive, send)
+                    return
+                elif match.value == MATCH_PARTIAL and partial is None:
+                    partial, partial_scope = route, child_scope
+        current_node = current_node.parent
+
+    if partial is not None:
+        scope.update(partial_scope)
+        await partial.handle(scope, receive, send)
+        return
+
+    if scope["type"] == "http" and router.redirect_slashes and route_path != "/":
+        new_path = route_path.rstrip("/") if route_path.endswith("/") else route_path + "/"
+        redirect_scope = {**scope, "path": new_path}
+        
+        if leaf_node.prefix == new_path and leaf_node.static_routes:
+            redirect_url = URL(scope=redirect_scope)
+            response = RedirectResponse(url=str(redirect_url))
+            await response(scope, receive, send)
+            return
+
+    await router.default(scope, receive, send)
+
+
+ROOT = RouteNode("")
+
+
+def install(app):
+    for route in app.routes:
+        ROOT.add_route(route.path, route)
+    app.router.middleware_stack = handle

fastapi_extra-0.4.0/fastapi_extra/native/urlparse.pyx

@@ -0,0 +1,88 @@
+# cython: language_level=3
+# cython: boundscheck=False
+# cython: wraparound=False
+# cython: initializedcheck=False
+# cython: nonecheck=False
+
+
+__author__ = "ziyan.yin"
+__describe__ = ""
+
+
+from libc.stdlib cimport strtol
+from libc.string cimport memmove, strlen
+
+
+cdef inline size_t _unquote_optimized(char* c_str, bint change_plus) nogil:
+    cdef:
+        size_t n = strlen(c_str)
+        size_t read_pos = 0
+        size_t write_pos = 0
+        char hex_buf[3]
+        
+    hex_buf[2] = 0 # 确保 strtol 有终止符
+
+    while read_pos < n:
+        if c_str[read_pos] == b'+' and change_plus:
+            c_str[write_pos] = b' '
+            read_pos += 1
+            write_pos += 1
+        elif c_str[read_pos] == b'%' and read_pos + 2 < n:
+            # 提取两位十六进制数
+            hex_buf[0] = c_str[read_pos + 1]
+            hex_buf[1] = c_str[read_pos + 2]
+            # 转换为字符
+            c_str[write_pos] = <char>strtol(hex_buf, NULL, 16)
+            read_pos += 3
+            write_pos += 1
+        else:
+            # 普通字符移动
+            c_str[write_pos] = c_str[read_pos]
+            read_pos += 1
+            write_pos += 1
+            
+    return write_pos
+
+def unquote(bytes val, str encoding = "utf-8"):
+    if not val: return ""
+    # 注意：这里会修改原始 bytes 的内存（如果是从 Python 传进来的，通常是只读的）
+    # 建议先 copy 一份或者使用 bytearray
+    cdef bytearray tmp = bytearray(val)
+    cdef char* c_raw = tmp
+    cdef size_t new_len = _unquote_optimized(c_raw, 0)
+    return tmp[:new_len].decode(encoding)
+
+
+def unquote_plus(val: bytes, encoding: str = "utf-8") -> str:
+    if not val: return ""
+    # 注意：这里会修改原始 bytes 的内存（如果是从 Python 传进来的，通常是只读的）
+    # 建议先 copy 一份或者使用 bytearray
+    cdef bytearray tmp = bytearray(val)
+    cdef char* c_raw = tmp
+    cdef size_t new_len = _unquote_optimized(c_raw, 1)
+    return tmp[:new_len].decode(encoding)
+
+
+def parse_qsl(bytes qs, bint keep_blank_values = False):
+    if not qs:
+        return []
+    
+    cdef list r = []  # 修复未定义错误
+    query_args = qs.split(b'&')
+    
+    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
+            name = unquote_plus(nv[0])
+            value = ""
+        else:
+            name = unquote_plus(nv[0])
+            value = unquote_plus(nv[1])
+            
+        r.append((name, value))
+    return r

{fastapi_extra-0.3.5 → fastapi_extra-0.4.0}/fastapi_extra/response.py

@@ -223,7 +223,7 @@ class APIResponse(JSONResponse):
         
     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-length", f"{len(self.body)}".encode("latin-1")),
             (b"content-type", b"application/json; charset=utf-8"),
         ]
         if headers:
@@ -234,8 +234,6 @@ class APIResponse(JSONResponse):
             self.raw_headers.extend(raw_headers)
 
 
-
-
 class APIError(Exception):
     __slots__ = ("code", "message")
 

{fastapi_extra-0.3.5 → fastapi_extra-0.4.0}/fastapi_extra/types.py

@@ -4,7 +4,7 @@ __date__ = "2024-12-25"
 
 import datetime
 import decimal
-from typing import Annotated, Any, TypeVar, Union
+from typing import Annotated, Any, ParamSpec, TypeVar, Union
 
 from pydantic import BaseModel, PlainSerializer
 from sqlmodel import SQLModel
@@ -19,8 +19,10 @@ T = TypeVar("T", bound=Any)
 E = TypeVar("E", bound=Exception)
 C = TypeVar("C", bound=Comparable)
 S = TypeVar("S", bound=Serializable)
+P = ParamSpec("P")
 Schema = TypeVar("Schema", bound=BaseModel)
 Model = TypeVar("Model", bound=SQLModel)
+NoneType = type(None)
 
 Cursor = Annotated[int, PlainSerializer(lambda x: str(x), return_type=str)]
 LocalDateTime = Annotated[

{fastapi_extra-0.3.5 → fastapi_extra-0.4.0}/fastapi_extra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-extra
-Version: 0.3.5
+Version: 0.4.0
 Summary: extra package for fastapi.
 Author-email: Ziyan Yin <408856732@qq.com>
 License: BSD-3-Clause

{fastapi_extra-0.3.5 → fastapi_extra-0.4.0}/fastapi_extra.egg-info/SOURCES.txt

@@ -27,6 +27,7 @@ fastapi_extra/database/__init__.py
 fastapi_extra/database/model.py
 fastapi_extra/database/service.py
 fastapi_extra/database/session.py
+fastapi_extra/database/sqlmap.py
 fastapi_extra/native/cursor.pyx
 fastapi_extra/native/routing.pyx
 fastapi_extra/native/urlparse.pyx

fastapi_extra-0.3.5/fastapi_extra/native/routing.pyx

@@ -1,191 +0,0 @@
-__author__ = "ziyan.yin"
-__describe__ = ""
-
-cimport cython
-
-from starlette import _utils as starlette_utils
-from starlette.datastructures import URL
-from starlette.responses import RedirectResponse
-
-
-cdef int find_params(unicode path):
-    for i, ch in enumerate(path):
-        if ch == "{":
-            return i
-    return -1
-
-
-cdef int get_longest_common_prefix(unicode path, unicode node_path):
-    cdef int i
-    cdef int max_len = min(len(path), len(node_path))
-    for i in range(max_len):
-        if path[i] != node_path[i]:
-            return i
-    return max_len
-
-
-@cython.no_gc
-cdef class RouteNode:
-
-    cdef readonly:
-        unicode prefix
-        list params_routes
-        list static_routes
-        dict children
-    
-    cdef public object parent
-
-    def __cinit__(self, prefix: str):
-        self.prefix = prefix
-        self.params_routes = []
-        self.static_routes = []
-        self.children = {}
-        self.parent = None
-    
-    def add_route(self, fullpath: str, handler: object):
-        wild_child = False
-        if (index := find_params(fullpath)) >= 0:
-            wild_child = True
-            path = fullpath[:index]
-        else:
-            path = fullpath
-        insert_route(self, path, wild_child, handler)
-
-
-cdef void insert_route(RouteNode node, unicode path, bint wild_child, object handler):
-    if node.prefix == path:
-        add_node(node, wild_child, handler)
-        return
-
-    cdef Py_UCS4 key = path.removeprefix(node.prefix)[0]
-    if key not in node.children:
-        add_child_node(node, key, path, wild_child, handler)
-        return
-
-    child_node = node.children[key]
-    i = get_longest_common_prefix(child_node.prefix, path)
-    longest_prefix = child_node.prefix[0: i]
-    if i == len(child_node.prefix):
-        insert_route(node.children[key], path, wild_child, handler)
-        return
-    next_node = RouteNode.__new__(RouteNode, longest_prefix)
-    next_node.parent = node
-    node.children[key] = next_node
-    next_node.children[child_node.prefix[i]] = child_node
-    child_node.parent = next_node
-    insert_route(next_node, path, wild_child, handler)
-
-
-cdef inline void add_child_node(RouteNode node, Py_UCS4 key, unicode path, bint wild_child, object handler):
-    child = RouteNode.__new__(RouteNode, path)
-    child.parent = node
-    add_node(child, wild_child, handler)
-    node.children[key] = child
-
-
-cdef inline void add_node(RouteNode node, bint wild_child, object handler):
-    if wild_child:
-        node.params_routes.append(handler)
-    else:
-        node.static_routes.append(handler)
-
-
-root_node = RouteNode.__new__(RouteNode, "")
-
-
-cdef RouteNode search_node(unicode url):
-    cdef RouteNode current_node = root_node
-    cdef int n = len(url)
-    cdef int i = get_longest_common_prefix(url, current_node.prefix)
-    
-    while i < n:
-        key = url[i]
-        if key not in current_node.children:
-            break
-        current_node = current_node.children[key]
-        i = get_longest_common_prefix(url, current_node.prefix)
-
-    return current_node
-
-
-async def handle(scope, receive, send):
-    router = scope["app"].router
-    assert scope["type"] in ("http", "websocket", "lifespan")
-
-    if "router" not in scope:
-        scope["router"] = router
-
-    if scope["type"] == "lifespan":
-        await router.lifespan(scope, receive, send)
-        return
-
-    partial = None
-
-    scope["path"] = route_path = starlette_utils.get_route_path(scope)
-    leaf_node = search_node(route_path)
-
-    if leaf_node.prefix == route_path:
-        for route in leaf_node.static_routes:
-            match, child_scope = route.matches(scope)
-            if match.value == 2:
-                scope.update(child_scope)
-                await route.handle(scope, receive, send)
-                return
-            elif match.value == 1 and partial is None:
-                partial = route
-                partial_scope = child_scope
-    else:
-        current_node = leaf_node
-        routes = current_node.params_routes
-        while current_node.parent:
-            for route in routes:
-                match, child_scope = route.matches(scope)
-                if match.value == 2:
-                    scope.update(child_scope)
-                    await route.handle(scope, receive, send)
-                    return
-                elif match.value == 1 and partial is None:
-                    partial = route
-                    partial_scope = child_scope
-            current_node = current_node.parent
-
-    if partial is not None:
-        scope.update(partial_scope)
-        await partial.handle(scope, receive, send)
-        return
-
-    if scope["type"] == "http" and router.redirect_slashes and route_path != "/":
-        redirect_scope = dict(scope)
-        if route_path.endswith("/"):
-            redirect_scope["path"] = redirect_scope["path"].rstrip("/")
-        else:
-            redirect_scope["path"] = redirect_scope["path"] + "/"
-        
-        if leaf_node.prefix == redirect_scope["path"]:
-            for route in leaf_node.static_routes:
-                match, child_scope = route.matches(redirect_scope)
-                if match.value != 0:
-                    redirect_url = URL(scope=redirect_scope)
-                    response = RedirectResponse(url=str(redirect_url))
-                    await response(scope, receive, send)
-                    return
-        else:
-            current_node = leaf_node
-            routes = current_node.params_routes
-            while current_node.parent:
-                for route in routes:
-                    if match.value != 0:
-                        redirect_url = URL(scope=redirect_scope)
-                        response = RedirectResponse(url=str(redirect_url))
-                        await response(scope, receive, send)
-                        return
-                current_node = current_node.parent
-
-    await router.default(scope, receive, send)
-
-
-def install(app):
-    for route in app.routes:
-        root_node.add_route(route.path, route)
-
-    app.router.middleware_stack = handle

fastapi_extra-0.3.5/fastapi_extra/native/urlparse.pyx

@@ -1,50 +0,0 @@
-__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