jararaca 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

jararaca/cli.py

@@ -1,9 +1,11 @@
 import importlib
 import importlib.resources
+import multiprocessing
 import os
 import sys
 import time
 from codecs import StreamWriter
+from pathlib import Path
 from typing import Any
 from urllib.parse import urlparse, urlunsplit
 
@@ -265,6 +267,30 @@ def scheduler_v2(
     scheduler.run()
 
 
+def generate_interfaces(app_path: str, file_path: str) -> None:
+    try:
+        app = find_microservice_by_module_path(app_path)
+        content = write_microservice_to_typescript_interface(app)
+
+        with open(file_path, "w", encoding="utf-8") as file:
+            # Save current position
+            file.tell()
+
+            # Reset file to beginning
+            file.seek(0)
+            file.truncate()
+
+            # Write new content
+            file.write(content)
+            file.flush()
+
+        print(
+            f"Generated TypeScript interfaces at {time.strftime('%H:%M:%S')} at {str(Path(file_path).absolute())}"
+        )
+    except Exception as e:
+        print(f"Error generating TypeScript interfaces: {e}", file=sys.stderr)
+
+
 @cli.command()
 @click.argument(
     "app_path",
@@ -272,7 +298,7 @@ def scheduler_v2(
 )
 @click.argument(
     "file_path",
-    type=click.File("w"),
+    type=click.Path(file_okay=True, dir_okay=False),
 )
 @click.option(
     "--watch",
@@ -283,32 +309,11 @@ def scheduler_v2(
     type=click.Path(exists=True, file_okay=False, dir_okay=True),
     default="src",
 )
-def gen_tsi(app_path: str, file_path: StreamWriter, watch: bool, src_dir: str) -> None:
+def gen_tsi(app_path: str, file_path: str, watch: bool, src_dir: str) -> None:
     """Generate TypeScript interfaces from a Python microservice."""
 
-    # Generate typescript interfaces
-    def generate_interfaces() -> None:
-        try:
-            app = find_microservice_by_module_path(app_path)
-            content = write_microservice_to_typescript_interface(app)
-
-            # Save current position
-            file_path.tell()
-
-            # Reset file to beginning
-            file_path.seek(0)
-            file_path.truncate()
-
-            # Write new content
-            file_path.write(content)
-            file_path.flush()
-
-            print(f"Generated TypeScript interfaces at {time.strftime('%H:%M:%S')}")
-        except Exception as e:
-            print(f"Error generating TypeScript interfaces: {e}", file=sys.stderr)
-
     # Initial generation
-    generate_interfaces()
+    generate_interfaces(app_path, file_path)
 
     # If watch mode is not enabled, exit
     if not watch:
@@ -334,7 +339,33 @@ def gen_tsi(app_path: str, file_path: StreamWriter, watch: bool, src_dir: str) -
             )
             if not event.is_directory and src_path.endswith(".py"):
                 print(f"File changed: {src_path}")
-                generate_interfaces()
+                # Create a completely detached process to ensure classes are reloaded
+                process = multiprocessing.get_context("spawn").Process(
+                    target=generate_interfaces,
+                    args=(app_path, file_path),
+                    daemon=False,  # Non-daemon to ensure it completes
+                )
+                process.start()
+                # Don't join to keep it detached from main process
+
+        def _run_generator_in_separate_process(
+            self, app_path: str, file_path: str
+        ) -> None:
+            # Using Python executable to start a completely new process
+            # This ensures all modules are freshly imported
+            generate_interfaces(app_path, file_path)
+            # cmd = [
+            #     sys.executable,
+            #     "-c",
+            #     (
+            #         f"import sys; sys.path.extend({sys.path}); "
+            #         f"from jararaca.cli import generate_interfaces; "
+            #         f"generate_interfaces('{app_path}', '{file_path}')"
+            #     ),
+            # ]
+            # import subprocess
+
+            # subprocess.run(cmd, check=False)
 
     # Set up observer
     observer = Observer()

jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py

@@ -1,3 +1,4 @@
+import logging
 from contextlib import asynccontextmanager
 from datetime import datetime, timedelta
 from datetime import tzinfo as _TzInfo
@@ -29,10 +30,10 @@ class AIOPikaMessagePublisher(MessagePublisher):
         self.message_broker_backend = message_broker_backend
 
     async def publish(self, message: IMessage, topic: str) -> None:
-        exchange = await self.channel.declare_exchange(
-            self.exchange_name,
-            type=aio_pika.ExchangeType.TOPIC,
-        )
+        exchange = await self.channel.get_exchange(self.exchange_name, ensure=False)
+        if not exchange:
+            logging.warning(f"Exchange {self.exchange_name} not found")
+            return
         routing_key = f"{topic}."
         await exchange.publish(
             aio_pika.Message(body=message.model_dump_json().encode()),

jararaca/tools/typescript/interface_parser.py

@@ -193,10 +193,11 @@ def parse_type_to_typescript_interface(
     mapped_types.update(inherited_classes)
 
     if Enum in inherited_classes:
+        enum_values = sorted([(x._name_, x.value) for x in basemodel_type])
         return (
             set(),
             f"export enum {basemodel_type.__name__} {{\n"
-            + "\n ".join([f'\t{x._name_} = "{x.value}",' for x in basemodel_type])
+            + "\n ".join([f'\t{name} = "{value}",' for name, value in enum_values])
             + "\n}\n",
         )
 
@@ -222,31 +223,39 @@ def parse_type_to_typescript_interface(
     extends_expression = (
         " extends %s"
         % ", ".join(
-            [
-                (
-                    "%s" % get_field_type_for_ts(inherited_class)
-                    if not inherited_classes_consts_conflict[inherited_class]
-                    else "Omit<%s, %s>"
-                    % (
-                        get_field_type_for_ts(inherited_class),
-                        " | ".join(
-                            '"%s"' % field_name
-                            for field_name in inherited_classes_consts_conflict[
-                                inherited_class
-                            ]
-                        ),
+            sorted(
+                [
+                    (
+                        "%s" % get_field_type_for_ts(inherited_class)
+                        if not inherited_classes_consts_conflict[inherited_class]
+                        else "Omit<%s, %s>"
+                        % (
+                            get_field_type_for_ts(inherited_class),
+                            " | ".join(
+                                sorted(
+                                    [
+                                        '"%s"' % field_name
+                                        for field_name in inherited_classes_consts_conflict[
+                                            inherited_class
+                                        ]
+                                    ]
+                                )
+                            ),
+                        )
                     )
-                )
-                for inherited_class in valid_inherited_classes
-            ]
+                    for inherited_class in valid_inherited_classes
+                ],
+                key=lambda x: str(x),
+            )
         )
         if len(valid_inherited_classes) > 0
         else ""
     )
 
     if is_generic_type(basemodel_type):
+        generic_args = get_generic_args(basemodel_type)
         string_builder.write(
-            f"export interface {basemodel_type.__name__}<{', '.join([arg.__name__ for arg in get_generic_args(basemodel_type)])}>{extends_expression} {{\n"
+            f"export interface {basemodel_type.__name__}<{', '.join(sorted([arg.__name__ for arg in generic_args]))}>{extends_expression} {{\n"
         )
     else:
         string_builder.write(
@@ -254,12 +263,12 @@ def parse_type_to_typescript_interface(
         )
 
     if hasattr(basemodel_type, "__annotations__"):
-        # for field_name in (f for f in dir(basemodel_type) if is_constant(f)):
-        #     field = getattr(basemodel_type, field_name)
-        #     if field is None:
-        #         continue
-        #     string_builder.write(f"  {field_name}: {parse_literal_value(field)};\n")
-        for field_name, field in basemodel_type.__annotations__.items():
+        # Sort fields for consistent output
+        annotation_items = sorted(
+            basemodel_type.__annotations__.items(), key=lambda x: x[0]
+        )
+
+        for field_name, field in annotation_items:
             if field_name in cls_consts:
                 continue
 
@@ -277,8 +286,11 @@ def parse_type_to_typescript_interface(
             mapped_types.update(extract_all_envolved_types(field))
             mapped_types.add(field)
 
-    ## Loop over computed fields
-    members = inspect.getmembers(basemodel_type, lambda a: isinstance(a, property))
+    ## Loop over computed fields - sort them for consistent output
+    members = sorted(
+        inspect.getmembers(basemodel_type, lambda a: isinstance(a, property)),
+        key=lambda x: x[0],
+    )
     for field_name, field in members:
         if hasattr(field, "fget"):
             module_func_name = field.fget.__module__ + "." + field.fget.__qualname__
@@ -359,11 +371,13 @@ export type WebSocketMessageMap = {
 }
 """
         % "\n".join(
-            [
-                f'\t"{message.MESSAGE_ID}": {message.__name__};'
-                for registers in websocket_registries
-                for message in registers.message_types
-            ]
+            sorted(
+                [
+                    f'\t"{message.MESSAGE_ID}": {message.__name__};'
+                    for registers in websocket_registries
+                    for message in registers.message_types
+                ]
+            )
         )
     )
 
@@ -477,7 +491,12 @@ def write_rest_controller_to_typescript_interface(
 
     mapped_types: set[Any] = set()
 
-    for name, member in inspect.getmembers(controller, predicate=inspect.isfunction):
+    # Sort members for consistent output
+    member_items = sorted(
+        inspect.getmembers(controller, predicate=inspect.isfunction), key=lambda x: x[0]
+    )
+
+    for name, member in member_items:
         if (mapping := HttpMapping.get_http_mapping(member)) is not None:
             return_type = member.__annotations__.get("return")
 
@@ -514,17 +533,24 @@ def write_rest_controller_to_typescript_interface(
             )
             class_buffer.write(f"\t\t\tpath: `/{final_path}`,\n")
 
+            # Sort headers
+            header_params = sorted(
+                [param for param in arg_params_spec if param.type_ == "header"],
+                key=lambda x: x.name,
+            )
             class_buffer.write("\t\t\theaders: {\n")
-            for param in arg_params_spec:
-                if param.type_ == "header":
-                    class_buffer.write(f'\t\t\t\t"{param.name}": {param.name},\n')
-
+            for param in header_params:
+                class_buffer.write(f'\t\t\t\t"{param.name}": {param.name},\n')
             class_buffer.write("\t\t\t},\n")
-            class_buffer.write("\t\t\tquery: {\n")
 
-            for param in arg_params_spec:
-                if param.type_ == "query":
-                    class_buffer.write(f'\t\t\t\t"{param.name}": {param.name},\n')
+            # Sort query params
+            query_params = sorted(
+                [param for param in arg_params_spec if param.type_ == "query"],
+                key=lambda x: x.name,
+            )
+            class_buffer.write("\t\t\tquery: {\n")
+            for param in query_params:
+                class_buffer.write(f'\t\t\t\t"{param.name}": {param.name},\n')
             class_buffer.write("\t\t\t},\n")
 
             if (

{jararaca-0.3.0.dist-info → jararaca-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jararaca
-Version: 0.3.0
+Version: 0.3.2
 Summary: A simple and fast API framework for Python
 Author: Lucas S
 Author-email: me@luscasleo.dev

{jararaca-0.3.0.dist-info → jararaca-0.3.2.dist-info}/RECORD

@@ -3,7 +3,7 @@ jararaca/__main__.py,sha256=-O3vsB5lHdqNFjUtoELDF81IYFtR-DSiiFMzRaiSsv4,67
 jararaca/broker_backend/__init__.py,sha256=GzEIuHR1xzgCJD4FE3harNjoaYzxHMHoEL0_clUaC-k,3528
 jararaca/broker_backend/mapper.py,sha256=vTsi7sWpNvlga1PWPFg0rCJ5joJ0cdzykkIc2Tuvenc,696
 jararaca/broker_backend/redis_broker_backend.py,sha256=a7DHchy3NAiD71Ix8SwmQOUnniu7uup-Woa4ON_4J7I,5786
-jararaca/cli.py,sha256=8opY0_YOKGaglDxIg9ijTWKcTvgHlBY9x3xiJGEo1xk,8964
+jararaca/cli.py,sha256=oaLqJlb-GAbhYpQHzl-P8ajPdo-G_ddIuSu2SsZNDh8,10244
 jararaca/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/core/providers.py,sha256=wktH84FK7c1s2wNq-fudf1uMfi3CQBR0neU2czJ_L0U,434
@@ -16,7 +16,7 @@ jararaca/messagebus/bus_message_controller.py,sha256=Xd_qwnX5jUvgBTCarHR36fvtol9
 jararaca/messagebus/consumers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/messagebus/decorators.py,sha256=y-w4dWbP9ZW3ZJ4mE9iIaxw01ZC5snEbOuBY5NC-Bn0,5626
 jararaca/messagebus/interceptors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py,sha256=1pSaifCT6TnuKWH7u80llRcUvyFlS-G9p1AU83CxGuA,5315
+jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py,sha256=Aex87wopB34sMNzXBgi4KucVHjL2wYog3-IH75DAfDk,5387
 jararaca/messagebus/interceptors/publisher_interceptor.py,sha256=fQFFW9hH6ZU3UOyR7kMPrNp9wA71qEy5XlgrBQdBMS4,1230
 jararaca/messagebus/message.py,sha256=U6cyd2XknX8mtm0333slz5fanky2PFLWCmokAO56vvU,819
 jararaca/messagebus/publisher.py,sha256=K7WsOMVTyLmdms3ZKEshqrQc_DhNreiFK-HnmOT9Ce0,1965
@@ -63,11 +63,11 @@ jararaca/tools/app_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 jararaca/tools/app_config/decorators.py,sha256=-ckkMZ1dswOmECdo1rFrZ15UAku--txaNXMp8fd1Ndk,941
 jararaca/tools/app_config/interceptor.py,sha256=nfFZiS80hrbnL7-XEYrwmp2rwaVYBqxvqu3Y-6o_ov4,2575
 jararaca/tools/metadata.py,sha256=7nlCDYgItNybentPSSCc2MLqN7IpBd0VyQzfjfQycVI,1402
-jararaca/tools/typescript/interface_parser.py,sha256=4SHt094P-QawMFHSyMCiujQf8Niw7xACIO1RHBM8-w4,29192
+jararaca/tools/typescript/interface_parser.py,sha256=_4cqte3OMAiHP-dPqUCWzWar4Ur04F-0x4ZUEnSTN-c,30040
 jararaca/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/utils/rabbitmq_utils.py,sha256=zFqZE-j6TSWFOEPbkIaB2hy2sqsXup-5421jIiPLfXY,2543
-jararaca-0.3.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-jararaca-0.3.0.dist-info/METADATA,sha256=szUO6pqKIKDGAmJC1ppYnRXm-xVr2hoT49yCqLmf4o0,4951
-jararaca-0.3.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-jararaca-0.3.0.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
-jararaca-0.3.0.dist-info/RECORD,,
+jararaca-0.3.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+jararaca-0.3.2.dist-info/METADATA,sha256=S8sFyV7thyv0X-v-xiN-rK8JobRXvxpJzHef3wmW8Kc,4951
+jararaca-0.3.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+jararaca-0.3.2.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
+jararaca-0.3.2.dist-info/RECORD,,