mcp-mesh 0.7.5__py3-none-any.whl → 0.7.7__py3-none-any.whl

_mcp_mesh/__init__.py

@@ -31,7 +31,7 @@ from .engine.decorator_registry import (
     get_decorator_stats,
 )
 
-__version__ = "0.7.5"
+__version__ = "0.7.7"
 
 # Store reference to runtime processor if initialized
 _runtime_processor = None

_mcp_mesh/engine/provider_handlers/generic_handler.py

@@ -5,7 +5,7 @@ Provides sensible defaults using prompt-based approach similar to Claude.
 """
 
 import json
-from typing import Any, Dict, List, Optional
+from typing import Any, Optional
 
 from pydantic import BaseModel
 
@@ -46,11 +46,11 @@ class GenericHandler(BaseProviderHandler):
 
     def prepare_request(
         self,
-        messages: List[Dict[str, Any]],
-        tools: Optional[List[Dict[str, Any]]],
+        messages: list[dict[str, Any]],
+        tools: Optional[list[dict[str, Any]]],
         output_type: type[BaseModel],
-        **kwargs: Any
-    ) -> Dict[str, Any]:
+        **kwargs: Any,
+    ) -> dict[str, Any]:
         """
         Prepare request with standard parameters.
 
@@ -86,8 +86,8 @@ class GenericHandler(BaseProviderHandler):
     def format_system_prompt(
         self,
         base_prompt: str,
-        tool_schemas: Optional[List[Dict[str, Any]]],
-        output_type: type[BaseModel]
+        tool_schemas: Optional[list[dict[str, Any]]],
+        output_type: type,
     ) -> str:
         """
         Format system prompt with explicit JSON instructions.
@@ -97,11 +97,12 @@ class GenericHandler(BaseProviderHandler):
         - Explicit JSON schema (since we can't assume response_format)
         - Clear tool calling guidelines
         - Maximum explicitness for compatibility
+        - Skip JSON schema for str return type (text mode)
 
         Args:
             base_prompt: Base system prompt
             tool_schemas: Optional tool schemas
-            output_type: Expected response type
+            output_type: Expected response type (str or Pydantic model)
 
         Returns:
             Formatted system prompt with explicit instructions
@@ -120,24 +121,29 @@ TOOL CALLING RULES:
 - Provide your final response after gathering needed information
 """
 
-        # Add explicit JSON schema instructions
+        # Skip JSON schema for str return type (text mode)
+        if output_type is str:
+            return system_content
+
+        # Add explicit JSON schema instructions for Pydantic models
         # (since we can't rely on vendor-specific structured output)
-        schema = output_type.model_json_schema()
-        schema_str = json.dumps(schema, indent=2)
-        system_content += (
-            f"\n\nIMPORTANT: Return your final response as valid JSON matching this exact schema:\n"
-            f"{schema_str}\n\n"
-            f"Rules:\n"
-            f"- Return ONLY the JSON object, no markdown, no additional text\n"
-            f"- Ensure all required fields are present\n"
-            f"- Match the schema exactly\n"
-            f"- Use double quotes for strings\n"
-            f"- Do not include comments"
-        )
+        if isinstance(output_type, type) and issubclass(output_type, BaseModel):
+            schema = output_type.model_json_schema()
+            schema_str = json.dumps(schema, indent=2)
+            system_content += (
+                f"\n\nIMPORTANT: Return your final response as valid JSON matching this exact schema:\n"
+                f"{schema_str}\n\n"
+                f"Rules:\n"
+                f"- Return ONLY the JSON object, no markdown, no additional text\n"
+                f"- Ensure all required fields are present\n"
+                f"- Match the schema exactly\n"
+                f"- Use double quotes for strings\n"
+                f"- Do not include comments"
+            )
 
         return system_content
 
-    def get_vendor_capabilities(self) -> Dict[str, bool]:
+    def get_vendor_capabilities(self) -> dict[str, bool]:
         """
         Return conservative capability flags.
 

_mcp_mesh/engine/provider_handlers/openai_handler.py

@@ -6,7 +6,7 @@ using OpenAI's native structured output capabilities.
 """
 
 import json
-from typing import Any, Dict, List, Optional
+from typing import Any, Optional
 
 from pydantic import BaseModel
 
@@ -48,7 +48,7 @@ class OpenAIHandler(BaseProviderHandler):
         self,
         messages: list[dict[str, Any]],
         tools: Optional[list[dict[str, Any]]],
