jararaca 0.3.12a19__py3-none-any.whl → 0.3.12a20__py3-none-any.whl

jararaca/tools/typescript/interface_parser.py

@@ -48,6 +48,35 @@ def is_constant(name: str) -> bool:
     return CONSTANT_PATTERN.match(name) is not None
 
 
+def unwrap_annotated_type(field_type: Any) -> tuple[Any, list[Any]]:
+    """
+    Recursively unwrap Annotated types to find the real underlying type.
+
+    Args:
+        field_type: The type to unwrap, which may be deeply nested Annotated types
+
+    Returns:
+        A tuple of (unwrapped_type, all_metadata) where:
+        - unwrapped_type is the final non-Annotated type
+        - all_metadata is a list of all metadata from all Annotated layers
+    """
+    all_metadata = []
+    current_type = field_type
+
+    while get_origin(current_type) == Annotated:
+        # Collect metadata from current layer
+        if hasattr(current_type, "__metadata__"):
+            all_metadata.extend(current_type.__metadata__)
+
+        # Move to the next inner type
+        if hasattr(current_type, "__args__") and len(current_type.__args__) > 0:
+            current_type = current_type.__args__[0]
+        else:
+            break
+
+    return current_type, all_metadata
+
+
 def is_upload_file_type(field_type: Any) -> bool:
     """
     Check if a type is UploadFile or a list/array of UploadFile.
@@ -110,7 +139,8 @@ def should_exclude_field(
 
     # Check for Annotated types with Field metadata
     if get_origin(field_type) == Annotated:
-        for metadata in field_type.__metadata__:
+        unwrapped_type, all_metadata = unwrap_annotated_type(field_type)
+        for metadata in all_metadata:
             # Check if this is a Pydantic Field by looking for expected attributes
             if hasattr(metadata, "exclude") or hasattr(metadata, "alias"):
                 # Check if Field has exclude=True
@@ -205,7 +235,8 @@ def has_default_value(
 
     # Check for Annotated types with Field metadata that have defaults
     if get_origin(field_type) == Annotated:
-        for metadata in field_type.__metadata__:
+        unwrapped_type, all_metadata = unwrap_annotated_type(field_type)
+        for metadata in all_metadata:
             # Check if this is a Pydantic Field with a default
             if hasattr(metadata, "default") and hasattr(
                 metadata, "exclude"
@@ -356,16 +387,18 @@ def get_field_type_for_ts(field_type: Any, context_suffix: str = "") -> Any:
             [get_field_type_for_ts(x, context_suffix) for x in field_type.__args__]
         )
     if (get_origin(field_type) == Annotated) and (len(field_type.__args__) > 0):
+        unwrapped_type, all_metadata = unwrap_annotated_type(field_type)
+
         if (
             plain_validator := next(
-                (x for x in field_type.__metadata__ if isinstance(x, PlainValidator)),
+                (x for x in all_metadata if isinstance(x, PlainValidator)),
                 None,
             )
         ) is not None:
             return get_field_type_for_ts(
                 plain_validator.json_schema_input_type, context_suffix
             )
-        return get_field_type_for_ts(field_type.__args__[0], context_suffix)
+        return get_field_type_for_ts(unwrapped_type, context_suffix)
     return "unknown"
 
 
@@ -974,15 +1007,16 @@ def extract_parameters(
     if is_primitive(member):
 
         if get_origin(member) is Annotated:
+            unwrapped_type, all_metadata = unwrap_annotated_type(member)
             if (
                 plain_validator := next(
-                    (x for x in member.__metadata__ if isinstance(x, PlainValidator)),
+                    (x for x in all_metadata if isinstance(x, PlainValidator)),
                     None,
                 )
             ) is not None:
                 mapped_types.add(plain_validator.json_schema_input_type)
                 return parameters_list, mapped_types
-            return extract_parameters(member.__args__[0], controller, mapping)
+            return extract_parameters(unwrapped_type, controller, mapping)
         return parameters_list, mapped_types
 
     if hasattr(member, "__bases__"):
@@ -1002,8 +1036,21 @@ def extract_parameters(
                 continue
 
             if get_origin(parameter_type) == Annotated:
-                annotated_type_hook = parameter_type.__metadata__[0]
-                annotated_type = parameter_type.__args__[0]
+                unwrapped_type, all_metadata = unwrap_annotated_type(parameter_type)
+                # Look for FastAPI parameter annotations in all metadata layers
+                annotated_type_hook = None
+                for metadata in all_metadata:
+                    if isinstance(
+                        metadata, (Header, Cookie, Form, Body, Query, Path, Depends)
+                    ):
+                        annotated_type_hook = metadata
+                        break
+
+                if annotated_type_hook is None and all_metadata:
+                    # Fallback to first metadata if no FastAPI annotation found
+                    annotated_type_hook = all_metadata[0]
+
+                annotated_type = unwrapped_type
                 if isinstance(annotated_type_hook, Header):
                     mapped_types.add(str)
                     parameters_list.append(
@@ -1270,21 +1317,22 @@ def extract_parameters(
                 for _, parameter_type in parameter_members.items():
                     if is_primitive(parameter_type.annotation):
                         if get_origin(parameter_type.annotation) is not None:
-                            if (
-                                get_origin(parameter_type.annotation) == Annotated
-                                and (
-                                    plain_validator := next(
-                                        (
-                                            x
-                                            for x in parameter_type.annotation.__metadata__
-                                            if isinstance(x, PlainValidator)
-                                        ),
-                                        None,
-                                    )
+                            if get_origin(parameter_type.annotation) == Annotated:
+                                unwrapped_type, all_metadata = unwrap_annotated_type(
+                                    parameter_type.annotation
                                 )
-                                is not None
-                            ):
-                                mapped_types.add(plain_validator.json_schema_input_type)
+                                plain_validator = next(
+                                    (
+                                        x
+                                        for x in all_metadata
+                                        if isinstance(x, PlainValidator)
+                                    ),
+                                    None,
+                                )
+                                if plain_validator is not None:
+                                    mapped_types.add(
+                                        plain_validator.json_schema_input_type
+                                    )
                             else:
                                 args = parameter_type.annotation.__args__
                                 mapped_types.update(args)
@@ -1315,22 +1363,15 @@ def extract_all_envolved_types(field_type: Any) -> set[Any]:
 
     if is_primitive(field_type):
         if get_origin(field_type) is not None:
-            if (
-                get_origin(field_type) == Annotated
-                and (
-                    plain_validator := next(
-                        (
-                            x
-                            for x in field_type.__metadata__
-                            if isinstance(x, PlainValidator)
-                        ),
-                        None,
-                    )
+            if get_origin(field_type) == Annotated:
+                unwrapped_type, all_metadata = unwrap_annotated_type(field_type)
+                plain_validator = next(
+                    (x for x in all_metadata if isinstance(x, PlainValidator)),
+                    None,
                 )
-                is not None
-            ):
-                mapped_types.add(plain_validator.json_schema_input_type)
-                return mapped_types
+                if plain_validator is not None:
+                    mapped_types.add(plain_validator.json_schema_input_type)
+                    return mapped_types
             else:
                 mapped_types.update(
                     *[extract_all_envolved_types(arg) for arg in field_type.__args__]

{jararaca-0.3.12a19.dist-info → jararaca-0.3.12a20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jararaca
-Version: 0.3.12a19
+Version: 0.3.12a20
 Summary: A simple and fast API framework for Python
 Home-page: https://github.com/LuscasLeo/jararaca
 Author: Lucas S

{jararaca-0.3.12a19.dist-info → jararaca-0.3.12a20.dist-info}/RECORD

@@ -1,6 +1,6 @@
 LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 README.md,sha256=2qMM__t_MoLKZr4IY9tXjo-Jn6LKjuHMb1qbyXpgL08,3401
-pyproject.toml,sha256=mgJOhSQjMq5tiTypMWYNHonlLtptX67W82wrg7OUiFg,2041
+pyproject.toml,sha256=uJ0U1QV3oT9pdznIF6jWS3yTivDWOsFWynfAES9yqIU,2041
 jararaca/__init__.py,sha256=vK3zyIVLckwZgj1FPX6jzSbzaSWmSy3wQ2KMwmpJnmg,22046
 jararaca/__main__.py,sha256=-O3vsB5lHdqNFjUtoELDF81IYFtR-DSiiFMzRaiSsv4,67
 jararaca/broker_backend/__init__.py,sha256=GzEIuHR1xzgCJD4FE3harNjoaYzxHMHoEL0_clUaC-k,3528
@@ -70,12 +70,12 @@ jararaca/tools/app_config/decorators.py,sha256=-ckkMZ1dswOmECdo1rFrZ15UAku--txaN
 jararaca/tools/app_config/interceptor.py,sha256=HV8h4AxqUc_ACs5do4BSVlyxlRXzx7HqJtoVO9tfRnQ,2611
 jararaca/tools/typescript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/tools/typescript/decorators.py,sha256=y1zBq8mBZ8CBXlZ0nKy2RyIgCvP9kp4elACbaC6dptQ,2946
-jararaca/tools/typescript/interface_parser.py,sha256=dkM3Nsab_1HDRY_clC6LcZLtDXFHpAqNdcqIC_MzALc,51753
+jararaca/tools/typescript/interface_parser.py,sha256=Nsct1hdF35yAvXrXL-MVIC-uGKeQ3CY3xn-ixXfUidQ,53545
 jararaca/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/utils/rabbitmq_utils.py,sha256=ytdAFUyv-OBkaVnxezuJaJoLrmN7giZgtKeet_IsMBs,10918
 jararaca/utils/retry.py,sha256=DzPX_fXUvTqej6BQ8Mt2dvLo9nNlTBm7Kx2pFZ26P2Q,4668
-jararaca-0.3.12a19.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-jararaca-0.3.12a19.dist-info/METADATA,sha256=lpSsuVzfv-LNkPBbg-eFlR-E2PcsCzlNXl0da8gQbQk,4996
-jararaca-0.3.12a19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-jararaca-0.3.12a19.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
-jararaca-0.3.12a19.dist-info/RECORD,,
+jararaca-0.3.12a20.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+jararaca-0.3.12a20.dist-info/METADATA,sha256=f2WNsZHRbUMukKcfHiuZ08BNQuziV1ZEjigRDcS9Et8,4996
+jararaca-0.3.12a20.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+jararaca-0.3.12a20.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
+jararaca-0.3.12a20.dist-info/RECORD,,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jararaca"
-version = "0.3.12a19"
+version = "0.3.12a20"
 description = "A simple and fast API framework for Python"
 authors = ["Lucas S <me@luscasleo.dev>"]
 readme = "README.md"