fastapi-extra 0.2.0__cp312-cp312-win_amd64.whl → 0.2.2__cp312-cp312-win_amd64.whl

fastapi_extra/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.0"
+__version__ = "0.2.2"
 
 
 from fastapi import FastAPI

fastapi_extra/cursor.pyi

@@ -0,0 +1,8 @@
+__author__ = "ziyan.yin"
+__describe__ = ""
+
+
+class Cursor:
+    
+    def next_val(self) -> int:
+        ...

fastapi_extra/database/service.py

@@ -5,7 +5,7 @@ from contextvars import ContextVar
 from typing import Any, Generic, Self, TypeVar
 
 from fastapi_extra.database.model import SQLModel
-from fastapi_extra.database.session import DefaultSession
+from fastapi_extra.database.session import AsyncSession, DefaultSession
 from fastapi_extra.dependency import AbstractService
 
 Model = TypeVar("Model", bound=SQLModel)
@@ -32,7 +32,7 @@ class ModelService(AbstractService, Generic[Model], abstract=True):
         self.__session_container__.set(session)
     
     @property
-    def session(self):
+    def session(self) -> AsyncSession:
         _session = self.__session_container__.get()
         assert _session is not None, "Session is not initialized"
         return _session

fastapi_extra/native/cursor.pyx

@@ -37,8 +37,8 @@ cdef class Cursor:
         self.cursor = count
         return (point << (_sequence_length + 4)) + (self.seed << _sequence_length) + count
 
-    def next_val(self) -> str:
+    def next_val(self) -> int:
         index = self.fetch()
         while index == 0:
             index = self.fetch()
-        return str(index)
+        return index

fastapi_extra/native/routing.pyx

@@ -3,80 +3,113 @@ __describe__ = ""
 
 cimport cython
 
-from typing import MutableMapping
-
 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:
-        list routes
-        dict leaves
         unicode prefix
+        list params_routes
+        list static_routes
+        dict children
+    
+    cdef public object parent
 
-    def __cinit__(self, prefix):
+    def __cinit__(self, prefix: str):
         self.prefix = prefix
-        self.routes = []
-        self.leaves = {}
+        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)
 
-    def add_route(self, route):
-        self.routes.append(route)
 
-    def add_leaf(self, node):
-        if node.prefix in self.leaves:
-            raise KeyError(node.prefix)
-        else:
-            self.leaves[node.prefix] = node
+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
 
-cdef list change_path_to_ranks(unicode path):
-    ranks = path.lstrip('/').split('/')
-    return ranks
+    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 void add_route(unicode path, RouteNode root, object route):
-    current_node = root
-    ranks = change_path_to_ranks(path)
-    for r in ranks:
-        if r.find('{') >= 0 and r.find('}') > 0:
-            break
-        if not r:
-            continue
-        if r in current_node.leaves:
-            current_node = current_node.leaves[r]
-        else:
-            next_node = RouteNode.__new__(RouteNode, r)
-            current_node.add_leaf(next_node)
-            current_node = next_node
-    current_node.add_route(route)
-
-
-cdef list find_routes(unicode path, RouteNode root):
-    current_node = root
-    ranks = change_path_to_ranks(path)
-
-    routes = []
-    if current_node.routes:
-        routes += current_node.routes
-    for r in ranks:
-        if not r:
-            continue
-        if r in current_node.leaves:
-            current_node = current_node.leaves[r]
-            if current_node.routes:
-                routes += current_node.routes
-            continue
-        break
-    return routes
+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, "")
 
 
-async def handle(router, scope, receive, send):
+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:
@@ -89,47 +122,70 @@ async def handle(router, scope, receive, send):
     partial = None
 
     scope["path"] = route_path = starlette_utils.get_route_path(scope)
-    scope["root_path"] = ""
-    matched_routes = find_routes(route_path, root_node)
-    n = len(matched_routes)
-
-    for i in range(n):
-        route = matched_routes[n - i - 1]
-        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
+    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"] + "/"
-
-        for i in range(n):
-            route = matched_routes[n - i - 1]
-            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
+        
+        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:
-        add_route(route.path, root_node, route)
-    app.router.app = handle
+        root_node.add_route(route.path, route)
+
+    app.router.middleware_stack = handle

fastapi_extra/routing.pyi

@@ -0,0 +1,16 @@
+__author__ = "ziyan.yin"
+__describe__ = ""
+
+
+from typing import Any
+from fastapi import FastAPI
+
+
+class RouteNode:
+
+    def add_route(self, fullpath: str, handler: Any):
+        ...
+
+
+def install(app: FastAPI) -> None:
+    ...

{fastapi_extra-0.2.0.dist-info → fastapi_extra-0.2.2.dist-info}/METADATA

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

{fastapi_extra-0.2.0.dist-info → fastapi_extra-0.2.2.dist-info}/RECORD