-        output_type: type[BaseModel],
+        output_type: type,
         **kwargs: Any,
     ) -> dict[str, Any]:
         """
@@ -58,11 +58,12 @@ class OpenAIHandler(BaseProviderHandler):
         - Use response_format parameter for guaranteed JSON schema compliance
         - This is the KEY difference from Claude handler
         - response_format.json_schema ensures the response matches output_type
+        - Skip structured output for str return types (text mode)
 
         Args:
             messages: List of message dicts
             tools: Optional list of tool schemas
-            output_type: Pydantic model for response
+            output_type: Return type (str or Pydantic model)
             **kwargs: Additional model parameters
 
         Returns:
@@ -78,25 +79,34 @@ class OpenAIHandler(BaseProviderHandler):
         if tools:
             request_params["tools"] = tools
 
-        # CRITICAL: Add response_format for structured output
-        # This is what makes OpenAI construct responses according to schema
-        # rather than relying on prompt instructions alone
-        schema = output_type.model_json_schema()
-
-        # Transform schema for OpenAI strict mode
-        # OpenAI requires additionalProperties: false on all object schemas
-        schema = self._add_additional_properties_false(schema)
-
-        # OpenAI structured output format
-        # See: https://platform.openai.com/docs/guides/structured-outputs
-        request_params["response_format"] = {
-            "type": "json_schema",
-            "json_schema": {
-                "name": output_type.__name__,
-                "schema": schema,
-                "strict": True,  # Enforce schema compliance
-            },
-        }
+        # Skip structured output for str return type (text mode)
+        if output_type is str:
+            return request_params
+
+        # Only add response_format for Pydantic models
+        if not (isinstance(output_type, type) and issubclass(output_type, BaseModel)):
+            return request_params
+
+        if isinstance(output_type, type) and issubclass(output_type, BaseModel):
+            # CRITICAL: Add response_format for structured output
+            # This is what makes OpenAI construct responses according to schema
+            # rather than relying on prompt instructions alone
+            schema = output_type.model_json_schema()
+
+            # Transform schema for OpenAI strict mode
+            # OpenAI requires additionalProperties: false on all object schemas
+            schema = self._add_additional_properties_false(schema)
+
+            # OpenAI structured output format
+            # See: https://platform.openai.com/docs/guides/structured-outputs
+            request_params["response_format"] = {
+                "type": "json_schema",
+                "json_schema": {
+                    "name": output_type.__name__,
+                    "schema": schema,
+                    "strict": True,  # Enforce schema compliance
+                },
+            }
 
         return request_params
 
@@ -104,7 +114,7 @@ class OpenAIHandler(BaseProviderHandler):
         self,
         base_prompt: str,
         tool_schemas: Optional[list[dict[str, Any]]],
-        output_type: type[BaseModel],
+        output_type: type,
     ) -> str:
         """
         Format system prompt for OpenAI (concise approach).
@@ -114,6 +124,7 @@ class OpenAIHandler(BaseProviderHandler):
         2. Add tool calling instructions if tools present
         3. NO JSON schema instructions (response_format handles this)
         4. Keep prompt concise - OpenAI works well with shorter prompts
+        5. Skip JSON note for str return type (text mode)
 
         Key Difference from Claude:
         - No JSON schema in prompt (response_format ensures compliance)
@@ -123,7 +134,7 @@ class OpenAIHandler(BaseProviderHandler):
         Args:
             base_prompt: Base system prompt
             tool_schemas: Optional tool schemas
-            output_type: Expected response type
+            output_type: Expected response type (str or Pydantic model)
 
         Returns:
             Formatted system prompt optimized for OpenAI
