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

media_agent_mcp/async_server.py

@@ -26,6 +26,10 @@ 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):
@@ -132,6 +136,80 @@ class ReconnectableSSEMiddleware:
             # 不抛出异常，允许客户端重连
             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")
@@ -576,7 +654,7 @@ def main():
             mcp.settings.port = args.port
             # Use uvicorn to run SSE app with extended keep-alive timeout (5 minutes)
             uvicorn.run(
-                ReconnectableSSEMiddleware(mcp.sse_app()),
+                RestartOnErrorMiddleware(mcp.sse_app()),
                 host=args.host,
                 port=args.port,
                 timeout_keep_alive=300

media_agent_mcp/server.py

@@ -22,6 +22,11 @@ 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
 
@@ -57,46 +62,78 @@ class IgnoreClosedResourceErrorMiddleware:
 class ReconnectableSSEMiddleware:
     def __init__(self, app):
         self.app = app
-        self.connections = {}
+        self.connections = {}  # 存储活跃连接
 
     async def __call__(self, scope, receive, send):
-        # Generate a unique connection ID
-        connection_id = str(uuid.uuid4())
+        # 为每个连接生成唯一ID
+        connection_id = scope.get('client', ('unknown', 0))[0] + ':' + str(scope.get('client', ('unknown', 0))[1])
         
-        # Store connection info
-        if scope["type"] == "http":
-            self.connections[connection_id] = {
-                "status": "active",
-                "path": scope.get("path", ""),
-                "created_at": anyio.current_time()
-            }
-            
-            # Wrap the send function to track connection state
-            original_send = send
+        # 包装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}")
             
-            async def wrapped_send(message):
-                if message.get("type") == "http.response.body" and message.get("more_body", False) is False:
-                    # Connection is closing normally
-                    if connection_id in self.connections:
-                        self.connections[connection_id]["status"] = "closed"
-                return await original_send(message)
+            # 调用原始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
             
-            try:
-                # Use the wrapped send function
-                await self.app(scope, receive, wrapped_send)
-            except anyio.ClosedResourceError:
-                # Client disconnected, but we'll allow reconnection
-                if connection_id in self.connections:
-                    self.connections[connection_id]["status"] = "disconnected"
-                logger.warning(f"SSE client disconnected (ClosedResourceError). Connection {connection_id[:8]} marked for reconnection.")
-                return
-            finally:
-                # Clean up connection tracking after some time
-                if connection_id in self.connections:
-                    self.connections.pop(connection_id, None)
-        else:
-            # For non-HTTP connections, just pass through
+            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)
 load_dotenv()
@@ -636,7 +673,7 @@ def main():
     # Configure and run the server
     if args.transport == 'sse':
         # SSE transport
-        uvicorn.run(ReconnectableSSEMiddleware(mcp.create_sse_app()), host=args.host, port=args.port)
+        uvicorn.run(RestartOnErrorMiddleware(mcp.create_sse_app()), host=args.host, port=args.port)
     else:
         # STDIO transport (default)
         mcp.run()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: media-agent-mcp
-Version: 2.6.5
+Version: 2.6.6
 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

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

@@ -1,7 +1,7 @@
 media_agent_mcp/__init__.py,sha256=4kV5u8kHrsdjpMHDNUhc8h4U6AwOyw1mNptFPd2snrQ,365
-media_agent_mcp/async_server.py,sha256=6YfDHiGCNWREY_6y-u83vYMgRRI-i5-13ClVJv-xTMU,22070
+media_agent_mcp/async_server.py,sha256=suhjcxjolzojUnLGEeKwsyf2OsT-O0xK6K4xqm1w5CA,25324
 media_agent_mcp/async_wrapper.py,sha256=hiiBhhz9WeVDfSBWVh6ovhf5jeP5ZbsieBbz9P-KPn0,15351
-media_agent_mcp/server.py,sha256=cQSnSUSeSEhK2w7kvgtoqcZNcuufuBYH--cseiIMDek,21955
+media_agent_mcp/server.py,sha256=TAH88BDip7m3R0kNDz89RSuK6Vt8f-v8KeM5bgeSx1M,23104
 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.5.dist-info/METADATA,sha256=-dbz6LIZ8pXf9JgjwPglQ61JvllteHptkI-a8lPdAaM,11310
-media_agent_mcp-2.6.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-media_agent_mcp-2.6.5.dist-info/entry_points.txt,sha256=qhOUwR-ORVf9GO7emhhl7Lgd6MISgqbZr8bEuSH_VdA,70
-media_agent_mcp-2.6.5.dist-info/top_level.txt,sha256=WEa0YfchpTxZgiKn8gdxYgs-dir5HepJaTOrxAGx9nY,16
-media_agent_mcp-2.6.5.dist-info/RECORD,,
+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,,