datarobot-genai 0.1.75__py3-none-any.whl → 0.2.11__py3-none-any.whl

datarobot_genai/core/agents/base.py

@@ -23,6 +23,7 @@ from typing import TypedDict
 from typing import TypeVar
 from typing import cast
 
+from ag_ui.core import Event
 from openai.types.chat import CompletionCreateParams
 from ragas import MultiTurnSample
 
@@ -167,7 +168,7 @@ class UsageMetrics(TypedDict):
 
 # Canonical return type for DRUM-compatible invoke implementations
 InvokeReturn = (
-    AsyncGenerator[tuple[str, MultiTurnSample | None, UsageMetrics], None]
+    AsyncGenerator[tuple[str | Event, MultiTurnSample | None, UsageMetrics], None]
     | tuple[str, MultiTurnSample | None, UsageMetrics]
 )
 

datarobot_genai/core/chat/responses.py

@@ -27,6 +27,10 @@ from concurrent.futures import ThreadPoolExecutor
 from typing import Any
 from typing import TypeVar
 
+from ag_ui.core import BaseEvent
+from ag_ui.core import Event
+from ag_ui.core import TextMessageChunkEvent
+from ag_ui.core import TextMessageContentEvent
 from openai.types import CompletionUsage
 from openai.types.chat import ChatCompletion
 from openai.types.chat import ChatCompletionChunk
@@ -45,6 +49,7 @@ class CustomModelChatResponse(ChatCompletion):
 
 class CustomModelStreamingResponse(ChatCompletionChunk):
     pipeline_interactions: str | None = None
