Merge pull request #476 from minos-framework/issue-475-fix-concurrency-issues-check

#475 - Fix handling functions concurrency issues

Author: Sergio García Prado

packages/core/minos-microservice-networks/minos/networks/brokers/dispatchers/impl.py

@@ -16,7 +16,6 @@
 )
 from typing import (
     Optional,
-    Union,
 )
 
 from minos.common import (
@@ -28,13 +27,13 @@
 
 from ...decorators import (
     EnrouteFactory,
+    Handler,
 )
 from ...exceptions import (
     MinosActionNotFoundException,
 )
 from ...requests import (
     REQUEST_USER_CONTEXT_VAR,
-    Request,
     Response,
     ResponseException,
 )
@@ -50,16 +49,17 @@
 )
 from .requests import (
     BrokerRequest,
-    BrokerResponse,
 )
 
 logger = logging.getLogger(__name__)
 
+AdaptedHandler = Callable[[BrokerMessage], Awaitable[BrokerMessageV1Payload]]
+
 
 class BrokerDispatcher(SetupMixin):
     """Broker Dispatcher class."""
 
-    def __init__(self, actions: dict[str, Optional[Callable]], publisher: BrokerPublisher, **kwargs):
+    def __init__(self, actions: dict[str, Handler], publisher: BrokerPublisher, **kwargs):
         super().__init__(**kwargs)
         self._actions = actions
         self._publisher = publisher
@@ -72,9 +72,7 @@ def _from_config(cls, config: Config, **kwargs) -> BrokerDispatcher:
         return cls(**kwargs)
 
     @staticmethod
-    def _get_actions(
-        config: Config, handlers: dict[str, Optional[Callable]] = None, **kwargs
-    ) -> dict[str, Callable[[BrokerRequest], Awaitable[Optional[BrokerResponse]]]]:
+    def _get_actions(config: Config, handlers: dict[str, Handler] = None, **kwargs) -> dict[str, Handler]:
         if handlers is None:
             builder = EnrouteFactory(*config.get_services(), middleware=config.get_middleware())
             decorators = builder.get_broker_command_query_event(config=config, **kwargs)
@@ -104,7 +102,7 @@ def publisher(self) -> BrokerPublisher:
         return self._publisher
 
     @property
-    def actions(self) -> dict[str, Optional[Callable]]:
+    def actions(self) -> dict[str, Handler]:
         """Actions getter.
 
         :return: A dictionary in which the keys are topics and the values are the handler.
@@ -127,9 +125,7 @@ async def dispatch(self, message: BrokerMessage) -> None:
             await self.publisher.send(reply)
 
     @staticmethod
-    def get_callback(
-        fn: Callable[[BrokerRequest], Union[Optional[BrokerResponse], Awaitable[Optional[BrokerResponse]]]]
-    ) -> Callable[[BrokerMessage], Awaitable[BrokerMessageV1Payload]]:
+    def get_callback(fn: Handler) -> AdaptedHandler:
         """Get the handler function to be used by the Broker Handler.
 
         :param fn: The action function.
@@ -169,7 +165,7 @@ async def _wrapper(raw: BrokerMessage) -> BrokerMessageV1Payload:
 
         return _wrapper
 
-    def get_action(self, topic: str) -> Callable[[Request], Union[Optional[Response], Awaitable[Optional[Response]]]]:
+    def get_action(self, topic: str) -> Handler:
         """Get the handling function to be called.
 
         :param topic: The name of the topic that matches the action.

packages/core/minos-microservice-networks/minos/networks/decorators/callables/handlers.py

@@ -21,7 +21,6 @@
     TYPE_CHECKING,
     Optional,
     Protocol,
-    Type,
     Union,
     runtime_checkable,
 )
@@ -57,7 +56,7 @@ class HandlerWrapper(Protocol):
     """Handler Wrapper class."""
 
     meta: HandlerMeta
-    check: Type[CheckDecorator]
+    check: type[CheckDecorator]
     __call__: Handler
 
 
@@ -114,11 +113,10 @@ async def _wrapper(*args, **kwargs) -> Optional[Response]:
 
         _wrapper.meta = self
         _wrapper.check = self.check
-        _wrapper.__decorators__ = self.decorators  # FIXME: This attribute should be removed in future versions.
 
         return _wrapper
 
-    @cached_property
+    @property
     def sync_wrapper(self) -> HandlerWrapper:
         """Get the sync ``HandlerWrapper`` instance.
 
@@ -139,7 +137,6 @@ def _wrapper(*args, **kwargs) -> Optional[Response]:
 
         _wrapper.meta = self
         _wrapper.check = self.check
-        _wrapper.__decorators__ = self.decorators  # FIXME: This attribute should be removed in future versions.
 
         return _wrapper
 
@@ -157,7 +154,7 @@ def add_decorator(self, decorator: EnrouteDecorator) -> None:
         self.decorators.add(decorator)
 
     @cached_property
