u-toolkit 0.1.1__tar.gz → 0.1.2__tar.gz

{u_toolkit-0.1.1 → u_toolkit-0.1.2}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: u-toolkit
-Version: 0.1.1
+Version: 0.1.2
 Summary: Add your description here
 Requires-Python: >=3.11
 Requires-Dist: pydantic>=2.11.3
 Provides-Extra: fastapi
+Requires-Dist: fastapi>=0.115.12; extra == 'fastapi'
 Requires-Dist: pydantic-settings>=2.9.1; extra == 'fastapi'
 Provides-Extra: sqlalchemy
 Requires-Dist: sqlalchemy>=2.0.40; extra == 'sqlalchemy'

{u_toolkit-0.1.1 → u_toolkit-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "u-toolkit"
-version = "0.1.1"
+version = "0.1.2"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -16,6 +16,7 @@ sqlalchemy = [
     "sqlalchemy>=2.0.40",
 ]
 fastapi = [
+    "fastapi>=0.115.12",
     "pydantic-settings>=2.9.1",
 ]
 
@@ -26,13 +27,12 @@ build-backend = "hatchling.build"
 [dependency-groups]
 dev = [
     "devtools>=0.12.2",
+    "httpx>=0.28.1",
     "pytest>=8.3.5",
+    "python-multipart>=0.0.20",
     "ruff>=0.11.6",
     "uvicorn>=0.34.2",
 ]
-fastapi = [
-    "fastapi>=0.115.12",
-]
 
 
 

{u_toolkit-0.1.1 → u_toolkit-0.1.2}/src/u_toolkit/decorators.py

@@ -27,7 +27,8 @@ class DefineMethodDecorator(Generic[_T, _FnT]):
         self.register_method(DefineMethodParams(owner_class, name, self.fn))
 
     def __get__(self, instance: _T, owner_class: type[_T]):
-        update_parameters(self.fn, *list_parameters(self.fn)[1:])
+        parameters = list_parameters(self.fn)[1:]
+        update_parameters(self.fn, *parameters)
 
         @wraps(self.fn)
         def wrapper(*args, **kwargs):

{u_toolkit-0.1.1 → u_toolkit-0.1.2}/src/u_toolkit/fastapi/cbv.py

@@ -296,26 +296,31 @@ class CBV:
             )
             for name, dep in iter_dependencies(cls)
         ]
+
         update_parameters(collect_cls_dependencies, *parameters)
 
         def decorator(method: Callable):
-            sign_fn = partial(method)
-            update_wrapper(sign_fn, method)
+            method_name = method.__name__
+
+            cls_fn = getattr(cls, method_name)
+            sign_cls_fn = partial(cls_fn)
+            update_wrapper(sign_cls_fn, cls_fn)
 
             parameters, *_ = with_parameter(
-                method,
+                sign_cls_fn,
                 name=collect_cls_dependencies.__name__,
                 default=Depends(collect_cls_dependencies),
             )
-            update_parameters(sign_fn, *parameters)
 
-            @wraps(sign_fn)
+            update_parameters(sign_cls_fn, *(parameters[1:]))
+
+            @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 = getattr(instance, method_name)
                 return fn(*args, **kwargs)
 
             return wrapper

{u_toolkit-0.1.1 → u_toolkit-0.1.2}/src/u_toolkit/signature.py

@@ -57,13 +57,12 @@ def update_signature(
     return_annotation: type | None = None,
 ):
     signature = inspect.signature(fn)
-    kwargs = {}
     if parameters:
-        kwargs["parameters"] = parameters
+        signature = signature.replace(parameters=parameters)
     if return_annotation:
-        kwargs["return_annotation"] = return_annotation
+        signature = signature.replace(return_annotation=return_annotation)
 
-    fn.__signature__ = signature.replace(**kwargs)  # type: ignore
+    setattr(fn, "__signature__", signature)
 
 
 def update_parameters(fn: Callable, *parameters: inspect.Parameter):

u_toolkit-0.1.2/tests/fastapi/test_cbv.py

@@ -0,0 +1,94 @@
+from typing import Annotated, cast
+
+import sqlalchemy as sa
+from fastapi import Depends, FastAPI, status
+from fastapi.security import OAuth2PasswordRequestForm
+from fastapi.testclient import TestClient
+
+from u_toolkit.fastapi.cbv import CBV
+
+
+cbv = CBV()
+
+
+def gen_value():
+    return id(object())
+
+
+dep1_value = gen_value()
+
+
+def dep1():
+    return dep1_value
+
+
+dep2_value = gen_value()
+
+
+def dep2():
+    return dep2_value
+
+
+dep3_value = gen_value()
+
+
+def dep3():
+    yield dep3_value
+
+
+def db():
+    with sa.create_engine(
+        "sqlite+pysqlite:///:memory:", echo=True, future=True
+    ).connect() as conn:
+        yield conn
+
+
+RESULT = "hello world"
+
+
+@cbv
+class R:
+    value = Depends(dep1)
+    value2: Annotated[int, Depends(dep2)]
+    value3 = Depends(dep3)
+    db_dep = cast(sa.Connection, Depends(db))
+
+    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]
+
+
+@cbv
+class _NoPath:
+    value = Depends(dep1)
+
+    def post(self, data: Annotated[OAuth2PasswordRequestForm, Depends()]):
+        return data.username
+
+
+app = FastAPI()
+
+
+app.include_router(cbv.router)
+client = TestClient(app)
+
+
+def test_cbv():
+    assert client.get("/r").json() == [dep1_value, dep2_value, dep3_value]
+
+    post_resp = client.post("/r")
+    assert post_resp.status_code == status.HTTP_201_CREATED
+    assert post_resp.json() == RESULT
+
+    value = "example"
+    assert (
+        client.post(
+            "/",
+            data={"username": value, "password": value},
+        ).json()
+        == value
+    )