Refactor MCP decorators and imports, improve type hints

Co-authored-by: itay.dar <itay.dar@lemonade.com>

Author: cursoragent

nest/common/__init__.py

@@ -1 +1 @@
-from nest.common.mcp_resolver import MCPResolver
+

nest/common/module.py

@@ -5,8 +5,6 @@
 from typing import Any, List, Type
 from uuid import uuid4
 
-from nest.core import Module
-
 
 class ModulesContainer(dict):
     def __init__(self):
@@ -104,10 +102,10 @@ def distance(self):
     def distance(self, value):
         self._distance = value
 
-    def add_import(self, module_ref: Module):
+    def add_import(self, module_ref: "Module"):
         self._imports.add(module_ref)
 
-    def add_imports(self, module_ref: List[Module]):
+    def add_imports(self, module_ref: List["Module"]):
         for module in module_ref:
             self.add_import(module)
 

nest/core/__init__.py

@@ -16,12 +16,12 @@
 from nest.core.pynest_container import PyNestContainer
 from nest.core.pynest_factory import PyNestFactory
 
-# MCP exports
+# MCP application and factory (safe: fastmcp is lazily imported when used)
 from nest.core.pynest_mcp_application import PyNestMCPApp
 from nest.core.mcp_factory import MCPFactory
 
 # MCP decorators
-from nest.core.decorators.mcp.mcp_decorators import (
+from nest.core.decorators.mcp import (
     McpController,
     McpTool,
     McpResource,

nest/core/decorators/mcp/__init__.py

@@ -0,0 +1 @@
+from nest.core.decorators.mcp.mcp_decorators import McpController, McpTool, McpResource, McpPrompt

nest/core/decorators/mcp/mcp_decorators.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from nest.core.decorators.utils import get_instance_variables, parse_dependencies
 
 
@@ -22,7 +24,7 @@ def decorator(cls):
     return decorator
 
 
-def McpTool(name: str | None = None, **kwargs):
+def McpTool(name: Optional[str] = None, **kwargs):
     def decorator(func):
         metadata = {"name": name}
         metadata.update(kwargs)
@@ -44,7 +46,7 @@ def decorator(func):
     return decorator
 
 
-def McpPrompt(name: str | None = None, **kwargs):
+def McpPrompt(name: Optional[str] = None, **kwargs):
     def decorator(func):
         metadata = {"name": name}
         metadata.update(kwargs)