@@ -1,10 +1,12 @@
-fastapi_extra/__init__.py,sha256=MXf66njTRTUqUMbjSkWGF6HxU-1Dm8UVgfC5qh-uehM,286
-fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=0HTvLo9ZEY-GwvATHIVeaU5x-B1nxhdA8EvCZ6WhOu8,53760
+fastapi_extra/__init__.py,sha256=15p7teY89i6qSlOfYqQjU6a7fRvBPC-tPXGQU6Oo0O8,286
+fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=_Lkcm1Mi2PRMXa4M4QO5ydq-5N8Pk0pAjb8hiDLp13A,53760
+fastapi_extra/cursor.pyi,sha256=t1_ub-dRhu3OcXB_dIw5MdBG9r1n7853Vtgzc6bk6dw,115
 fastapi_extra/dependency.py,sha256=LtYnOTMyhOQUFSbNEViw7lxJvAFpPWbyuY4e2goSG-8,2130
 fastapi_extra/form.py,sha256=Fs9uEDOQThjFroDVTrjWnIGJ107BgXCppIVTymwQLzg,1247
 fastapi_extra/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_extra/response.py,sha256=DHvhOSgwot5eBNKuI_jPYxZ5rshZ55Xkg-FNBJlHD1E,9609
-fastapi_extra/routing.cp312-win_amd64.pyd,sha256=XlIyK5YoFeGcNGb_Mv27BYdjEEYJh2qlJagu7dZIJHk,87552
+fastapi_extra/routing.cp312-win_amd64.pyd,sha256=e_t1yZsSSJm-z1ppnXVOch9TGQF2q9ipphYNsY_9Otk,91136
+fastapi_extra/routing.pyi,sha256=QslcOUnVJqFCqt14VJQwjUYQ7Qd3bQBTo34Yx1xS7TA,243
 fastapi_extra/settings.py,sha256=cCcwaper5GiNNoT4gNKqf-iloSOTNnMsiUR0knJx4Mw,1461
 fastapi_extra/types.py,sha256=3z6gUnao6WZL76asZYmex20xfY9mvYA-RbnsxUcui30,819
 fastapi_extra/utils.py,sha256=tsPX3kpF_P5D9Bd3gnlG6rkVsLkv5gbxjml-s6ZL_6I,346
@@ -12,12 +14,12 @@ fastapi_extra/cache/__init__.py,sha256=kq4b_AYKCSJ0fEp4rqpeaoNJilko4XbtfC81xzUaY
 fastapi_extra/cache/redis.py,sha256=-hr2DRkmruzH4cIArdjsytqRiiWWtDJt9GIDy38wmtQ,1600
 fastapi_extra/database/__init__.py,sha256=pCYUoEylTponWqpR0AXJHcRo_cs4fnEXVVV9B5J9rt0,384
 fastapi_extra/database/model.py,sha256=2lDi9PQ5F0PSM7BGZozZf1wSefpXnTWqAVzEyGPaXRI,2453
-fastapi_extra/database/service.py,sha256=-tBC17jEbGZhnxdtWyftP2BUXfCwcOtxzNZ53qLp518,1798
+fastapi_extra/database/service.py,sha256=V5ojRpiWs9_B3XVQz-PtyvBePfmByTn8WG2gXwuhpO0,1828
 fastapi_extra/database/session.py,sha256=PALArHhXNS2gCgeMkiKjyatvINV_VW1LjgEIwXDKyfQ,1903
-fastapi_extra/native/cursor.pyx,sha256=bESprFDgk9gGjyPQ4YCSg51dov2WB6s60XrOs3r5-r0,1146
-fastapi_extra/native/routing.pyx,sha256=GrdGAoBospwCpxMHBon5cuRYcz9ifAFSSYa2Ytf49lg,3841
-fastapi_extra-0.2.0.dist-info/licenses/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
-fastapi_extra-0.2.0.dist-info/METADATA,sha256=CRLVgSMLpfE9MQ-pj1aEAdC_c_7wCtGG9pCA2ARn-ts,1371
-fastapi_extra-0.2.0.dist-info/WHEEL,sha256=RYNUKzg4pggqpqERKe4OLbPF4ZPP-Ng-rmq_sekLDXg,101
-fastapi_extra-0.2.0.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
-fastapi_extra-0.2.0.dist-info/RECORD,,
+fastapi_extra/native/cursor.pyx,sha256=GchJIPY6e5scuyl1BbA-Et0CdRcHOI3xgsTvDem0B70,1141
+fastapi_extra/native/routing.pyx,sha256=NisJ9YaxzceDVWJnF3EeVXWT8rv_6WRDuIfLEK0eWbc,6233
+fastapi_extra-0.2.2.dist-info/licenses/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
+fastapi_extra-0.2.2.dist-info/METADATA,sha256=buJJyc4jA2ve_5jdhJ0Gm6HXiazZC2rwJm6oGEktH3A,1371
+fastapi_extra-0.2.2.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
+fastapi_extra-0.2.2.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
+fastapi_extra-0.2.2.dist-info/RECORD,,

{fastapi_extra-0.2.0.dist-info → fastapi_extra-0.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-win_amd64