datarobot-genai 0.1.68__py3-none-any.whl → 0.1.70__py3-none-any.whl

datarobot_genai/core/mcp/common.py

@@ -13,16 +13,20 @@
 # limitations under the License.
 
 import json
+import logging
 import re
+from http import HTTPStatus
 from typing import Any
 from typing import Literal
-from urllib.parse import urlparse
 
+import requests
 from datarobot.core.config import DataRobotAppFrameworkBaseSettings
 from pydantic import field_validator
 
 from datarobot_genai.core.utils.auth import AuthContextHeaderHandler
 
+logger = logging.getLogger(__name__)
+
 
 class MCPConfig(DataRobotAppFrameworkBaseSettings):
     """Configuration for MCP server connection.
@@ -39,6 +43,7 @@ class MCPConfig(DataRobotAppFrameworkBaseSettings):
     datarobot_api_token: str | None = None
     authorization_context: dict[str, Any] | None = None
     forwarded_headers: dict[str, str] | None = None
+    mcp_server_port: int | None = None
 
     _auth_context_handler: AuthContextHeaderHandler | None = None
     _server_config: dict[str, Any] | None = None
@@ -49,17 +54,14 @@ class MCPConfig(DataRobotAppFrameworkBaseSettings):
         if value is None:
             return None
 
-        if not isinstance(value, str):
-            msg = "external_mcp_headers must be a JSON string"
-            raise TypeError(msg)
-
         candidate = value.strip()
 
         try:
             json.loads(candidate)
-        except json.JSONDecodeError as exc:
+        except json.JSONDecodeError:
             msg = "external_mcp_headers must be valid JSON"
-            raise ValueError(msg) from exc
+            logger.warning(msg)
+            return None
 
         return candidate
 
@@ -69,15 +71,12 @@ class MCPConfig(DataRobotAppFrameworkBaseSettings):
         if value is None:
             return None
 
-        if not isinstance(value, str):
-            msg = "mcp_deployment_id must be a string"
-            raise TypeError(msg)
-
         candidate = value.strip()
 
         if not re.fullmatch(r"[0-9a-fA-F]{24}", candidate):
             msg = "mcp_deployment_id must be a valid 24-character hex ID"
-            raise ValueError(msg)
+            logger.warning(msg)
+            return None
 
         return candidate
 
@@ -112,6 +111,45 @@ class MCPConfig(DataRobotAppFrameworkBaseSettings):
             # Authorization context not available (e.g., in tests)
             return {}
 
+    def _build_authenticated_headers(self) -> dict[str, str]:
+        """Build headers for authenticated requests.
+
+        Returns
+        -------
+            Dictionary containing forwarded headers (if available) and authentication headers.
+        """
+        headers: dict[str, str] = {}
+        if self.forwarded_headers:
+            headers.update(self.forwarded_headers)
+        headers.update(self._authorization_bearer_header())
+        headers.update(self._authorization_context_header())
+        return headers
+
+    def _check_localhost_server(self, url: str, timeout: float = 2.0) -> bool:
+        """Check if MCP server is running on localhost.
+
+        Parameters
+        ----------
+        url : str
+            The URL to check.
+        timeout : float, optional
+            Request timeout in seconds (default: 2.0).
+
+        Returns
+        -------
+        bool
+            True if server is running and responding with OK status, False otherwise.
+        """
+        try:
+            response = requests.get(url, timeout=timeout)
+            return (
+                response.status_code == HTTPStatus.OK
+                and response.json().get("message") == "DataRobot MCP Server is running"
+            )
+        except requests.RequestException as e:
+            logger.debug(f"Failed to connect to MCP server at {url}: {e}")
+            return False
+
     def _build_server_config(self) -> dict[str, Any] | None:
         """
         Get MCP server configuration.