-    def check(self) -> Type[CheckDecorator]:
+    def check(self) -> type[CheckDecorator]:
         """Get the check decorator.
 
         :return: A ``CheckDecorator`` type.

packages/core/minos-microservice-networks/minos/networks/decorators/collectors.py

@@ -5,9 +5,7 @@
 )
 from typing import (
     Any,
-    Callable,
     Optional,
-    Type,
 )
 
 from minos.common import (
@@ -84,7 +82,7 @@ def get_periodic_event(self) -> dict[str, set[PeriodicEventEnrouteDecorator]]:
         # noinspection PyTypeChecker
         return self._get_items({PeriodicEventEnrouteDecorator})
 
-    def _get_items(self, expected_types: set[Type[EnrouteDecorator]]) -> dict[str, set[EnrouteDecorator]]:
+    def _get_items(self, expected_types: set[type[EnrouteDecorator]]) -> dict[str, set[EnrouteDecorator]]:
         items = dict()
         for fn, decorators in self.get_all().items():
             decorators = {decorator for decorator in decorators if type(decorator) in expected_types}
@@ -97,7 +95,7 @@ def get_all(self) -> dict[str, set[EnrouteDecorator]]:
 
         :return: A mapping with functions as keys and a sets of decorators as values.
         """
-        fn: Callable = getattr(self.decorated, "__get_enroute__", self._get_all)
+        fn = getattr(self.decorated, "__get_enroute__", self._get_all)
         return fn(config=self.config)
 
     # noinspection PyUnusedLocal

packages/core/minos-microservice-networks/minos/networks/decorators/factories.py

@@ -5,7 +5,6 @@
     defaultdict,
 )
 from collections.abc import (
-    Awaitable,
     Callable,
     Collection,
 )
@@ -17,6 +16,7 @@
     isawaitable,
 )
 from typing import (
+    Awaitable,
     Optional,
     Union,
 )
@@ -25,6 +25,9 @@
     import_module,
 )
 
+from ..decorators import (
+    Handler,
+)
 from ..exceptions import (
     MinosRedefinedEnrouteDecoratorException,
 )
@@ -43,14 +46,16 @@
     RestEnrouteDecorator,
 )
 
-Handler = Callable[[Request], Awaitable[Optional[Response]]]
+Middleware = Callable[[Request, Handler], Union[Optional[Response], Awaitable[Optional[Response]]]]
 
 
 class EnrouteFactory:
     """Enroute factory class."""
 
     def __init__(
-        self, *classes: Union[str, type], middleware: Optional[Union[str, Callable, list[Union[str, Callable]]]] = None
+        self,
+        *classes: Union[str, type],
+        middleware: Optional[Union[str, Middleware, list[Union[str, Middleware]]]] = None,
     ):
         if middleware is None:
             middleware = tuple()

packages/core/minos-microservice-networks/minos/networks/http/adapters.py

@@ -3,9 +3,6 @@
 )
 
 import logging
-from collections.abc import (
-    Callable,
-)
 from typing import (
     Any,
 )
@@ -17,6 +14,7 @@
 )
 
 from ..decorators import (
+    Handler,
     HttpEnrouteDecorator,
 )
 from ..exceptions import (
@@ -44,16 +42,17 @@ def _from_config(cls, *args, config: Config, **kwargs) -> HttpAdapter:
     @staticmethod
     def _routers_from_config(config: Config, **kwargs) -> list[HttpRouter]:
         classes = config.get_routers()
+        # noinspection PyTypeChecker
         classes = tuple((class_ if not isinstance(class_, str) else import_module(class_)) for class_ in classes)
         classes = filter(lambda router: issubclass(router, HttpRouter), classes)
         routers = [router.from_config(config) for router in classes]
         return routers
 
     @property
-    def routes(self) -> dict[HttpEnrouteDecorator, Callable]:
+    def routes(self) -> dict[HttpEnrouteDecorator, Handler]:
         """Get routes.
 
-        :return: A ``dict`` with ``HttpEnrouteDecorator`` and ``Callable`` as values.
+        :return: A ``dict`` with ``HttpEnrouteDecorator`` and ``Handler`` as values.
         """
         routes = dict()
         for router in self._routers:

packages/core/minos-microservice-networks/minos/networks/http/connectors.py

@@ -12,6 +12,7 @@
     Semaphore,
 )
 from collections.abc import (
+    Awaitable,
     Callable,
 )
 from functools import (
@@ -21,11 +22,9 @@
     isawaitable,
 )
 from typing import (
-    Awaitable,
     Generic,
     Optional,
     TypeVar,
-    Union,
 )
 
 from minos.common import (
@@ -35,6 +34,7 @@
 )
 
 from ..decorators import (
+    Handler,
     HttpEnrouteDecorator,
 )
 from ..requests import (
@@ -47,10 +47,9 @@
     HttpAdapter,
 )
 
-_Callback = Callable[[Request], Union[Optional[Response], Awaitable[Optional[Response]]]]
-
 RawRequest = TypeVar("RawRequest")
 RawResponse = TypeVar("RawResponse")
+AdaptedHandler = Callable[[RawRequest], Awaitable[RawResponse]]
 
 logger = logging.getLogger(__name__)
 
@@ -124,7 +123,7 @@ def mount_routes(self) -> None:
         for decorator, callback in self.routes.items():
             self.mount_route(decorator.path, decorator.method, callback)
 
