fastapi-extra 0.1.2__cp312-cp312-win_amd64.whl → 0.1.3__cp312-cp312-win_amd64.whl

fastapi_extra/__init__.py

@@ -1,15 +1,13 @@
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 
 
 from fastapi import FastAPI
 
 
-def install(app: FastAPI) -> None:
+def setup(app: FastAPI) -> None:
     try:
         from fastapi_extra import routing as native_routing  # type: ignore
-        from fastapi_extra import dependency
         
         native_routing.install(app)
-        app.dependency_overrides |= dependency.default_dependency_override
     except ImportError:  # pragma: nocover
         pass

fastapi_extra/dependency.py

@@ -3,36 +3,35 @@ __date__ = "2025-01-05"
 
 
 from abc import ABCMeta
-from typing import Annotated, Any
+from typing import Annotated, Any, Self
 
 from fastapi.params import Depends
 
 
-default_dependency_override = {}
-
-
-class DependencyMetaClass(ABCMeta):
-    __root__: Any = None
+class AnnotationMetaClass(ABCMeta):
     
     def __new__(
         mcs,
         name: str,
         bases: tuple[type, ...],
         attrs: dict,
-        root: bool = False,
-        override: bool = False
+        annotated: bool = True
     ):
         new_cls = super().__new__(mcs, name, bases, attrs)
-        if not root:
-            if new_cls.__root__ is None:
-                new_cls.__root__ = new_cls
-            elif override:
-                default_dependency_override[new_cls.__root__] = new_cls
+        if annotated:
             return Annotated[new_cls, Depends(new_cls)]
         return new_cls
 
 
+class AbstractDependency(metaclass=AnnotationMetaClass, annotated=False):
+    __slot__ = ()
 
-class Service(metaclass=DependencyMetaClass, root=True):
+
+class AbstractWidget(AbstractDependency, annotated=False):
     __slot__ = ()
-    
+    __instance__: Any = None
+    
+    def __new__(cls, *args, **kwargs) -> Self:
+        if cls.__instance__ is None:
+            cls.__instance__ = super().__new__(cls)
+        return cls.__instance__

fastapi_extra/form.py

@@ -28,8 +28,3 @@ class ColumnExpression(BaseModel, Generic[S]):
 class WhereClause(BaseModel):
     option: Literal["and", "or"] = Field(default="and", title="关系")
     column_clauses: list[ColumnExpression | "WhereClause"]
-
-
-class LoginForm(BaseModel):
-    username: str = Field(title="用户名")
-    password: str = Field(title="密码")

fastapi_extra/native/routing.pyx

@@ -37,7 +37,7 @@ cdef list change_path_to_ranks(unicode path):
     return ranks
 
 
-cdef void add_route(unicode path, object root, object route):
+cdef void add_route(unicode path, RouteNode root, object route):
     current_node = root
     ranks = change_path_to_ranks(path)
     for r in ranks:
@@ -59,13 +59,15 @@ cdef list find_routes(unicode path, RouteNode root):
     ranks = change_path_to_ranks(path)
 
     routes = []
-    routes += current_node.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]
-            routes += current_node.routes
+            if current_node.routes:
+                routes += current_node.routes
             continue
         break
     return routes
@@ -73,6 +75,7 @@ cdef list find_routes(unicode path, RouteNode root):
 
 root_node = RouteNode.__new__(RouteNode, "")
 
+
 async def handle(router, scope, receive, send):
     assert scope["type"] in ("http", "websocket", "lifespan")
 

