u-toolkit 0.1.3__tar.gz → 0.1.5__tar.gz

{u_toolkit-0.1.3 → u_toolkit-0.1.5}/PKG-INFO

@@ -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 → u_toolkit-0.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "u-toolkit"
-version = "0.1.3"
+version = "0.1.5"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{u_toolkit-0.1.3 → u_toolkit-0.1.5}/src/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-0.1.3 → u_toolkit-0.1.5}/src/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 → u_toolkit-0.1.5}/tests/fastapi/test_cbv.py

@@ -1,3 +1,4 @@
+import asyncio
 from typing import Annotated, cast
 
 import sqlalchemy as sa
@@ -56,17 +57,21 @@ class R:
     def get(self):
         return self.value, self.value2, self.value3
 
-    @cbv.info(status=status.HTTP_201_CREATED)
-    def post(self):
-        record = self.db_dep.execute(sa.text(f"select '{RESULT}'")).one()
-        return record[0]
-
     def get__wtf____(self):
         pass
 
     @cbv.info(path="/lalala")
     def get_custom(self): ...
 
+    async def get_async_value(self):
+        await asyncio.sleep(0.001)
+        return 1
+
+    @cbv.info(status=status.HTTP_201_CREATED)
+    def post(self):
+        record = self.db_dep.execute(sa.text(f"select '{RESULT}'")).one()
+        return record[0]
+
 
 @cbv
 class _NoPath:
@@ -85,7 +90,9 @@ client = TestClient(app)
 
 def test_cbv():
     assert client.get("/r").json() == [dep1_value, dep2_value, dep3_value]
-    assert client.get("/_wtf____").is_success
+    assert client.get("/r/_wtf//").is_success
+    assert client.get("/lalala").is_success
+    assert client.get("/r/async_value").json() == 1
 
     post_resp = client.post("/r")
     assert post_resp.status_code == status.HTTP_201_CREATED