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

fastapi_extra/__init__.py

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

fastapi_extra/dependency.py

@@ -0,0 +1,38 @@
+__author__ = "ziyan.yin"
+__date__ = "2025-01-05"
+
+
+from abc import ABCMeta
+from typing import Annotated, Any
+
+from fastapi.params import Depends
+
+
+default_dependency_override = {}
+
+
+class DependencyMetaClass(ABCMeta):
+    __root__: Any = None
+    
+    def __new__(
+        mcs,
+        name: str,
+        bases: tuple[type, ...],
+        attrs: dict,
+        root: bool = False,
+        override: bool = False
+    ):
+        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
+            return Annotated[new_cls, Depends(new_cls)]
+        return new_cls
+
+
+
+class Service(metaclass=DependencyMetaClass, root=True):
+    __slot__ = ()
+    

fastapi_extra/form.py

@@ -28,3 +28,8 @@ 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

@@ -5,21 +5,11 @@ cimport cython
 
 from typing import MutableMapping
 
-from basex.common import strings
-from fastapi import APIRouter
 from starlette import _utils as starlette_utils
 from starlette.datastructures import URL
 from starlette.responses import RedirectResponse
 
 
-def get_route_path(scope: MutableMapping) -> str:
-    root_path = scope.get("root_path", "")
-    route_path = scope["path"].removeprefix(root_path)
-    return route_path
-
-starlette_utils.get_route_path = get_route_path
-
-
 @cython.no_gc
 cdef class RouteNode:
     cdef readonly:
@@ -78,86 +68,65 @@ cdef list find_routes(unicode path, RouteNode root):
             routes += current_node.routes
             continue
         break
-
-    routes.reverse()
     return routes
 
 
-_super_router = APIRouter
-
-
-class BaseRouter(_super_router):
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.root_node = RouteNode.__new__(RouteNode, '')
-        for route in self.routes:
-            add_route(route.path, self.root_node, route)
+root_node = RouteNode.__new__(RouteNode, "")
 
-    def add_route(self, path, endpoint, **kwargs):
-        super().add_route(path, endpoint, **kwargs)
-        add_route(self.routes[-1].path, self.root_node, self.routes[-1])
+async def handle(router, scope, receive, send):
+    assert scope["type"] in ("http", "websocket", "lifespan")
 
-    def add_api_route(self, path, endpoint, **kwargs):
-        super().add_api_route(path)
-        add_route(self.routes[-1].path, self.root_node, self.routes[-1])
+    if "router" not in scope:
+        scope["router"] = router
 
-    def add_websocket_route(self, path, endpoint, **kwargs):
-        super().add_websocket_route(path, endpoint, **kwargs)
-        add_route(self.routes[-1].path, self.root_node, self.routes[-1])
+    if scope["type"] == "lifespan":
+        await router.lifespan(scope, receive, send)
+        return
 
-    def add_api_websocket_route(self, path, endpoint, **kwargs):
-        super().add_api_websocket_route(path, endpoint, **kwargs)
-        add_route(self.routes[-1].path, self.root_node, self.routes[-1])
+    partial = None
 
-    def mount(self, path, app, **kwargs):
-        super().mount(path, app, **kwargs)
-        add_route(self.routes[-1].path, self.root_node, self.routes[-1])
+    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)
 
-    async def __call__(self, scope, receive, send):
-        assert scope["type"] in ("http", "websocket", "lifespan")
-
-        if "router" not in scope:
-            scope["router"] = self
-
-        if scope["type"] == "lifespan":
-            await self.lifespan(scope, receive, send)
+    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
 
-        partial = None
+    if partial is not None:
+        scope.update(partial_scope)
+        await partial.handle(scope, receive, send)
+        return
 
-        route_path = get_route_path(scope)
-        matched_routes = find_routes(route_path, self.root_node)
 
-        for route in matched_routes:
-            match, child_scope = route.matches(scope)
-            if match.value == 2:
-                scope.update(child_scope)
-                await route.handle(scope, receive, send)
+    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
-            elif match.value == 1 and partial is None:
-                partial = route
-                partial_scope = child_scope
-
-        if partial is not None:
-            scope.update(partial_scope)
-            await partial.handle(scope, receive, send)
-            return
-
 
-        if scope["type"] == "http" and self.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"] + "/"
+    await router.default(scope, receive, send)
 
-            for route in matched_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
 
-        await self.default(scope, receive, send)
+def install(app):
+    for route in app.routes:
+        add_route(route.path, root_node, route)
+    app.router.app = handle

fastapi_extra/settings.py

@@ -4,6 +4,7 @@ __date__ = "2024-12-26"
 
 from typing import Literal, Tuple, Type
 
+from pydantic import model_validator
 from pydantic_settings import (BaseSettings, PydanticBaseSettingsSource,
                                SettingsConfigDict, TomlConfigSettingsSource)
 