@@ -121,34 +159,6 @@ class MCPConfig(DataRobotAppFrameworkBaseSettings):
             Server configuration dict with url, transport, and optional headers,
             or None if not configured.
         """
-        if self.external_mcp_url:
-            # External MCP URL - no authentication needed
-            headers: dict[str, str] = {}
-
-            # Forward headers for localhost connections
-            if self.forwarded_headers:
-                try:
-                    parsed_url = urlparse(self.external_mcp_url)
-                    hostname = parsed_url.hostname or ""
-                    # Check if hostname is localhost or 127.0.0.1
-                    if hostname in ("localhost", "127.0.0.1", "::1"):
-                        headers.update(self.forwarded_headers)
-                except Exception:
-                    # If URL parsing fails, fall back to simple string check
-                    if "localhost" in self.external_mcp_url or "127.0.0.1" in self.external_mcp_url:
-                        headers.update(self.forwarded_headers)
-
-            # Merge external headers if provided
-            if self.external_mcp_headers:
-                external_headers = json.loads(self.external_mcp_headers)
-                headers.update(external_headers)
-
-            return {
-                "url": self.external_mcp_url.rstrip("/"),
-                "transport": self.external_mcp_transport,
-                "headers": headers,
-            }
-
         if self.mcp_deployment_id:
             # DataRobot deployment ID - requires authentication
             if self.datarobot_endpoint is None:
@@ -165,15 +175,9 @@ class MCPConfig(DataRobotAppFrameworkBaseSettings):
                 base_url = f"{base_url}/api/v2"
 
             url = f"{base_url}/deployments/{self.mcp_deployment_id}/directAccess/mcp"
+            headers = self._build_authenticated_headers()
 
-            # Start with forwarded headers if available
-            headers = {}
-            if self.forwarded_headers:
-                headers.update(self.forwarded_headers)
-
-            # Add authentication headers
-            headers.update(self._authorization_bearer_header())
-            headers.update(self._authorization_context_header())
+            logger.info(f"Using DataRobot hosted MCP deployment: {url}")
 
             return {
                 "url": url,
@@ -181,4 +185,34 @@ class MCPConfig(DataRobotAppFrameworkBaseSettings):
                 "headers": headers,
             }
 
+        if self.external_mcp_url:
+            # External MCP URL - no authentication needed
+            headers = {}
+
+            # Merge external headers if provided
+            if self.external_mcp_headers:
+                external_headers = json.loads(self.external_mcp_headers)
+                headers.update(external_headers)
+
+            logger.info(f"Using external MCP URL: {self.external_mcp_url}")
+
+            return {
+                "url": self.external_mcp_url.rstrip("/"),
+                "transport": self.external_mcp_transport,
+                "headers": headers,
+            }
+
+        # No MCP configuration found, setup localhost if running locally
+        if self.mcp_server_port:
+            url = f"http://localhost:{self.mcp_server_port}"
+            if self._check_localhost_server(url):
+                headers = self._build_authenticated_headers()
+                logger.info(f"Using localhost MCP server: {url}")
+                return {
+                    "url": f"{url}/mcp",
+                    "transport": "streamable-http",
+                    "headers": headers,
+                }
+            logger.warning(f"MCP server is not running or not responding at {url}")
+
         return None

datarobot_genai/crewai/base.py

@@ -80,6 +80,37 @@ class CrewAIAgent(BaseAgent[BaseTool], abc.ABC):
         """
         raise NotImplementedError
 
+    def _extract_pipeline_interactions(self) -> MultiTurnSample | None:
+        """Extract pipeline interactions from event listener if available."""
+        if not hasattr(self, "event_listener"):
+            return None
+        try:
+            listener = getattr(self, "event_listener", None)
+            messages = getattr(listener, "messages", None) if listener is not None else None
+            return create_pipeline_interactions_from_messages(messages)
+        except Exception:
+            return None
+
+    def _extract_usage_metrics(self, crew_output: Any) -> UsageMetrics:
+        """Extract usage metrics from crew output."""
+        token_usage = getattr(crew_output, "token_usage", None)
+        if token_usage is not None:
+            return {
+                "completion_tokens": int(getattr(token_usage, "completion_tokens", 0)),
+                "prompt_tokens": int(getattr(token_usage, "prompt_tokens", 0)),
+                "total_tokens": int(getattr(token_usage, "total_tokens", 0)),
+            }
+        return default_usage_metrics()
+
+    def _process_crew_output(
+        self, crew_output: Any
+    ) -> tuple[str, MultiTurnSample | None, UsageMetrics]:
+        """Process crew output into response tuple."""
+        response_text = str(crew_output.raw)
+        pipeline_interactions = self._extract_pipeline_interactions()
+        usage_metrics = self._extract_usage_metrics(crew_output)
+        return response_text, pipeline_interactions, usage_metrics
+
     async def invoke(self, completion_create_params: CompletionCreateParams) -> InvokeReturn:
         """Run the CrewAI workflow with the provided completion parameters."""
         user_prompt_content = extract_user_prompt_content(completion_create_params)
