refactored routing factory

Author: eadwinCode

ellar/common/routing/__init__.py

@@ -3,7 +3,6 @@
 from ellar.common.params.params import ParamFieldInfo as Param, ParamTypes
 
 from .base import RouteOperationBase
-from .controller.factory import ControllerRouterFactory
 from .mount import ModuleMount, ModuleRouter
 from .operation_definitions import OperationDefinitions
 from .route import RouteOperation
@@ -47,7 +46,6 @@
     "RouteOperationBase",
     "OperationDefinitions",
     "WebsocketRouteOperation",
-    "ControllerRouterFactory",
 ]
 
 

ellar/core/modules/ref.py

@@ -15,7 +15,6 @@
 )
 from ellar.common.models import ControllerBase
 from ellar.common.routing import ModuleMount
-from ellar.common.routing.builder import get_controller_builder_factory
 from ellar.common.templating import ModuleTemplating
 from ellar.di import (
     MODULE_REF_TYPES,
@@ -27,6 +26,7 @@
 from ellar.di.providers import ModuleProvider
 from ellar.reflect import reflect
 
+from ..routing import get_controller_builder_factory
 from .base import ModuleBase, ModuleBaseMeta
 
 if t.TYPE_CHECKING:  # pragma: no cover

ellar/core/routing/__init__.py

@@ -1,5 +1,10 @@
 from .app import ApplicationRouter
+from .builder import RouterBuilder, get_controller_builder_factory
+from .factory import ControllerRouterFactory
 
 __all__ = [
     "ApplicationRouter",
+    "ControllerRouterFactory",
+    "get_controller_builder_factory",
+    "RouterBuilder",
 ]

ellar/common/routing/builder.py renamed to ellar/core/routing/builder.py

@@ -3,7 +3,7 @@
 from starlette.routing import Mount
 
 if t.TYPE_CHECKING:  # pragma: no cover
-    from .mount import ModuleMount
+    from ellar.common.routing.mount import ModuleMount
 
 _router_builder_factory: t.Dict[t.Type, t.Type["RouterBuilder"]] = {}
 

ellar/common/routing/controller/factory.py renamed to ellar/core/routing/factory.py

@@ -8,11 +8,10 @@
     CONTROLLER_WATERMARK,
 )
 from ellar.common.models import ControllerBase, ControllerType
+from ellar.common.routing import ModuleMount, RouteCollection
 from ellar.reflect import reflect
 
-from ..builder import RouterBuilder
-from ..mount import ModuleMount
-from ..route_collections import RouteCollection
+from .builder import RouterBuilder
 
 
 class ControllerRouterFactory(RouterBuilder, controller_type=type(ControllerBase)):

ellar/socket_io/factory.py

@@ -3,7 +3,7 @@
 import socketio
 from starlette.routing import Mount
 
-from ellar.common.routing.builder import RouterBuilder
+from ellar.core.routing import RouterBuilder
 from ellar.reflect import reflect
 from ellar.socket_io.adapter import SocketIOASGIApp
 from ellar.socket_io.constants import (

tests/test_controller/test_controller_decorator.py

@@ -5,7 +5,7 @@
     CONTROLLER_CLASS_KEY,
     CONTROLLER_OPERATION_HANDLER_KEY,
 )
-from ellar.common.routing import ControllerRouterFactory
+from ellar.core.routing import ControllerRouterFactory
 from ellar.di import has_binding, is_decorated_with_injectable
 from ellar.reflect import reflect
 

tests/test_controller/test_controller_inheritance.py

@@ -2,8 +2,8 @@
 
 from ellar.common import Controller, get, ws_route
 from ellar.common.constants import CONTROLLER_CLASS_KEY
-from ellar.common.routing import ControllerRouterFactory
 from ellar.core import AppFactory
+from ellar.core.routing import ControllerRouterFactory
 from ellar.reflect import reflect