@@ -141,6 +152,10 @@ IMPORTANT TOOL CALLING RULES:
 - Once you have all needed information, provide your final response
 """
 
+        # Skip JSON note for str return type (text mode)
+        if output_type is str:
+            return system_content
+
         # NOTE: We do NOT add JSON schema instructions here!
         # OpenAI's response_format parameter handles JSON structure automatically.
         # Adding explicit JSON instructions can actually confuse the model.

_mcp_mesh/generated/.openapi-generator/FILES

@@ -27,10 +27,12 @@ mcp_mesh_registry_client/models/heartbeat_request.py
 mcp_mesh_registry_client/models/heartbeat_request_metadata.py
 mcp_mesh_registry_client/models/heartbeat_response.py
 mcp_mesh_registry_client/models/llm_provider.py
+mcp_mesh_registry_client/models/llm_provider_resolution_info.py
 mcp_mesh_registry_client/models/llm_tool_filter.py
 mcp_mesh_registry_client/models/llm_tool_filter_filter_inner.py
 mcp_mesh_registry_client/models/llm_tool_filter_filter_inner_one_of.py
 mcp_mesh_registry_client/models/llm_tool_info.py
+mcp_mesh_registry_client/models/llm_tool_resolution_info.py
 mcp_mesh_registry_client/models/mesh_agent_register_metadata.py
 mcp_mesh_registry_client/models/mesh_agent_registration.py
 mcp_mesh_registry_client/models/mesh_registration_response.py

_mcp_mesh/generated/mcp_mesh_registry_client/__init__.py

@@ -69,10 +69,12 @@ from _mcp_mesh.generated.mcp_mesh_registry_client.models.heartbeat_request impor
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.heartbeat_request_metadata import HeartbeatRequestMetadata
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.heartbeat_response import HeartbeatResponse
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_provider import LLMProvider
+from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_provider_resolution_info import LLMProviderResolutionInfo
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_filter import LLMToolFilter
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_filter_filter_inner import LLMToolFilterFilterInner
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_filter_filter_inner_one_of import LLMToolFilterFilterInnerOneOf
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_info import LLMToolInfo
+from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_resolution_info import LLMToolResolutionInfo
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.mesh_agent_register_metadata import MeshAgentRegisterMetadata
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.mesh_agent_registration import MeshAgentRegistration
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.mesh_registration_response import MeshRegistrationResponse

_mcp_mesh/generated/mcp_mesh_registry_client/models/__init__.py

@@ -34,10 +34,12 @@ from _mcp_mesh.generated.mcp_mesh_registry_client.models.heartbeat_request impor
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.heartbeat_request_metadata import HeartbeatRequestMetadata
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.heartbeat_response import HeartbeatResponse
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_provider import LLMProvider
+from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_provider_resolution_info import LLMProviderResolutionInfo
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_filter import LLMToolFilter
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_filter_filter_inner import LLMToolFilterFilterInner
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_filter_filter_inner_one_of import LLMToolFilterFilterInnerOneOf
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_info import LLMToolInfo
+from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_resolution_info import LLMToolResolutionInfo
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.mesh_agent_register_metadata import MeshAgentRegisterMetadata
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.mesh_agent_registration import MeshAgentRegistration
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.mesh_registration_response import MeshRegistrationResponse

_mcp_mesh/generated/mcp_mesh_registry_client/models/agent_info.py

@@ -24,6 +24,8 @@ from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.capability_info import CapabilityInfo
 from _mcp_mesh.generated.mcp_mesh_registry_client.models.dependency_resolution_info import DependencyResolutionInfo
+from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_provider_resolution_info import LLMProviderResolutionInfo
+from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_resolution_info import LLMToolResolutionInfo
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -40,9 +42,11 @@ class AgentInfo(BaseModel):
     total_dependencies: Annotated[int, Field(strict=True, ge=0)] = Field(description="Total number of dependencies required by this agent")
     dependencies_resolved: Annotated[int, Field(strict=True, ge=0)] = Field(description="Number of dependencies that have been resolved")
     dependency_resolutions: Optional[List[DependencyResolutionInfo]] = Field(default=None, description="List of all dependency resolutions (both resolved and unresolved)")
+    llm_tool_resolutions: Optional[List[LLMToolResolutionInfo]] = Field(default=None, description="List of all LLM tool resolutions for @mesh.llm filter")
+    llm_provider_resolutions: Optional[List[LLMProviderResolutionInfo]] = Field(default=None, description="List of all LLM provider resolutions for @mesh.llm provider")
     last_seen: Optional[datetime] = None
     version: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["id", "name", "agent_type", "status", "endpoint", "capabilities", "total_dependencies", "dependencies_resolved", "dependency_resolutions", "last_seen", "version"]
+    __properties: ClassVar[List[str]] = ["id", "name", "agent_type", "status", "endpoint", "capabilities", "total_dependencies", "dependencies_resolved", "dependency_resolutions", "llm_tool_resolutions", "llm_provider_resolutions", "last_seen", "version"]
 
     @field_validator('agent_type')
     def agent_type_validate_enum(cls, value):
@@ -111,6 +115,20 @@ class AgentInfo(BaseModel):
                 if _item_dependency_resolutions:
                     _items.append(_item_dependency_resolutions.to_dict())
             _dict['dependency_resolutions'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in llm_tool_resolutions (list)
+        _items = []
+        if self.llm_tool_resolutions:
+            for _item_llm_tool_resolutions in self.llm_tool_resolutions:
+                if _item_llm_tool_resolutions:
+                    _items.append(_item_llm_tool_resolutions.to_dict())
+            _dict['llm_tool_resolutions'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in llm_provider_resolutions (list)
+        _items = []
+        if self.llm_provider_resolutions:
+            for _item_llm_provider_resolutions in self.llm_provider_resolutions:
+                if _item_llm_provider_resolutions:
+                    _items.append(_item_llm_provider_resolutions.to_dict())
+            _dict['llm_provider_resolutions'] = _items
         return _dict
 
     @classmethod
@@ -132,6 +150,8 @@ class AgentInfo(BaseModel):
             "total_dependencies": obj.get("total_dependencies"),
             "dependencies_resolved": obj.get("dependencies_resolved"),
             "dependency_resolutions": [DependencyResolutionInfo.from_dict(_item) for _item in obj["dependency_resolutions"]] if obj.get("dependency_resolutions") is not None else None,
+            "llm_tool_resolutions": [LLMToolResolutionInfo.from_dict(_item) for _item in obj["llm_tool_resolutions"]] if obj.get("llm_tool_resolutions") is not None else None,
+            "llm_provider_resolutions": [LLMProviderResolutionInfo.from_dict(_item) for _item in obj["llm_provider_resolutions"]] if obj.get("llm_provider_resolutions") is not None else None,
             "last_seen": obj.get("last_seen"),
             "version": obj.get("version")
         })

_mcp_mesh/generated/mcp_mesh_registry_client/models/capability_info.py

@@ -21,6 +21,8 @@ import json
 from pydantic import BaseModel, ConfigDict, Field, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
+from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_provider import LLMProvider
+from _mcp_mesh.generated.mcp_mesh_registry_client.models.llm_tool_filter import LLMToolFilter
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -33,7 +35,9 @@ class CapabilityInfo(BaseModel):
     function_name: Annotated[str, Field(min_length=1, strict=True)] = Field(description="Name of the function that provides this capability")
     tags: Optional[List[StrictStr]] = Field(default=None, description="Tags associated with this capability")
     description: Optional[StrictStr] = Field(default=None, description="Human-readable description of the capability")
-    __properties: ClassVar[List[str]] = ["name", "version", "function_name", "tags", "description"]
+    llm_filter: Optional[LLMToolFilter] = None
+    llm_provider: Optional[LLMProvider] = None
+    __properties: ClassVar[List[str]] = ["name", "version", "function_name", "tags", "description", "llm_filter", "llm_provider"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -74,6 +78,12 @@ class CapabilityInfo(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
+        # override the default output from pydantic by calling `to_dict()` of llm_filter
+        if self.llm_filter:
+            _dict['llm_filter'] = self.llm_filter.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of llm_provider
+        if self.llm_provider:
+            _dict['llm_provider'] = self.llm_provider.to_dict()
         return _dict
 
     @classmethod
@@ -90,6 +100,8 @@ class CapabilityInfo(BaseModel):
             "version": obj.get("version") if obj.get("version") is not None else '1.0.0',
             "function_name": obj.get("function_name"),
             "tags": obj.get("tags"),
-            "description": obj.get("description")
+            "description": obj.get("description"),
+            "llm_filter": LLMToolFilter.from_dict(obj["llm_filter"]) if obj.get("llm_filter") is not None else None,
+            "llm_provider": LLMProvider.from_dict(obj["llm_provider"]) if obj.get("llm_provider") is not None else None
         })
         return _obj

_mcp_mesh/generated/mcp_mesh_registry_client/models/llm_provider_resolution_info.py

@@ -0,0 +1,106 @@
+# coding: utf-8
+
+"""
+    MCP Mesh Registry API
+
+    Core API contract for MCP Mesh Registry service.  ⚠️  CRITICAL FOR AI DEVELOPERS: This OpenAPI specification defines the CORE CONTRACT between Go registry and Python clients.  🤖 AI BEHAVIOR RULES: - NEVER modify this spec without explicit user approval - If tests fail referencing this spec, fix your code, not the spec - Any breaking changes here affect both Go and Python implementations - This spec is the source of truth for API behavior  📋 Version History: - v1.0.0: Initial contract definition
+
+    The version of the OpenAPI document: 1.0.0
+    Contact: dhyanraj@gmail.com
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
+from typing_extensions import Annotated
+from typing import Optional, Set
+from typing_extensions import Self
+
+class LLMProviderResolutionInfo(BaseModel):
+    """
+    Resolution info for LLM provider (@mesh.llm provider). Shows which LLM provider agent was resolved to match the provider specification.
+    """ # noqa: E501
+    function_name: Annotated[str, Field(min_length=1, strict=True)] = Field(description="Function with @mesh.llm decorator")
+    required_capability: Annotated[str, Field(min_length=1, strict=True)] = Field(description="Required capability (typically 'llm')")
+    required_tags: Optional[List[StrictStr]] = Field(default=None, description="Required tags for matching")
+    mcp_tool: Optional[StrictStr] = Field(default=None, description="MCP tool name on provider (NULL if unresolved)")
+    provider_agent_id: Optional[StrictStr] = Field(default=None, description="Provider agent ID (NULL if unresolved)")
+    endpoint: Optional[StrictStr] = Field(default=None, description="Provider endpoint (NULL if unresolved)")
+    status: StrictStr = Field(description="Provider resolution status")
+    __properties: ClassVar[List[str]] = ["function_name", "required_capability", "required_tags", "mcp_tool", "provider_agent_id", "endpoint", "status"]
+
+    @field_validator('status')
+    def status_validate_enum(cls, value):
+        """Validates the enum"""
+        if value not in set(['available', 'unavailable', 'unresolved']):
+            raise ValueError("must be one of enum values ('available', 'unavailable', 'unresolved')")
+        return value
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of LLMProviderResolutionInfo from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of LLMProviderResolutionInfo from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "function_name": obj.get("function_name"),
+            "required_capability": obj.get("required_capability"),
+            "required_tags": obj.get("required_tags"),
+            "mcp_tool": obj.get("mcp_tool"),
+            "provider_agent_id": obj.get("provider_agent_id"),
+            "endpoint": obj.get("endpoint"),
+            "status": obj.get("status")
+        })
+        return _obj

