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

jararaca/persistence/interceptors/aiosqa_interceptor.py

@@ -114,9 +114,14 @@ async def providing_new_session(
         current_session.bind,
     ) as new_session, new_session.begin() as new_tx:
         with providing_session(new_session, new_tx, connection_name):
-            yield new_session
-            if new_tx.is_active:
-                await new_tx.commit()
+            try:
+                yield new_session
+                if new_tx.is_active:
+                    await new_tx.commit()
+            except Exception:
+                if new_tx.is_active:
+                    await new_tx.rollback()
+                raise
 
 
 def use_session(connection_name: str | None = None) -> AsyncSession:

jararaca/tools/typescript/interface_parser.py

@@ -24,7 +24,7 @@ from typing import (
 from uuid import UUID
 
 from fastapi import Request, Response, UploadFile
-from fastapi.params import Body, Cookie, Depends, Header, Path, Query
+from fastapi.params import Body, Cookie, Depends, Form, Header, Path, Query
 from fastapi.security.http import HTTPBase
 from pydantic import BaseModel, PlainValidator
 from pydantic_core import PydanticUndefined
@@ -48,6 +48,29 @@ def is_constant(name: str) -> bool:
     return CONSTANT_PATTERN.match(name) is not None
 
 
+def is_upload_file_type(field_type: Any) -> bool:
+    """
+    Check if a type is UploadFile or a list/array of UploadFile.
+
+    Args:
+        field_type: The type to check
+
+    Returns:
+        True if it's UploadFile or list[UploadFile], False otherwise
+    """
+    if field_type == UploadFile:
+        return True
+
+    # Check for list[UploadFile], List[UploadFile], etc.
+    origin = get_origin(field_type)
+    if origin in (list, frozenset, set):
+        args = getattr(field_type, "__args__", ())
+        if args and args[0] == UploadFile:
+            return True
+
+    return False
+
+
 def should_exclude_field(
     field_name: str, field_type: Any, basemodel_type: Type[Any]
 ) -> bool:
@@ -625,6 +648,21 @@ def write_microservice_to_typescript_interface(
 // noinspection JSUnusedGlobalSymbols
 
 import { HttpService, HttpBackend, HttpBackendRequest, ResponseType, createClassQueryHooks , createClassMutationHooks, createClassInfiniteQueryHooks, paginationModelByFirstArgPaginationFilter } from "@jararaca/core";
+
+function makeFormData(data: Record<string, any>): FormData {
+  const formData = new FormData();
+  for (const key in data) {
+    if (Array.isArray(data[key])) {
+      data[key].forEach((item: any) => {
+        formData.append(key, item);
+      });
+    } else {
+      formData.append(key, data[key]);
+    }
+  }
+  return formData;
+}
+
 export type WebSocketMessageMap = {
 %s
 }
@@ -768,10 +806,21 @@ def write_rest_controller_to_typescript_interface(
             class_buffer.write(f'\t\t\tmethod: "{mapping.method}",\n')
 
             endpoint_path = parse_path_with_params(mapping.path, arg_params_spec)
-            final_path = "/".join(
-                s.strip("/") for s in [rest_controller.path, endpoint_path]
-            )
-            class_buffer.write(f"\t\t\tpath: `/{final_path}`,\n")
+
+            # Properly handle path joining to avoid double slashes
+            controller_path = rest_controller.path or ""
+            path_parts = []
+
+            if controller_path and controller_path.strip("/"):
+                path_parts.append(controller_path.strip("/"))
+            if endpoint_path and endpoint_path.strip("/"):
+                path_parts.append(endpoint_path.strip("/"))
+
+            final_path = "/".join(path_parts) if path_parts else ""
+            # Ensure the path starts with a single slash
+            formatted_path = f"/{final_path}" if final_path else "/"
+
+            class_buffer.write(f"\t\t\tpath: `{formatted_path}`,\n")
 
             # Sort path params
             path_params = sorted(
@@ -803,10 +852,25 @@ def write_rest_controller_to_typescript_interface(
                 class_buffer.write(f'\t\t\t\t"{param.name}": {param.name},\n')
             class_buffer.write("\t\t\t},\n")
 
-            if (
-                body := next((x for x in arg_params_spec if x.type_ == "body"), None)
-            ) is not None:
-                class_buffer.write(f"\t\t\tbody: {body.name}\n")
+            # Check if we need to use FormData (for file uploads or form parameters)
+            form_params = [param for param in arg_params_spec if param.type_ == "form"]
+            body_param = next((x for x in arg_params_spec if x.type_ == "body"), None)
+
+            if form_params:
+                # Use FormData for file uploads and form parameters
+                class_buffer.write("\t\t\tbody: makeFormData({\n")
+
+                # Add form parameters (including file uploads)
+                for param in form_params:
+                    class_buffer.write(f'\t\t\t\t"{param.name}": {param.name},\n')
+
+                # Add body parameter if it exists alongside form params
+                if body_param:
+                    class_buffer.write(f"\t\t\t\t...{body_param.name},\n")
+
+                class_buffer.write("\t\t\t})\n")
+            elif body_param is not None:
+                class_buffer.write(f"\t\t\tbody: {body_param.name}\n")
             else:
                 class_buffer.write("\t\t\tbody: undefined\n")
 
@@ -862,7 +926,7 @@ EXCLUDED_REQUESTS_TYPES = [Request, Response]
 
 @dataclass
 class HttpParemeterSpec:
-    type_: Literal["query", "path", "body", "header", "cookie"]
+    type_: Literal["query", "path", "body", "header", "cookie", "form"]
     name: str
     required: bool
     argument_type_str: str
@@ -960,6 +1024,16 @@ def extract_parameters(
                             argument_type_str=get_field_type_for_ts(str),
                         )
                     )
+                elif isinstance(annotated_type_hook, Form):
+                    mapped_types.add(annotated_type)
+                    parameters_list.append(
+                        HttpParemeterSpec(
+                            type_="form",
+                            name=parameter_name,
+                            required=True,
+                            argument_type_str=get_field_type_for_ts(annotated_type),
+                        )
+                    )
                 elif isinstance(annotated_type_hook, Body):
                     mapped_types.update(extract_all_envolved_types(parameter_type))
                     # For body parameters, use Input suffix if it's a split model
@@ -1067,26 +1141,37 @@ def extract_parameters(
                     )
                 else:
                     mapped_types.add(annotated_type)
-                    # For default parameters (treated as query), use Input suffix if it's a split model
-                    context_suffix = (
-                        "Input"
-                        if (
-                            inspect.isclass(annotated_type)
-                            and hasattr(annotated_type, "__dict__")
-                            and SplitInputOutput.is_split_model(annotated_type)
+                    # Special handling for UploadFile and list[UploadFile] - should be treated as form data
+                    if is_upload_file_type(annotated_type):
+                        parameters_list.append(
+                            HttpParemeterSpec(
+                                type_="form",
+                                name=parameter_name,
+                                required=True,
+                                argument_type_str=get_field_type_for_ts(annotated_type),
+                            )
                         )
-                        else ""
-                    )
-                    parameters_list.append(
-                        HttpParemeterSpec(
-                            type_="query",
-                            name=parameter_name,
-                            required=True,
-                            argument_type_str=get_field_type_for_ts(
-                                annotated_type, context_suffix
-                            ),
+                    else:
+                        # For default parameters (treated as query), use Input suffix if it's a split model
+                        context_suffix = (
+                            "Input"
+                            if (
+                                inspect.isclass(annotated_type)
+                                and hasattr(annotated_type, "__dict__")
+                                and SplitInputOutput.is_split_model(annotated_type)
+                            )
+                            else ""
+                        )
+                        parameters_list.append(
+                            HttpParemeterSpec(
+                                type_="query",
+                                name=parameter_name,
+                                required=True,
+                                argument_type_str=get_field_type_for_ts(
+                                    annotated_type, context_suffix
+                                ),
+                            )
                         )
-                    )
 
             elif inspect.isclass(parameter_type) and issubclass(
                 parameter_type, BaseModel
@@ -1106,6 +1191,17 @@ def extract_parameters(
                         ),
                     )
                 )
+            elif parameter_type == UploadFile or is_upload_file_type(parameter_type):
+                # UploadFile and list[UploadFile] should be treated as form data
+                mapped_types.add(parameter_type)
+                parameters_list.append(
+                    HttpParemeterSpec(
+                        type_="form",
+                        name=parameter_name,
+                        required=True,
+                        argument_type_str=get_field_type_for_ts(parameter_type),
+                    )
+                )
             elif (
                 # Match both simple parameters {param} and parameters with converters {param:converter}
                 re.search(f"{{{parameter_name}(:.*?)?}}", controller.path) is not None
@@ -1134,26 +1230,37 @@ def extract_parameters(
                 )
             else:
                 mapped_types.add(parameter_type)
-                # For default parameters (treated as query), use Input suffix if it's a split model
-                context_suffix = (
-                    "Input"
-                    if (
-                        inspect.isclass(parameter_type)
-                        and hasattr(parameter_type, "__dict__")
-                        and SplitInputOutput.is_split_model(parameter_type)
+                # Special handling for UploadFile and list[UploadFile] - should be treated as form data
+                if is_upload_file_type(parameter_type):
+                    parameters_list.append(
+                        HttpParemeterSpec(
+                            type_="form",
+                            name=parameter_name,
+                            required=True,
+                            argument_type_str=get_field_type_for_ts(parameter_type),
+                        )
                     )
-                    else ""
-                )
-                parameters_list.append(
-                    HttpParemeterSpec(
-                        type_="query",
-                        name=parameter_name,
-                        required=True,
-                        argument_type_str=get_field_type_for_ts(
-                            parameter_type, context_suffix
-                        ),
+                else:
+                    # For default parameters (treated as query), use Input suffix if it's a split model
+                    context_suffix = (
+                        "Input"
+                        if (
+                            inspect.isclass(parameter_type)
+                            and hasattr(parameter_type, "__dict__")
+                            and SplitInputOutput.is_split_model(parameter_type)
+                        )
+                        else ""
+                    )
+                    parameters_list.append(
+                        HttpParemeterSpec(
+                            type_="query",
+                            name=parameter_name,
+                            required=True,
+                            argument_type_str=get_field_type_for_ts(
+                                parameter_type, context_suffix
+                            ),
+                        )
                     )
-                )
 
             if inspect.isclass(parameter_type) and not is_primitive(parameter_type):
                 signature = inspect.signature(parameter_type)

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

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

{jararaca-0.3.12a17.dist-info → jararaca-0.3.12a19.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=stDeBAKKaDdBk5oL2gpGAiJLpPeIrDN16gnoXjeZmlE,2041
+pyproject.toml,sha256=mgJOhSQjMq5tiTypMWYNHonlLtptX67W82wrg7OUiFg,2041
 jararaca/__init__.py,sha256=vK3zyIVLckwZgj1FPX6jzSbzaSWmSy3wQ2KMwmpJnmg,22046
 jararaca/__main__.py,sha256=-O3vsB5lHdqNFjUtoELDF81IYFtR-DSiiFMzRaiSsv4,67
 jararaca/broker_backend/__init__.py,sha256=GzEIuHR1xzgCJD4FE3harNjoaYzxHMHoEL0_clUaC-k,3528
@@ -32,7 +32,7 @@ jararaca/observability/providers/otel.py,sha256=8N1F32W43t7c8cwmtTh6Yz9b7HyfGFSR
 jararaca/persistence/base.py,sha256=xnGUbsLNz3gO-9iJt-Sn5NY13Yc9-misP8wLwQuGGoM,1024
 jararaca/persistence/exports.py,sha256=Ghx4yoFaB4QVTb9WxrFYgmcSATXMNvrOvT8ybPNKXCA,62
 jararaca/persistence/interceptors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/persistence/interceptors/aiosqa_interceptor.py,sha256=kHI1rb71o3Ug3JzkQ0RQ2uqJuENsIRgDF69MX7H65lk,6760
+jararaca/persistence/interceptors/aiosqa_interceptor.py,sha256=-YDKDicaocEz71fbt1X1S33KJBwqMYZG-4igNylbh9A,6922
 jararaca/persistence/interceptors/constants.py,sha256=o8g5RxDX9dSSnM9eXYlTJalGPfWxYm6-CAA8-FooUzE,36
 jararaca/persistence/interceptors/decorators.py,sha256=p37r9ux5w_bvn8xPNPhScl3fjCc2enqTR0cJYLxMsrI,1627
 jararaca/persistence/session.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=OMvz4vcsKD0eYPwH1hd3PJpLP2Bc_Ex0CefIhsJArf4,47306
+jararaca/tools/typescript/interface_parser.py,sha256=dkM3Nsab_1HDRY_clC6LcZLtDXFHpAqNdcqIC_MzALc,51753
 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.12a17.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-jararaca-0.3.12a17.dist-info/METADATA,sha256=lwNzy_Aycpsghy1xAsRkSIqz15GWEuCqyu_gNFC39Oc,4996
-jararaca-0.3.12a17.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-jararaca-0.3.12a17.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
-jararaca-0.3.12a17.dist-info/RECORD,,
+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,,

pyproject.toml

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