jararaca 0.3.12a1__py3-none-any.whl → 0.3.12a3__py3-none-any.whl

jararaca/scheduler/beat_worker.py

@@ -5,7 +5,6 @@ import signal
 import time
 from abc import ABC, abstractmethod
 from datetime import UTC, datetime
-from types import FrameType
 from typing import Any
 from urllib.parse import parse_qs
 
@@ -249,13 +248,16 @@ class BeatWorker:
 
     def run(self) -> None:
 
-        def on_signal_received(signal: int, frame_type: FrameType | None) -> None:
-            logger.info("Received shutdown signal")
-            self.shutdown_event.set()
-
-        signal.signal(signal.SIGINT, on_signal_received)
+        def on_shutdown(loop: asyncio.AbstractEventLoop) -> None:
+            logger.info("Shutting down - signal received")
+            # Schedule the shutdown to run in the event loop
+            asyncio.create_task(self._graceful_shutdown())
 
         with asyncio.Runner(loop_factory=uvloop.new_event_loop) as runner:
+            loop = runner.get_loop()
+            loop.add_signal_handler(signal.SIGINT, on_shutdown, loop)
+            # Add graceful shutdown handler for SIGTERM as well
+            loop.add_signal_handler(signal.SIGTERM, on_shutdown, loop)
             runner.run(self.start_scheduler())
 
     async def start_scheduler(self) -> None:
@@ -340,3 +342,9 @@ class BeatWorker:
 
         await self.backend.dispose()
         await self.broker.dispose()
+
+    async def _graceful_shutdown(self) -> None:
+        """Handles graceful shutdown process"""
+        logger.info("Initiating graceful shutdown sequence")
+        self.shutdown_event.set()
+        logger.info("Graceful shutdown completed")

jararaca/tools/typescript/interface_parser.py

@@ -603,8 +603,19 @@ class HttpParemeterSpec:
 
 
 def parse_path_with_params(path: str, parameters: list[HttpParemeterSpec]) -> str:
+    # Use a regular expression to match both simple parameters {param} and
+    # parameters with converters {param:converter}
+    import re
+
+    pattern = re.compile(r"{([^:}]+)(?::[^}]*)?}")
+
+    # For each parameter found in the path, replace it with :param format
     for parameter in parameters:
-        path = path.replace(f"{{{parameter.name}}}", f":{parameter.name}")
+        path = pattern.sub(
+            lambda m: f":{m.group(1)}" if m.group(1) == parameter.name else m.group(0),
+            path,
+        )
+
     return path
 
 
@@ -728,7 +739,9 @@ def extract_parameters(
                         )
                         mapped_types.update(rec_mapped_types)
                         parameters_list.extend(rec_parameters)
-                elif controller.path.find(f":{parameter_name}") != -1:
+                elif (
+                    re.search(f":{parameter_name}(?:/|$)", controller.path) is not None
+                ):
                     mapped_types.add(annotated_type)
                     parameters_list.append(
                         HttpParemeterSpec(
@@ -762,8 +775,9 @@ def extract_parameters(
                     )
                 )
             elif (
-                controller.path.find(f"{{{parameter_name}}}") != -1
-                or mapping.path.find(f"{{{parameter_name}}}") != -1
+                # Match both simple parameters {param} and parameters with converters {param:converter}
+                re.search(f"{{{parameter_name}(:.*?)?}}", controller.path) is not None
+                or re.search(f"{{{parameter_name}(:.*?)?}}", mapping.path) is not None
             ):
                 mapped_types.add(parameter_type)
                 parameters_list.append(

{jararaca-0.3.12a1.dist-info → jararaca-0.3.12a3.dist-info}/METADATA

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

{jararaca-0.3.12a1.dist-info → jararaca-0.3.12a3.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=pegG6HUFXIUVHdfGGruJu_hqjwWTYYSSsRar1mjbmqw,2040
+pyproject.toml,sha256=Hiy7cJKBQIrdiYnBskiQEYruLl8LsGgsknkKCD2uSp8,2040
 jararaca/__init__.py,sha256=EdOPigKYraoG7I-Hl9V3XteqrbhdBS3xy1rUakh58lc,17949
 jararaca/__main__.py,sha256=-O3vsB5lHdqNFjUtoELDF81IYFtR-DSiiFMzRaiSsv4,67
 jararaca/broker_backend/__init__.py,sha256=GzEIuHR1xzgCJD4FE3harNjoaYzxHMHoEL0_clUaC-k,3528
@@ -60,18 +60,18 @@ jararaca/rpc/http/backends/otel.py,sha256=Uc6CjHSCZ5hvnK1fNFv3ota5xzUFnvIl1JOpG3
 jararaca/rpc/http/decorators.py,sha256=oUSzgMGI8w6SoKiz3GltDbd3BWAuyY60F23cdRRNeiw,11897
 jararaca/rpc/http/httpx.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/scheduler/beat_worker.py,sha256=JZXjkEMmZkvSwjfqgY4ClJE9Fwi6O-u2G_lHnjptVys,11605
+jararaca/scheduler/beat_worker.py,sha256=i_NyovjFhhLYuUivf2mwpVC27oQ9SGTFOHZ7Ec4jv6I,12076
 jararaca/scheduler/decorators.py,sha256=iyWFvPLCRh9c0YReQRemI2mLuaUv7r929So-xuKIWUs,4605
 jararaca/scheduler/types.py,sha256=4HEQOmVIDp-BYLSzqmqSFIio1bd51WFmgFPIzPpVu04,135
 jararaca/tools/app_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/tools/app_config/decorators.py,sha256=-ckkMZ1dswOmECdo1rFrZ15UAku--txaNXMp8fd1Ndk,941
 jararaca/tools/app_config/interceptor.py,sha256=HV8h4AxqUc_ACs5do4BSVlyxlRXzx7HqJtoVO9tfRnQ,2611
-jararaca/tools/typescript/interface_parser.py,sha256=rM2t_6iAC2u75vBvTmZYy-JS14w36s4PKmaaGZzRYw4,30944
+jararaca/tools/typescript/interface_parser.py,sha256=Bux7DUjEQ8eAry_qZeKCIYz0aPaMO78_5wAPVErXGFo,31482
 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.12a1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-jararaca-0.3.12a1.dist-info/METADATA,sha256=vwoe5SBCrXlu3jg5CE_pBXADBbTnKipjeLBAN7S71DI,4995
-jararaca-0.3.12a1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-jararaca-0.3.12a1.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
-jararaca-0.3.12a1.dist-info/RECORD,,
+jararaca-0.3.12a3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+jararaca-0.3.12a3.dist-info/METADATA,sha256=wspP7q-KGhpcjXzXfRPGdW14rjggwwhzGOFnhmhjgDE,4995
+jararaca-0.3.12a3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+jararaca-0.3.12a3.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
+jararaca-0.3.12a3.dist-info/RECORD,,

pyproject.toml

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