u-toolkit 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

u_toolkit/fastapi/cbv.py

@@ -13,7 +13,11 @@ from u_toolkit.fastapi.helpers import get_depend_from_annotation, is_depend
 from u_toolkit.fastapi.responses import Response, build_responses
 from u_toolkit.helpers import is_annotated
 from u_toolkit.merge import deep_merge_dict
-from u_toolkit.signature import update_parameters, with_parameter
+from u_toolkit.signature import (
+    list_parameters,
+    update_parameters,
+    with_parameter,
+)
 
 
 class EndpointsClassInterface(Protocol):
@@ -304,7 +308,16 @@ class CBV:
             for name, dep in iter_dependencies(cls)
         ]
 
-        update_parameters(collect_cls_dependencies, *parameters)
+        has_cls_deps = bool(parameters)
+        if has_cls_deps:
+            update_parameters(collect_cls_dependencies, *parameters)
+
+        def new_fn(method_name, kwargs):
+            instance = self._build_cls(cls)
+            dependencies = kwargs.pop(collect_cls_dependencies.__name__)
+            for dep_name, dep_value in dependencies.items():
+                setattr(instance, dep_name, dep_value)
+            return getattr(instance, method_name)
 
         def decorator(method: Callable):
             method_name = method.__name__
@@ -313,21 +326,29 @@ class CBV:
             sign_cls_fn = partial(cls_fn)
             update_wrapper(sign_cls_fn, cls_fn)
 
-            parameters, *_ = with_parameter(
-                sign_cls_fn,
-                name=collect_cls_dependencies.__name__,
-                default=Depends(collect_cls_dependencies),
-            )
+            if has_cls_deps:
+                parameters, *_ = with_parameter(
+                    sign_cls_fn,
+                    name=collect_cls_dependencies.__name__,
+                    default=Depends(collect_cls_dependencies),
+                )
+            else:
+                parameters = list_parameters(sign_cls_fn)
 
             update_parameters(sign_cls_fn, *(parameters[1:]))
 
+            if inspect.iscoroutinefunction(method):
+
+                @wraps(sign_cls_fn)
+                async def awrapper(*args, **kwargs):
+                    fn = new_fn(method_name, kwargs)
+                    return await fn(*args, **kwargs)
+
+                return awrapper
+
             @wraps(sign_cls_fn)
             def wrapper(*args, **kwargs):
-                instance = self._build_cls(cls)
-                dependencies = kwargs.pop(collect_cls_dependencies.__name__)
-                for dep_name, dep_value in dependencies.items():
-                    setattr(instance, dep_name, dep_value)
-                fn = getattr(instance, method_name)
+                fn = new_fn(method_name, kwargs)
                 return fn(*args, **kwargs)
 
             return wrapper

u_toolkit/signature.py

@@ -1,6 +1,5 @@
 import inspect
 from collections.abc import Callable, Sequence
-from functools import partial
 from typing import Annotated, Any, overload
 
 
@@ -57,9 +56,9 @@ def update_signature(
     return_annotation: type | None = None,
 ):
     signature = inspect.signature(fn)
-    if parameters:
+    if parameters is not None:
         signature = signature.replace(parameters=parameters)
-    if return_annotation:
+    if return_annotation is not None:
         signature = signature.replace(return_annotation=return_annotation)
 
     setattr(fn, "__signature__", signature)

{u_toolkit-0.1.3.dist-info → u_toolkit-0.1.5.dist-info}/METADATA

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

{u_toolkit-0.1.3.dist-info → u_toolkit-0.1.5.dist-info}/RECORD

@@ -9,9 +9,9 @@ u_toolkit/logger.py,sha256=NOmdR24QfSuo1EMnetyFioa8pA8OYceYTlQ4qiQcBdE,209
 u_toolkit/merge.py,sha256=kHrloud-nPti5j48zkdvaiy4mIJYqOVguixAjWC46kE,924
 u_toolkit/object.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 u_toolkit/path.py,sha256=IkyIHcU9hKBCOZfF30FrKf4CfL-MH91fjeYF9EY7eos,128
-u_toolkit/signature.py,sha256=wXyGFgb_E68xevYWx7gIy9P5lVZmHUebpf2EGI_fCnw,2167
+u_toolkit/signature.py,sha256=-Q6n28PYBYYdd2OXBKESeVkL2rYpV6EaY3IVwQmzezQ,2161
 u_toolkit/fastapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-u_toolkit/fastapi/cbv.py,sha256=DDkScAD0ab3ws4rRamy-Fw_TXzbpsCTY99xzzlqfXy8,10225
+u_toolkit/fastapi/cbv.py,sha256=gtNhV8mQAEQNf9uIwyjlrA-ZbVwLeJenJ-f2G2Co1SE,10808
 u_toolkit/fastapi/config.py,sha256=kGpokR9XXr1KxMA1GVKYkCdKwqIQAIwOJ-v6sGbqzAQ,267
 u_toolkit/fastapi/exception.py,sha256=5E4wAJYwp0RJ4SEBVkchOgrgfwCgniQ8Mtg1O5sWUXE,3288
 u_toolkit/fastapi/helpers.py,sha256=BCMMLxa1c6BMA_rKq-hCi0iyEjrR3Z5rPMeTvgaVJB0,447
@@ -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.3.dist-info/METADATA,sha256=4ibTb4RAFOVw_aJ4Ays4FxrhsjY9IZhpWFIPhkjFcuo,365
-u_toolkit-0.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-u_toolkit-0.1.3.dist-info/entry_points.txt,sha256=hTfAYCd5vvRiqgnJk2eBsoRIiIVB9pK8WZm3Q3jjKFU,45
-u_toolkit-0.1.3.dist-info/RECORD,,
+u_toolkit-0.1.5.dist-info/METADATA,sha256=4JnI6t-zFqp7sGsXFTxSX_JvpnwspQVEmcXJ1PbHe_g,365
+u_toolkit-0.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+u_toolkit-0.1.5.dist-info/entry_points.txt,sha256=hTfAYCd5vvRiqgnJk2eBsoRIiIVB9pK8WZm3Q3jjKFU,45
+u_toolkit-0.1.5.dist-info/RECORD,,