idun-agent-engine 0.2.7__tar.gz → 0.3.1__tar.gz

{idun_agent_engine-0.2.7 → idun_agent_engine-0.3.1}/.gitignore

@@ -3,6 +3,7 @@ __pycache__/
 *.py[cod]
 *$py.class
 
+.python-version
 # C extensions
 *.so
 .DS_Store

{idun_agent_engine-0.2.7 → idun_agent_engine-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: idun-agent-engine
-Version: 0.2.7
+Version: 0.3.1
 Summary: Python SDK and runtime to serve AI agents with FastAPI, LangGraph, and observability.
 Project-URL: Homepage, https://github.com/geoffreyharrazi/idun-agent-platform
 Project-URL: Repository, https://github.com/geoffreyharrazi/idun-agent-platform
@@ -19,29 +19,43 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Typing :: Typed
 Requires-Python: <3.14,>=3.12
+Requires-Dist: ag-ui-adk<0.4.0,>=0.3.4
 Requires-Dist: ag-ui-langgraph<0.1.0,>=0.0.20
 Requires-Dist: ag-ui-protocol<0.2.0,>=0.1.8
 Requires-Dist: aiosqlite<0.22.0,>=0.21.0
 Requires-Dist: arize-phoenix-otel<1.0.0,>=0.2.0
 Requires-Dist: arize-phoenix<12.0.0,>=11.22.0
-Requires-Dist: click>=8.2.1
+Requires-Dist: click>=8.2.0
 Requires-Dist: copilotkit<0.2.0,>=0.1.72
+Requires-Dist: deepagents<1.0.0,>=0.2.8
 Requires-Dist: fastapi<0.116.0,>=0.115.0
-Requires-Dist: google-adk<2.0.0,>=1.9.0
+Requires-Dist: google-adk<2.0.0,>=1.19.0
+Requires-Dist: google-cloud-logging<4.0.0,>=3.10.0
+Requires-Dist: guardrails-ai<0.8.0,>=0.7.0
 Requires-Dist: httpx<0.29.0,>=0.28.1
-Requires-Dist: idun-agent-schema<0.3.0,>=0.2.7
-Requires-Dist: langchain-core<0.4.0,>=0.3.72
-Requires-Dist: langchain-google-vertexai<3.0.0,>=2.0.27
-Requires-Dist: langchain<0.4,>=0.3.27
+Requires-Dist: idun-agent-schema<1.0.0,>=0.2.7
+Requires-Dist: langchain-core<2.0.0,>=1.0.0
+Requires-Dist: langchain-google-vertexai<4.0.0,>=2.0.27
+Requires-Dist: langchain-mcp-adapters<0.2.0,>=0.1.0
+Requires-Dist: langchain<2.0.0,>=1.0.0
 Requires-Dist: langfuse-haystack>=2.3.0
-Requires-Dist: langfuse==2.60.8
-Requires-Dist: langgraph-checkpoint-sqlite<3.0.0,>=2.0.11
-Requires-Dist: langgraph<0.7.0,>=0.6.3
+Requires-Dist: langfuse<4.0.0,>=2.60.8
+Requires-Dist: langgraph-checkpoint-postgres<4.0.0,>=3.0.0
+Requires-Dist: langgraph-checkpoint-sqlite<4.0.0,>=3.0.0
+Requires-Dist: langgraph<2.0.0,>=1.0.0
+Requires-Dist: mcp<2.0.0,>=1.0.0
+Requires-Dist: openinference-instrumentation-google-adk<1.0.0,>=0.1.0
+Requires-Dist: openinference-instrumentation-guardrails<1.0.0,>=0.1.0
 Requires-Dist: openinference-instrumentation-langchain<1.0.0,>=0.1.13
+Requires-Dist: openinference-instrumentation-mcp<2.0.0,>=1.0.0
+Requires-Dist: openinference-instrumentation-vertexai<1.0.0,>=0.1.0
+Requires-Dist: opentelemetry-exporter-gcp-trace<2.0.0,>=1.6.0
+Requires-Dist: opentelemetry-exporter-otlp-proto-http<2.0.0,>=1.22.0
 Requires-Dist: pydantic<3.0.0,>=2.11.7
 Requires-Dist: python-dotenv>=1.1.1
 Requires-Dist: sqlalchemy<3.0.0,>=2.0.36
 Requires-Dist: streamlit<2.0.0,>=1.47.1
+Requires-Dist: tavily-python<0.8.0,>=0.7.9
 Requires-Dist: uvicorn<0.36.0,>=0.35.0
 Description-Content-Type: text/markdown
 
@@ -214,6 +228,7 @@ agent:
 - `agent.config.graph_definition` (str): absolute or relative `path/to/file.py:variable`
 - `agent.config.checkpointer` (sqlite): `{ type: "sqlite", db_url: "sqlite:///file.db" }`
 - `agent.config.observability` (optional): provider options as shown above
+- `mcp_servers` (list, optional): collection of MCP servers that should be available to your agent runtime. Each entry matches the fields supported by `langchain-mcp-adapters` (name, transport, url/command, headers, etc.).
 
 Config can be sourced by:
 
@@ -221,6 +236,43 @@ Config can be sourced by:
 - `config_dict`: dict validated at runtime
 - `config_path`: path to YAML; defaults to `config.yaml`
 
+### MCP Servers
+
+You can mount MCP servers directly in your engine config. The engine will automatically
+create a `MultiServerMCPClient` and expose it on `app.state.mcp_registry`.
+
+```yaml
+mcp_servers:
+  - name: "math"
+    transport: "stdio"
+    command: "python"
+    args:
+      - "/path/to/math_server.py"
+  - name: "weather"
+    transport: "streamable_http"
+    url: "http://localhost:8000/mcp"
+```
+
+Inside your FastAPI dependencies or handlers:
+
+```python
+from idun_agent_engine.server.dependencies import get_mcp_registry
+
+@router.get("/mcp/{server}/tools")
+async def list_tools(server: str, registry = Depends(get_mcp_registry)):
+    return await registry.get_tools(server)
+```
+
+Or outside of FastAPI:
+
+```python
+from langchain_mcp_adapters.tools import load_mcp_tools
+
+registry = app.state.mcp_registry
+async with registry.get_session("math") as session:
+    tools = await load_mcp_tools(session)
+```
+
 ## Examples
 
 The `examples/` folder contains complete projects:

{idun_agent_engine-0.2.7 → idun_agent_engine-0.3.1}/README.md

@@ -167,6 +167,7 @@ agent:
 - `agent.config.graph_definition` (str): absolute or relative `path/to/file.py:variable`
 - `agent.config.checkpointer` (sqlite): `{ type: "sqlite", db_url: "sqlite:///file.db" }`
 - `agent.config.observability` (optional): provider options as shown above
+- `mcp_servers` (list, optional): collection of MCP servers that should be available to your agent runtime. Each entry matches the fields supported by `langchain-mcp-adapters` (name, transport, url/command, headers, etc.).
 
 Config can be sourced by:
 
@@ -174,6 +175,43 @@ Config can be sourced by:
 - `config_dict`: dict validated at runtime
 - `config_path`: path to YAML; defaults to `config.yaml`
 
+### MCP Servers
+
+You can mount MCP servers directly in your engine config. The engine will automatically
+create a `MultiServerMCPClient` and expose it on `app.state.mcp_registry`.
+
+```yaml
+mcp_servers:
+  - name: "math"
+    transport: "stdio"
+    command: "python"
+    args:
+      - "/path/to/math_server.py"
+  - name: "weather"
+    transport: "streamable_http"
+    url: "http://localhost:8000/mcp"
+```
+
+Inside your FastAPI dependencies or handlers:
+
+```python
+from idun_agent_engine.server.dependencies import get_mcp_registry
+
+@router.get("/mcp/{server}/tools")
+async def list_tools(server: str, registry = Depends(get_mcp_registry)):
+    return await registry.get_tools(server)
+```
+
+Or outside of FastAPI:
+
+```python
+from langchain_mcp_adapters.tools import load_mcp_tools
+
+registry = app.state.mcp_registry
+async with registry.get_session("math") as session:
+    tools = await load_mcp_tools(session)
+```
+
 ## Examples
 
 The `examples/` folder contains complete projects:

{idun_agent_engine-0.2.7 → idun_agent_engine-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "idun-agent-engine"
-version = "0.2.7"
+version = "0.3.1"
 description = "Python SDK and runtime to serve AI agents with FastAPI, LangGraph, and observability."
 authors = [{ name = "Geoffrey HARRAZI", email = "geoffreyharrazi@gmail.com" }]
 requires-python = ">=3.12,<3.14"
@@ -24,34 +24,52 @@ classifiers = [
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Libraries",
     "Typing :: Typed",
+
+
+
 ]
+
 dependencies = [
+    "tavily-python>=0.7.9,<0.8.0",
+    "deepagents>=0.2.8,<1.0.0",
+    "guardrails-ai>=0.7.0, <0.8.0",
     "fastapi>=0.115.0,<0.116.0",
     "uvicorn>=0.35.0,<0.36.0",
-    "langgraph>=0.6.3,<0.7.0",
-    "langgraph-checkpoint-sqlite>=2.0.11,<3.0.0",
+    "langgraph>=1.0.0,<2.0.0",
+    "langgraph-checkpoint-sqlite>=3.0.0,<4.0.0",
+    "langgraph-checkpoint-postgres>=3.0.0,<4.0.0",
     "streamlit>=1.47.1,<2.0.0",
     "httpx>=0.28.1,<0.29.0",
     "pydantic>=2.11.7,<3.0.0",
-    "langchain-core>=0.3.72,<0.4.0",
-    "langchain-google-vertexai>=2.0.27,<3.0.0",
-    "google-adk>=1.9.0,<2.0.0",
+    "langchain-core>=1.0.0,<2.0.0",
+    "langchain-google-vertexai>=2.0.27,<4.0.0",
+    "google-adk>=1.19.0,<2.0.0",
     "ag-ui-protocol>=0.1.8,<0.2.0",
     "aiosqlite>=0.21.0,<0.22.0",
-    "langfuse==2.60.8",
+    "langfuse>=2.60.8,<4.0.0",
     "arize-phoenix-otel>=0.2.0,<1.0.0",
     "openinference-instrumentation-langchain>=0.1.13,<1.0.0",
-    "langchain>=0.3.27,<0.4",
+    "langchain>=1.0.0,<2.0.0",
     # Pin <12: 12.x currently depends on placeholder jmespath==99.99.99 and fails in Docker
     "arize-phoenix>=11.22.0,<12.0.0",
-    "idun-agent-schema>=0.2.7,<0.3.0",
+    "idun-agent-schema>=0.2.7,<1.0.0",
     "langfuse-haystack>=2.3.0",
     "python-dotenv>=1.1.1",
-    "click>=8.2.1",
+    "click>=8.2.0",
     # Pin SQLAlchemy for Python 3.13 compatibility (required by Phoenix)
     "sqlalchemy>=2.0.36,<3.0.0",
     "ag-ui-langgraph>=0.0.20,<0.1.0",
     "copilotkit>=0.1.72,<0.2.0",
+    "langchain-mcp-adapters>=0.1.0,<0.2.0",
+    "ag-ui-adk>=0.3.4,<0.4.0",
+    "opentelemetry-exporter-gcp-trace>=1.6.0,<2.0.0",
+    "openinference-instrumentation-guardrails>=0.1.0,<1.0.0",
+    "openinference-instrumentation-vertexai>=0.1.0,<1.0.0",
+    "openinference-instrumentation-google-adk>=0.1.0,<1.0.0",
+    "openinference-instrumentation-mcp>=1.0.0,<2.0.0",
+    "google-cloud-logging>=3.10.0,<4.0.0",
+    "opentelemetry-exporter-otlp-proto-http>=1.22.0,<2.0.0",
+    "mcp>=1.0.0,<2.0.0",
 ]
 
 

{idun_agent_engine-0.2.7 → idun_agent_engine-0.3.1}/src/idun_agent_engine/_version.py

@@ -1,3 +1,3 @@
 """Version information for Idun Agent Engine."""
 
-__version__ = "0.2.7"
+__version__ = "0.3.1"

idun_agent_engine-0.3.1/src/idun_agent_engine/agent/adk/__init__.py

@@ -0,0 +1,5 @@
+"""ADK Agent implementation."""
+
+from .adk import AdkAgent
+
+__all__ = ["AdkAgent"]

idun_agent_engine-0.3.1/src/idun_agent_engine/agent/adk/adk.py

@@ -0,0 +1,296 @@
+"""ADK agent adapter implementing the BaseAgent protocol."""
+
+import importlib.util
+import uuid
+from collections.abc import AsyncGenerator
+from typing import Any
+
+from google.adk.apps.app import App
+from google.adk.memory import (
+    InMemoryMemoryService,
+    VertexAiMemoryBankService,
+)
+from google.adk.sessions import (
+    DatabaseSessionService,
+    InMemorySessionService,
+    VertexAiSessionService,
+)
+from idun_agent_schema.engine.adk import (
+    AdkAgentConfig,
+    AdkDatabaseSessionConfig,
+    AdkInMemoryMemoryConfig,
+    AdkInMemorySessionConfig,
+    AdkVertexAiMemoryConfig,
+    AdkVertexAiSessionConfig,
+)
+from idun_agent_schema.engine.observability_v2 import ObservabilityConfig
+
+from ag_ui_adk import ADKAgent as ADKAGUIAgent
+from idun_agent_engine.agent import base as agent_base
+from idun_agent_engine import observability
+
+
+class AdkAgent(agent_base.BaseAgent):
+    """ADK agent adapter implementing the BaseAgent protocol."""
+
+    def __init__(self):
+        """Initialize an unconfigured AdkAgent with default state."""
+        self._id = str(uuid.uuid4())
+        self._agent_type = "ADK"
+        self._agent_instance: Any = None
+        self._copilotkit_agent_instance: ADKAGUIAgent | None = None
+        self._configuration: AdkAgentConfig | None = None
+        self._name: str = "Unnamed ADK Agent"
+        self._infos: dict[str, Any] = {
+            "status": "Uninitialized",
+            "name": self._name,
+            "id": self._id,
+        }
+        self._session_service: Any = None
+        self._memory_service: Any = None
+        # Observability (provider-agnostic)
+        self._obs_callbacks: list[Any] | None = None
+
+    @property
+    def id(self) -> str:
+        """Return unique identifier for this agent instance."""
+        return self._id
+
+    @property
+    def agent_type(self) -> str:
+        """Return agent type label."""
+        return self._agent_type
+
+    @property
+    def name(self) -> str:
+        """Return configured human-readable agent name."""
+        return self._name
+
+    @property
+    def agent_instance(self) -> Any:
+        """Return the underlying ADK agent instance.
+
+        Raises:
+            RuntimeError: If the agent is not yet initialized.
+        """
+        if self._agent_instance is None:
+            raise RuntimeError("Agent not initialized. Call initialize() first.")
+        return self._agent_instance
+
+    @property
+    def copilotkit_agent_instance(self) -> ADKAGUIAgent:
+        """Return the CopilotKit agent instance.
+
+        Raises:
+            RuntimeError: If the CopilotKit agent is not yet initialized.
+        """
+        if self._copilotkit_agent_instance is None:
+            raise RuntimeError(
+                "CopilotKit agent not initialized. Call initialize() first."
+            )
+        return self._copilotkit_agent_instance
+
+    @property
+    def configuration(self) -> AdkAgentConfig:
+        """Return validated configuration.
+
+        Raises:
+            RuntimeError: If the agent has not been configured yet.
+        """
+        if not self._configuration:
+            raise RuntimeError("Agent not configured. Call initialize() first.")
+        return self._configuration
+
+    @property
+    def infos(self) -> dict[str, Any]:
+        """Return diagnostic information about the agent instance."""
+        self._infos["underlying_agent_type"] = (
+            str(type(self._agent_instance)) if self._agent_instance else "N/A"
+        )
+        return self._infos
+
+    async def initialize(
+        self,
+        config: AdkAgentConfig,
+        observability_config: list[ObservabilityConfig] | None = None,
+    ) -> None:
+        """Initialize the ADK agent asynchronously."""
+        self._configuration = AdkAgentConfig.model_validate(config)
+
+        self._name = self._configuration.app_name or "Unnamed ADK Agent"
+        self._infos["name"] = self._name
+
+        # Observability (provider-agnostic)
+        if observability_config:
+            handlers, infos = observability.create_observability_handlers(
+                observability_config # type: ignore[arg-type]
+            )
+            self._obs_callbacks = []
+            for handler in handlers:
+                # Even if callbacks aren't used by ADK directly, instantiating the handler
+                # might set up global instrumentation (e.g. Phoenix, Langfuse env vars).
+                self._obs_callbacks.extend(handler.get_callbacks())
+
+            if infos:
+                self._infos["observability"] = infos
+
+        if observability_config:
+            try:
+                # Check if langfuse is enabled in any of the observability configs
+                def _is_langfuse_provider(c: Any) -> bool:
+                    provider = getattr(c, "provider", None)
+                    if provider is None and isinstance(c, dict):
+                        provider = c.get("provider")
+
+                    if provider is not None and hasattr(provider, "value"):
+                        provider = provider.value
+
+                    return str(provider).lower() == "langfuse"
+
+                is_langfuse_enabled = any(
+                    _is_langfuse_provider(config) for config in observability_config
+                )
+
+                if is_langfuse_enabled:
+                    import os
+                    langfuse_pk = os.environ.get("LANGFUSE_PUBLIC_KEY")
+                    langfuse_host = os.environ.get("LANGFUSE_BASE_URL")
+                    print(f"LANGFUSE_PUBLIC_KEY: {langfuse_pk}")
+                    print(f"LANGFUSE_BASE_URL: {langfuse_host}")
+                    try:
+                        from openinference.instrumentation.google_adk import (
+                            GoogleADKInstrumentor,
+                        )
+
+                        GoogleADKInstrumentor().instrument()
+                        print("GoogleADKInstrumentor instrumented successfully.")
+                    except ImportError:
+                        print(
+                            "openinference-instrumentation-google-adk not installed, skipping Google ADK instrumentation."
+                        )
+                    except Exception as e:
+                        print(f"Failed to instrument Google ADK: {e}")
+            except Exception as e:
+                print(f"Error checking observability config for ADK instrumentation: {e}")
+
+        # Initialize Session Service
+        await self._initialize_session_service()
+
+        # Initialize Memory Service
+        await self._initialize_memory_service()
+
+        # Load the agent instance
+        agent = self._load_agent(self._configuration.agent)
+
+        self._agent_instance = App(root_agent=agent, name=self._name)
+
+        # Initialize CopilotKit/AG-UI Agent Wrapper
+        # TODO: Pass session and memory services when supported by AG-UI ADK adapter if needed
+        self._copilotkit_agent_instance = ADKAGUIAgent(
+            adk_agent=agent,
+            session_service=self._session_service,
+            memory_service=self._memory_service,
+            app_name=self._name,
+        )
+
+        self._infos["status"] = "Initialized"
+        self._infos["config_used"] = self._configuration.model_dump()
+
+    async def _initialize_session_service(self) -> None:
+        """Initialize the session service based on configuration."""
+        if not self._configuration:
+            raise RuntimeError("Configuration not initialized")
+
+        if not self._configuration.session_service:
+            # Default to InMemory if not specified
+            self._session_service = InMemorySessionService()
+            return
+
+        config = self._configuration.session_service
+        if isinstance(config, AdkInMemorySessionConfig):
+            self._session_service = InMemorySessionService()
+        elif isinstance(config, AdkVertexAiSessionConfig):
+            self._session_service = VertexAiSessionService(
+                project=config.project_id,
+                location=config.location,
+                agent_engine_id=config.reasoning_engine_app_name,
+            )
+        elif isinstance(config, AdkDatabaseSessionConfig):
+            self._session_service = DatabaseSessionService(db_url=config.db_url)
+        else:
+            raise ValueError(f"Unsupported session service type: {config.type}")  # type: ignore
+
+    async def _initialize_memory_service(self) -> None:
+        """Initialize the memory service based on configuration."""
+        if not self._configuration:
+            raise RuntimeError("Configuration not initialized")
+
+        if not self._configuration.memory_service:
+            # Default to InMemory if not specified
+            self._memory_service = InMemoryMemoryService()
+            return
+
+        config = self._configuration.memory_service
+        if isinstance(config, AdkInMemoryMemoryConfig):
+            self._memory_service = InMemoryMemoryService()
+        elif isinstance(config, AdkVertexAiMemoryConfig):
+            self._memory_service = VertexAiMemoryBankService(
+                project=config.project_id,
+                location=config.location,
+                agent_engine_id=config.memory_bank_id,
+            )
+        else:
+            raise ValueError(f"Unsupported memory service type: {config.type}")  # type: ignore
+
+    def _load_agent(self, agent_definition: str) -> Any:
+        """Loads an agent instance from a specified path."""
+        try:
+            module_path, agent_variable_name = agent_definition.rsplit(":", 1)
+        except ValueError:
+            raise ValueError(
+                "agent_definition must be in the format 'path/to/file.py:variable_name'"
+            ) from None
+
+        try:
+            from pathlib import Path
+
+            resolved_path = Path(module_path).resolve()
+            spec = importlib.util.spec_from_file_location(
+                agent_variable_name, str(resolved_path)
+            )
+            if spec is None or spec.loader is None:
+                raise ImportError(f"Could not load spec for module at {module_path}")
+
+            module = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(module)
+
+            agent_instance = getattr(module, agent_variable_name)
+            return agent_instance
+        except (FileNotFoundError, ImportError, AttributeError) as e:
+            raise ValueError(
+                f"Failed to load agent from {agent_definition}: {e}"
+            ) from e
+
+    async def invoke(self, message: Any) -> Any:
+        """Process a single input to chat with the agent."""
+        if self._agent_instance is None:
+            raise RuntimeError(
+                "Agent not initialized. Call initialize() before processing messages."
+            )
+
+        # TODO: Implement ADK invoke logic using session and memory services
+        raise NotImplementedError("ADK invoke not implemented yet")
+
+    async def stream(self, message: Any) -> AsyncGenerator[Any]:
+        """Process a single input message and return an asynchronous stream."""
+        if self._agent_instance is None:
+            raise RuntimeError(
+                "Agent not initialized. Call initialize() before processing messages."
+            )
+
+        # TODO: Implement ADK stream logic using session and memory services
+        raise NotImplementedError("ADK stream not implemented yet")
+
+        # Required to make this a generator
+        if False:
+            yield

{idun_agent_engine-0.2.7 → idun_agent_engine-0.3.1}/src/idun_agent_engine/agent/base.py

@@ -8,6 +8,7 @@ from collections.abc import AsyncGenerator
 from typing import Any
 
 from idun_agent_schema.engine.agent import BaseAgentConfig
+from idun_agent_schema.engine.observability_v2 import ObservabilityConfig
 
 
 class BaseAgent[ConfigType: BaseAgentConfig](ABC):
@@ -63,13 +64,18 @@ class BaseAgent[ConfigType: BaseAgentConfig](ABC):
         pass
 
     @abstractmethod
-    async def initialize(self, config: dict[str, Any]) -> None:
+    async def initialize(
+        self,
+        config: dict[str, Any],
+        observability: list[ObservabilityConfig] | None = None,
+    ) -> None:
         """Initialize the agent with a given configuration.
 
         This method should set up the underlying agent framework instance.
 
         Args:
             config: A dictionary containing the agent's configuration.
+            observability: Optional list of observability configurations.
         """
         pass
 

{idun_agent_engine-0.2.7 → idun_agent_engine-0.3.1}/src/idun_agent_engine/agent/haystack/haystack.py

@@ -126,7 +126,11 @@ class HaystackAgent(BaseAgent):
                 self._langfuse_tracing = True
         logger.info("Agent tracing not supported yet")
 
-    async def initialize(self, config: HaystackAgentConfig | dict[str, Any]) -> None:
+    async def initialize(
+        self,
+        config: HaystackAgentConfig | dict[str, Any],
+        observability_config: list[ObservabilityConfig] | None = None,
+    ) -> None:
         try:
             logger.debug(f"Initializing haystack agent config: {config}...")