media-agent-mcp 0.3.10__py3-none-any.whl → 0.3.11__py3-none-any.whl

media_agent_mcp/async_server.py

@@ -22,17 +22,27 @@ from typing import List, Optional
 import json
 from dotenv import load_dotenv
 import uvicorn
-from tenacity import retry, stop_after_attempt, wait_fixed
-
-def _is_result_error(result):
-    """Return True if the result is a dictionary with status 'error'."""
-    if isinstance(result, str):
-        try:
-            data = json.loads(result)
-            return isinstance(data, dict) and data.get('status') == 'error'
-        except json.JSONDecodeError:
-            return False
-    return isinstance(result, dict) and result.get('status') == 'error'
+from functools import wraps
+
+def async_retry(max_retries=3, delay=2):
+    def decorator(func):
+        @wraps(func)
+        async def wrapper(*args, **kwargs):
+            for attempt in range(max_retries):
+                try:
+                    result = await func(*args, **kwargs)
+                    if isinstance(result, dict) and result.get('status') == 'error':
+                        logger.warning(f"Attempt {attempt + 1} of {max_retries} failed for {func.__name__}. Error: {result.get('message')}. Retrying in {delay}s...")
+                        await asyncio.sleep(delay)
+                        continue
+                    return result
+                except Exception as e:
+                    logger.error(f"Attempt {attempt + 1} of {max_retries} failed for {func.__name__} with exception: {e}. Retrying in {delay}s...")
+                    await asyncio.sleep(delay)
+            logger.error(f"Function {func.__name__} failed after {max_retries} retries.")
+            return {"status": "error", "data": None, "message": f"Function {func.__name__} failed after {max_retries} retries."}
+        return wrapper
+    return decorator
 
 from mcp.server.fastmcp import FastMCP
 
@@ -60,7 +70,7 @@ mcp = FastMCP("Media-Agent-MCP-Async")
 
 
 @mcp.tool()
-@retry(stop=stop_after_attempt(3), wait=wait_fixed(2), retry_if_result=_is_result_error)
+@async_retry()
 async def video_concat_tool(video_urls: List[str]) -> dict:
     """
     Asynchronously concatenate multiple videos from URLs and upload to TOS.
@@ -75,7 +85,7 @@ async def video_concat_tool(video_urls: List[str]) -> dict:
 
 
 @mcp.tool()
-@retry(stop=stop_after_attempt(3), wait=wait_fixed(2), retry_if_result=_is_result_error)
+@async_retry()
 async def video_last_frame_tool(video_url: str) -> dict:
     """
     Asynchronously extract the last frame from a video file and upload to TOS.
@@ -90,7 +100,7 @@ async def video_last_frame_tool(video_url: str) -> dict:
 
 
 @mcp.tool()
-@retry(stop=stop_after_attempt(3), wait=wait_fixed(2), retry_if_result=_is_result_error)
+@async_retry()
 async def seedream_generate_image_tool(prompt: str, size: str = "1024x1024") -> dict:
     """
     Asynchronously generate an image using Seedream AI model.
@@ -106,7 +116,7 @@ async def seedream_generate_image_tool(prompt: str, size: str = "1024x1024") ->
 
 
 @mcp.tool()
-@retry(stop=stop_after_attempt(3), wait=wait_fixed(2), retry_if_result=_is_result_error)
+@async_retry()
 async def seedance_generate_video_tool(prompt: str, first_frame_image: str, 
                                             last_frame_image: str = None, duration: int = 5, 
                                             resolution: str = "720p") -> dict:
@@ -127,7 +137,7 @@ async def seedance_generate_video_tool(prompt: str, first_frame_image: str,
 
 
 @mcp.tool()
-@retry(stop=stop_after_attempt(3), wait=wait_fixed(2), retry_if_result=_is_result_error)
+@async_retry()
 async def seededit_tool(image_url: str, prompt: str, seed: int = -1, 
                              scale: float = 0.5, charactor_keep: bool = False) -> dict:
     """
