OpenWebUI/mcpo
1
0
Fork 0
mirror of https://github.com/open-webui/mcpo synced 2025-06-26 18:26:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed ToolResponse

Browse Source
This commit is contained in:
bmen25124 2025-04-10 21:35:46 +03:00
parent 8f8cd406dc
commit 566c308d05
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mcpo/main.py
View File

@ -13,7 +13,7 @@ from mcp import ClientSession, StdioServerParameters
from mcp.client.stdio import stdio_client
from mcpo.utils.main import get_model_fields, get_tool_handler, ToolResponse
from mcpo.utils.main import get_model_fields, get_tool_handler
from mcpo.utils.auth import get_verify_api_key
@ -58,7 +58,6 @@ async def create_dynamic_endpoints(app: FastAPI, api_dependency=None):
f"/{endpoint_name}",
summary=endpoint_name.replace("_", " ").title(),
description=endpoint_description,
response_model=ToolResponse,
response_model_exclude_none=True,
dependencies=[Depends(api_dependency)] if api_dependency else [],
)(tool_handler)

17
src/mcpo/utils/main.py
View File

@ -1,5 +1,5 @@
from typing import Any, Dict, List, Type, Union, ForwardRef, Optional
from pydantic import BaseModel, create_model, Field
from typing import Any, Dict, List, Type, Union, ForwardRef
from pydantic import create_model, Field
from pydantic.fields import FieldInfo
from mcp import ClientSession, types
from fastapi import HTTPException
@ -17,11 +17,6 @@ MCP_ERROR_TO_HTTP_STATUS = {
}
class ToolResponse(BaseModel):
response: Optional[Any] = None
errorMessage: Optional[str] = None
errorData: Optional[Any] = None
def process_tool_response(result: CallToolResult) -> list:
"""Universal response processor for all tool endpoints"""
response = []
@ -142,7 +137,7 @@ def get_tool_handler(session, endpoint_name, form_model_name, model_fields):
def make_endpoint_func(
endpoint_name: str, FormModel, session: ClientSession
): # Parameterized endpoint
async def tool(form_data: FormModel) -> ToolResponse:
async def tool(form_data: FormModel):
args = form_data.model_dump(exclude_none=True)
print(f"Calling endpoint: {endpoint_name}, with args: {args}")
try:
@ -164,7 +159,7 @@ def get_tool_handler(session, endpoint_name, form_model_name, model_fields):
response_data = process_tool_response(result)
final_response = response_data[0] if len(response_data) == 1 else response_data
return ToolResponse(response=final_response)
return final_response
except McpError as e:
print(f"MCP Error calling {endpoint_name}: {e.error}")
@ -192,7 +187,7 @@ def get_tool_handler(session, endpoint_name, form_model_name, model_fields):
def make_endpoint_func_no_args(
endpoint_name: str, session: ClientSession
): # Parameterless endpoint
async def tool() -> ToolResponse: # No parameters
async def tool(): # No parameters
print(f"Calling endpoint: {endpoint_name}, with no args")
try:
result = await session.call_tool(
@ -212,7 +207,7 @@ def get_tool_handler(session, endpoint_name, form_model_name, model_fields):
response_data = process_tool_response(result)
final_response = response_data[0] if len(response_data) == 1 else response_data
return ToolResponse(response=final_response)
return final_response
except McpError as e:
print(f"MCP Error calling {endpoint_name}: {e.error}")