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

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

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: u-toolkit
-Version: 0.1.1
+Version: 0.1.3
 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.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "u-toolkit"
-version = "0.1.1"
+version = "0.1.3"
 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.3}/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.3}/src/u_toolkit/fastapi/cbv.py

@@ -24,7 +24,8 @@ class EndpointsClassInterface(Protocol):
     deprecated: bool | None = None
 
     @classmethod
-    def build_self(cls) -> Self: ...
+    def build_self(cls) -> Self:
+        return cls()
 
 
 _T = TypeVar("_T")
@@ -68,7 +69,8 @@ class Methods(StrEnum):
 
 
 METHOD_PATTERNS = {
-    method: re.compile(f"^{method}", re.IGNORECASE) for method in Methods
+    method: re.compile(f"^({method}_|{method})", re.IGNORECASE)
+    for method in Methods
 }
 
 _FnName = str
@@ -107,7 +109,7 @@ def iter_endpoints(cls: type[_T]):
         paths = [prefix]
 
         if method := get_method(name):
-            path = method[1].sub(name, "").replace("__", "/")
+            path = method[1].sub("", name).replace("__", "/")
             if path:
                 paths.append(path)
 
@@ -136,6 +138,7 @@ def iter_dependencies(cls: type[_T]):
 
 
 _CBVEndpointParamName = Literal[
+    "path",
     "tags",
     "dependencies",
     "responses",
@@ -197,6 +200,8 @@ class CBV:
             method
         ]
 
+        path = self._state[cls][method_name].get("path") or path
+
         return self.router.api_route(
             path,
             methods=endpoint_methods,
@@ -211,6 +216,7 @@ class CBV:
     def info(
         self,
         *,
+        path: str | None = None,
         methods: list[Methods | LiteralUpperMethods | LiteralLowerMethods]
         | None = None,
         tags: list[str | Enum] | None = None,
@@ -223,6 +229,7 @@ class CBV:
         state = self._state
         initial_state = self._initial_state
         data: dict[_CBVEndpointParamName, Any] = {
+            "path": path,
             "methods": methods,
             "tags": tags,
             "dependencies": dependencies,
@@ -296,26 +303,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.3}/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.3/tests/fastapi/test_cbv.py

@@ -0,0 +1,101 @@
+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]
+
+    def get__wtf____(self):
+        pass
+
+    @cbv.info(path="/lalala")
+    def get_custom(self): ...
+
+
+@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]
+    assert client.get("/_wtf____").is_success
+
+    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
+    )

{u_toolkit-0.1.1 → u_toolkit-0.1.3}/uv.lock

@@ -37,6 +37,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/45/86/4736ac618d82a20d87d2f92ae19441ebc7ac9e7a581d7e58bbe79233b24a/asttokens-2.4.1-py2.py3-none-any.whl", hash = "sha256:051ed49c3dcae8913ea7cd08e46a606dba30b79993209636c4875bc1d637bc24", size = 27764 },
 ]
 
+[[package]]
+name = "certifi"
+version = "2025.1.31"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/1c/ab/c9f1e32b7b1bf505bf26f0ef697775960db7932abeb7b516de930ba2705f/certifi-2025.1.31.tar.gz", hash = "sha256:3d5da6925056f6f18f119200434a4780a94263f10d1c21d032a6f6b2baa20651", size = 167577 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/38/fc/bce832fd4fd99766c04d1ee0eead6b0ec6486fb100ae5e74c1d91292b982/certifi-2025.1.31-py3-none-any.whl", hash = "sha256:ca78db4565a652026a4db2bcdf68f2fb589ea80d0be70e03929ed730746b84fe", size = 166393 },
+]
+
 [[package]]
 name = "click"
 version = "8.1.8"
@@ -147,6 +156,34 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/95/04/ff642e65ad6b90db43e668d70ffb6736436c7ce41fcc549f4e9472234127/h11-0.14.0-py3-none-any.whl", hash = "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761", size = 58259 },
 ]
 