@@ -147,7 +157,7 @@ async def seededit_tool(image_url: str, prompt: str, seed: int = -1,
 
 
 @mcp.tool()
-@retry(stop=stop_after_attempt(3), wait=wait_fixed(2), retry_if_result=_is_result_error)
+@async_retry()
 async def vlm_vision_task_tool(messages: List) -> dict:
     """
     Asynchronously perform vision-language tasks using VLM model.
@@ -162,7 +172,7 @@ async def vlm_vision_task_tool(messages: List) -> dict:
 
 
 @mcp.tool()
-@retry(stop=stop_after_attempt(3), wait=wait_fixed(2), retry_if_result=_is_result_error)
+@async_retry()
 async def image_selector_tool(image_paths: List[str], prompt: str) -> dict:
     """
     Asynchronously select the best image from multiple options using VLM model.
@@ -178,7 +188,7 @@ async def image_selector_tool(image_paths: List[str], prompt: str) -> dict:
 
 
 @mcp.tool()
-@retry(stop=stop_after_attempt(3), wait=wait_fixed(2), retry_if_result=_is_result_error)
+@async_retry()
 async def video_selector_tool(video_paths: List[str], prompt: str) -> dict:
     """
     Asynchronously select the best video from multiple options using VLM model.
@@ -194,7 +204,7 @@ async def video_selector_tool(video_paths: List[str], prompt: str) -> dict:
 
 
 @mcp.tool()
-@retry(stop=stop_after_attempt(3), wait=wait_fixed(2), retry_if_result=_is_result_error)
+@async_retry()
 async def tos_save_content_tool(content: str, file_extension: str = "txt", 
                                      object_key: Optional[str] = None) -> dict:
     """

{media_agent_mcp-0.3.10.dist-info → media_agent_mcp-0.3.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: media-agent-mcp
-Version: 0.3.10
+Version: 0.3.11
 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
@@ -22,7 +22,6 @@ Requires-Dist: numpy>=1.24.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: volcengine-python-sdk>=1.0.0
 Requires-Dist: volcengine>=1.0.194
-Requires-Dist: tenacity>=8.2.3
 
 # Media Agent MCP
 

{media_agent_mcp-0.3.10.dist-info → media_agent_mcp-0.3.11.dist-info}/RECORD

@@ -1,5 +1,5 @@
 media_agent_mcp/__init__.py,sha256=4kV5u8kHrsdjpMHDNUhc8h4U6AwOyw1mNptFPd2snrQ,365
-media_agent_mcp/async_server.py,sha256=vpOMvN804eWz-FKf00Y_H3pE5FTl2C52SeXvFtfDJ8U,10495
+media_agent_mcp/async_server.py,sha256=IpXezeefilGukutgBqOU7RvCDp-t9_j11A2OOqiu2z0,10524
 media_agent_mcp/async_wrapper.py,sha256=bHi0cCKxv6R9oHcNcNq8tV0AyKrTDV47s8BuWetqlIg,8992
 media_agent_mcp/server.py,sha256=-mTeNcJXIlgByCG2HhaqV6zSbhjrQIEv_ssLN47KAzM,13759
 media_agent_mcp/ai_models/__init__.py,sha256=WN8JDSJbj2-sNwaQg3MDwmm9mvJTC1mqpWliac3sHoc,427
@@ -14,8 +14,8 @@ media_agent_mcp/storage/__init__.py,sha256=eio7ZiSeLjCxICSZwZisiR7wKJfXlT2PV7aDE
 media_agent_mcp/storage/tos_client.py,sha256=9c3GPmQe2stvxgZzsWYjVqKzVyvluZqYneCXYj-FQ3M,3174
 media_agent_mcp/video/__init__.py,sha256=4ILnqYaUaYKI4GWOSg2SNZqt10UM1Y-8Q2SVvjoijqY,277
 media_agent_mcp/video/processor.py,sha256=5ABPyj1IoD2xyIiB8dkEx4ZssPTXKHtuoFjy-dmnFks,11866
-media_agent_mcp-0.3.10.dist-info/METADATA,sha256=F0VfYB3vYpzoj0vk9537QWNBFIsCjfzpGUrvd15QdA8,11007
-media_agent_mcp-0.3.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-media_agent_mcp-0.3.10.dist-info/entry_points.txt,sha256=qhOUwR-ORVf9GO7emhhl7Lgd6MISgqbZr8bEuSH_VdA,70
-media_agent_mcp-0.3.10.dist-info/top_level.txt,sha256=WEa0YfchpTxZgiKn8gdxYgs-dir5HepJaTOrxAGx9nY,16
-media_agent_mcp-0.3.10.dist-info/RECORD,,
+media_agent_mcp-0.3.11.dist-info/METADATA,sha256=92jf-Ti8koiMfQqYbpcFNwNVQ4sntuCz0XrRTnBe0rI,10976
+media_agent_mcp-0.3.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+media_agent_mcp-0.3.11.dist-info/entry_points.txt,sha256=qhOUwR-ORVf9GO7emhhl7Lgd6MISgqbZr8bEuSH_VdA,70
+media_agent_mcp-0.3.11.dist-info/top_level.txt,sha256=WEa0YfchpTxZgiKn8gdxYgs-dir5HepJaTOrxAGx9nY,16
+media_agent_mcp-0.3.11.dist-info/RECORD,,