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

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/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/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.1.dist-info → u_toolkit-0.1.3.dist-info}/METADATA

@@ -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.dist-info → u_toolkit-0.1.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 u_toolkit/__init__.py,sha256=7f_bFg1UERA4gyh3HjCAjOZo2cBUgElpwgX5x-Xk2WA,238
 u_toolkit/alias_generators.py,sha256=KmPL1ViGJjptONffZUAX4ENvkldrwDylm_Ly5RYE8b4,963
 u_toolkit/datetime.py,sha256=GOG0xa6yKeqvFXJkImK5Pt7wsPXnHMlNKju8deniGJ4,644
-u_toolkit/decorators.py,sha256=i6dCahV4AHQPwpW48Q55vxMYvcq8GC1noq1SpVE-xjE,1229
+u_toolkit/decorators.py,sha256=NVQPvl8nByo11IRVtAi_kRRjhGvuHPlEme4dYTGZU0s,1261
 u_toolkit/enum.py,sha256=2yWmK8V1q0P5S3ltBED-TF2H09BmRbsBuqu3Th3G1NE,862
 u_toolkit/function.py,sha256=GAE6TIm5jpemUiNUPjzk7pIHrxwSSX7sHl1V5E735dE,252
 u_toolkit/helpers.py,sha256=K3FCz93K1nT4o7gWKVpMKy3k3BnirTPCSb8F8EFUrWk,112
@@ -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=jjIhyqTV3XL_tjPeA4l8dFnF5TybHd4AHF_g_2G2uAg,2168
+u_toolkit/signature.py,sha256=wXyGFgb_E68xevYWx7gIy9P5lVZmHUebpf2EGI_fCnw,2167
 u_toolkit/fastapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-u_toolkit/fastapi/cbv.py,sha256=fuZCe6An75D3ernxFk6BLta_27VpoXvxBgwhToiCMIA,9940
+u_toolkit/fastapi/cbv.py,sha256=DDkScAD0ab3ws4rRamy-Fw_TXzbpsCTY99xzzlqfXy8,10225
 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.1.dist-info/METADATA,sha256=DBFOvqAnvvO1KZYL_IQl4hP2WyTA0qgK0RopSxsMmqM,312
-u_toolkit-0.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-u_toolkit-0.1.1.dist-info/entry_points.txt,sha256=hTfAYCd5vvRiqgnJk2eBsoRIiIVB9pK8WZm3Q3jjKFU,45
-u_toolkit-0.1.1.dist-info/RECORD,,
+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,,