Merge pull request #235 from python-ellar/fix_treemanager

fix: ForwardRef and Service lookup

Author: eadwinCode

ellar/common/decorators/modules.py

@@ -53,7 +53,7 @@ def Module(
     *,
     name: t.Optional[str] = None,
     controllers: t.Sequence[t.Union[t.Type[ControllerBase], t.Type]] = (),
-    routers: t.Sequence[t.Union[ModuleRouter, Mount, Host]] = (),
+    routers: t.Sequence[t.Union[ModuleRouter, Mount, Host, t.Callable]] = (),
     providers: t.Sequence[t.Union[t.Type, "ProviderConfig"]] = (),
     exports: t.Sequence[t.Union[t.Type]] = (),
     template_folder: t.Optional[str] = "templates",

ellar/di/injector/tree_manager.py

@@ -126,15 +126,20 @@ def add_forward_ref(
         forward_ref: "ModuleForwardRef",
     ) -> "ModuleTreeManager":
         module_node = self.get_module(module_type)
-        module_node.dependencies.append(forward_ref)
+        _forward_data = self._forward_refs.get(forward_ref)
+
+        if not _forward_data:
+            # Get referenced module node
+            _forward_module_node = self.get_module(forward_ref.module)
+            _forward_data = TreeData(
+                value=forward_ref,
+                parent=_forward_module_node.parent,
+                dependencies=_forward_module_node.dependencies,
+            )
 
-        data = TreeData(
-            value=forward_ref,
-            parent=module_node.parent,
-            dependencies=module_node.dependencies,
-        )
+            self._forward_refs[forward_ref] = _forward_data
 
-        self._forward_refs[forward_ref] = data
+        module_node.dependencies.append(_forward_data.value)
 
         return self
 
@@ -245,14 +250,18 @@ def search_module_tree(
         :param find_predicate:
         :return: The node with the given ID, or None if not found.
         """
+        _stack_cycle: t.Tuple[t.Any] = ()  # type:ignore[assignment]
 
         def dfs(current_node: TreeData) -> t.Optional[TreeData]:
+            nonlocal _stack_cycle
+            _stack_cycle += (current_node.value.module,)  # type:ignore[assignment]
+
             if find_predicate(current_node):
                 return current_node
 
             for child_id in current_node.dependencies:
                 child_node = self.get_module(child_id)
-                if child_node:
+                if child_node and child_node.value.module not in _stack_cycle:
                     res = dfs(child_node)
                     if res:
                         return res

ellar/threading/sync_worker.py

@@ -17,7 +17,7 @@
 
 _Item = t.TypeVar("_Item")
 
-logger = logging.getLogger("ellar.sync_worker")
+logger = logging.getLogger("ellar")
 
 
 class _Sentinel(enum.Enum):
@@ -96,7 +96,7 @@ def run(self) -> None:
         except (SystemExit, KeyboardInterrupt):  # pragma: no cover
             pass
         except Exception as ex:
-            logger.error(ex)
+            logger.exception(ex)
         finally:
             loop.run_until_complete(loop.shutdown_asyncgens())
             loop.stop()
@@ -191,6 +191,7 @@ async def async_context_manager_wrapper(self, agen: t.AsyncContextManager) -> No
                 self.stream_block.wait()
         except Exception as e:
             self.stream_queue.put((e, None))
+            logger.exception(e)
 
     def interrupt_generator(self) -> None:
         self.agen_shutdown = True