@@ -11,12 +12,15 @@ from pydantic_settings import (BaseSettings, PydanticBaseSettingsSource,
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(
         toml_file=["config.default.toml", "config.custom.toml"], 
-        validate_default=False
+        validate_default=False,
+        extra="ignore"
     )
     
-    title: str = ""
+    title: str = "FastAPI"
     version: str = "0.1.0"
     debug: bool = False
+    root_path: str = ""
+    include_in_schema: bool = True
     mode: Literal["dev", "test", "prod"] = "dev"
     
     @classmethod
@@ -34,3 +38,10 @@ class Settings(BaseSettings):
             init_settings,
             file_secret_settings
         )
+
+    @model_validator(mode="after")
+    def validate_mode(self) -> "Settings":
+        if self.mode == "prod":
+            self.include_in_schema = False
+            self.debug = False
+        return self

fastapi_extra/types.py

@@ -4,7 +4,10 @@ __date__ = "2024-12-25"
 
 import datetime
 import decimal
-from typing import Any, TypeVar, Union
+from typing import Annotated, Any, TypeVar, Union
+
+from pydantic import PlainSerializer
+from sqlmodel import SQLModel
 
 Comparable = Union[int, float, decimal.Decimal, datetime.datetime, datetime.date, datetime.time]
 Serializable = Union[Comparable, bool, str, None]
@@ -14,3 +17,11 @@ T = TypeVar("T", bound=Any)
 E = TypeVar("E", bound=Exception)
 C = TypeVar("C", bound=Comparable)
 S = TypeVar("S", bound=Serializable)
+Model = TypeVar("Model", bound=SQLModel)
+
+Cursor = Annotated[
+    int, PlainSerializer(lambda x: str(x), return_type=str)
+]
+LocalDateTime = Annotated[
+    datetime.datetime, PlainSerializer(lambda x: x.strftime("%Y-%m-%d %H:%M:%S"), return_type=str)
+]

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

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

fastapi_extra-0.1.2.dist-info/RECORD

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

{fastapi_extra-0.1.0.dist-info → fastapi_extra-0.1.2.dist-info}/WHEEL

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

fastapi_extra/databases.py

@@ -1,96 +0,0 @@
-__author__ = "ziyan.yin"
-__date__ = "2024-12-26"
-
-
-from typing import Annotated, Any, Literal
-
-from fastapi.params import Depends
-from pydantic import AnyUrl, BaseModel
-from sqlalchemy import Engine, NullPool
-from sqlalchemy.ext.asyncio import AsyncEngine
-from sqlalchemy.ext.asyncio import AsyncSession as _AsyncSession
-from sqlalchemy.orm import Session as _Session
-from sqlalchemy.util import _concurrency_py3k
-from sqlmodel import create_engine
-
-from fastapi_extra.settings import Settings
-
-
-class DatabaseConfig(BaseModel):
-    url: AnyUrl
-    echo: bool = False
-    echo_pool: bool = False
-    isolation_level: Literal[
-        "SERIALIZABLE",
-        "REPEATABLE READ",
-        "READ COMMITTED",
-        "READ UNCOMMITTED",
-        "AUTOCOMMIT",
-    ] | None = None
-    max_overflow: int = 10
-    pool_pre_ping: bool = False
-    pool_size: int = 5
-    pool_recycle: int = -1
-    pool_timeout: int = 30
-    pool_use_lifo: bool = False
-    query_cache_size: int = 500
-
-
-class DatabaseSettings(Settings):
-    datasources: dict[str, DatabaseConfig]
-    
-
-_settings = DatabaseSettings()  # type: ignore
-_engines: dict[str, Engine] = {}
-
-
-def load_engine(name: str = "default", **kw: Any) -> Engine:
-    if name in _engines:
-        return _engines[name]
-    if name in _settings.datasources:
-        config = _settings.datasources[name]
-        _engines[name] = create_engine(
-            url=str(config.url),
-            **config.model_dump(exclude_defaults=True, exclude={"url"}), 
-            **kw
-        )
-            
-        return _engines[name]
-        
-    raise KeyError(f"cannot find datasources.{name}")
-
-
-async def shutdown() -> None:
-    for engine in _engines.values():
-        await _concurrency_py3k.greenlet_spawn(engine.dispose)
-
-
-class SessionFactory(Depends):
-    __slots__ = ("engine", )
-    datasource: str = "default"
-    
-    def __init__(self):
-        super().__init__()
-        if _settings.mode == "test":
-            self.engine = load_engine(self.datasource, poolclass=NullPool)
-        else:
-            self.engine = load_engine(self.datasource)
-        self.dependency = self
-
-    def __call__(self):
-        with _Session(self.engine) as session:
-            yield session
-
-
-class AsyncSessionFactory(SessionFactory):
-    
-    def __init__(self):
-        super().__init__()
-        self.engine = AsyncEngine(self.engine)
-    
-    async def __call__(self):
-        async with _AsyncSession(self.engine) as session:
-            yield session
-
-
-AsyncSession = Annotated[_AsyncSession, AsyncSessionFactory()]

fastapi_extra/model.py