@@ -116,64 +147,13 @@ class CrewAIAgent(BaseAgent[BaseTool], abc.ABC):
                 async def _gen() -> AsyncGenerator[
                     tuple[str, MultiTurnSample | None, UsageMetrics]
                 ]:
-                    # Run kickoff in a worker thread.
                     crew_output = await asyncio.to_thread(
                         crew.kickoff,
                         inputs=self.make_kickoff_inputs(user_prompt_content),
                     )
-
-                    pipeline_interactions = None
-                    if hasattr(self, "event_listener"):
-                        try:
-                            listener = getattr(self, "event_listener", None)
-                            messages = (
-                                getattr(listener, "messages", None)
-                                if listener is not None
-                                else None
-                            )
-                            pipeline_interactions = create_pipeline_interactions_from_messages(
-                                messages
-                            )
-                        except Exception:
-                            pipeline_interactions = None
-
-                    token_usage = getattr(crew_output, "token_usage", None)
-                    if token_usage is not None:
-                        usage_metrics: UsageMetrics = {
-                            "completion_tokens": int(getattr(token_usage, "completion_tokens", 0)),
-                            "prompt_tokens": int(getattr(token_usage, "prompt_tokens", 0)),
-                            "total_tokens": int(getattr(token_usage, "total_tokens", 0)),
-                        }
-                    else:
-                        usage_metrics = default_usage_metrics()
-
-                    # Finalize stream with empty chunk carrying interactions and usage
-                    yield "", pipeline_interactions, usage_metrics
+                    yield self._process_crew_output(crew_output)
 
                 return _gen()
 
-            # Non-streaming: run to completion and return final result
             crew_output = crew.kickoff(inputs=self.make_kickoff_inputs(user_prompt_content))
-
-            response_text = str(crew_output.raw)
-
-            pipeline_interactions = None
-            if hasattr(self, "event_listener"):
-                try:
-                    listener = getattr(self, "event_listener", None)
-                    messages = getattr(listener, "messages", None) if listener is not None else None
-                    pipeline_interactions = create_pipeline_interactions_from_messages(messages)
-                except Exception:
-                    pipeline_interactions = None
-
-            token_usage = getattr(crew_output, "token_usage", None)
-            if token_usage is not None:
-                usage_metrics: UsageMetrics = {
-                    "completion_tokens": int(getattr(token_usage, "completion_tokens", 0)),
-                    "prompt_tokens": int(getattr(token_usage, "prompt_tokens", 0)),
-                    "total_tokens": int(getattr(token_usage, "total_tokens", 0)),
-                }
-            else:
-                usage_metrics = default_usage_metrics()
-
-            return response_text, pipeline_interactions, usage_metrics
+            return self._process_crew_output(crew_output)