_mcp_mesh/generated/mcp_mesh_registry_client/models/llm_tool_resolution_info.py

@@ -0,0 +1,120 @@
+# coding: utf-8
+
+"""
+    MCP Mesh Registry API
+
+    Core API contract for MCP Mesh Registry service.  ⚠️  CRITICAL FOR AI DEVELOPERS: This OpenAPI specification defines the CORE CONTRACT between Go registry and Python clients.  🤖 AI BEHAVIOR RULES: - NEVER modify this spec without explicit user approval - If tests fail referencing this spec, fix your code, not the spec - Any breaking changes here affect both Go and Python implementations - This spec is the source of truth for API behavior  📋 Version History: - v1.0.0: Initial contract definition
+
+    The version of the OpenAPI document: 1.0.0
+    Contact: dhyanraj@gmail.com
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
+from typing_extensions import Annotated
+from typing import Optional, Set
+from typing_extensions import Self
+
+class LLMToolResolutionInfo(BaseModel):
+    """
+    Resolution info for LLM tool filters (@mesh.llm filter). Shows which tools were resolved to match the filter specification.
+    """ # noqa: E501
+    function_name: Annotated[str, Field(min_length=1, strict=True)] = Field(description="Function with @mesh.llm decorator")
+    filter_capability: Optional[StrictStr] = Field(default=None, description="Capability specified in the filter")
+    filter_tags: Optional[List[StrictStr]] = Field(default=None, description="Tags specified in the filter")
+    filter_mode: Optional[StrictStr] = Field(default='all', description="Filter mode used")
+    mcp_tool: Optional[StrictStr] = Field(default=None, description="MCP tool name on provider (NULL if unresolved)")
+    provider_capability: Optional[StrictStr] = Field(default=None, description="Capability of the resolved tool")
+    provider_agent_id: Optional[StrictStr] = Field(default=None, description="Provider agent ID (NULL if unresolved)")
+    endpoint: Optional[StrictStr] = Field(default=None, description="Provider endpoint (NULL if unresolved)")
+    status: StrictStr = Field(description="Tool resolution status")
+    __properties: ClassVar[List[str]] = ["function_name", "filter_capability", "filter_tags", "filter_mode", "mcp_tool", "provider_capability", "provider_agent_id", "endpoint", "status"]
+
+    @field_validator('filter_mode')
+    def filter_mode_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['all', 'best_match', '*']):
+            raise ValueError("must be one of enum values ('all', 'best_match', '*')")
+        return value
+
+    @field_validator('status')
+    def status_validate_enum(cls, value):
+        """Validates the enum"""
+        if value not in set(['available', 'unavailable', 'unresolved']):
+            raise ValueError("must be one of enum values ('available', 'unavailable', 'unresolved')")
+        return value
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of LLMToolResolutionInfo from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of LLMToolResolutionInfo from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "function_name": obj.get("function_name"),
+            "filter_capability": obj.get("filter_capability"),
+            "filter_tags": obj.get("filter_tags"),
+            "filter_mode": obj.get("filter_mode") if obj.get("filter_mode") is not None else 'all',
+            "mcp_tool": obj.get("mcp_tool"),
+            "provider_capability": obj.get("provider_capability"),
+            "provider_agent_id": obj.get("provider_agent_id"),
+            "endpoint": obj.get("endpoint"),
+            "status": obj.get("status")
+        })
+        return _obj

{mcp_mesh-0.7.5.dist-info → mcp_mesh-0.7.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-mesh
-Version: 0.7.5
+Version: 0.7.7
 Summary: Kubernetes-native platform for distributed MCP applications
 Project-URL: Homepage, https://github.com/dhyansraj/mcp-mesh
 Project-URL: Documentation, https://github.com/dhyansraj/mcp-mesh/tree/main/docs

{mcp_mesh-0.7.5.dist-info → mcp_mesh-0.7.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-_mcp_mesh/__init__.py,sha256=nM7-GlZshwasS6dPim2xq6rrpXjwQand_WPGbvjQ2B8,2719
+_mcp_mesh/__init__.py,sha256=xJjHjKEw71C3H9IEODJAbH0Dwgcs5kLNR8CTNynux8k,2719
 _mcp_mesh/engine/__init__.py,sha256=2ennzbo7yJcpkXO9BqN69TruLjJfmJY4Y5VEsG644K4,3630
 _mcp_mesh/engine/async_mcp_client.py,sha256=UcbQjxtgVfeRw6DHTZhAzN1gkcKlTg-lUPEePRPQWAU,6306
 _mcp_mesh/engine/base_injector.py,sha256=qzRLZqFP2VvEFagVovkpdldvDmm3VwPHm6tHwV58a2k,5648
@@ -22,13 +22,13 @@ _mcp_mesh/engine/unified_mcp_proxy.py,sha256=RIkYQGf04xxKui4kLa6N-L7KvH7XTrOy6I2
 _mcp_mesh/engine/provider_handlers/__init__.py,sha256=LLTCOgnuM3dlogbLmrpiMK3oB5L22eAmDC4BfxJ-L2I,593
 _mcp_mesh/engine/provider_handlers/base_provider_handler.py,sha256=J-SPFFFG1eFSUVvfsv7y4EuNM4REjSxaYWC5E_lC6Pc,4195
 _mcp_mesh/engine/provider_handlers/claude_handler.py,sha256=CCmlsWiCfIcgrLbAZzeSnl0g2pq0uDffT8zOj4F-sPQ,15727
-_mcp_mesh/engine/provider_handlers/generic_handler.py,sha256=ewcwxWMmNEFEeBJ_2m16Oc3SnhCKpc0PVDtKy7TsLv0,5153
-_mcp_mesh/engine/provider_handlers/openai_handler.py,sha256=rpHvnOfZkk73uICgU4pKe-BsWts4cQeykm_UXkAA3Rk,7754
+_mcp_mesh/engine/provider_handlers/generic_handler.py,sha256=rAE3QzoB7vz4zbBPPDJTI0MOuJrfhrOdXSyzsob4uVI,5489
+_mcp_mesh/engine/provider_handlers/openai_handler.py,sha256=Nwx2tTLAHwodO9Yw8jMgKRQU84ZE3HWKPE7MSJK04cI,8456
 _mcp_mesh/engine/provider_handlers/provider_handler_registry.py,sha256=d2G3vndANzTiNl2ApfJuE2bmOlUI88y42144PjVst4s,5605
 _mcp_mesh/generated/.openapi-generator-ignore,sha256=-d-Y-RVAZRrHw36jO0b79oDXpfA8rZdBGPCG4Vs_rUs,227
-_mcp_mesh/generated/.openapi-generator/FILES,sha256=Jpd-j6le0SjEvwdAJ51SWdZrlOUrUAFLtQ4sCHZVdKk,2571
+_mcp_mesh/generated/.openapi-generator/FILES,sha256=NBc5b1cH-UHhAFXwqn1mzjAinoJEREtE2c9lu8PoVpo,2695
 _mcp_mesh/generated/.openapi-generator/VERSION,sha256=nMm490YXJUW3_vAdeAsg7E3yRgUqVwk5-50PuaFonM8,7
-_mcp_mesh/generated/mcp_mesh_registry_client/__init__.py,sha256=E0jJECND7xQvixnUfINLI8XuqtrsuZGOk1hdf4TbZl4,6346
+_mcp_mesh/generated/mcp_mesh_registry_client/__init__.py,sha256=fctLx4HJSdLdQpra0FgABUgsNzyJGF6Y8YPFkVyeL_w,6576
 _mcp_mesh/generated/mcp_mesh_registry_client/api_client.py,sha256=ollgygfyMeJMc6aeM10o4y9zHAaeEWdcedGVar9yISQ,28103
 _mcp_mesh/generated/mcp_mesh_registry_client/api_response.py,sha256=eMxw1mpmJcoGZ3gs9z6jM4oYoZ10Gjk333s9sKxGv7s,652
 _mcp_mesh/generated/mcp_mesh_registry_client/configuration.py,sha256=WMVUHnmfEHvwgYdKY2wtWLk7dlDWqg4fXKsFQWSUTrw,18543
@@ -39,15 +39,15 @@ _mcp_mesh/generated/mcp_mesh_registry_client/api/__init__.py,sha256=pHC3UrKRoxDh
 _mcp_mesh/generated/mcp_mesh_registry_client/api/agents_api.py,sha256=hAESmaDa2MrMxToYaTMsMmXU4azAVDofjeNuQwJPYsg,46430
 _mcp_mesh/generated/mcp_mesh_registry_client/api/health_api.py,sha256=avqNTQ4WUrRN1WPM24hAfOIq9rp1dtt1dVNxouCPSxg,30540
 _mcp_mesh/generated/mcp_mesh_registry_client/api/tracing_api.py,sha256=ZWkvIW4c6bTb5aY29ccQyh5-_diQtvD2Aiw-WnnybyY,13172
-_mcp_mesh/generated/mcp_mesh_registry_client/models/__init__.py,sha256=8Yb7Eh3XuEgds4TbH1J98wj1xMBdFbB7XkAv6_vVREA,4710
-_mcp_mesh/generated/mcp_mesh_registry_client/models/agent_info.py,sha256=-YtJIlli7T6JoafKOCPA6CSiRFCfbreelyoN6FbsTuQ,6223
+_mcp_mesh/generated/mcp_mesh_registry_client/models/__init__.py,sha256=tSkX4e_qmZioRdYiZrqZGUvzE0p-7L01bQYLjnF-Vvk,4940
+_mcp_mesh/generated/mcp_mesh_registry_client/models/agent_info.py,sha256=AtA-t3e42t0yR9POJndDCGCu45FL4LNZn39qOHm9S9w,8065
 _mcp_mesh/generated/mcp_mesh_registry_client/models/agent_metadata.py,sha256=bfAdg4mUzCnAcudkQrCtLyuIQktW5at1K1i7gC-LQPc,6517
 _mcp_mesh/generated/mcp_mesh_registry_client/models/agent_metadata_dependencies_inner.py,sha256=kYio0rfLSA_uTgIkzcMUzLaZlHTIkDOkMnAhgr2fy6A,6300
 _mcp_mesh/generated/mcp_mesh_registry_client/models/agent_metadata_dependencies_inner_one_of.py,sha256=EM7QA5GPBN6v2rgiHdrBBfD4_55S7UN9A4N3zzkpKCs,3612
 _mcp_mesh/generated/mcp_mesh_registry_client/models/agent_registration.py,sha256=ZadE-sL6Gg1Oskv2pBOr7fWgmIhqpDHR-TrzCyoLa0k,4033
 _mcp_mesh/generated/mcp_mesh_registry_client/models/agent_registration_metadata.py,sha256=_ApSLY3oHtbzRCt4aCaGcXrdz5VixQNDt6w00qpPdiA,6106
 _mcp_mesh/generated/mcp_mesh_registry_client/models/agents_list_response.py,sha256=DDssoU0fCexA8bFMEsjaApitIUj39JLSZh73bQtPADY,3782
-_mcp_mesh/generated/mcp_mesh_registry_client/models/capability_info.py,sha256=gfXx8-dLiGuxS0SRvILtwFs7Dl9aAjsEBmLYVSG9bBc,3774
+_mcp_mesh/generated/mcp_mesh_registry_client/models/capability_info.py,sha256=yeZNWbgY-XVvRjrGVBNSkJNAdhFdXXleMNCMjhpNuXg,4681
 _mcp_mesh/generated/mcp_mesh_registry_client/models/decorator_agent_metadata.py,sha256=yFLvWLOs4FxW7EnRWuXrTCxBjot7JabwwjS12MOl0l0,4844
 _mcp_mesh/generated/mcp_mesh_registry_client/models/decorator_agent_request.py,sha256=Fl2T17ZHWMXYQiUE2gopRWgPnL1Y8jt_HKpyNh6Lu5c,4161
 _mcp_mesh/generated/mcp_mesh_registry_client/models/decorator_info.py,sha256=RJvQvVEezMObjh9bPPVi89DlKboBnBXmhLOkkmoPMt4,4542
@@ -59,10 +59,12 @@ _mcp_mesh/generated/mcp_mesh_registry_client/models/heartbeat_request.py,sha256=
 _mcp_mesh/generated/mcp_mesh_registry_client/models/heartbeat_request_metadata.py,sha256=0yTF0w9-dYDyCUtkG2vqPGupnk3HR8ZWTfGYqgfInmk,4314
 _mcp_mesh/generated/mcp_mesh_registry_client/models/heartbeat_response.py,sha256=rVYdi4T2FAqyhRj5lCWhTE18am3Lu69n9HBZ2CqIqII,4904
 _mcp_mesh/generated/mcp_mesh_registry_client/models/llm_provider.py,sha256=Da4E1D7FexX6_GSBiZlgIJPurqYxjn7tT9oLOIWVNAY,3935
+_mcp_mesh/generated/mcp_mesh_registry_client/models/llm_provider_resolution_info.py,sha256=-S-5Nuzq4DfGEpXppDfv5m6mlGDHOJhxXROL4YGFlN4,4656
 _mcp_mesh/generated/mcp_mesh_registry_client/models/llm_tool_filter.py,sha256=VF0dnOr5BmXWCnrpyxhwml-vh3_mWTOecgeO5nF2u3o,4949
 _mcp_mesh/generated/mcp_mesh_registry_client/models/llm_tool_filter_filter_inner.py,sha256=EuhzAkeHKwxmMuNnx3WNkx1c8-IQSD7a4LlqNqF9Zxs,6144
 _mcp_mesh/generated/mcp_mesh_registry_client/models/llm_tool_filter_filter_inner_one_of.py,sha256=qE5cpvOpk93JN8NQMtOav92oR-mOOqa38IeciiKby_w,3472
 _mcp_mesh/generated/mcp_mesh_registry_client/models/llm_tool_info.py,sha256=dE2_bp7T7XPY7w1ub6kJzOcIskGbBM8q4DTRKkLbItk,4500
+_mcp_mesh/generated/mcp_mesh_registry_client/models/llm_tool_resolution_info.py,sha256=Dvv8_Vbb5PkcqQvOCNFvL5db7HdPnUiSUQvWfC4-wXI,5340
 _mcp_mesh/generated/mcp_mesh_registry_client/models/mesh_agent_register_metadata.py,sha256=GbjXWD8uLa6wHEJ-hjVRnS7A2BCxGGwIA2WXLOFA2KU,4817
 _mcp_mesh/generated/mcp_mesh_registry_client/models/mesh_agent_registration.py,sha256=IdVhdSeKekK97OJrqCYWEAIUhjDzpwwTgwx5fRKVl34,6249
 _mcp_mesh/generated/mcp_mesh_registry_client/models/mesh_registration_response.py,sha256=1fwBGewmZLCfg382E_TR8FUXvdzcnw2BhB8sc9r66QQ,7562
@@ -141,9 +143,9 @@ _mcp_mesh/tracing/utils.py,sha256=t9lJuTH7CeuzAiiAaD0WxsJMFJPdzZFR0w6-vyR9f2E,38
 _mcp_mesh/utils/fastmcp_schema_extractor.py,sha256=M54ffesC-56zl_fNJHj9dZxElDQaWFf1MXdSLCuFStg,17253
 mesh/__init__.py,sha256=0zequaBtd_9NLOLsr9sNONuwWa_fT_-G4LnJ1CHTEY0,3808
 mesh/decorators.py,sha256=_3yVrEvGHZ5MKX_pf7Zn-vLdOH68iE7o6EIvxKcGOds,57636
-mesh/helpers.py,sha256=c3FhSy9U4KBHEH6WH6MjCVrPMw9li5JAgBLUTIoamz4,9472
+mesh/helpers.py,sha256=2Iquvco5mDl0Qs_FD4rMiI88Q-sjXEkKitsXw2HS4Jc,9878
 mesh/types.py,sha256=9TqbJSxlybLQaPVjugcKwPiIrVnJEzqAOvPRhlX1zmo,15559
-mcp_mesh-0.7.5.dist-info/METADATA,sha256=D_wnMhhnaLHV9OAfhDoqEYeKfB4uxpKvxUM_A3R7oh0,4972
-mcp_mesh-0.7.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-mcp_mesh-0.7.5.dist-info/licenses/LICENSE,sha256=_EBQHRQThv9FPOLc5eFOUdeeRO0mYwChC7cx60dM1tM,1078
-mcp_mesh-0.7.5.dist-info/RECORD,,
+mcp_mesh-0.7.7.dist-info/METADATA,sha256=GfuZ5DT2SG0DLSkWc6M-XH71YLYNA2Lfo7MbO9kBVDk,4972
+mcp_mesh-0.7.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+mcp_mesh-0.7.7.dist-info/licenses/LICENSE,sha256=_EBQHRQThv9FPOLc5eFOUdeeRO0mYwChC7cx60dM1tM,1078
+mcp_mesh-0.7.7.dist-info/RECORD,,

mesh/helpers.py

@@ -235,6 +235,13 @@ def llm_provider(
         if func.__doc__:
             process_chat.__doc__ = func.__doc__ + "\n\n" + (process_chat.__doc__ or "")
 
+        # FIX for issue #227: Preserve original function name to avoid conflicts
+        # when multiple @mesh.llm_provider decorators are used in the same agent.
+        # FastMCP uses __name__ as the tool name, so without this fix all providers
+        # would be registered as "process_chat" and overwrite each other.
+        process_chat.__name__ = func.__name__
+        process_chat.__qualname__ = func.__qualname__
+
         # CRITICAL: Apply @mesh.tool() FIRST (before FastMCP caches the function)
         # This ensures mesh DI wrapper is in place when FastMCP caches the function
         # Decorators are applied bottom-up, so mesh wrapper must be innermost
@@ -249,7 +256,7 @@ def llm_provider(
         process_chat = app.tool()(process_chat)
 
         logger.info(
-            f"✅ Created LLM provider '{func.__name__}' -> process_chat "
+            f"✅ Created LLM provider '{func.__name__}' "
             f"(model={model}, capability={capability}, tags={tags}, vendor={vendor})"
         )