u-toolkit 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

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,
@@ -299,6 +306,13 @@ class CBV:
 
         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__
 
@@ -314,13 +328,18 @@ class CBV:
 
             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.2.dist-info → u_toolkit-0.1.4.dist-info}/METADATA

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

{u_toolkit-0.1.2.dist-info → u_toolkit-0.1.4.dist-info}/RECORD

@@ -11,7 +11,7 @@ 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/fastapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-u_toolkit/fastapi/cbv.py,sha256=M-4J7zcEzAsPLxGEYl6fVGnS9NGapddlfjF_ewNiYaM,10055
+u_toolkit/fastapi/cbv.py,sha256=WRp6jgwWFrdc_ujpUb9Pn6-BkkRfyEshVA_GsGFL8_s,10580
 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.2.dist-info/METADATA,sha256=16nsc--BhN024hNXzvlR6hCS9Zoebtu2ziv1Ytcfua4,365
-u_toolkit-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-u_toolkit-0.1.2.dist-info/entry_points.txt,sha256=hTfAYCd5vvRiqgnJk2eBsoRIiIVB9pK8WZm3Q3jjKFU,45
-u_toolkit-0.1.2.dist-info/RECORD,,
+u_toolkit-0.1.4.dist-info/METADATA,sha256=v6ehDmn-iQaNDZSx4KZgQDlWqKHvzKStbaRqH1IcYrw,365
+u_toolkit-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+u_toolkit-0.1.4.dist-info/entry_points.txt,sha256=hTfAYCd5vvRiqgnJk2eBsoRIiIVB9pK8WZm3Q3jjKFU,45
+u_toolkit-0.1.4.dist-info/RECORD,,