-    def mount_route(self, path: str, method: str, callback: Callable[[Request], Optional[Response]]):
+    def mount_route(self, path: str, method: str, callback: Handler):
         """Mount a new route on the application.
 
         :param path: The request's path.
@@ -136,12 +135,10 @@ def mount_route(self, path: str, method: str, callback: Callable[[Request], Opti
         self._mount_route(path, method, adapted_callback)
 
     @abstractmethod
-    def _mount_route(self, path: str, method: str, adapted_callback: Callable) -> None:
+    def _mount_route(self, path: str, method: str, adapted_callback: AdaptedHandler) -> None:
         raise NotImplementedError
 
-    def adapt_callback(
-        self, callback: Callable[[Request], Union[Optional[Response], Awaitable[Optional[Response]]]]
-    ) -> Callable[[RawRequest], Awaitable[RawResponse]]:
+    def adapt_callback(self, callback: Handler) -> AdaptedHandler:
         """Get the adapted callback to be used by the connector.
 
         :param callback: The function.
@@ -206,7 +203,7 @@ def port(self) -> int:
         return self._port
 
     @property
-    def routes(self) -> dict[HttpEnrouteDecorator, _Callback]:
+    def routes(self) -> dict[HttpEnrouteDecorator, Handler]:
         """Get the port.
 
         :return: A ``int`` value.

packages/core/minos-microservice-networks/minos/networks/routers.py

@@ -8,7 +8,6 @@
 )
 from typing import (
     Any,
-    Callable,
 )
 
 from cached_property import (
@@ -24,6 +23,7 @@
     BrokerEnrouteDecorator,
     EnrouteDecorator,
     EnrouteFactory,
+    Handler,
     HttpEnrouteDecorator,
     PeriodicEnrouteDecorator,
 )
@@ -42,25 +42,25 @@ def _from_config(cls, config: Config, **kwargs) -> Router:
         return cls(config)
 
     @cached_property
-    def routes(self) -> dict[EnrouteDecorator, Callable]:
+    def routes(self) -> dict[EnrouteDecorator, Handler]:
         """Get the routes stored on the router.
 
         :return: A dict with decorators as keys and callbacks as values.
         """
         return self._build_routes()
 
-    def _build_routes(self) -> dict[EnrouteDecorator, Callable]:
+    def _build_routes(self) -> dict[EnrouteDecorator, Handler]:
         routes = self._get_all_routes()
         routes = self._filter_routes(routes)
         return routes
 
-    def _get_all_routes(self) -> dict[EnrouteDecorator, Callable]:
+    def _get_all_routes(self) -> dict[EnrouteDecorator, Handler]:
         builder = EnrouteFactory(*self._config.get_services(), middleware=self._config.get_middleware())
         routes = builder.get_all(config=self._config)
         return routes
 
     @abstractmethod
-    def _filter_routes(self, routes: dict[EnrouteDecorator, Callable]) -> dict[EnrouteDecorator, Callable]:
+    def _filter_routes(self, routes: dict[EnrouteDecorator, Handler]) -> dict[EnrouteDecorator, Handler]:
         raise NotImplementedError
 
     def __eq__(self, other: Any) -> bool:
@@ -80,13 +80,13 @@ def __eq__(self, other: Any) -> bool:
 class HttpRouter(Router, ABC):
     """Http Router base class."""
 
-    routes: dict[HttpEnrouteDecorator, Callable]
+    routes: dict[HttpEnrouteDecorator, Handler]
 
 
 class RestHttpRouter(HttpRouter):
     """Rest Http Router class."""
 
-    def _filter_routes(self, routes: dict[EnrouteDecorator, Callable]) -> dict[EnrouteDecorator, Callable]:
+    def _filter_routes(self, routes: dict[EnrouteDecorator, Handler]) -> dict[EnrouteDecorator, Handler]:
         routes = {
             decorator: callback for decorator, callback in routes.items() if isinstance(decorator, HttpEnrouteDecorator)
         }
@@ -96,7 +96,7 @@ def _filter_routes(self, routes: dict[EnrouteDecorator, Callable]) -> dict[Enrou
 class BrokerRouter(Router):
     """Broker Router class."""
 
-    def _filter_routes(self, routes: dict[EnrouteDecorator, Callable]) -> dict[EnrouteDecorator, Callable]:
+    def _filter_routes(self, routes: dict[EnrouteDecorator, Handler]) -> dict[EnrouteDecorator, Handler]:
         routes = {
             decorator: callback
             for decorator, callback in routes.items()
@@ -108,7 +108,7 @@ def _filter_routes(self, routes: dict[EnrouteDecorator, Callable]) -> dict[Enrou
 class PeriodicRouter(Router):
     """Periodic Router class."""
 
-    def _filter_routes(self, routes: dict[EnrouteDecorator, Callable]) -> dict[EnrouteDecorator, Callable]:
+    def _filter_routes(self, routes: dict[EnrouteDecorator, Handler]) -> dict[EnrouteDecorator, Handler]:
         routes = {
             decorator: callback
             for decorator, callback in routes.items()