u-toolkit 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

u_toolkit/fastapi/cbv.py

@@ -39,7 +39,7 @@ EndpointsClassInterfaceT = TypeVar(
 )
 
 
-LiteralUpperMethods = Literal[
+LiteralUpperMethod = Literal[
     "GET",
     "POST",
     "PATCH",
@@ -49,7 +49,7 @@ LiteralUpperMethods = Literal[
     "HEAD",
     "TRACE",
 ]
-LiteralLowerMethods = Literal[
+LiteralLowerMethod = Literal[
     "get",
     "post",
     "patch",
@@ -72,23 +72,31 @@ class Methods(StrEnum):
     TRACE = auto()
 
 
+RequestMethod = Methods | LiteralLowerMethod | LiteralUpperMethod
+
+
 METHOD_PATTERNS = {
     method: re.compile(f"^({method}_|{method})", re.IGNORECASE)
     for method in Methods
 }
 
+
 _FnName = str
 
 
 class EndpointInfo(NamedTuple):
-    fn: Callable
-    original_name: str
-    method: Methods
+    handle: Callable
+    original_handle_name: str
+    handle_name: str
+    method: RequestMethod
     method_pattern: re.Pattern
     path: str
 
 
-def get_method(name: str):
+_MethodInfo = tuple[RequestMethod, re.Pattern[str]]
+
+
+def get_method(name: str) -> _MethodInfo | None:
     for method, method_pattern in METHOD_PATTERNS.items():
         if method_pattern.search(name):
             return method, method_pattern
@@ -100,29 +108,41 @@ def valid_endpoint(name: str):
         raise ValueError("Invalid endpoint function.")
 
 
-def iter_endpoints(cls: type[_T]):
-    prefix = "/"
+def iter_endpoints(
+    cls: type[_T],
+    valid_method: Callable[[str, Callable], list[_MethodInfo] | None]
+    | None = None,
+):
+    prefix = ""
 
     if not cls.__name__.startswith("_"):
-        prefix += f"{to_snake(cls.__name__)}"
+        prefix += f"/{to_snake(cls.__name__)}"
 
-    for name, fn in inspect.getmembers(
+    for name, handle in inspect.getmembers(
         cls,
         lambda arg: inspect.ismethoddescriptor(arg) or inspect.isfunction(arg),
     ):
         paths = [prefix]
 
+        methods: list[_MethodInfo] = []
         if method := get_method(name):
-            path = method[1].sub("", name).replace("__", "/")
+            methods.append(method)
+        elif valid_method:
+            methods.extend(valid_method(name, handle) or [])
+
+        for method, pattern in methods:
+            handle_name = pattern.sub("", name)
+            path = handle_name.replace("__", "/")
             if path:
                 paths.append(path)
 
             yield EndpointInfo(
-                fn=fn,
-                original_name=name,
+                handle=handle,
+                original_handle_name=name,
+                handle_name=handle_name,
                 path="/".join(paths),
-                method=method[0],
-                method_pattern=method[1],
+                method=method,
+                method_pattern=pattern,
             )
 
 
@@ -171,7 +191,7 @@ class CBV:
         *,
         cls: type[EndpointsClassInterfaceT],
         path: str,
-        method: Methods | LiteralUpperMethods | LiteralLowerMethods,
+        method: RequestMethod,
         method_name: str,
     ):
         class_tags = list(cls.tags) if cls.tags else []
@@ -221,8 +241,7 @@ class CBV:
         self,
         *,
         path: str | None = None,
-        methods: list[Methods | LiteralUpperMethods | LiteralLowerMethods]
-        | None = None,
+        methods: list[RequestMethod] | None = None,
         tags: list[str | Enum] | None = None,
         dependencies: list | None = None,
         responses: list[Response] | None = None,
@@ -261,7 +280,7 @@ class CBV:
 
         default_data = {}
         for endpoint in iter_endpoints(n_cls):
-            default_data[endpoint.original_name] = {}
+            default_data[endpoint.original_handle_name] = {}
 
         self._state.setdefault(n_cls, default_data)
         result = self._build_cls(n_cls)
@@ -361,14 +380,31 @@ class CBV:
 
         decorator = self.__create_class_dependencies_injector(cls_)
 
-        for endpoint_info in iter_endpoints(cls):
+        def valid_method(
+            name: str, _handle: Callable
+        ) -> None | list[_MethodInfo]:
+            if (cls_state := self._state.get(cls_)) and (
+                method_state := cls_state.get(name)
+            ):
+                methods: list[RequestMethod] = (
+                    method_state.get("methods") or []
+                )
+                result: list[_MethodInfo] = []
+                for i in methods:
+                    method = Methods(i.lower())
+                    result.append((method, METHOD_PATTERNS[method]))
+                return result
+
+            return None
+
+        for endpoint_info in iter_endpoints(cls, valid_method):
             route = self.create_route(
                 cls=cast(type[EndpointsClassInterface], cls),
                 path=endpoint_info.path,
                 method=endpoint_info.method,
-                method_name=endpoint_info.original_name,
+                method_name=endpoint_info.original_handle_name,
             )
-            method = getattr(instance, endpoint_info.original_name)
+            method = getattr(instance, endpoint_info.original_handle_name)
             endpoint = decorator(method)
             route(endpoint)
 

u_toolkit/fastapi/responses.py

@@ -13,7 +13,7 @@ def _merge_responses(
         model_class = response.get("model")
         if status in source:
             source_model_class = source[status].get("model")
-            if source_model_class is not None:
+            if source_model_class and model_class:
                 target[status]["model"] = model_class | source_model_class
 
     for status, response in source.items():
@@ -59,6 +59,7 @@ def build_responses(*responses: Response):
             status = arg
         else:
             errors.append(arg)
+            continue
 
         result[status] = {"model": response}
 

{u_toolkit-0.1.9.dist-info → u_toolkit-0.1.11.dist-info}/METADATA

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

{u_toolkit-0.1.9.dist-info → u_toolkit-0.1.11.dist-info}/RECORD

@@ -11,13 +11,13 @@ u_toolkit/object.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 u_toolkit/path.py,sha256=IkyIHcU9hKBCOZfF30FrKf4CfL-MH91fjeYF9EY7eos,128
 u_toolkit/signature.py,sha256=-Q6n28PYBYYdd2OXBKESeVkL2rYpV6EaY3IVwQmzezQ,2161
 u_toolkit/fastapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-u_toolkit/fastapi/cbv.py,sha256=gtNhV8mQAEQNf9uIwyjlrA-ZbVwLeJenJ-f2G2Co1SE,10808
+u_toolkit/fastapi/cbv.py,sha256=oxQFHWa48kZxxhL7UFeq9mUVqo9Q0QgQK_IllkyOFUk,11937
 u_toolkit/fastapi/config.py,sha256=kGpokR9XXr1KxMA1GVKYkCdKwqIQAIwOJ-v6sGbqzAQ,267
 u_toolkit/fastapi/exception.py,sha256=P9apEEQvbBMmffiHX57768gmemMeAy69-nb-1JQZAZE,4624
 u_toolkit/fastapi/helpers.py,sha256=BCMMLxa1c6BMA_rKq-hCi0iyEjrR3Z5rPMeTvgaVJB0,447
 u_toolkit/fastapi/lifespan.py,sha256=W1TwWymW7xtmntx59QBC4LQ6xQr3L7yuMMGj4U8hhTQ,1813
 u_toolkit/fastapi/pagination.py,sha256=yOgEDUT04m_mZ0cPliuDbUHLFnmxGAmr5PyZlwfjT_s,1940
-u_toolkit/fastapi/responses.py,sha256=ZxxFCQpahS1I0ilB-XYW6_cqq1Qscu950iMauq7Oi5E,1740
+u_toolkit/fastapi/responses.py,sha256=alXUuFK9g1xwkw7V_gpeJFyWuGTHSh-fuuWTuaG8of8,1765
 u_toolkit/pydantic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 u_toolkit/pydantic/fields.py,sha256=9I8Jwek_oNn_niI98ZWaSPEUYIl5mw24YgbnpcEtgZk,839
 u_toolkit/pydantic/models.py,sha256=Dqp3HnPlUU7ZpfBbYbERfcrLUb2CBJKHySRvM1Rv3HE,1101
@@ -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.9.dist-info/METADATA,sha256=5Cqv8wacCiIyr68zBiVWhghEUxDQTOYP848G52cGaq0,365
-u_toolkit-0.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-u_toolkit-0.1.9.dist-info/entry_points.txt,sha256=hTfAYCd5vvRiqgnJk2eBsoRIiIVB9pK8WZm3Q3jjKFU,45
-u_toolkit-0.1.9.dist-info/RECORD,,
+u_toolkit-0.1.11.dist-info/METADATA,sha256=XqvuAjDSFm1JLYjz-ag0CVE3gmJ8EKs8BbGRk92yb6o,366
+u_toolkit-0.1.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+u_toolkit-0.1.11.dist-info/entry_points.txt,sha256=hTfAYCd5vvRiqgnJk2eBsoRIiIVB9pK8WZm3Q3jjKFU,45
+u_toolkit-0.1.11.dist-info/RECORD,,