{datarobot_genai-0.1.68.dist-info → datarobot_genai-0.1.70.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datarobot-genai
-Version: 0.1.68
+Version: 0.1.70
 Summary: Generic helpers for GenAI
 Project-URL: Homepage, https://github.com/datarobot-oss/datarobot-genai
 Author: DataRobot, Inc.

{datarobot_genai-0.1.68.dist-info → datarobot_genai-0.1.70.dist-info}/RECORD

@@ -13,13 +13,13 @@ datarobot_genai/core/cli/__init__.py,sha256=B93Yb6VavoZpatrh8ltCL6YglIfR5FHgytXb
 datarobot_genai/core/cli/agent_environment.py,sha256=BJzQoiDvZF5gW4mFE71U0yeg-l72C--kxiE-fv6W194,1662
 datarobot_genai/core/cli/agent_kernel.py,sha256=3XX58DQ6XPpWB_tn5m3iGb3XTfhZf5X3W9tc6ADieU4,7790
 datarobot_genai/core/mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datarobot_genai/core/mcp/common.py,sha256=Y24Ij8e4BwOnxojnz2BJRIFcs_Y7EfbORLrN6txowpY,6833
+datarobot_genai/core/mcp/common.py,sha256=Y8SjuquUODKEfI7T9X-QuTMKdIlpCWFI1b3xs6tmHFA,7812
 datarobot_genai/core/utils/__init__.py,sha256=VxtRUz6iwb04eFQQy0zqTNXLAkYpPXcJxVoKV0nOdXk,59
 datarobot_genai/core/utils/auth.py,sha256=Xo1PxVr6oMgtMHkmHdS02klDKK1cyDpjGvIMF4Tx0Lo,7874
 datarobot_genai/core/utils/urls.py,sha256=tk0t13duDEPcmwz2OnS4vwEdatruiuX8lnxMMhSaJik,2289
 datarobot_genai/crewai/__init__.py,sha256=MtFnHA3EtmgiK_GjwUGPgQQ6G1MCEzz1SDBwQi9lE8M,706
 datarobot_genai/crewai/agent.py,sha256=vp8_2LExpeLls7Fpzo0R6ud5I6Ryfu3n3oVTN4Yyi6A,1417
-datarobot_genai/crewai/base.py,sha256=iDIbU5LrdEaBKd914WuZuVg5f9yMw7pZTsWZqMTO1TI,7506
+datarobot_genai/crewai/base.py,sha256=JLljEN7sj8zaH8OamYoevFBZzza5BjZ4f0CGHRp2jUU,6447
 datarobot_genai/crewai/events.py,sha256=K67bO1zwPrxmppz2wh8dFGNbVebyWGXAMD7oodFE2sQ,5462
 datarobot_genai/crewai/mcp.py,sha256=AJTrs-8KdiRSjRECfBT1lJOsszWMoFoN9NIa1p5_wsM,2115
 datarobot_genai/drmcp/__init__.py,sha256=JE83bfpGU7v77VzrDdlb0l8seM5OwUsUbaQErJ2eisc,2983
@@ -93,9 +93,9 @@ datarobot_genai/nat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 datarobot_genai/nat/agent.py,sha256=siBLDWAff2-JwZ8Q3iNpM_e4_IoSwG9IvY0hyEjNenw,10292
 datarobot_genai/nat/datarobot_llm_clients.py,sha256=IZq_kooUL8QyDTkpEreszLQk9vCzg6-FbTjIkXR9wc0,7203
 datarobot_genai/nat/datarobot_llm_providers.py,sha256=lOVaL_0Fl6-7GFYl3HmfqttqKpKt-2w8o92P3T7B6cU,3683
-datarobot_genai-0.1.68.dist-info/METADATA,sha256=xq2ZHJmEjMUH1313Nxx1A4lQcArJi0Y-Dt8yo-6CnXY,5918
-datarobot_genai-0.1.68.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-datarobot_genai-0.1.68.dist-info/entry_points.txt,sha256=CZhmZcSyt_RBltgLN_b9xasJD6J5SaDc_z7K0wuOY9Y,150
-datarobot_genai-0.1.68.dist-info/licenses/AUTHORS,sha256=isJGUXdjq1U7XZ_B_9AH8Qf0u4eX0XyQifJZ_Sxm4sA,80
-datarobot_genai-0.1.68.dist-info/licenses/LICENSE,sha256=U2_VkLIktQoa60Nf6Tbt7E4RMlfhFSjWjcJJfVC-YCE,11341
-datarobot_genai-0.1.68.dist-info/RECORD,,
+datarobot_genai-0.1.70.dist-info/METADATA,sha256=Dwm4E8vbAhiaRmO-TcfHOgti00CJP7GyTsKTn5efiew,5918
+datarobot_genai-0.1.70.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+datarobot_genai-0.1.70.dist-info/entry_points.txt,sha256=CZhmZcSyt_RBltgLN_b9xasJD6J5SaDc_z7K0wuOY9Y,150
+datarobot_genai-0.1.70.dist-info/licenses/AUTHORS,sha256=isJGUXdjq1U7XZ_B_9AH8Qf0u4eX0XyQifJZ_Sxm4sA,80
+datarobot_genai-0.1.70.dist-info/licenses/LICENSE,sha256=U2_VkLIktQoa60Nf6Tbt7E4RMlfhFSjWjcJJfVC-YCE,11341
+datarobot_genai-0.1.70.dist-info/RECORD,,