{fastapi_extra-0.1.2.dist-info → fastapi_extra-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastapi-extra
-Version: 0.1.2
+Version: 0.1.3
 Summary: extra package for fastapi.
 Author-email: Ziyan Yin <408856732@qq.com>
 License: BSD-3-Clause
@@ -22,3 +22,13 @@ Requires-Dist: fastapi<0.116.0,>=0.115.0
 Requires-Dist: httpx<0.29.0,>=0.28.0
 Requires-Dist: pydantic-settings>=2.7.0
 Requires-Dist: sqlmodel>=0.0.22
+Provides-Extra: redis
+Requires-Dist: redis; extra == "redis"
+Provides-Extra: scheduler
+Requires-Dist: apscheduler; extra == "scheduler"
+Provides-Extra: mysql
+Requires-Dist: asyncmy; extra == "mysql"
+Provides-Extra: pgsql
+Requires-Dist: asyncpg; extra == "pgsql"
+Provides-Extra: aiomysql
+Requires-Dist: aiomysql; extra == "aiomysql"

fastapi_extra-0.1.3.dist-info/RECORD

@@ -0,0 +1,16 @@
+fastapi_extra/__init__.py,sha256=YDEfRnc8WDitSi7nV_0AzTdZRG8Utju6bWJW3Ho0iBE,286
+fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=ovXk0tkV4Up8RdS4PEEgJAccITd8BDl6e2JETGA6FJw,57344
+fastapi_extra/dependency.py,sha256=Pgl4Y9Mm6JY5pw19w_xJEmnnLkQ9p_K1h1w9lLVHUJQ,907
+fastapi_extra/form.py,sha256=LikaJkA16dSRGCqX9K7z2S8-e3SJcMiVXX5nRZU_kVY,957
+fastapi_extra/response.py,sha256=DHvhOSgwot5eBNKuI_jPYxZ5rshZ55Xkg-FNBJlHD1E,9609
+fastapi_extra/routing.cp312-win_amd64.pyd,sha256=5FzRt60laNI3hWONCZqWtMQUHPe6tReGNRQ-MXGX-hw,94720
+fastapi_extra/settings.py,sha256=cCcwaper5GiNNoT4gNKqf-iloSOTNnMsiUR0knJx4Mw,1461
+fastapi_extra/types.py,sha256=EUjT9jFryzlazHvWs4m-IfUezmSEvyxwaOGe_vTTBnY,763
+fastapi_extra/utils.py,sha256=tsPX3kpF_P5D9Bd3gnlG6rkVsLkv5gbxjml-s6ZL_6I,346
+fastapi_extra/native/cursor.pyx,sha256=bESprFDgk9gGjyPQ4YCSg51dov2WB6s60XrOs3r5-r0,1146
+fastapi_extra/native/routing.pyx,sha256=GrdGAoBospwCpxMHBon5cuRYcz9ifAFSSYa2Ytf49lg,3841
+fastapi_extra-0.1.3.dist-info/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
+fastapi_extra-0.1.3.dist-info/METADATA,sha256=rrPhKMJTo4WWZgXOosqszSbTqXQFEUervKVwerZZE2A,1348
+fastapi_extra-0.1.3.dist-info/WHEEL,sha256=cRmSBGD-cl98KkuHMNqv9Ac9L9_VqTvcBYwpIvxN0cg,101
+fastapi_extra-0.1.3.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
+fastapi_extra-0.1.3.dist-info/RECORD,,

fastapi_extra-0.1.2.dist-info/RECORD

@@ -1,16 +0,0 @@
-fastapi_extra/__init__.py,sha256=Q--tEaIQ892MOwYjKzWvrpUD2H3srBTbCBDRDBAFRqE,410
-fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=g21HsiTvEovTioMgGGC9VKnMRhtTH6qOOOxCh7w9ffg,57344
-fastapi_extra/dependency.py,sha256=fs-WUmYImz8UUGC2LkOxn_3w1H_iVA4dVha8oiz6hKA,878
-fastapi_extra/form.py,sha256=h6xaWF8sjnD4uinBRWnFbgWgaxerYjzUAROXQiXyFBk,1079
-fastapi_extra/response.py,sha256=DHvhOSgwot5eBNKuI_jPYxZ5rshZ55Xkg-FNBJlHD1E,9609
-fastapi_extra/routing.cp312-win_amd64.pyd,sha256=14ZPwBtxTMT2rHqp9sGq3vxDsfCO5O9geq8QlTdL1lI,94208
-fastapi_extra/settings.py,sha256=cCcwaper5GiNNoT4gNKqf-iloSOTNnMsiUR0knJx4Mw,1461
-fastapi_extra/types.py,sha256=EUjT9jFryzlazHvWs4m-IfUezmSEvyxwaOGe_vTTBnY,763
-fastapi_extra/utils.py,sha256=tsPX3kpF_P5D9Bd3gnlG6rkVsLkv5gbxjml-s6ZL_6I,346
-fastapi_extra/native/cursor.pyx,sha256=bESprFDgk9gGjyPQ4YCSg51dov2WB6s60XrOs3r5-r0,1146
-fastapi_extra/native/routing.pyx,sha256=sByKvUrILFKkEky2nhlzA4vLJsmvk1B2cZs0s2yH1g0,3762
-fastapi_extra-0.1.2.dist-info/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
-fastapi_extra-0.1.2.dist-info/METADATA,sha256=aSjC76xJbexcUAHmFUPFabhn11xEaBcYkW5pK-mNwVI,1006
-fastapi_extra-0.1.2.dist-info/WHEEL,sha256=cRmSBGD-cl98KkuHMNqv9Ac9L9_VqTvcBYwpIvxN0cg,101
-fastapi_extra-0.1.2.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
-fastapi_extra-0.1.2.dist-info/RECORD,,