Added test for ensure build context

Author: eadwinCode

ellar/common/serializer/base.py

@@ -122,7 +122,7 @@ class Serializer(SerializerBase, BaseModel, __skip_filter__=True):
 
 
 def _lazy_current_config() -> t.Any:
-    return LazyStrImport("ellar.core:config")
+    return LazyStrImport("ellar.core:current_config")
 
 
 def serialize_object(

ellar/core/__init__.py

@@ -6,7 +6,7 @@
     ExecutionContext,
     HostContext,
     HttpRequestConnectionContext,
-    config,
+    current_config,
     current_connection,
     current_injector,
     injector_context,
@@ -45,7 +45,7 @@
     "mount",
     "host",
     "current_injector",
-    "config",
+    "current_config",
     "ForwardRefModule",
     "TemplateRenderingService",
     "HttpRequestConnectionContext",

ellar/core/execution_context/__init__.py

@@ -4,7 +4,7 @@
 from .execution import ExecutionContext
 from .factory import ExecutionContextFactory, HostContextFactory
 from .host import HostContext
-from .injector import config, current_injector, injector_context
+from .injector import current_config, current_injector, injector_context
 from .request import HttpRequestConnectionContext, current_connection
 
 __all__ = [
@@ -13,7 +13,7 @@
     "ExecutionContextFactory",
     "HostContextFactory",
     "current_injector",
-    "config",
+    "current_config",
     "HttpRequestConnectionContext",
     "current_connection",
     "injector_context",

ellar/core/execution_context/injector.py

@@ -36,7 +36,7 @@ def _get_application_config() -> Config:
     return Config(config_module=config_module)
 
 
-config: Config = t.cast(Config, SimpleLazyObject(func=_get_application_config))
+current_config: Config = t.cast(Config, SimpleLazyObject(func=_get_application_config))
 
 current_injector: EllarInjector = t.cast(
     EllarInjector, SimpleLazyObject(func=_get_injector)
@@ -45,7 +45,7 @@ def _get_application_config() -> Config:
 
 def _clear_lazy_objects() -> None:
     current_injector._wrapped = empty  # type:ignore[attr-defined]
-    config._wrapped = empty
+    current_config._wrapped = empty
 
 
 @asynccontextmanager

ellar/socket_io/gateway.py

@@ -16,7 +16,7 @@
 from ellar.common.exceptions import WebSocketRequestValidationError
 from ellar.common.logging import logger
 from ellar.common.params import WebsocketEndpointArgsModel
-from ellar.core.execution_context import config, current_injector
+from ellar.core.execution_context import current_config, current_injector
 from ellar.reflect import reflect
 from ellar.socket_io.context import GatewayContext
 from ellar.socket_io.model import GatewayBase
@@ -107,7 +107,7 @@ async def catch(self, sid: t.Any) -> t.AsyncGenerator:
             await self._handle_error(
                 sid=sid,
                 code=status.WS_1011_INTERNAL_ERROR,
-                reason=str(ex) if config.DEBUG else "Something went wrong",
+                reason=str(ex) if current_config.DEBUG else "Something went wrong",
             )
 
     async def _handle_error(self, sid: str, code: int, reason: t.Any) -> None:

ellar/testing/module.py

@@ -33,6 +33,10 @@ def __init__(
         self._global_guards = global_guards
         self._app: t.Optional[App] = None
 
+    @property
+    def module(self) -> t.Type[ModuleBase]:
+        return self._testing_module
+
     def override_provider(
         self,
         base_type: t.Union[t.Type[T], t.Type],

tests/test_application/test_application_factory.py

@@ -4,8 +4,9 @@
 from ellar.common.constants import MODULE_WATERMARK
 from ellar.common.exceptions import ImproperConfiguration
 from ellar.core import LazyModuleImport as lazyLoad
-from ellar.core import ModuleBase, ModuleSetup, injector_context
+from ellar.core import ModuleBase, ModuleSetup, current_config, injector_context
 from ellar.di import ProviderConfig
+from ellar.events import ensure_build_context
 from ellar.reflect import reflect
 from ellar.testing import TestClient
 from ellar.utils import get_unique_type
@@ -117,3 +118,20 @@ def test_config_overrider_core_service_registration():
         AppFactory.create_app(
             config_module={"OVERRIDE_CORE_SERVICE": [ProviderConfig(provider_type)]}
         )
+
+
+async def test_ensure_build_works(anyio_backend):
+    @ensure_build_context
+    def set_xxx(key, value):
+        current_config[key] = value
+
+    set_xxx("DES", 12)
+    set_xxx("DES_34", 34)
+
+    app = AppFactory.create_app()
+    async with injector_context(app.injector):
+        set_xxx("DES_345", 23432)
+
+    assert app.config.DES == 12
+    assert app.config.DES_34 == 34
+    assert app.config.DES_345 == 23432

tests/test_modules/test_forward_ref.py

@@ -60,15 +60,17 @@ class ModuleWithModuleRefByType:
 
 
 def test_sample_controller_fails_for_module_without_module_ref_as_dependency():
-    app = Test.create_test_module(
-        modules=[ModuleToBeReference, ModuleWithoutModuleRef]
-    ).create_application()
-    module_ref = app.injector.tree_manager.get_module(ModuleWithoutModuleRef).value
+    tm = Test.create_test_module(modules=[ModuleToBeReference, ModuleWithoutModuleRef])
+    app = tm.create_application()
+    tm_module_ref = app.injector.tree_manager.get_module(tm.module).value
+
+    assert ModuleToBeReference in tm_module_ref.modules
 
     with pytest.raises(
         di_exceptions.UnsatisfiedRequirement,
         match="SampleController has an unsatisfied requirement on UserService",
     ):
+        module_ref = app.injector.tree_manager.get_module(ModuleWithoutModuleRef).value
         assert module_ref.get(SampleController)