Merge pull request #101 from eadwinCode/di_container_fix

Fixed register_services not calling in modules

Author: eadwinCode

ellar/di/injector/container.py

@@ -238,10 +238,10 @@ def register_services(self, container):
             t.cast(type, instance), InjectorModule
         ):
             instance = t.cast(type, instance)(**init_kwargs)
-        elif isinstance(instance, type) and not isinstance(instance, InjectorModule):
+        elif isinstance(instance, type):
             return self.injector.get(t.cast(type, instance))
         elif not isinstance(instance, type) and not isinstance(
-            type(instance), InjectorModule
+            instance, InjectorModule
         ):
             return instance
 

tests/test_di/test_injector.py

@@ -25,7 +25,7 @@ def test_container_install_module_case_1():
     called = False
     app_container = EllarInjector().container
 
-    class FakeModule(ModuleBase):
+    class PlainModule(ModuleBase):
         def register_services(self, container: Container) -> None:
             nonlocal called
             called = True
@@ -36,16 +36,25 @@ def register_services(self, container: Container) -> None:
             nonlocal called
             called = True
 
-    fake_module = app_container.install(FakeModule)
+    plain_module = app_container.install(PlainModule)
     assert called
-    assert isinstance(fake_module, FakeModule)
+    assert isinstance(plain_module, PlainModule)
 
     called = False
 
     decorated_module = app_container.install(DecoratedModuleWithBase)
     assert called
     assert isinstance(decorated_module, DecoratedModuleWithBase)
 
+    called = False
+    app_container.install(PlainModule())
+    assert called
+
+    called = False
+
+    app_container.install(DecoratedModuleWithBase())
+    assert called
+
 
 def test_container_install_module_return_case_2():
     called = False
@@ -61,6 +70,10 @@ def register_services(self, container: Container) -> None:
     assert called is False
     assert isinstance(decorated_module, DecoratedModule)
 
+    decorated_module = app_container.install(DecoratedModule())
+    assert called is False
+    assert isinstance(decorated_module, DecoratedModule)
+
 
 def test_default_container_registration():
     injector = EllarInjector(auto_bind=False)