u-toolkit 0.1.15__py3-none-any.whl → 0.1.18__py3-none-any.whl

u_toolkit/fastapi/cbv.py

@@ -163,21 +163,31 @@ class CBVRoutesInfo(TypedDict):
     deprecated: NotRequired[bool | None]
 
 
+CBVRoutesInfoT = TypeVar("CBVRoutesInfoT", bound=CBVRoutesInfo)
+
+
 class CBVRouteInfo(CBVRoutesInfo, Generic[_T]):
     methods: NotRequired[list[RequestMethod] | None]
     response_model: NotRequired[type[_T] | None]
     status: NotRequired[int | None]
+    summary: NotRequired[str | None]
+    description: NotRequired[str | None]
+    name: NotRequired[str | None]
 
 
-class CBV:
+class CBV(Generic[CBVRoutesInfoT]):
     def __init__(self, router: APIRouter | None = None) -> None:
         self.router = router or APIRouter()
 
-        self._state: dict[type, dict[_FnName, CBVRouteInfo]] = {}
-        self._cls_routes_extra: dict[
-            type, tuple[CBVRoutesInfo, Callable[[type[_T]], _T] | None]  # type: ignore
+        self.state: dict[type, dict[_FnName, CBVRouteInfo]] = {}
+        self.routes_extra: dict[
+            type,
+            tuple[
+                CBVRoutesInfoT | None,
+                Callable[[type[_T]], _T] | None,  # type: ignore
+            ],
         ] = {}
-        self._initialed_state: dict[type[_T], _T] = {}  # type: ignore
+        self.initialed_state: dict[type[_T], _T] = {}  # type: ignore
 
     def create_route(
         self,
@@ -187,41 +197,44 @@ class CBV:
         method: RequestMethod,
         method_name: str,
     ):
-        class_routes_info = self._cls_routes_extra[cls][0]
+        class_routes_info = self.routes_extra[cls][0] or {}
 
         class_tags = class_routes_info.get("tags") or []
         endpoint_tags: list[str | Enum] = (
-            self._state[cls][method_name].get("tags") or []
+            self.state[cls][method_name].get("tags") or []
         )
         tags = class_tags + endpoint_tags
 
         class_dependencies = class_routes_info.get("dependencies") or []
         endpoint_dependencies = (
-            self._state[cls][method_name].get("dependencies") or []
+            self.state[cls][method_name].get("dependencies") or []
         )
         dependencies = class_dependencies + endpoint_dependencies
 
         class_responses = class_routes_info.get("responses") or []
         endpoint_responses = (
-            self._state[cls][method_name].get("responses") or []
+            self.state[cls][method_name].get("responses") or []
         )
         responses = build_responses(*class_responses, *endpoint_responses)
 
-        status_code = self._state[cls][method_name].get("status")
+        status_code = self.state[cls][method_name].get("status")
 
-        deprecated = self._state[cls][method_name].get(
+        deprecated = self.state[cls][method_name].get(
             "deprecated", class_routes_info.get("deprecated")
         )
 
-        response_model = self._state[cls][method_name].get("response_model")
+        response_model = self.state[cls][method_name].get("response_model")
 
         endpoint_methods = [
             i.upper()
-            for i in (self._state[cls][method_name].get("methods") or [method])
+            for i in (self.state[cls][method_name].get("methods") or [method])
         ]
 
-        path = self._state[cls][method_name].get("path") or path
+        path = self.state[cls][method_name].get("path") or path
 
+        summary = self.state[cls][method_name].get("summary")
+        description = self.state[cls][method_name].get("description")
+        name = self.state[cls][method_name].get("name")
         return self.router.api_route(
             path,
             methods=endpoint_methods,
@@ -231,9 +244,12 @@ class CBV:
             responses=responses,
             status_code=status_code,
             deprecated=deprecated,
+            summary=summary,
+            description=description,
+            name=name,
         )
 
-    def info(
+    def info(  # noqa: PLR0913
         self,
         *,
         path: str | None = None,
@@ -242,10 +258,13 @@ class CBV:
         dependencies: list | None = None,
         responses: list[Response] | None = None,
         response_model: type[_T] | None = None,
+        summary: str | None = None,
+        description: str | None = None,
+        name: str | None = None,
         status: int | None = None,
         deprecated: bool | None = None,
     ):
-        state = self._state
+        state = self.state
         initial_state = self._initial_state
         data = CBVRouteInfo(
             path=path,
@@ -256,6 +275,9 @@ class CBV:
             response_model=response_model,
             status=status,
             deprecated=deprecated,
+            summary=summary,
+            description=description,
+            name=name,
         )
 
         def handle(params: DefineMethodParams):
@@ -268,22 +290,20 @@ class CBV:
         return define_method_handler(handle)
 
     def _initial_state(self, cls: type[_T]) -> _T:
-        if result := self._initialed_state.get(cls):
+        if result := self.initialed_state.get(cls):
             return cast(_T, result)
 
         default_data = {}
         for endpoint in iter_endpoints(cls):
             default_data[endpoint.original_handle_name] = {}
 
-        self._state.setdefault(cls, default_data)
+        self.state.setdefault(cls, default_data)
         result = self._build_cls(cls)
-        self._initialed_state[cls] = result
+        self.initialed_state[cls] = result
         return result
 
     def _build_cls(self, cls: type[_T]) -> _T:
-        if cls in self._cls_routes_extra and (
-            build := self._cls_routes_extra[cls][1]
-        ):
+        if cls in self.routes_extra and (build := self.routes_extra[cls][1]):
             return build(cls)  # type: ignore
         return cls()
 
@@ -366,24 +386,24 @@ class CBV:
     def __call__(
         self,
         *,
-        info: CBVRoutesInfo | None = None,
+        info: CBVRoutesInfoT | None = None,
         build: Callable[[type[_T]], _T] | None = None,
     ) -> Callable[[type[_T]], type[_T]]: ...
 
     def __call__(self, *args, **kwargs):
-        info: CBVRoutesInfo = {}
+        info = None
         build: Callable | None = None
 
         def decorator(cls: type[_T]) -> type[_T]:
             instance = self._initial_state(cls)
-            self._cls_routes_extra[cls] = info, build
+            self.routes_extra[cls] = info, build
 
             decorator = self.__create_class_dependencies_injector(cls)
 
             def valid_method(
                 name: str, _handle: Callable
             ) -> None | list[_MethodInfo]:
-                if (cls_state := self._state.get(cls)) and (
+                if (cls_state := self.state.get(cls)) and (
                     method_state := cls_state.get(name)
                 ):
                     methods: list[RequestMethod] = (
@@ -414,7 +434,7 @@ class CBV:
         if args:
             return decorator(args[0])
 
-        info.update(kwargs.get("info") or {})
+        info = kwargs.get("info") or None
         build = kwargs.get("build")
 
         return decorator

u_toolkit/fastapi/exception.py

@@ -97,7 +97,7 @@ class NamedHTTPError(Exception, Generic[WrapperErrorT, BaseModelT]):
     ) -> None:
         kwargs: dict[str, Any] = {
             "code": self.error_code(),
-            "message": message or "operation failed",
+            "message": message or self.message or "operation failed",
         }
 
         if target:

{u_toolkit-0.1.15.dist-info → u_toolkit-0.1.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: u-toolkit
-Version: 0.1.15
+Version: 0.1.18
 Summary: Add your description here
 Requires-Python: >=3.11
 Requires-Dist: pydantic>=2.11.3

{u_toolkit-0.1.15.dist-info → u_toolkit-0.1.18.dist-info}/RECORD

@@ -11,9 +11,9 @@ u_toolkit/object.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 u_toolkit/path.py,sha256=IkyIHcU9hKBCOZfF30FrKf4CfL-MH91fjeYF9EY7eos,128
 u_toolkit/signature.py,sha256=-Q6n28PYBYYdd2OXBKESeVkL2rYpV6EaY3IVwQmzezQ,2161
 u_toolkit/fastapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-u_toolkit/fastapi/cbv.py,sha256=q9A4HKguOVBfLeZmhnY9kfiP6FfAViZUo52m-5aKZhU,12219
+u_toolkit/fastapi/cbv.py,sha256=vRYGeopzduO7Gmf5O5oz76zGOYqFtD8aGAe1oCcK8R4,12910
 u_toolkit/fastapi/config.py,sha256=kGpokR9XXr1KxMA1GVKYkCdKwqIQAIwOJ-v6sGbqzAQ,267
-u_toolkit/fastapi/exception.py,sha256=P9apEEQvbBMmffiHX57768gmemMeAy69-nb-1JQZAZE,4624
+u_toolkit/fastapi/exception.py,sha256=iZy1kjNkhtkLw6nl5x0_g3uvgpkpwutEsjfB7VvX9M0,4640
 u_toolkit/fastapi/helpers.py,sha256=BCMMLxa1c6BMA_rKq-hCi0iyEjrR3Z5rPMeTvgaVJB0,447
 u_toolkit/fastapi/lifespan.py,sha256=W1TwWymW7xtmntx59QBC4LQ6xQr3L7yuMMGj4U8hhTQ,1813
 u_toolkit/fastapi/pagination.py,sha256=yOgEDUT04m_mZ0cPliuDbUHLFnmxGAmr5PyZlwfjT_s,1940
@@ -30,7 +30,7 @@ u_toolkit/sqlalchemy/type_vars.py,sha256=m2VeV41CBIK_1QX3w2kgz-n556sILAGZ-Kaz3TD
 u_toolkit/sqlalchemy/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 u_toolkit/sqlalchemy/orm/fields.py,sha256=3zoYil23I6YLtc_59aHDt9w5l1NBTkePT9AfXI3DMiY,593
 u_toolkit/sqlalchemy/orm/models.py,sha256=V8vf4ps3phAmwxyaFYK7pw8Igz7h097o4QBjKB0gwC8,705
-u_toolkit-0.1.15.dist-info/METADATA,sha256=9YW-ZY96UyD1LCdAKjIGAVWbvOM8mqaCvcP-152uIVU,366
-u_toolkit-0.1.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-u_toolkit-0.1.15.dist-info/entry_points.txt,sha256=hTfAYCd5vvRiqgnJk2eBsoRIiIVB9pK8WZm3Q3jjKFU,45
-u_toolkit-0.1.15.dist-info/RECORD,,
+u_toolkit-0.1.18.dist-info/METADATA,sha256=sUdl21yodtOf2SmY7zrlZn6YAMM8M0A_KFcwopsTt3I,366
+u_toolkit-0.1.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+u_toolkit-0.1.18.dist-info/entry_points.txt,sha256=hTfAYCd5vvRiqgnJk2eBsoRIiIVB9pK8WZm3Q3jjKFU,45
+u_toolkit-0.1.18.dist-info/RECORD,,