+    event: Event | None = None
 
 
 def to_custom_model_chat_response(
@@ -88,7 +93,7 @@ def to_custom_model_streaming_response(
     thread_pool_executor: ThreadPoolExecutor,
     event_loop: AbstractEventLoop,
     streaming_response_generator: AsyncGenerator[
-        tuple[str, MultiTurnSample | None, dict[str, int]], None
+        tuple[str | Event, MultiTurnSample | None, dict[str, int]], None
     ],
     model: str | object | None,
 ) -> Iterator[CustomModelStreamingResponse]:
@@ -110,7 +115,7 @@ def to_custom_model_streaming_response(
         while True:
             try:
                 (
-                    response_text,
+                    response_text_or_event,
                     pipeline_interactions,
                     usage_metrics,
                 ) = thread_pool_executor.submit(
@@ -119,10 +124,10 @@ def to_custom_model_streaming_response(
                 last_pipeline_interactions = pipeline_interactions
                 last_usage_metrics = usage_metrics
 
-                if response_text:
+                if isinstance(response_text_or_event, str) and response_text_or_event:
                     choice = ChunkChoice(
                         index=0,
-                        delta=ChoiceDelta(role="assistant", content=response_text),
+                        delta=ChoiceDelta(role="assistant", content=response_text_or_event),
                         finish_reason=None,
                     )
                     yield CustomModelStreamingResponse(
@@ -135,6 +140,29 @@ def to_custom_model_streaming_response(
                         if usage_metrics
                         else None,
                     )
+                elif isinstance(response_text_or_event, BaseEvent):
+                    content = ""
+                    if isinstance(
+                        response_text_or_event, (TextMessageContentEvent, TextMessageChunkEvent)
+                    ):
+                        content = response_text_or_event.delta or content
+                    choice = ChunkChoice(
+                        index=0,
+                        delta=ChoiceDelta(role="assistant", content=content),
+                        finish_reason=None,
+                    )
+
+                    yield CustomModelStreamingResponse(
+                        id=completion_id,
+                        object="chat.completion.chunk",
+                        created=created,
+                        model=model,
+                        choices=[choice],
+                        usage=CompletionUsage.model_validate(required_usage_metrics | usage_metrics)
+                        if usage_metrics
+                        else None,
+                        event=response_text_or_event,
+                    )
             except StopAsyncIteration:
                 break
         event_loop.run_until_complete(streaming_response_generator.aclose())

datarobot_genai/drmcp/core/config.py

@@ -197,6 +197,54 @@ class MCPServerConfig(BaseSettings):
         description="Enable/disable predictive tools",
     )
 
+    # Jira tools
+    enable_jira_tools: bool = Field(
+        default=False,
+        validation_alias=AliasChoices(
+            RUNTIME_PARAM_ENV_VAR_NAME_PREFIX + "ENABLE_JIRA_TOOLS",
+            "ENABLE_JIRA_TOOLS",
+        ),
+        description="Enable/disable Jira tools",
+    )
+    is_jira_oauth_provider_configured: bool = Field(
+        default=False,
+        validation_alias=AliasChoices(
+            RUNTIME_PARAM_ENV_VAR_NAME_PREFIX + "IS_JIRA_OAUTH_PROVIDER_CONFIGURED",
+            "IS_JIRA_OAUTH_PROVIDER_CONFIGURED",
+        ),
+        description="Whether Jira OAuth provider is configured for Jira integration",
+    )
+
+    @property
+    def is_jira_oauth_configured(self) -> bool:
+        return self.is_jira_oauth_provider_configured or bool(
+            os.getenv("JIRA_CLIENT_ID") and os.getenv("JIRA_CLIENT_SECRET")
+        )
+
+    # Confluence tools
+    enable_confluence_tools: bool = Field(
+        default=False,
+        validation_alias=AliasChoices(
+            RUNTIME_PARAM_ENV_VAR_NAME_PREFIX + "ENABLE_CONFLUENCE_TOOLS",
+            "ENABLE_CONFLUENCE_TOOLS",
+        ),
+        description="Enable/disable Confluence tools",
+    )
+    is_confluence_oauth_provider_configured: bool = Field(
+        default=False,
+        validation_alias=AliasChoices(
+            RUNTIME_PARAM_ENV_VAR_NAME_PREFIX + "IS_CONFLUENCE_OAUTH_PROVIDER_CONFIGURED",
+            "IS_CONFLUENCE_OAUTH_PROVIDER_CONFIGURED",
+        ),
+        description="Whether Confluence OAuth provider is configured for Confluence integration",
+    )
+
+    @property
+    def is_confluence_oauth_configured(self) -> bool:
+        return self.is_confluence_oauth_provider_configured or bool(
+            os.getenv("CONFLUENCE_CLIENT_ID") and os.getenv("CONFLUENCE_CLIENT_SECRET")
+        )
+
     @field_validator(
         "otel_attributes",
         mode="before",
@@ -220,6 +268,10 @@ class MCPServerConfig(BaseSettings):
         "tool_registration_duplicate_behavior",
         "mcp_server_register_dynamic_prompts_on_startup",
         "enable_predictive_tools",
+        "enable_jira_tools",
+        "is_jira_oauth_provider_configured",
+        "enable_confluence_tools",
+        "is_confluence_oauth_provider_configured",
         mode="before",
     )
     @classmethod

datarobot_genai/drmcp/core/dr_mcp_server.py

@@ -40,6 +40,8 @@ from .routes_utils import prefix_mount_path
 from .server_life_cycle import BaseServerLifecycle
 from .telemetry import OtelASGIMiddleware
 from .telemetry import initialize_telemetry
+from .tool_config import TOOL_CONFIGS
+from .tool_config import is_tool_enabled
 
 
 def _import_modules_from_dir(
@@ -115,6 +117,9 @@ class DataRobotMCPServer:
         self._mcp = mcp
         self._mcp_transport = transport
 
+        # Configure MCP server capabilities
+        self._configure_mcp_capabilities()
+
         # Initialize telemetry
         initialize_telemetry(mcp)
 
@@ -139,11 +144,12 @@ class DataRobotMCPServer:
 
         # Load static tools modules
         base_dir = os.path.dirname(os.path.dirname(__file__))
-        if self._config.enable_predictive_tools:
-            _import_modules_from_dir(
-                os.path.join(base_dir, "tools", "predictive"),
-                "datarobot_genai.drmcp.tools.predictive",
-            )
+        for tool_type, tool_config in TOOL_CONFIGS.items():
+            if is_tool_enabled(tool_type, self._config):
+                _import_modules_from_dir(
+                    os.path.join(base_dir, "tools", tool_config["directory"]),
+                    tool_config["package_prefix"],
+                )
 
         # Load memory management tools if available
         if self._memory_manager:
@@ -163,6 +169,37 @@ class DataRobotMCPServer:
         if transport == "streamable-http":
             register_routes(self._mcp)
 
+    def _configure_mcp_capabilities(self) -> None:
+        """Configure MCP capabilities that FastMCP doesn't expose directly.
+
+        See: https://github.com/modelcontextprotocol/python-sdk/issues/1126
+        """
+        server = self._mcp._mcp_server
+
+        # Declare prompts_changed capability  (capabilities.prompts.listChanged: true)
+        server.notification_options.prompts_changed = True
+
+        # Declare experimental capabilities ( experimental.dynamic_prompts: true)
+        server.experimental_capabilities = {"dynamic_prompts": {"enabled": True}}
+
+        # Patch to include experimental_capabilities (FastMCP doesn't expose this)
+        original = server.create_initialization_options
+
+        def patched(
+            notification_options: Any = None,
+            experimental_capabilities: dict[str, dict[str, Any]] | None = None,
+            **kwargs: Any,
+        ) -> Any:
+            if experimental_capabilities is None:
+                experimental_capabilities = getattr(server, "experimental_capabilities", None)
+            return original(
+                notification_options=notification_options,
+                experimental_capabilities=experimental_capabilities,
+                **kwargs,
+            )
+
+        server.create_initialization_options = patched
+
     def run(self, show_banner: bool = False) -> None:
         """Run the DataRobot MCP server synchronously."""
         try:
@@ -179,6 +216,9 @@ class DataRobotMCPServer:
                 self._logger.info("Registering dynamic prompts from prompt management...")
                 asyncio.run(register_prompts_from_datarobot_prompt_management())
 
+            # Execute pre-server start actions
+            asyncio.run(self._lifecycle.pre_server_start(self._mcp))
+
             # List registered tools, prompts, and resources before starting server
             tools = asyncio.run(self._mcp._list_tools_mcp())
             prompts = asyncio.run(self._mcp._list_prompts_mcp())
@@ -198,9 +238,6 @@ class DataRobotMCPServer:
             for resource in resources:
                 self._logger.info(f" > {resource.name}")
 
-            # Execute pre-server start actions
-            asyncio.run(self._lifecycle.pre_server_start(self._mcp))
-
             # Create event loop for async operations
             loop = asyncio.new_event_loop()
             asyncio.set_event_loop(loop)

datarobot_genai/drmcp/core/dynamic_prompts/dr_lib.py

@@ -12,78 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from collections import defaultdict
-from dataclasses import dataclass
 
 import datarobot as dr
 
 from datarobot_genai.drmcp.core.clients import get_api_client
 
-# Needed SDK version (3.10.0) is not published yet. We'll reimplement simplified version of it.
-# get_datarobot_prompt_templates = dr.genai.PromptTemplate.list()
-# DrPrompt = dr.genai.PromptTemplate
-# DrPromptVersion = dr.genai.PromptTemplateVersion
-# DrVariable = dr.genai.Variable
 
-
-@dataclass
-class DrVariable:
-    name: str
-    description: str
-
-
-@dataclass
-class DrPromptVersion:
-    id: str
-    prompt_template_id: str
-    version: int
-    prompt_text: str
-    variables: list[DrVariable]
-
-    @classmethod
-    def from_dict(cls, d: dict) -> "DrPromptVersion":
-        variables = [
-            DrVariable(name=v["name"], description=v["description"]) for v in d["variables"]
-        ]
-        return cls(
-            id=d["id"],
-            prompt_template_id=d["promptTemplateId"],
-            version=d["version"],
-            prompt_text=d["promptText"],
-            variables=variables,
-        )
-
-
-@dataclass
-class DrPrompt:
-    id: str
-    name: str
-    description: str
-
-    def get_latest_version(self) -> DrPromptVersion | None:
-        all_prompt_template_versions = get_datarobot_prompt_template_versions([self.id])
-        prompt_template_versions = all_prompt_template_versions.get(self.id)
-
-        if not prompt_template_versions:
-            return None
-        latest_version = max(prompt_template_versions, key=lambda v: v.version)
-        return latest_version
-
-    @classmethod
-    def from_dict(cls, d: dict) -> "DrPrompt":
-        return cls(id=d["id"], name=d["name"], description=d["description"])
-
-
-def get_datarobot_prompt_templates() -> list[DrPrompt]:
-    prompt_templates_data = dr.utils.pagination.unpaginate(
-        initial_url="genai/promptTemplates/", initial_params={}, client=get_api_client()
-    )
-
-    return [DrPrompt.from_dict(prompt_template) for prompt_template in prompt_templates_data]
+def get_datarobot_prompt_templates() -> list[dr.genai.PromptTemplate]:
+    try:
+        return dr.genai.PromptTemplate.list()
+    except Exception:
+        return []
 
 
 def get_datarobot_prompt_template_versions(
     prompt_template_ids: list[str],
-) -> dict[str, list[DrPromptVersion]]:
+) -> dict[str, list[dr.genai.PromptTemplateVersion]]:
+    # Still missing in SDK
     prompt_template_versions_data = dr.utils.pagination.unpaginate(
         initial_url="genai/promptTemplates/versions/",
         initial_params={
@@ -94,35 +39,32 @@ def get_datarobot_prompt_template_versions(
     prompt_template_versions = defaultdict(list)
     for prompt_template_version in prompt_template_versions_data:
         prompt_template_versions[prompt_template_version["promptTemplateId"]].append(
-            DrPromptVersion.from_dict(prompt_template_version)
+            dr.genai.PromptTemplateVersion(
+                id=prompt_template_version["id"],
+                prompt_template_id=prompt_template_version["promptTemplateId"],
+                prompt_text=prompt_template_version["promptText"],
+                commit_comment=prompt_template_version["commitComment"],
+                version=prompt_template_version["version"],
+                variables=prompt_template_version["variables"],
+                creation_date=prompt_template_version["creationDate"],
+                creation_user_id=prompt_template_version["creationUserId"],
+                user_name=prompt_template_version["userName"],
+            )
         )
     return prompt_template_versions
 
 
-def get_datarobot_prompt_template(prompt_template_id: str) -> DrPrompt | None:
-    api_client = get_api_client()
+def get_datarobot_prompt_template(prompt_template_id: str) -> dr.genai.PromptTemplate | None:
     try:
-        prompt_template_response = api_client.get(
-            f"genai/promptTemplates/{prompt_template_id}/", join_endpoint=True
-        )
-        prompt_template_json = prompt_template_response.json()
+        return dr.genai.PromptTemplate.get(prompt_template_id)
     except Exception:
         return None
 
-    return DrPrompt.from_dict(prompt_template_json)
-
 
 def get_datarobot_prompt_template_version(
     prompt_template_id: str, prompt_template_version_id: str
-) -> DrPromptVersion | None:
-    api_client = get_api_client()
+) -> dr.genai.PromptTemplateVersion | None:
     try:
-        prompt_template_version_response = api_client.get(
-            f"genai/promptTemplates/{prompt_template_id}/versions/{prompt_template_version_id}/",
-            join_endpoint=True,
-        )
-        prompt_template_version_json = prompt_template_version_response.json()
+        return dr.genai.PromptTemplateVersion.get(prompt_template_id, prompt_template_version_id)
     except Exception:
         return None
-
-    return DrPromptVersion.from_dict(prompt_template_version_json)

datarobot_genai/drmcp/core/dynamic_prompts/register.py

@@ -18,15 +18,13 @@ from collections.abc import Callable
 from inspect import Parameter
 from inspect import Signature
 
+import datarobot as dr
 from fastmcp.prompts.prompt import Prompt
 from pydantic import Field
 
 from datarobot_genai.drmcp.core.exceptions import DynamicPromptRegistrationError
 from datarobot_genai.drmcp.core.mcp_instance import register_prompt
 
-from .dr_lib import DrPrompt
-from .dr_lib import DrPromptVersion
-from .dr_lib import DrVariable
 from .dr_lib import get_datarobot_prompt_template_versions
 from .dr_lib import get_datarobot_prompt_templates
 
@@ -57,7 +55,8 @@ async def register_prompts_from_datarobot_prompt_management() -> None:
 
 
 async def register_prompt_from_datarobot_prompt_management(
-    prompt_template: DrPrompt, prompt_template_version: DrPromptVersion | None = None
+    prompt_template: dr.genai.PromptTemplate,
+    prompt_template_version: dr.genai.PromptTemplateVersion | None = None,
 ) -> Prompt:
     """Register a single prompt.
 
@@ -173,7 +172,7 @@ def to_valid_mcp_prompt_name(s: str) -> str:
 
 
 def make_prompt_function(
-    name: str, description: str, prompt_text: str, variables: list[DrVariable]
+    name: str, description: str, prompt_text: str, variables: list[dr.genai.Variable]
 ) -> Callable:
     params = []
     for v in variables:

datarobot_genai/drmcp/core/mcp_instance.py

@@ -22,6 +22,7 @@ from fastmcp import Context
 from fastmcp import FastMCP
 from fastmcp.exceptions import NotFoundError
 from fastmcp.prompts.prompt import Prompt
+from fastmcp.server.dependencies import get_context
 from fastmcp.tools import FunctionTool
 from fastmcp.tools import Tool
 from fastmcp.utilities.types import NotSet
@@ -91,6 +92,34 @@ class TaggedFastMCP(FastMCP):
         self._deployments_map: dict[str, str] = {}
         self._prompts_map: dict[str, tuple[str, str]] = {}
 
+    async def notify_prompts_changed(self) -> None:
+        """
+        Notify connected clients that the prompt list has changed.
+
+        This method attempts to send a prompts/list_changed notification to inform
+        clients that they should refresh their prompt list.
+
+        Note: In stateless HTTP mode (default for this server), notifications may not
+        reach clients since each request is independent. This method still logs the
+        change for auditing purposes and will work if the server is configured for
+        stateful connections.
+
+        See: https://github.com/modelcontextprotocol/python-sdk/issues/710
+        """
+        logger.info("Prompt list changed - attempting to notify connected clients")
+
+        # Try to use FastMCP's built-in notification mechanism if in an MCP context
+        try:
+            context = get_context()
+            context._queue_prompt_list_changed()
+            logger.debug("Queued prompts_changed notification via MCP context")
+        except RuntimeError:
+            # No active MCP context - this is expected when called from REST API
+            logger.debug(
+                "No active MCP context for notification. "
+                "In stateless mode, clients will see changes on next request."
+            )
+
     @overload
     def tool(
         self,
@@ -286,6 +315,9 @@ class TaggedFastMCP(FastMCP):
                 f"already mapped to {existing_prompt_template_version_id}. "
                 f"Updating to version id = {prompt_template_version_id} and name = {prompt_name}"
             )
+            await self.remove_prompt_mapping(
+                prompt_template_id, existing_prompt_template_version_id
+            )
 
         self._prompts_map[prompt_template_id] = (prompt_template_version_id, prompt_name)
 
@@ -308,7 +340,7 @@ class TaggedFastMCP(FastMCP):
                     f"skipping removal."
                 )
             else:
-                prompts_d = await mcp.get_prompts()
+                prompts_d = await self.get_prompts()
                 for prompt in prompts_d.values():
                     if (
                         prompt.meta is not None
@@ -319,6 +351,9 @@ class TaggedFastMCP(FastMCP):
                         prompt.disable()
 
                 self._prompts_map.pop(prompt_template_id, None)
+
+                # Notify clients that the prompt list has changed
+                await self.notify_prompts_changed()
         else:
             logger.debug(
                 f"Do not found prompt template with id = {prompt_template_id} in registry, "
@@ -526,17 +561,21 @@ async def register_prompt(
     )
 
     # Register the prompt
-    registered_prompt = mcp.add_prompt(prompt)
     if prompt_template:
         prompt_template_id, prompt_template_version_id = prompt_template
         await mcp.set_prompt_mapping(
             prompt_template_id, prompt_template_version_id, prompt_name_no_duplicate
         )
 
+    registered_prompt = mcp.add_prompt(prompt)
+
     # Verify prompt is registered
     prompts = await mcp.get_prompts()
     if not any(prompt.name == prompt_name_no_duplicate for prompt in prompts.values()):
         raise RuntimeError(f"Prompt {prompt_name_no_duplicate} was not registered successfully")
     logger.info(f"Registered prompts: {len(prompts)}")
 
+    # Notify clients that the prompt list has changed
+    await mcp.notify_prompts_changed()
+
     return registered_prompt

datarobot_genai/drmcp/core/routes.py

@@ -428,7 +428,10 @@ def register_routes(mcp: TaggedFastMCP) -> None:
         """Refresh prompt templates."""
         try:
             await refresh_registered_prompt_template()
-            return JSONResponse(status_code=HTTPStatus.NO_CONTENT, content=None)
+            return JSONResponse(
+                status_code=HTTPStatus.OK,
+                content={"message": "Prompts refreshed successfully"},
+            )
         except Exception as e:
             return JSONResponse(
                 status_code=HTTPStatus.INTERNAL_SERVER_ERROR,

datarobot_genai/drmcp/core/tool_config.py

@@ -0,0 +1,95 @@
+# Copyright 2025 DataRobot, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Tool configuration and enablement logic."""
+
+from collections.abc import Callable
+from enum import Enum
+from typing import TYPE_CHECKING
+from typing import TypedDict
+
+if TYPE_CHECKING:
+    from .config import MCPServerConfig
+
+
+class ToolType(str, Enum):
+    """Enumeration of available tool types."""
+
+    PREDICTIVE = "predictive"
+    JIRA = "jira"
+    CONFLUENCE = "confluence"
+
+
+class ToolConfig(TypedDict):
+    """Configuration for a tool type."""
+
+    name: str
+    oauth_check: Callable[["MCPServerConfig"], bool] | None
+    directory: str
+    package_prefix: str
+    config_field_name: str  # Name of the config field (e.g., "enable_predictive_tools")
+
+
+# Tool configuration registry
+TOOL_CONFIGS: dict[ToolType, ToolConfig] = {
+    ToolType.PREDICTIVE: ToolConfig(
+        name="predictive",
+        oauth_check=None,
+        directory="predictive",
+        package_prefix="datarobot_genai.drmcp.tools.predictive",
+        config_field_name="enable_predictive_tools",
+    ),
+    ToolType.JIRA: ToolConfig(
+        name="jira",
+        oauth_check=lambda config: config.is_jira_oauth_configured,
+        directory="jira",
+        package_prefix="datarobot_genai.drmcp.tools.jira",
+        config_field_name="enable_jira_tools",
+    ),
+    ToolType.CONFLUENCE: ToolConfig(
+        name="confluence",
+        oauth_check=lambda config: config.is_confluence_oauth_configured,
+        directory="confluence",
+        package_prefix="datarobot_genai.drmcp.tools.confluence",
+        config_field_name="enable_confluence_tools",
+    ),
+}
+
+
+def get_tool_enable_config_name(tool_type: ToolType) -> str:
+    """Get the configuration field name for enabling a tool."""
+    return TOOL_CONFIGS[tool_type]["config_field_name"]
+
+
+def is_tool_enabled(tool_type: ToolType, config: "MCPServerConfig") -> bool:
+    """
+    Check if a tool is enabled based on configuration.
+
+    Args:
+        tool_type: The type of tool to check
+        config: The server configuration
+
+    Returns
+    -------
+        True if the tool is enabled, False otherwise
+    """
+    tool_config = TOOL_CONFIGS[tool_type]
+    enable_config_name = tool_config["config_field_name"]
+    is_enabled = getattr(config, enable_config_name)
+
+    # If tool is enabled, check OAuth requirements if needed
+    if is_enabled and tool_config["oauth_check"] is not None:
+        return tool_config["oauth_check"](config)
+
+    return is_enabled

datarobot_genai/drmcp/test_utils/mcp_utils_ete.py

@@ -16,6 +16,8 @@ import os
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 
+import aiohttp
+from aiohttp import ClientSession as HttpClientSession
 from mcp import ClientSession
 from mcp.client.streamable_http import streamablehttp_client
 
@@ -29,6 +31,11 @@ def get_dr_mcp_server_url() -> str | None:
     return os.environ.get("DR_MCP_SERVER_URL")
 
 
+def get_dr_mcp_server_http_url() -> str | None:
+    """Get DataRobot MCP server http URL."""
+    return os.environ.get("DR_MCP_SERVER_HTTP_URL")
+
+
 def get_openai_llm_client_config() -> dict[str, str]:
     """Get OpenAI LLM client configuration."""
     openai_api_key = os.environ.get("OPENAI_API_KEY")
@@ -94,3 +101,25 @@ async def ete_test_mcp_session(
                 yield session
     except asyncio.TimeoutError:
         raise TimeoutError(f"Check if the MCP server is running at {get_dr_mcp_server_url()}")
+
+
+@asynccontextmanager
+async def ete_test_http_session(
+    additional_headers: dict[str, str] | None = None,
+) -> AsyncGenerator[HttpClientSession, None]:
+    """Create an HTTP session for each test that can connect to MCP custom http routes.
+
+    Parameters
+    ----------
+    additional_headers : dict[str, str], optional
+        Additional headers to include in the HTTP session (e.g., auth headers for testing).
+    """
+    headers = get_headers()
+    if additional_headers:
+        headers.update(additional_headers)
+
+    async with ete_test_mcp_session(additional_headers=additional_headers):
+        async with aiohttp.ClientSession(
+            base_url=get_dr_mcp_server_http_url(), headers=headers
+        ) as client:
+            yield client