edri 2025.12.1rc4__py3-none-any.whl → 2025.12.2rc1__py3-none-any.whl

edri/api/handlers/base_handler.py

@@ -137,8 +137,8 @@ class BaseHandler[T: ResponseDirective](ABC):
                 # Determine underlying class and optional inner type
                 item_type = None
 
-                if isinstance(cls, GenericAlias):
-                    origin = get_origin(cls)  # e.g. ListValidation
+                origin = get_origin(cls)
+                if origin is not None:
                     args = get_args(cls)  # e.g. (int,)
                     target_cls = origin
 
@@ -159,6 +159,9 @@ class BaseHandler[T: ResponseDirective](ABC):
                     if k in param_names
                 }
 
+                if origin is not None:
+                    filtered_params["generics"] = args
+
                 # If this is a list-like validator with an inner type -> convert elements first
                 if item_type is not None:
                     if (not isinstance(value, Iterable)) or isinstance(value, (str, bytes)):

edri/api/handlers/http_handler.py

@@ -184,22 +184,19 @@ class URLNode:
 
             regex_function = cls.DATA_TYPE_REGEX.get(origin)
         elif isinstance(type_, Injection):
-            previous_regex = None
-            for vot in type_.classes:
-                for base in vot.__mro__[1:]:  # Skip the type itself
-                    regex_function = cls.DATA_TYPE_REGEX.get(base)
-
-                    if regex_function:
-                        if previous_regex is None:
-                            previous_regex = regex_function
-                        elif previous_regex != regex_function:
-                            raise TypeError("All classes in 'inject' must have the same base class when used as URL parameters.")
-                        break  # Only check the first valid base class regex
-
-            if vot is StringValidator:
-                regex = type_.parameters.get("regex", None)
-                if regex is not None:
-                    regex_function = lambda name, _: rf"^(?P<{escape(name)}>{sub(r'^\^(.*)\$$', r'\1', regex.pattern)})$"
+            if regex := type_.parameters.get("regex"):
+                regex_function = lambda name, _: rf"^(?P<{escape(name)}>{sub(r'^\^(.*)\$$', r'\1', regex.pattern)})$"
+            else:
+                previous_regex = None
+                for vot in type_.classes:
+                    for base in vot.__mro__[1:]:  # Skip the type itself
+                        regex_function = cls.DATA_TYPE_REGEX.get(base)
+                        if regex_function:
+                            if previous_regex is None:
+                                previous_regex = regex_function
+                            elif previous_regex != regex_function:
+                                raise TypeError("All classes in 'inject' must have the same base class when used as URL parameters.")
+                            break  # Only check the first valid base class regex
 
         elif issubclass(type_, Enum):
             regex_function = cls.DATA_TYPE_REGEX.get(Enum)

edri/api/listener.py

@@ -216,7 +216,7 @@ class Listener(Process):
                 current_exception = e
                 while current_exception:
                     reasons.append({
-                        "message": str(current_exception)
+                        "message": current_exception.__repr__()
                     })
                     # Move to the next exception in the chain
                     current_exception = current_exception.__context__

edri/dataclass/injection.py

@@ -1,6 +1,5 @@
 from inspect import signature
-from types import GenericAlias
-from typing import Any, Type, get_origin
+from typing import Any, Type
 
 
 class Injection:
@@ -18,8 +17,6 @@ class Injection:
                                      constructor's signature will be passed to the class.
 
     Methods:
