ai-microcore 4.0.0.dev14__tar.gz → 4.0.0.dev15__tar.gz

{ai_microcore-4.0.0.dev14 → ai_microcore-4.0.0.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ai-microcore
-Version: 4.0.0.dev14
+Version: 4.0.0.dev15
 Summary: # Minimalistic Foundation for AI Applications
 Keywords: llm,large language models,ai,similarity search,ai search,gpt,openai,framework,adapter
 Author-email: Vitalii Stepanenko <mail@vitalii.in>

{ai_microcore-4.0.0.dev14 → ai_microcore-4.0.0.dev15}/microcore/__init__.py

@@ -184,4 +184,4 @@ __all__ = [
     # "wrappers",
 ]
 
-__version__ = "4.0.0-dev14"
+__version__ = "4.0.0-dev15"

{ai_microcore-4.0.0.dev14 → ai_microcore-4.0.0.dev15}/microcore/configuration.py

@@ -112,7 +112,13 @@ class BaseConfig:
 
         if self.USE_DOT_ENV:
             if self.DOT_ENV_FILE or not _default_dotenv_loaded:
-                dotenv.load_dotenv(override=True, dotenv_path=self.DOT_ENV_FILE)
+                fp = self.DOT_ENV_FILE
+                if fp and "~" in fp:
+                    fp = Path(fp).expanduser()
+                dotenv.load_dotenv(
+                    override=True,
+                    dotenv_path=fp
+                )
             if not self.DOT_ENV_FILE:
                 _default_dotenv_loaded = True
 
@@ -411,6 +417,7 @@ class Config(LLMConfig):
     MCP_SERVERS: list = from_env(dtype=list)
 
     INTERACTIVE_SETUP: bool = field(default=False)
+    """Whether to run interactive setup if configuration is not valid."""
 
     def __post_init__(self):
         try:

{ai_microcore-4.0.0.dev14 → ai_microcore-4.0.0.dev15}/microcore/mcp.py

@@ -6,7 +6,7 @@ from dataclasses import dataclass, field
 from mcp.client.streamable_http import streamablehttp_client
 from mcp import ClientSession, types
 
-from .utils import ExtendedString
+from .utils import ExtendedString, ConvertableToMessage
 from .ai_func import AiFuncSyntax
 from . import ui
 from .types import BadAIAnswer, BadAIJsonAnswer
@@ -38,6 +38,10 @@ class ToolsCache:
         storage.write_json(ToolsCache.FILE, cached_tools)
 
 
+class MCPAnswer(ExtendedString, ConvertableToMessage):
+    ...
+
+
 @dataclass
 class MCPConnection:
     url: str = None
@@ -46,8 +50,9 @@ class MCPConnection:
     connection: any = None
     context_manager: any = None
     session: ClientSession = field(default=None, init=False)
-    del_event: asyncio.Event = field(default=None, init=False)
     tools: Optional["Tools"] = field(default=None, init=False)
+    _lifecycle_task: asyncio.Task = field(default=None, init=False)
+    _del_event: asyncio.Event = field(default=None, init=False)
 
     @staticmethod
     async def init(
@@ -59,7 +64,7 @@ class MCPConnection:
         del_event = asyncio.Event()
         opened_event = asyncio.Event()
         con: MCPConnection = MCPConnection()
-        con.del_event = del_event
+        con._del_event = del_event  # pylint: disable=W0212
 
         # That's a bit of a hack for closing the async context managers
         async def lifecycle():
@@ -80,15 +85,23 @@ class MCPConnection:
                 if fetch_tools:
                     await con.fetch_tools(use_cache=use_cache)
                 opened_event.set()
-                await del_event.wait()
+
             finally:
-                await con.close()
+                await del_event.wait()
+                await con._close()  # pylint: disable=W0212
 
-        asyncio.create_task(lifecycle())
+        con._lifecycle_task = asyncio.create_task(lifecycle())  # pylint: disable=W0212
         await opened_event.wait()
         return con
 
     async def close(self):
+        self._del_event.set()
+        if self._lifecycle_task:
+            await self._lifecycle_task
+        else:
+            logging.error(f"Trying to close MCP connection that is not opened ({self.url})")
+
+    async def _close(self):
         logging.info(f"Closing MCP session ({self.url})...")
         try:
             if self.session:
@@ -129,7 +142,7 @@ class MCPConnection:
         return self.tools
 
     def __del__(self):
-        self.del_event.set()
+        self._del_event.set()
 
     async def exec(self, params: dict | LLMResponse):
         if isinstance(params, LLMResponse):
@@ -150,7 +163,7 @@ class MCPConnection:
         result = await self.session.call_tool(name, params)
         content = result.content
         if content and len(content) == 1 and content[0].type == "text":
-            return ExtendedString(content[0].text, result.__dict__)
+            return MCPAnswer(content[0].text, result.__dict__)
         return result
 
 
@@ -231,10 +244,19 @@ class Tools(dict[str, Tool]):
 
 @dataclass
 class MCPServer:
-    name: str
     url: str
+    name: str = field(default="")
     tools: Tools = field(default_factory=Tools)
 
+    @staticmethod
+    def name_from_url(url: str) -> str:
+        """Domain name from URL."""
+        return url.split("//")[-1].split("/")[0]
+
+    def __post_init__(self):
+        if not self.name:
+            self.name = MCPServer.name_from_url(self.url)
+
     async def connect(
         self,
         fetch_tools: bool = True,
@@ -244,9 +266,14 @@ class MCPServer:
 
 
 class MCPRegistry(dict[str, MCPServer]):
-    def __init__(self, server_configs: list[dict]):
+    def __init__(self, server_configs: list[dict | str]):
         super().__init__()
         for server_config in server_configs:
+            if isinstance(server_config, str):
+                server_config = {
+                    "name": MCPServer.name_from_url(server_config),
+                    "url": server_config
+                }
             self[server_config["name"]] = MCPServer(**server_config)
 
     def get(self, server_name: str) -> MCPServer:

{ai_microcore-4.0.0.dev14 → ai_microcore-4.0.0.dev15}/microcore/wrappers/llm_response_wrapper.py

@@ -6,7 +6,7 @@ from ..utils import ExtendedString, ConvertableToMessage, extract_number
 from ..message_types import Role, AssistantMsg
 
 if TYPE_CHECKING:
-    from ..mcp import MCPConnection
+    from ..mcp import MCPConnection, MCPAnswer
 
 
 class DictFromLLMResponse(dict):
@@ -90,5 +90,12 @@ class LLMResponse(ExtendedString, ConvertableToMessage):
     def as_message(self) -> AssistantMsg:
         return self.as_assistant
 
-    async def to_mcp(self, mcp: "MCPConnection"):
+    async def to_mcp(self, mcp: "MCPConnection") -> "MCPAnswer":
         return await mcp.exec(self)
+
+    def is_tool_call(self):
+        from .._env import env
+        return self.parse_json(
+            raise_errors=False,
+            required_fields=[env().config.AI_SYNTAX_FUNCTION_NAME_FIELD],
+        ) is not False