@@ -1,73 +0,0 @@
-__author__ = "ziyan.yin"
-__date__ = "2024-12-25"
-
-
-import datetime
-from typing import Annotated
-
-from pydantic import PlainSerializer
-from sqlalchemy import BigInteger, DateTime, Integer, SmallInteger, func
-from sqlalchemy.ext.declarative import declared_attr
-from sqlmodel import Field, SQLModel
-
-from fastapi_extra.cursor import Cursor as _Cursor  # type: ignore
-from fastapi_extra.utils import get_machine_seed
-
-Cursor = Annotated[
-    int, PlainSerializer(lambda x: str(x), return_type=str)
-]
-LocalDateTime = Annotated[
-    datetime.datetime, PlainSerializer(lambda x: x.strftime("%Y-%m-%d %H:%M:%S"), return_type=str)
-]
-
-
-class SQLBase(SQLModel):
-    id: int | None = Field(
-        default_factory=lambda: None, 
-        title="ID", 
-        primary_key=True
-    )
-    create_at: LocalDateTime = Field(
-        default_factory=datetime.datetime.now, 
-        title="CREATE_AT",
-        sa_type=DateTime,
-        sa_column_kwargs={"default": func.now(), "nullable": False, "comment": "CREATE_AT"},
-        schema_extra={"json_schema_extra": {"readOnly": True}},
-    )
-    update_at: LocalDateTime = Field(
-        default_factory=datetime.datetime.now, 
-        title="UPDATE_AT",
-        sa_type=DateTime,
-        sa_column_kwargs={"default": func.now(), "onupdate": func.now(), "nullable": False, "comment": "UPDATE_AT"},
-        schema_extra={"json_schema_extra": {"readOnly": True}},
-    )
-
-
-class LocalPK(SQLBase):
-    id: Cursor | None = Field(
-        default_factory=_Cursor(get_machine_seed()).next_val, title="ID", primary_key=True, sa_type=BigInteger
-    )
-
-
-class Deleted(SQLBase):
-    deleted: int = Field(
-        default=0,
-        title="DELETED",
-        sa_type=SmallInteger,
-        sa_column_kwargs={"nullable": False, "comment": "DELETED"},
-        schema_extra={"json_schema_extra": {"readOnly": True}},
-    )
-
-
-class Versioned(SQLBase):
-    version_id: int = Field(
-        default=0,
-        title="VERSION_ID",
-        sa_type=Integer,
-        sa_column_kwargs={"nullable": False, "comment": "VERSION_ID"},
-        schema_extra={"json_schema_extra": {"readOnly": True}},
-    )
-    
-    @declared_attr  # type: ignore
-    def __mapper_args__(cls) -> dict:
-        return {"version_id_col": "version_id"}

fastapi_extra-0.1.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-fastapi_extra/__init__.py,sha256=DgMHXQo8iKj_jrge574Zb0iq9_zNmPKUWIVaigBvu5I,310
-fastapi_extra/cursor.cp312-win_amd64.pyd,sha256=c0rgFuCuy2msqHfTQxI7Nk64UvgnTrr0qAQpPyd_hzM,57344
-fastapi_extra/databases.py,sha256=KNMQUGn7ABsZfk7_XfkqNZ1zP8IkP1JoJf2MQxtmaBo,2639
-fastapi_extra/form.py,sha256=LikaJkA16dSRGCqX9K7z2S8-e3SJcMiVXX5nRZU_kVY,957
-fastapi_extra/model.py,sha256=_I-cp_E4Vm1D73OKGqNImiUNuKl9DvkhiONrGt5DEZg,2306
-fastapi_extra/response.py,sha256=DHvhOSgwot5eBNKuI_jPYxZ5rshZ55Xkg-FNBJlHD1E,9609
-fastapi_extra/routing.cp312-win_amd64.pyd,sha256=dCFyilewdtYWCBPulIWER6kWus3fntLBGJRaJzMFqMc,115200
-fastapi_extra/settings.py,sha256=gegO1r-lV3rO_qauk8J9L5qikn1ffKAp-Z9luyMv5iQ,1118
-fastapi_extra/types.py,sha256=FFX5831Bkjy5DGkgpiScAZuOv5AqrI58ReuP3aRvtp8,421
-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=Umgpiz6FMevIo7428LdRm_v2O1NHKEgXWxDqGiZUS3c,5115
-fastapi_extra-0.1.0.dist-info/LICENSE,sha256=0vTjHDa3VDsxTT-R-sH6SpYcA2F1hKtbX9ZFZQm-EcU,1516
-fastapi_extra-0.1.0.dist-info/METADATA,sha256=TNS1sgrLbwu85E9qVtgLcNofU16JRbtnGfJJy_HNqAk,1006
-fastapi_extra-0.1.0.dist-info/WHEEL,sha256=pWXrJbnZSH-J-PhYmKs2XNn4DHCPNBYq965vsBJBFvA,101
-fastapi_extra-0.1.0.dist-info/top_level.txt,sha256=B7D80bEftE2E-eSd1be2r9BWkLLMZN21dRTWpb4y4Ig,14
-fastapi_extra-0.1.0.dist-info/RECORD,,