-        __iter__: Iterates over the provided classes and creates callables that can instantiate them
-                  with the appropriate parameters.
         __repr__: Returns a string representation of the Injection instance, showing the classes and
                   the parameters that will be passed to their constructors.
     """
@@ -29,29 +26,6 @@ class Injection:
         self.classes = classes  # Store the classes
         self.parameters = parameters  # Store the parameters
 
-    def __iter__(self):
-        # Create the callable on demand when iterating
-        for cls in self.classes:
-            # Get the signature of the __init__ method of the class
-            if isinstance(cls, GenericAlias):
-                sig = signature(get_origin(cls))
-            else:
-                sig = signature(cls)
-            # Extract parameter names from the signature
-            param_names: list[str] = [param.name for param in sig.parameters.values() if param.name != 'self']
-
-            # Filter the parameters dictionary to include only the ones needed for the class
-            filtered_params: dict[str, Any] = {k: v for k, v in self.parameters.items() if k in param_names}
-
-            # Create the callable (function) to instantiate the class with the filtered parameters
-            def create_instance(value: str, cls=cls, filtered_params=filtered_params):
-                # Here we assume that `value` will be passed to the `__init__` of the class
-                # This is a simple way to make sure that `value` can be used along with the filtered params
-                return cls(value, **filtered_params)
-
-            # Yield the callable (this will be used in the iteration)
-            yield create_instance
-
     def __repr__(self):
         # Representation of the class, including class names and their filtered parameters
         param_info = []

{edri-2025.12.1rc4.dist-info → edri-2025.12.2rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edri
-Version: 2025.12.1rc4
+Version: 2025.12.2rc1
 Summary: Event Driven Routing Infrastructure
 Author: Marek Olšan
 Author-email: marek.olsan@gmail.com

{edri-2025.12.1rc4.dist-info → edri-2025.12.2rc1.dist-info}/RECORD

@@ -10,7 +10,7 @@ edri/abstract/worker/worker_process.py,sha256=QiNxOuwkMds0sV2MBLyp7bjrovm5xColC7
 edri/abstract/worker/worker_thread.py,sha256=xoMPuDn-hAkWk6kFY3Xf8mxOVP__5t7-x7f-b396-8M,2176
 edri/api/__init__.py,sha256=ZDxCpHKFGajJ1RwDpV7CzxLDUaKpozJRfOCv1OPv5ZY,142
 edri/api/broker.py,sha256=I3z_bKbcTDnKXk82yteGEQmuxpqHgp5KrhQaJmk3US0,37258
-edri/api/listener.py,sha256=8ffX8ntJ5XbHAqT5hM38teMRsd1cBjcJ7PJAMa4Ez7c,20403
+edri/api/listener.py,sha256=vXvLx2agQG43BIaLOnVpu9ATXhLvKon8BVRLCbVRs_Q,20409
 edri/api/middleware.py,sha256=6_x55swthVDczT-fu_1ufY1cDsHTZ04jMx6J6xfjbsM,5483
 edri/api/dataclass/__init__.py,sha256=8Y-zcaJtzMdALnNG7M9jsCaB1qAJKM8Ld3h9MDajYjA,292
 edri/api/dataclass/api_event.py,sha256=08edshexI9FxdebPIgTQMSQ4fEtGpAa3K_VYCmN1jFs,6587
@@ -20,9 +20,9 @@ edri/api/extensions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 edri/api/extensions/url_extension.py,sha256=rZKumjR7J6pDTiSLIZf8IzxGgDZP7p2g0Kgs0USug_U,1971
 edri/api/extensions/url_prefix.py,sha256=kNI6g5ZlW0w-J_IMacYLco1EQvmTtMJyEkN6-SK1wC0,491
 edri/api/handlers/__init__.py,sha256=MI6OGDf1rM8jf_uCKK_JYeOGMts62CNy10BwwNlG0Tk,200
-edri/api/handlers/base_handler.py,sha256=aZN95tWX7hkmJ3D401c-JPfF2azjH0t1jJy_zsjPc_4,13113
+edri/api/handlers/base_handler.py,sha256=4qavJ4XD1BeFq_KjFxj_Mp6PzIhAAFqFfXNrwv8CCtw,13170
 edri/api/handlers/html_handler.py,sha256=OprcTg1IQDI7eBK-_oHqA60P1H30LA9xIQpD7iV-Neg,7464
-edri/api/handlers/http_handler.py,sha256=AC-8oi4ez5LcNfCd-wrkGSc9fLo2fBNw51yEg8MDiPs,36368
+edri/api/handlers/http_handler.py,sha256=jjOyx2Wu756K99x6zvJoybgM2Bj0eWXkjEElLYkCDZ0,36338
 edri/api/handlers/rest_handler.py,sha256=GAG5lVTsRMCf9IUmYb_pokxyPcOfbnKZ2p3jxfy_-Dw,3300
 edri/api/handlers/websocket_handler.py,sha256=Dh2XannDuW0eFj5CEzf3owlGc1VTyQ8ehjpxYRrCYW8,8144
 edri/api/static_pages/documentation.j2,sha256=Fe7KLsbqp9P-pQYqG2z8rbhhGVDDFf3m6SQ2mc3PFG4,8934
@@ -36,7 +36,7 @@ edri/config/setting.py,sha256=kzii_wmx4C8-uE_TNfBvRlJMkpJrvVLXvZam-2pm3eE,2065
 edri/dataclass/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edri/dataclass/event.py,sha256=3XwbS_8Nst0V5D6vQ0FYhrX5rx6KfLGd3-9ba71xUMQ,9866
 edri/dataclass/health_checker.py,sha256=62H5wGUtOhql3acPwFtMhpGKPUTmFwWQ4hlqIn6tjfo,1784
-edri/dataclass/injection.py,sha256=C-VzC64FNhMvnLxkGBhgc-Kma2vPIvnRUyPEpyIE-h8,3554
+edri/dataclass/injection.py,sha256=64vziTFB2KJdOiW9u6ELDbw2njzY8Z8aWENAAQqo4L8,2112
 edri/dataclass/response.py,sha256=VBMmVdna1IOKC5YGBXor6AayYOoiEYb9xx_RZ3bpKnw,3867
 edri/dataclass/directive/__init__.py,sha256=nfvsh1BmxhACW7Q8gnwy7y3l3_cI1P0k2WP0jV5RJhI,608
 edri/dataclass/directive/base.py,sha256=2ghQpv1bGcNHYEMA0nyWGumIplXBzj9cPQ34aJ7uVr0,296
@@ -147,7 +147,7 @@ tests/router/test_cache.py,sha256=qzSIyumJWrZa6ZU6H2WkKZIC-kd-bhUh8qDAZEF9qzc,36
 tests/router/test_health_checker.py,sha256=StvW9FrXuFz_53GeJOeBemYBtwRfmmKyM_0sIhetHDc,5744
 tests/router/test_router.py,sha256=DzfgifAp0TnpOMt5B0o2OfZ2WYDfOOOqrDva_8QqXXI,8107
 tests/utility/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/utility/test_function.py,sha256=DviammLjqikMJ654UMasFMuiEeyuLbyBkbF_PSgwLmQ,3977
+tests/utility/test_function.py,sha256=FQfjWsM-BQdIXVNNNULkBnjoZtHmiOu7wAUgsEswggk,3379
 tests/utility/test_json_encoder.py,sha256=ZblEFAsxf8VlTDqyvlr8GJNd1gwkkyH_RjMuF_Tkd8c,2618
 tests/utility/test_normalized_default_dict.py,sha256=Utd4EhN6uW6m3eBxz1hhUwRCOWqN6FLeloJ7KUh3uhk,2368
 tests/utility/test_shared_memory_pipe.py,sha256=JVzr-h8rjjlB6Uk_OnUBAlRwD2X4e74VKHBKCOE8KFM,7308
@@ -157,7 +157,7 @@ tests/utility/test_validation.py,sha256=wZcXjLrj3JheVLKnYKkkYfyC8CCpHVAw9Jn_uDnu
 tests/utility/manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/utility/manager/test_scheduler.py,sha256=sROffYvSOaWsYQxQGTy6l9Mn_qeNPRmJoXLVPKU3XNY,9153
 tests/utility/manager/test_store.py,sha256=xlo1JUsPLIhPJyQn7AXldAgWDo_O8ba2ns25TEaaGdQ,2821
-edri-2025.12.1rc4.dist-info/METADATA,sha256=F3trdD833w_uTf2_YtW5Yuzzk8LOj3ZvPHD3I8DwPZk,8374
-edri-2025.12.1rc4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-edri-2025.12.1rc4.dist-info/top_level.txt,sha256=himES6JgPlx4Zt8aDrQEj2fxAd7IDD6MBOsiNZkzKHQ,11
-edri-2025.12.1rc4.dist-info/RECORD,,
+edri-2025.12.2rc1.dist-info/METADATA,sha256=5CZ7Va_rqOYA9-RANc9xNRrmlnSeexDMWMAcZdc2ixw,8374
+edri-2025.12.2rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+edri-2025.12.2rc1.dist-info/top_level.txt,sha256=himES6JgPlx4Zt8aDrQEj2fxAd7IDD6MBOsiNZkzKHQ,11
+edri-2025.12.2rc1.dist-info/RECORD,,

tests/utility/test_function.py

@@ -81,22 +81,6 @@ class TestStringMethods(unittest.TestCase):
         )
         self.assertEqual(injection.classes, (StringTransformer,))
 
-    def test_iteration(self):
-        injection = Injection(
-            classes=(StringTransformer,),
-            parameters={"transform": lambda x: x[::-1]}  # Reversing the string
-        )
-
-        # Test the callable functionality of iteration
-        iter_objects = list(injection)
-
-        # Check if the correct number of callables are yielded (should be 1 in this case)
-        self.assertEqual(len(iter_objects), 1)
-
-        # Create an instance using the yielded function and check the result
-        instance = iter_objects[0]("hello")
-        self.assertEqual(str(instance), "olleh")
-
     def test_repr(self):
         injection = Injection(
             classes=(StringTransformer,),