+[[package]]
+name = "httpcore"
+version = "1.0.8"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "certifi" },
+    { name = "h11" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/9f/45/ad3e1b4d448f22c0cff4f5692f5ed0666658578e358b8d58a19846048059/httpcore-1.0.8.tar.gz", hash = "sha256:86e94505ed24ea06514883fd44d2bc02d90e77e7979c8eb71b90f41d364a1bad", size = 85385 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/18/8d/f052b1e336bb2c1fc7ed1aaed898aa570c0b61a09707b108979d9fc6e308/httpcore-1.0.8-py3-none-any.whl", hash = "sha256:5254cf149bcb5f75e9d1b2b9f729ea4a4b883d1ad7379fc632b727cec23674be", size = 78732 },
+]
+
+[[package]]
+name = "httpx"
+version = "0.28.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "anyio" },
+    { name = "certifi" },
+    { name = "httpcore" },
+    { name = "idna" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517 },
+]
+
 [[package]]
 name = "idna"
 version = "3.10"
@@ -310,6 +347,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/1e/18/98a99ad95133c6a6e2005fe89faedf294a748bd5dc803008059409ac9b1e/python_dotenv-1.1.0-py3-none-any.whl", hash = "sha256:d7c01d9e2293916c18baf562d95698754b0dbbb5e74d457c45d4f6561fb9d55d", size = 20256 },
 ]
 
+[[package]]
+name = "python-multipart"
+version = "0.0.20"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f3/87/f44d7c9f274c7ee665a29b885ec97089ec5dc034c7f3fafa03da9e39a09e/python_multipart-0.0.20.tar.gz", hash = "sha256:8dd0cab45b8e23064ae09147625994d090fa46f5b0d1e13af944c331a7fa9d13", size = 37158 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/45/58/38b5afbc1a800eeea951b9285d3912613f2603bdf897a4ab0f4bd7f405fc/python_multipart-0.0.20-py3-none-any.whl", hash = "sha256:8a62d3a8335e06589fe01f2a3e178cdcc632f3fbe0d492ad9ee0ec35aab1f104", size = 24546 },
+]
+
 [[package]]
 name = "ruff"
 version = "0.11.6"
@@ -425,7 +471,7 @@ wheels = [
 
 [[package]]
 name = "u-toolkit"
-version = "0.1.0"
+version = "0.1.1"
 source = { editable = "." }
 dependencies = [
     { name = "pydantic" },
@@ -433,6 +479,7 @@ dependencies = [
 
 [package.optional-dependencies]
 fastapi = [
+    { name = "fastapi" },
     { name = "pydantic-settings" },
 ]
 sqlalchemy = [
@@ -442,16 +489,16 @@ sqlalchemy = [
 [package.dev-dependencies]
 dev = [
     { name = "devtools" },
+    { name = "httpx" },
     { name = "pytest" },
+    { name = "python-multipart" },
     { name = "ruff" },
     { name = "uvicorn" },
 ]
-fastapi = [
-    { name = "fastapi" },
-]
 
 [package.metadata]
 requires-dist = [
+    { name = "fastapi", marker = "extra == 'fastapi'", specifier = ">=0.115.12" },
     { name = "pydantic", specifier = ">=2.11.3" },
     { name = "pydantic-settings", marker = "extra == 'fastapi'", specifier = ">=2.9.1" },
     { name = "sqlalchemy", marker = "extra == 'sqlalchemy'", specifier = ">=2.0.40" },
@@ -461,11 +508,12 @@ provides-extras = ["sqlalchemy", "fastapi"]
 [package.metadata.requires-dev]
 dev = [
     { name = "devtools", specifier = ">=0.12.2" },
+    { name = "httpx", specifier = ">=0.28.1" },
     { name = "pytest", specifier = ">=8.3.5" },
+    { name = "python-multipart", specifier = ">=0.0.20" },
     { name = "ruff", specifier = ">=0.11.6" },
     { name = "uvicorn", specifier = ">=0.34.2" },
 ]
-fastapi = [{ name = "fastapi", specifier = ">=0.115.12" }]
 
 [[package]]
 name = "uvicorn"