Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
58d30344f5 | ||
|
|
a6064035bd | ||
|
|
141fb4758f | ||
|
|
5450027bbc | ||
|
|
721a213bbf | ||
|
|
9ce81f5012 | ||
|
|
a28f3bb680 | ||
|
|
14e45235b4 | ||
|
|
6a69d678fd | ||
|
|
48ba7ffd96 | ||
|
|
faa1f552e6 |
No files matched your search
@@ -162,7 +162,7 @@ export const Home: React.FC<HomeProps> = ({
|
||||
<CardBody className="p-4">
|
||||
{/* Header */}
|
||||
<div className="flex items-start justify-between mb-3">
|
||||
<div className="flex items-center gap-2 w-full">
|
||||
<div className="flex items-center gap-2 w-full overflow-hidden">
|
||||
<div className="w-8 h-8 bg-slate-600 rounded-sm flex items-center justify-center">
|
||||
<Star className="w-4 h-4 text-white" />
|
||||
</div>
|
||||
|
||||
@@ -168,7 +168,7 @@ export const Home: React.FC<HomeProps> = ({
|
||||
<CardBody className="p-4">
|
||||
{/* Header */}
|
||||
<div className="flex items-start justify-between mb-3">
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="flex items-center gap-2 overflow-hidden">
|
||||
<div className="w-8 h-8 bg-blue-100 rounded-lg flex items-center justify-center">
|
||||
<Zap className="w-4 h-4 text-blue-600" />
|
||||
</div>
|
||||
|
||||
@@ -6,7 +6,7 @@ MYSQL_PASSWORD=mysql_ZTdhRB
|
||||
MYSQL_DB=xpack
|
||||
|
||||
# 服务端口配置
|
||||
API_PORT=8000
|
||||
API_PORT=8002
|
||||
ADMIN_PORT=8001
|
||||
|
||||
# 调试配置
|
||||
|
||||
@@ -34,11 +34,11 @@ fi
|
||||
# 初始化数据库
|
||||
python ./init_db.py
|
||||
|
||||
nohup uvicorn services.admin_service.main:app --host 0.0.0.0 --port 8001 --reload > ${LOG_DIR}/admin_service.log 2>&1 &
|
||||
nohup uvicorn services.admin_service.main:app --host 0.0.0.0 --port 8001 --reload --timeout-graceful-shutdown 2 --timeout-keep-alive 1 > ${LOG_DIR}/admin_service.log 2>&1 &
|
||||
|
||||
sleep 5s
|
||||
|
||||
nohup uvicorn services.api_service.main:app --host 0.0.0.0 --port 8002 --reload > ${LOG_DIR}/api_service.log 2>&1 &
|
||||
nohup uvicorn services.api_service.main:app --host 0.0.0.0 --port 8002 --reload --timeout-graceful-shutdown 2 --timeout-keep-alive 1 > ${LOG_DIR}/api_service.log 2>&1 &
|
||||
HOSTNAME=""
|
||||
cd frontend/ && nohup node server.js> ${LOG_DIR}//frontend.log 2>&1 &
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"downloads": {
|
||||
"program": {
|
||||
"xpack_mcp_market": {
|
||||
"version": "v1.1.0",
|
||||
"version": "v1.1.1",
|
||||
"docker": "xpackai/xpack-mcp-market",
|
||||
"tar": "xpack-mcp-market.tar.gz",
|
||||
"url": "https://public.eolinker.com/xpack/images/xpack-mcp-market.${VERSION}.${ARCH}.tar.gz"
|
||||
|
||||
@@ -172,8 +172,8 @@ class McpManagerService:
|
||||
new_api.response_examples = temp_api.response_examples
|
||||
new_api.response_headers = temp_api.response_headers
|
||||
new_api.operation_examples = temp_api.operation_examples
|
||||
new_api.enabled = temp_api.enabled
|
||||
new_api.is_deleted = temp_api.is_deleted
|
||||
new_api.enabled = True
|
||||
# new_api.is_deleted = temp_api.is_deleted
|
||||
|
||||
# Save new API record
|
||||
self.mcp_tool_api_repository.create(new_api)
|
||||
|
||||
@@ -27,12 +27,12 @@ class McpController:
|
||||
|
||||
def __init__(self):
|
||||
self.sse = SseServerTransport("/messages/")
|
||||
# StreamableHTTP 会话持久化:按 (service_id, user_id) 维度保存传输与服务器任务
|
||||
# StreamableHTTP session persistence: store transport and server task keyed by (service_id, user_id)
|
||||
self._http_transports: dict[str, StreamableHTTPServerTransport] = {}
|
||||
self._http_server_tasks: dict[str, asyncio.Task] = {}
|
||||
self._http_servers: dict[str, Server] = {}
|
||||
self.server_factory = McpServerFactory()
|
||||
# 会话回收:空闲时间记录与后台清理任务
|
||||
# Session recycling: track idle time and run a background cleanup task
|
||||
self._session_last_activity: dict[str, float] = {}
|
||||
self._session_gc_task: Optional[asyncio.Task] = None
|
||||
self._session_gc_stop_event = asyncio.Event()
|
||||
@@ -128,8 +128,8 @@ class McpController:
|
||||
async def handle_sse_connection_asgi(self, request: Request):
|
||||
"""Return an ASGI app that handles MCP SSE connections.
|
||||
|
||||
Starlette 的 Route 会传入一个 Request,然后将返回的可调用对象视为 ASGI 应用。
|
||||
我们在返回的 ASGI 可调用中完成 SSE 握手,并运行 MCP 服务器。
|
||||
Starlette Route passes a Request and treats the returned callable as an ASGI app.
|
||||
The returned ASGI callable performs the SSE handshake and runs the MCP server.
|
||||
"""
|
||||
|
||||
async def asgi(scope, receive, send):
|
||||
@@ -234,8 +234,9 @@ class McpController:
|
||||
async def handle_streamable_http_asgi(self, request: Request):
|
||||
"""Return an ASGI app that handles MCP Streamable HTTP (GET/POST/DELETE).
|
||||
|
||||
将请求交由StreamableHTTP的handle_request处理;同时使用持久化的transport与server,
|
||||
让 GET/POST/DELETE 在同一会话中交互,保证工具/资源列表等请求能返回到相同的 SSE 流。
|
||||
Delegate requests to StreamableHTTP's handle_request; use persistent transport and server
|
||||
so GET/POST/DELETE interact within the same session, ensuring tools/resources queries
|
||||
return to the same SSE stream.
|
||||
"""
|
||||
|
||||
async def asgi(scope, receive, send):
|
||||
@@ -281,28 +282,36 @@ class McpController:
|
||||
user_id, apikey_id = user_info
|
||||
session_key = f"{service_id}:{user_id}"
|
||||
|
||||
# Register connection to manager(便于统计与审计)
|
||||
connection_key = connection_manager.register_connection(service_id, user_id, client_ip)
|
||||
# Build connection key for lifecycle management
|
||||
connection_key = f"{service_id}:{user_id}:{client_ip}"
|
||||
|
||||
try:
|
||||
# 获取(或创建)持久化的 StreamableHTTP 传输与 MCP 服务器
|
||||
# Get or create a persistent StreamableHTTP transport and MCP server
|
||||
transport = await self._ensure_http_session(session_key, service_id, user_id, apikey_id)
|
||||
|
||||
# 记录会话活跃
|
||||
# Note session activity
|
||||
self._note_session_activity(session_key)
|
||||
|
||||
# 将请求交由 transport 处理;若是 GET,将建立 SSE;若是 POST,将发送 JSON-RPC;DELETE 将终止会话
|
||||
# Register only on GET (SSE handshake); POST just updates activity
|
||||
if req.method == "GET":
|
||||
connection_manager.register_connection(service_id, user_id, client_ip)
|
||||
elif req.method == "POST":
|
||||
connection_manager.update_activity(connection_key)
|
||||
|
||||
# Delegate request to transport; GET establishes SSE; POST sends JSON-RPC; DELETE terminates the session
|
||||
await transport.handle_request(scope, receive, send)
|
||||
|
||||
# 处理完成后更新活跃时间(避免长处理后的误清理)
|
||||
# Update activity after handling (avoid cleaning long-running processing)
|
||||
self._note_session_activity(session_key)
|
||||
|
||||
# 如果会话已经终止,立即清理资源
|
||||
# If the session has terminated or DELETE called, clean up and unregister
|
||||
if transport.is_terminated or req.method == "DELETE":
|
||||
await self._cleanup_http_session(session_key)
|
||||
connection_manager.unregister_connection(connection_key)
|
||||
finally:
|
||||
# Unregister connection(按请求粒度解除登记)
|
||||
connection_manager.unregister_connection(connection_key)
|
||||
# Unregister when SSE GET disconnects
|
||||
if req.method == "GET":
|
||||
connection_manager.unregister_connection(connection_key)
|
||||
|
||||
except ConnectionError as e:
|
||||
logger.warning(f"Connection error - Service ID: {service_id or 'unknown'}, Client: {client_ip}: {str(e)}")
|
||||
@@ -334,20 +343,20 @@ class McpController:
|
||||
async def _ensure_http_session(self, session_key: str, service_id: str, user_id: str, apikey_id: str) -> StreamableHTTPServerTransport:
|
||||
"""Ensure a persistent StreamableHTTP transport and MCP server exist for the session.
|
||||
|
||||
- 创建(或复用) transport
|
||||
- 若尚未启动服务器,则在 transport.connect() 上启动 mcp_server.run()
|
||||
- Create or reuse the transport
|
||||
- If the server has not been started, start mcp_server.run() within transport.connect()
|
||||
"""
|
||||
if session_key in self._http_transports:
|
||||
transport = self._http_transports[session_key]
|
||||
# 启动回收任务(若未启动)
|
||||
# Start GC task if not started
|
||||
self._ensure_session_gc_task()
|
||||
# 记录活跃
|
||||
# Note activity
|
||||
self._note_session_activity(session_key)
|
||||
# 服务器任务存在且未结束,直接复用
|
||||
# If the server task exists and is not finished, reuse it
|
||||
task = self._http_server_tasks.get(session_key)
|
||||
if task and not task.done():
|
||||
return transport
|
||||
# 没有任务或任务已结束,则重新启动
|
||||
# If no task or the task is finished, restart
|
||||
mcp_server = self._http_servers.get(session_key)
|
||||
if mcp_server is None:
|
||||
mcp_server = await self.server_factory.create_server(service_id, user_id, apikey_id)
|
||||
@@ -368,7 +377,7 @@ class McpController:
|
||||
self._http_server_tasks[session_key] = task
|
||||
return transport
|
||||
|
||||
# 新建 transport 与 server
|
||||
# Create transport and server
|
||||
transport = StreamableHTTPServerTransport(mcp_session_id=None, is_json_response_enabled=False)
|
||||
mcp_server = await self.server_factory.create_server(service_id, user_id, apikey_id)
|
||||
self._http_transports[session_key] = transport
|
||||
@@ -378,7 +387,7 @@ class McpController:
|
||||
init_options.server_name = f"mcp-service-{service_id}"
|
||||
logger.info(f"StreamableHTTP session created - Service: {service_id}, User: {user_id}")
|
||||
|
||||
# 启动回收任务(若未启动)并记录活跃
|
||||
# Start GC task if not started and note activity
|
||||
self._ensure_session_gc_task()
|
||||
self._note_session_activity(session_key)
|
||||
|
||||
@@ -403,7 +412,7 @@ class McpController:
|
||||
|
||||
if task and not task.done():
|
||||
try:
|
||||
# 终止 transport,促使服务器退出
|
||||
# Terminate transport to prompt server exit
|
||||
if transport and not transport.is_terminated:
|
||||
await transport.terminate()
|
||||
await task
|
||||
@@ -500,8 +509,9 @@ class McpController:
|
||||
return self.sse.handle_post_message
|
||||
|
||||
def get_streamable_http_handler(self):
|
||||
# 不再返回持久化实例的 handler;如果确实需要,可改为在路由层调用 handle_streamable_http_asgi
|
||||
# 这里保留占位以避免外部引用报错,但不使用。
|
||||
# We no longer return a handler for a persistent instance; if needed, call
|
||||
# handle_streamable_http_asgi at the routing layer. This placeholder is
|
||||
# retained to avoid external references breaking, but it is not used.
|
||||
raise NotImplementedError("Use handle_streamable_http_asgi for StreamableHTTP routes")
|
||||
|
||||
|
||||
@@ -528,7 +538,7 @@ class McpController:
|
||||
idle = (now - last) > self._session_idle_ttl
|
||||
task = self._http_server_tasks.get(key)
|
||||
active_task = task is not None and not task.done()
|
||||
# 仅在无活动任务时才按TTL清理,避免中断活跃的SSE会话
|
||||
# Only TTL-clean when there is no active task, to avoid killing active SSE sessions
|
||||
if transport.is_terminated or (idle and not active_task):
|
||||
stale_keys.append(key)
|
||||
for key in stale_keys:
|
||||
|
||||
@@ -57,13 +57,13 @@ class McpServerFactory:
|
||||
|
||||
# Register tool call handler
|
||||
@app.call_tool()
|
||||
async def call_tool(name: str, arguments: dict) -> List[types.Content]:
|
||||
async def call_tool(name: str, arguments: dict) -> tuple[List[types.Content], dict]:
|
||||
"""Execute specified tool"""
|
||||
# user_id must exist, otherwise we shouldn't reach here
|
||||
if not user_id:
|
||||
error_msg = "Missing user authentication"
|
||||
logger.error(error_msg)
|
||||
return [types.TextContent(type="text", text=error_msg)]
|
||||
return [types.TextContent(type="text", text=error_msg)], {}
|
||||
|
||||
return await self._handle_call_tool_with_billing(service_id, name, arguments, user_id, apikey_id)
|
||||
|
||||
@@ -102,7 +102,7 @@ class McpServerFactory:
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
async def _handle_call_tool_with_billing(self, service_id: str, name: str, arguments: dict, user_id: str, apikey_id: Optional[str] = None) -> List[types.Content]:
|
||||
async def _handle_call_tool_with_billing(self, service_id: str, name: str, arguments: dict, user_id: str, apikey_id: Optional[str] = None) -> tuple[List[types.Content], dict]:
|
||||
"""
|
||||
Handle tool call with billing logic
|
||||
|
||||
@@ -145,7 +145,7 @@ class McpServerFactory:
|
||||
|
||||
# If tool API id not found, skip sending billing message to avoid FK errors
|
||||
if not api_id_for_log:
|
||||
return [types.TextContent(type="text", text=error_msg)]
|
||||
return [types.TextContent(type="text", text=error_msg)], {}
|
||||
|
||||
call_log = ApiCallLogInfo(
|
||||
user_id=user_id,
|
||||
@@ -163,7 +163,7 @@ class McpServerFactory:
|
||||
)
|
||||
await self.billing_service.send_billing_message(call_log, False, datetime.now(timezone.utc))
|
||||
|
||||
return [types.TextContent(type="text", text=error_msg)]
|
||||
return [types.TextContent(type="text", text=error_msg)],{}
|
||||
|
||||
logger.info(f"Pre-deduction successful - User ID: {user_id}, Deduction amount: {pre_deduct_result.service_price}")
|
||||
amount = pre_deduct_result.service_price
|
||||
@@ -171,6 +171,7 @@ class McpServerFactory:
|
||||
db = next(get_db())
|
||||
call_success = False
|
||||
result: List[types.ContentBlock] = []
|
||||
response_data: dict = {}
|
||||
# calculate input token amount
|
||||
input_token_amount = Decimal("0")
|
||||
output_token_amount = Decimal("0")
|
||||
@@ -195,7 +196,7 @@ class McpServerFactory:
|
||||
logger.error(error_msg)
|
||||
# Close DB and return error without sending billing message to avoid FK violation
|
||||
db.close()
|
||||
return [types.TextContent(type="text", text=error_msg)]
|
||||
return [types.TextContent(type="text", text=error_msg)],{}
|
||||
|
||||
try:
|
||||
logger.info(f"Found tool configuration: {tool_config.name}")
|
||||
@@ -205,7 +206,7 @@ class McpServerFactory:
|
||||
logger.debug(f"Call params: {call_params}")
|
||||
|
||||
# Execute tool
|
||||
result = await self.tool_service.execute_tool(tool_config, arguments, call_params)
|
||||
result,response_data = await self.tool_service.execute_tool(tool_config, arguments, call_params)
|
||||
call_success = True
|
||||
logger.info(f"Tool call successful - User ID: {user_id}, Tool: {name}")
|
||||
|
||||
@@ -254,7 +255,7 @@ class McpServerFactory:
|
||||
logger.info(f"Billing message sent - User ID: {user_id}, Tool: {name}, Success: {call_success}")
|
||||
|
||||
# Ensure return type is correct
|
||||
return result
|
||||
return result,response_data
|
||||
|
||||
def _create_mcp_service(self, db) -> McpService:
|
||||
"""
|
||||
|
||||
@@ -131,11 +131,15 @@ class McpService:
|
||||
"required": []
|
||||
}
|
||||
|
||||
return types.Tool(
|
||||
t = types.Tool(
|
||||
name=tool_api.name,
|
||||
description=tool_api.description,
|
||||
inputSchema=input_schema
|
||||
inputSchema=input_schema,
|
||||
)
|
||||
output_schema = self._build_output_schema(tool_api)
|
||||
if output_schema:
|
||||
t.outputSchema = output_schema
|
||||
return t
|
||||
except Exception as e:
|
||||
self.logger.error(f"Tool conversion failed for {tool_api.name}: {e}")
|
||||
return None
|
||||
@@ -271,4 +275,62 @@ class McpService:
|
||||
return {
|
||||
"base_url": service.base_url or "",
|
||||
"headers": headers
|
||||
}
|
||||
}
|
||||
|
||||
def _build_output_schema(self,tool_api:McpToolApi) -> Optional[dict]:
|
||||
"""
|
||||
Build output schema based on API configuration
|
||||
|
||||
Priority:
|
||||
1) Use explicit JSON Schema from `response_schema` if present
|
||||
2) Infer a reasonable JSON Schema from `response_examples`
|
||||
3) Fallback to a generic text content schema
|
||||
"""
|
||||
# 1) Try explicit response schema
|
||||
try:
|
||||
if tool_api.response_schema:
|
||||
parsed = json.loads(tool_api.response_schema)
|
||||
if isinstance(parsed, dict):
|
||||
return parsed
|
||||
except Exception as e:
|
||||
self.logger.warning(f"Failed to parse response_schema for {tool_api.name}: {e}")
|
||||
|
||||
# 2) Try to infer schema from examples
|
||||
try:
|
||||
if getattr(tool_api, "response_examples", None) and tool_api.response_examples.strip():
|
||||
examples = json.loads(tool_api.response_examples)
|
||||
# If multiple examples provided, use the first for inference
|
||||
example_value = examples[0] if isinstance(examples, list) and examples else examples
|
||||
inferred = self._infer_json_schema_from_example(example_value)
|
||||
if inferred:
|
||||
return inferred
|
||||
except Exception as e:
|
||||
self.logger.warning(f"Failed to infer schema from response_examples for {tool_api.name}: {e}")
|
||||
|
||||
# 3) Fallback to a generic text MCP content schema
|
||||
return None
|
||||
|
||||
# Helper: Infer a simple JSON Schema from a Python value
|
||||
def _infer_json_schema_from_example(self, value) -> dict:
|
||||
try:
|
||||
if isinstance(value, str):
|
||||
return {"type": "string"}
|
||||
if isinstance(value, bool):
|
||||
return {"type": "boolean"}
|
||||
if isinstance(value, int):
|
||||
return {"type": "integer"}
|
||||
if isinstance(value, float):
|
||||
return {"type": "number"}
|
||||
if isinstance(value, list):
|
||||
if not value:
|
||||
return {"type": "array", "items": {}}
|
||||
# Infer from first element; for heterogeneous arrays this is a best-effort
|
||||
return {"type": "array", "items": self._infer_json_schema_from_example(value[0])}
|
||||
if isinstance(value, dict):
|
||||
props = {k: self._infer_json_schema_from_example(v) for k, v in value.items()}
|
||||
required = list(value.keys())
|
||||
return {"type": "object", "properties": props, "required": required}
|
||||
# Fallback
|
||||
return {"type": "string"}
|
||||
except Exception:
|
||||
return {"type": "string"}
|
||||
@@ -17,7 +17,7 @@ class McpToolService:
|
||||
def __init__(self):
|
||||
self.http_builder = HttpRequestBuilder()
|
||||
|
||||
async def execute_tool(self, tool_config, arguments: dict, call_params: dict) -> List[types.Content]:
|
||||
async def execute_tool(self, tool_config, arguments: dict, call_params: dict) -> tuple[List[types.Content],dict]:
|
||||
"""
|
||||
Execute tool call
|
||||
|
||||
@@ -37,14 +37,17 @@ class McpToolService:
|
||||
|
||||
# Send HTTP request
|
||||
response_text = await self._send_http_request(request_info)
|
||||
|
||||
if response_text:
|
||||
response_data = json.loads(response_text)
|
||||
else:
|
||||
response_data = {}
|
||||
logger.info("Tool execution completed successfully")
|
||||
return [types.TextContent(type="text", text=response_text)]
|
||||
return [types.TextContent(type="text", text=response_text)],response_data
|
||||
|
||||
except Exception as e:
|
||||
error_msg = f"Tool execution failed: {str(e)}"
|
||||
logger.error(f"Tool execution failed: {error_msg}", exc_info=True)
|
||||
return [types.TextContent(type="text", text=error_msg)]
|
||||
return [types.TextContent(type="text", text=error_msg)],{}
|
||||
|
||||
async def _send_http_request(self, request_info: Dict[str, Any]) -> str:
|
||||
"""
|
||||
@@ -81,6 +84,8 @@ class McpToolService:
|
||||
raise ValueError(f"Unsupported HTTP method: {method}")
|
||||
|
||||
logger.info(f"HTTP response status code: {response.status_code}")
|
||||
if response.text != "":
|
||||
logger.debug(f"Response content: {response.text}")
|
||||
response.raise_for_status()
|
||||
|
||||
response_text = response.text
|
||||
|
||||
Reference in new issue
Block a user