media-agent-mcp 2.6.6__py3-none-any.whl → 2.6.9__py3-none-any.whl

media_agent_mcp/async_server.py

@@ -26,10 +26,6 @@ from dotenv import load_dotenv
 import uvicorn
 import anyio
 from functools import wraps
-import os
-import sys
-import signal
-import subprocess
 
 def async_retry(max_retries=3, delay=2):
     def decorator(func):
@@ -85,131 +81,6 @@ from media_agent_mcp.async_wrapper import (
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-# Swallow ClosedResourceError from AnyIO (e.g., SSE client disconnected)
-class IgnoreClosedResourceErrorMiddleware:
-    def __init__(self, app):
-        self.app = app
-
-    async def __call__(self, scope, receive, send):
-        try:
-            await self.app(scope, receive, send)
-        except anyio.ClosedResourceError:
-            logger.warning("SSE client disconnected (ClosedResourceError). Ignoring.")
-            return
-
-# Enhanced middleware that supports reconnection for SSE clients
-class ReconnectableSSEMiddleware:
-    def __init__(self, app):
-        self.app = app
-        self.connections = {}  # 存储活跃连接
-
-    async def __call__(self, scope, receive, send):
-        # 为每个连接生成唯一ID
-        connection_id = scope.get('client', ('unknown', 0))[0] + ':' + str(scope.get('client', ('unknown', 0))[1])
-        
-        # 包装send函数以跟踪连接状态
-        original_send = send
-        
-        async def wrapped_send(message):
-            if message.get('type') == 'http.response.start':
-                # 记录新连接
-                self.connections[connection_id] = {'active': True}
-                logger.info(f"New SSE connection established: {connection_id}")
-            elif message.get('type') == 'http.response.body' and message.get('more_body', False) is False:
-                # 连接结束
-                if connection_id in self.connections:
-                    self.connections[connection_id]['active'] = False
-                    logger.info(f"SSE connection closed normally: {connection_id}")
-            
-            # 调用原始send
-            await original_send(message)
-        
-        try:
-            # 使用包装后的send函数
-            await self.app(scope, receive, wrapped_send)
-        except anyio.ClosedResourceError:
-            # 客户端断开连接
-            if connection_id in self.connections:
-                self.connections[connection_id]['active'] = False
-            
-            logger.warning(f"SSE client disconnected (ClosedResourceError): {connection_id}. Client can reconnect.")
-            # 不抛出异常，允许客户端重连
-            return
-
-# 在出现错误时重启应用的中间件
-class RestartOnErrorMiddleware:
-    def __init__(self, app):
-        self.app = app
-        self.restart_cooldown = 5  # 重启冷却时间（秒）
-        self.script_path = os.path.abspath(sys.argv[0])
-        self.args = sys.argv[1:]
-
-    async def __call__(self, scope, receive, send):
-        try:
-            await self.app(scope, receive, send)
-        except anyio.ClosedResourceError:
-            logger.warning("检测到 ClosedResourceError，准备重启应用...")
-            # 等待一段时间，确保日志输出
-            await asyncio.sleep(1)
-            
-            # 先终止当前进程的服务器，释放端口
-            logger.info("正在关闭当前服务器以释放端口...")
-            # 发送SIGTERM信号给当前进程，但不立即退出
-            # 这会触发uvicorn的关闭流程，释放端口
-            os.kill(os.getpid(), signal.SIGUSR1)
-            
-            # 等待端口释放
-            await asyncio.sleep(2)
-            
-            # 启动新进程
-            logger.info(f"启动新进程: {self.script_path} {' '.join(self.args)}")
-            subprocess.Popen([sys.executable, self.script_path] + self.args)
-            
-            # 等待冷却时间
-            logger.info(f"等待 {self.restart_cooldown} 秒后终止当前进程...")
-            await asyncio.sleep(self.restart_cooldown)
-            
-            # 终止当前进程
-            logger.info("终止当前进程")
-            os.kill(os.getpid(), signal.SIGTERM)
-            return
-            
-            # 重置超过窗口期的错误计数
-            if current_time - self.last_error_time > self.error_window:
-                self.error_count = 0
-            
-            self.last_error_time = current_time
-            self.error_count += 1
-            
-            logger.warning(f"SSE client disconnected (ClosedResourceError). Error count: {self.error_count}/{self.max_errors}")
-            
-            # 如果错误次数超过阈值，重启应用
-            if self.error_count >= self.max_errors:
-                logger.error(f"Too many connection errors ({self.error_count}). Restarting application...")
-                
-                # 启动一个新进程来重启应用
-                # 使用当前脚本的路径和参数
-                args = sys.argv.copy()
-                
-                # 确保我们不会立即重启（可能导致无限循环）
-                logger.info(f"Cooling down for {self.restart_cooldown} seconds before restart...")
-                await asyncio.sleep(self.restart_cooldown)
-                
-                # 使用subprocess启动新进程
-                subprocess.Popen(args, env=os.environ.copy())
-                
-                # 发送SIGTERM信号给当前进程
-                logger.info("Sending termination signal to current process...")
-                os.kill(os.getpid(), signal.SIGTERM)
-                
-                # 等待进程终止
-                await asyncio.sleep(1)
-                
-                # 如果进程还在运行，强制退出
-                sys.exit(0)
-            
-            return
-
 # Initialize FastMCP server (will be configured in main function)
 load_dotenv()
 mcp = FastMCP("Media-Agent-MCP-Async")
@@ -654,7 +525,7 @@ def main():
             mcp.settings.port = args.port
             # Use uvicorn to run SSE app with extended keep-alive timeout (5 minutes)
             uvicorn.run(
-                RestartOnErrorMiddleware(mcp.sse_app()),
+                IgnoreClosedResourceErrorMiddleware(mcp.sse_app()),
                 host=args.host,
                 port=args.port,
                 timeout_keep_alive=300

media_agent_mcp/server.py

@@ -21,12 +21,6 @@ import json
 from dotenv import load_dotenv
 import uvicorn
 import anyio
-import uuid
-import os
-import sys
-import signal
-import subprocess
-import asyncio
 
 from mcp.server.fastmcp import FastMCP
 
@@ -56,83 +50,6 @@ class IgnoreClosedResourceErrorMiddleware:
             await self.app(scope, receive, send)
         except anyio.ClosedResourceError:
             logger.warning("SSE client disconnected (ClosedResourceError). Ignoring.")
-            return
-
-# Enhanced middleware that supports reconnection for SSE clients
-class ReconnectableSSEMiddleware:
-    def __init__(self, app):
-        self.app = app
-        self.connections = {}  # 存储活跃连接
-
-    async def __call__(self, scope, receive, send):
-        # 为每个连接生成唯一ID
-        connection_id = scope.get('client', ('unknown', 0))[0] + ':' + str(scope.get('client', ('unknown', 0))[1])
-        
-        # 包装send函数以跟踪连接状态
-        original_send = send
-        
-        async def wrapped_send(message):
-            if message.get('type') == 'http.response.start':
-                # 记录新连接
-                self.connections[connection_id] = {'active': True}
-                logger.info(f"New SSE connection established: {connection_id}")
-            elif message.get('type') == 'http.response.body' and message.get('more_body', False) is False:
-                # 连接结束
-                if connection_id in self.connections:
-                    self.connections[connection_id]['active'] = False
-                    logger.info(f"SSE connection closed normally: {connection_id}")
-            
-            # 调用原始send
-            await original_send(message)
-        
-        try:
-            # 使用包装后的send函数
-            await self.app(scope, receive, wrapped_send)
-        except anyio.ClosedResourceError:
-            # 客户端断开连接
-            if connection_id in self.connections:
-                self.connections[connection_id]['active'] = False
-            
-            logger.warning(f"SSE client disconnected (ClosedResourceError): {connection_id}. Client can reconnect.")
-            # 不抛出异常，允许客户端重连
-            return
-
-# 在出现错误时重启应用的中间件
-class RestartOnErrorMiddleware:
-    def __init__(self, app):
-        self.app = app
-        self.restart_cooldown = 5  # 重启冷却时间（秒）
-        self.script_path = os.path.abspath(sys.argv[0])
-        self.args = sys.argv[1:]
-
-    async def __call__(self, scope, receive, send):
-        try:
-            await self.app(scope, receive, send)
-        except anyio.ClosedResourceError:
-            logger.warning("检测到 ClosedResourceError，准备重启应用...")
-            # 等待一段时间，确保日志输出
-            await asyncio.sleep(1)
-            
-            # 启动新进程
-            logger.info(f"启动新进程: {self.script_path} {' '.join(self.args)}")
-            subprocess.Popen([sys.executable, self.script_path] + self.args)
-            
-            # 等待冷却时间
-            logger.info(f"等待 {self.restart_cooldown} 秒后终止当前进程...")
-            await asyncio.sleep(self.restart_cooldown)
-            
-            # 终止当前进程
-            logger.info("终止当前进程")
-            os.kill(os.getpid(), signal.SIGTERM)
-            return
-                
-                
-                
-                
-                
-                
-                
-            
             return
 
 # Initialize FastMCP server (will be configured in main function)
@@ -673,7 +590,7 @@ def main():
     # Configure and run the server
     if args.transport == 'sse':
         # SSE transport
-        uvicorn.run(RestartOnErrorMiddleware(mcp.create_sse_app()), host=args.host, port=args.port)
+        uvicorn.run(IgnoreClosedResourceErrorMiddleware(mcp.create_sse_app()), host=args.host, port=args.port)
     else:
         # STDIO transport (default)
         mcp.run()

{media_agent_mcp-2.6.6.dist-info → media_agent_mcp-2.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: media-agent-mcp
-Version: 2.6.6
+Version: 2.6.9
 Summary: A Model Context Protocol server for media processing with AI tools
 Author-email: Media Agent Team <team@mediaagent.com>
 Keywords: mcp,ai,media,video,image,processing
@@ -12,7 +12,6 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: httpx>=0.28.1
-Requires-Dist: mcp[cli]>=1.12.2
 Requires-Dist: opencv-python>=4.12.0.88
 Requires-Dist: pillow>=11.3.0
 Requires-Dist: requests>=2.32.4
@@ -29,6 +28,7 @@ Requires-Dist: Flask>=3.0.0
 Requires-Dist: pydub>=0.25.1
 Requires-Dist: audioop-lts; python_version >= "3.13"
 Requires-Dist: google-genai>=1.33.0
+Requires-Dist: mcp==1.11.0
 
 # Media Agent MCP
 

{media_agent_mcp-2.6.6.dist-info → media_agent_mcp-2.6.9.dist-info}/RECORD

@@ -1,7 +1,7 @@
 media_agent_mcp/__init__.py,sha256=4kV5u8kHrsdjpMHDNUhc8h4U6AwOyw1mNptFPd2snrQ,365
-media_agent_mcp/async_server.py,sha256=suhjcxjolzojUnLGEeKwsyf2OsT-O0xK6K4xqm1w5CA,25324
+media_agent_mcp/async_server.py,sha256=OXbeOpzWq-8v_b6vnerT1cIyk3bXTiFy9Rp9gl7tK6E,19907
 media_agent_mcp/async_wrapper.py,sha256=hiiBhhz9WeVDfSBWVh6ovhf5jeP5ZbsieBbz9P-KPn0,15351
-media_agent_mcp/server.py,sha256=TAH88BDip7m3R0kNDz89RSuK6Vt8f-v8KeM5bgeSx1M,23104
+media_agent_mcp/server.py,sha256=hZ_m7HodF_ct_q3FXuCrjE6_tw6rXOim38q2sSdTI9I,19976
 media_agent_mcp/ai_models/__init__.py,sha256=2kHzTYwjQw89U4QGDq0e2WqJScqDkDNlDaWHGak5JeY,553
 media_agent_mcp/ai_models/omni_human.py,sha256=s_Ja4gEmHG_bgii1x4SoeV73lz0Zg_3iBRvu36goxVA,4643
 media_agent_mcp/ai_models/openaiedit.py,sha256=uu4d2BgXSrjWRdNPs_SryI9muxO93pItVtEze9nDhjc,9776
@@ -44,8 +44,8 @@ media_agent_mcp/video/__init__.py,sha256=tfz22XEeFSeuKa3AggYCE0vCDt4IwXRCKW6avof
 media_agent_mcp/video/processor.py,sha256=twfqmN5DbVryjDawZUcqTUcnglcBJYpUbAnApqHgD0c,12787
 media_agent_mcp/video/stack.py,sha256=pyoJiJ9NhU1tjy2l3kARI9sWFoC00Fj97psxYOBi2NU,1736
 media_agent_mcp/video/subtitle.py,sha256=TlrWVhWJqYTUJpnVz7eccwMAn8ixfrRzRxS6ETMY-DM,16323
-media_agent_mcp-2.6.6.dist-info/METADATA,sha256=LVviMD07NXIxSmeG6yXohs0hoVSoVdKSO0f03fEZNVQ,11310
-media_agent_mcp-2.6.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-media_agent_mcp-2.6.6.dist-info/entry_points.txt,sha256=qhOUwR-ORVf9GO7emhhl7Lgd6MISgqbZr8bEuSH_VdA,70
-media_agent_mcp-2.6.6.dist-info/top_level.txt,sha256=WEa0YfchpTxZgiKn8gdxYgs-dir5HepJaTOrxAGx9nY,16
-media_agent_mcp-2.6.6.dist-info/RECORD,,
+media_agent_mcp-2.6.9.dist-info/METADATA,sha256=v9oWNaTmOcNrbn60b79PdNO8miLvXn5xda48kGYflf8,11305
+media_agent_mcp-2.6.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+media_agent_mcp-2.6.9.dist-info/entry_points.txt,sha256=qhOUwR-ORVf9GO7emhhl7Lgd6MISgqbZr8bEuSH_VdA,70
+media_agent_mcp-2.6.9.dist-info/top_level.txt,sha256=WEa0YfchpTxZgiKn8gdxYgs-dir5HepJaTOrxAGx9nY,16
+media_agent_mcp-2.6.9.dist-info/RECORD,,