media-agent-mcp 2.6.2__py3-none-any.whl → 2.6.4__py3-none-any.whl

media_agent_mcp/ai_models/openaiedit.py

@@ -183,33 +183,47 @@ def google_edit(image_urls: List[str], prompt: str) -> Dict[str, Any]:
 
         contents = pil_images + [prompt]
         
-        # model = genai.GenerativeModel("gemini-1.5-flash-latest")
-        # response = model.generate_content(contents)
         client = genai.Client(
             api_key=api_key,
         )
 
-        response = client.models.generate_content(
-            model="gemini-2.5-flash-image-preview",
-            contents=contents
-        )
+        # 最多尝试3次
+        max_retries = 3
+        for attempt in range(max_retries):
+            try:
+                response = client.models.generate_content(
+                    model="gemini-2.5-flash-image-preview",
+                    contents=contents
+                )
 
-        image_data = None
-        if response.candidates and response.candidates[0].content and response.candidates[0].content.parts:
-            image_parts = [
-                part.inline_data.data
-                for part in response.candidates[0].content.parts
-                if part.inline_data
-            ]
-            if image_parts:
-                image_data = image_parts[0]
+                image_data = None
+                if response.candidates and response.candidates[0].content and response.candidates[0].content.parts:
+                    image_parts = [
+                        part.inline_data.data
+                        for part in response.candidates[0].content.parts
+                        if part.inline_data
+                    ]
+                    if image_parts:
+                        image_data = image_parts[0]
 
-        if not image_data:
-            return {
-                "status": "error",
-                "data": None,
-                "message": "Google API response did not contain image data."
-            }
+                # 如果获取到了图片数据，跳出重试循环
+                if image_data:
+                    break
+                    
+                # 如果是最后一次尝试且仍然没有图片数据，返回错误
+                if attempt == max_retries - 1:
+                    return {
+                        "status": "error",
+                        "data": None,
+                        "message": f"Google API response did not contain image data after {max_retries} attempts."
+                    }
+                    
+            except Exception as api_error:
+                # 如果是最后一次尝试，抛出异常
+                if attempt == max_retries - 1:
+                    raise api_error
+                # 否则继续下一次尝试
+                continue
 
         with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as temp_edited_file:
             temp_edited_file.write(image_data)

media_agent_mcp/async_server.py

@@ -24,6 +24,7 @@ from typing import List, Optional
 import json
 from dotenv import load_dotenv
 import uvicorn
+import anyio
 from functools import wraps
 
 def async_retry(max_retries=3, delay=2):
@@ -80,6 +81,18 @@ 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
+
 # Initialize FastMCP server (will be configured in main function)
 load_dotenv()
 mcp = FastMCP("Media-Agent-MCP-Async")
@@ -524,7 +537,7 @@ def main():
             mcp.settings.port = args.port
             # Use uvicorn to run SSE app with extended keep-alive timeout (5 minutes)
             uvicorn.run(
-                mcp.sse_app(),
+                IgnoreClosedResourceErrorMiddleware(mcp.sse_app()),
                 host=args.host,
                 port=args.port,
                 timeout_keep_alive=300

media_agent_mcp/server.py

@@ -20,6 +20,7 @@ from typing import Optional, Dict, Any
 import json
 from dotenv import load_dotenv
 import uvicorn
+import anyio
 
 from mcp.server.fastmcp import FastMCP
 
@@ -39,6 +40,18 @@ from media_agent_mcp.media_selectors.video_selector import select_best_video
 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
+
 # Initialize FastMCP server (will be configured in main function)
 load_dotenv()
 mcp = FastMCP("Media-Agent-MCP")
@@ -577,7 +590,7 @@ def main():
     # Configure and run the server
     if args.transport == 'sse':
         # SSE transport
-        uvicorn.run(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.2.dist-info → media_agent_mcp-2.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: media-agent-mcp
-Version: 2.6.2
+Version: 2.6.4
 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.2.dist-info → media_agent_mcp-2.6.4.dist-info}/RECORD

@@ -1,10 +1,10 @@
 media_agent_mcp/__init__.py,sha256=4kV5u8kHrsdjpMHDNUhc8h4U6AwOyw1mNptFPd2snrQ,365
-media_agent_mcp/async_server.py,sha256=a1KqygwC46wEq91_6N6Sk5edJ_95sthu4VBe-mCOcXM,19857
+media_agent_mcp/async_server.py,sha256=rZJXfC9Htx1fk2smyCyxflAdaUV8tILvvviUDE9IsnA,20339
 media_agent_mcp/async_wrapper.py,sha256=hiiBhhz9WeVDfSBWVh6ovhf5jeP5ZbsieBbz9P-KPn0,15351
-media_agent_mcp/server.py,sha256=e8ubU0-R0OnuJy5Gk6jPg8rQXq478O_6f5lNMRMyeQA,19494
+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=ZTWG9kfKqmSaHQ8rG9_GvU9IsTD_Eb60VG0RfCJPDk8,9077
+media_agent_mcp/ai_models/openaiedit.py,sha256=uu4d2BgXSrjWRdNPs_SryI9muxO93pItVtEze9nDhjc,9776
 media_agent_mcp/ai_models/seed16.py,sha256=_rPBfgDASxb2_5-mydus-SLK-6XGy2Cy5lLh5ORBtN8,5078
 media_agent_mcp/ai_models/seedance.py,sha256=ni7LtXn4jTn5wX2NtcWDMj5Eea8LoP1QLYgwSx_GvBs,9014
 media_agent_mcp/ai_models/seededit.py,sha256=2f0GiQPqH5IJKsZyW0h5WNA99DX--9oOKiD6vqg8Urk,2091
@@ -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.2.dist-info/METADATA,sha256=Vs8JRSrWktTDtsuZlXU0dxmNTcCvrIpBiCu4EEQZ3CM,11310
-media_agent_mcp-2.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-media_agent_mcp-2.6.2.dist-info/entry_points.txt,sha256=qhOUwR-ORVf9GO7emhhl7Lgd6MISgqbZr8bEuSH_VdA,70
-media_agent_mcp-2.6.2.dist-info/top_level.txt,sha256=WEa0YfchpTxZgiKn8gdxYgs-dir5HepJaTOrxAGx9nY,16
-media_agent_mcp-2.6.2.dist-info/RECORD,,
+media_agent_mcp-2.6.4.dist-info/METADATA,sha256=rqUYSncUPBBUiTQtMTWEax03GEBSCs5JyLC7ErZ_VAw,11310
+media_agent_mcp-2.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+media_agent_mcp-2.6.4.dist-info/entry_points.txt,sha256=qhOUwR-ORVf9GO7emhhl7Lgd6MISgqbZr8bEuSH_VdA,70
+media_agent_mcp-2.6.4.dist-info/top_level.txt,sha256=WEa0YfchpTxZgiKn8gdxYgs-dir5HepJaTOrxAGx9nY,16
+media_agent_mcp-2.6.4.dist-info/RECORD,,