media-agent-mcp 2.6.1__py3-none-any.whl → 2.6.3__py3-none-any.whl

media_agent_mcp/ai_models/openaiedit.py

@@ -167,8 +167,6 @@ def google_edit(image_urls: List[str], prompt: str) -> Dict[str, Any]:
                 "data": None,
                 "message": "GOOGLE_API_KEY environment variable is not set."
             }
-        
-        genai.configure(api_key=api_key)
 
         if not image_urls or not isinstance(image_urls, list):
             return {
@@ -185,25 +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)
-
-        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."
-            }
+        client = genai.Client(
+            api_key=api_key,
+        )
+
+        # 最多尝试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]
+
+                # 如果获取到了图片数据，跳出重试循环
+                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)
@@ -237,8 +257,8 @@ if __name__ == '__main__':
     # For example: export OPENAI_API_KEY='your-api-key'
     image_url = 'https://carey.tos-ap-southeast-1.bytepluses.com/Art%20Portrait/Art%20Portrait/Art%20Portrait/Art%20Portrait%20(1).jpg'
     prompt = 'A cute baby sea otter cooking a meal'
-    result = openaiedit([image_url, image_url], prompt)
-    print(result)
+    # result = openaiedit([image_url, image_url], prompt)
+    # print(result)
     
     # Test for google_edit
     # Make sure to set your GOOGLE_API_KEY environment variable
@@ -246,7 +266,7 @@ if __name__ == '__main__':
     print("\nTesting Google Edit...")
     if os.getenv("GOOGLE_API_KEY"):
         google_prompt = "make the person smile"
-        google_result = google_edit([image_url], google_prompt)
+        google_result = google_edit([image_url, image_url], google_prompt)
         print(f"Google Edit result: {google_result}")
     else:
         print("GOOGLE_API_KEY not set, skipping google_edit test.")

{media_agent_mcp-2.6.1.dist-info → media_agent_mcp-2.6.3.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ media_agent_mcp/async_wrapper.py,sha256=hiiBhhz9WeVDfSBWVh6ovhf5jeP5ZbsieBbz9P-K
 media_agent_mcp/server.py,sha256=e8ubU0-R0OnuJy5Gk6jPg8rQXq478O_6f5lNMRMyeQA,19494
 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=nz29gYXaTmmekDS2UOiPK1mpq0gimpiRJIb5JcI1MDY,8894
+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.1.dist-info/METADATA,sha256=zvJ0hMsKHt2xTnZVvORWbecu15EqGJlGuX9VdApXerw,11310
-media_agent_mcp-2.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-media_agent_mcp-2.6.1.dist-info/entry_points.txt,sha256=qhOUwR-ORVf9GO7emhhl7Lgd6MISgqbZr8bEuSH_VdA,70
-media_agent_mcp-2.6.1.dist-info/top_level.txt,sha256=WEa0YfchpTxZgiKn8gdxYgs-dir5HepJaTOrxAGx9nY,16
-media_agent_mcp-2.6.1.dist-info/RECORD,,
+media_agent_mcp-2.6.3.dist-info/METADATA,sha256=FsbCwmhhslumpLV0wamMizqUxyzE4G3qTJMfd7wrcYE,11310
+media_agent_mcp-2.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+media_agent_mcp-2.6.3.dist-info/entry_points.txt,sha256=qhOUwR-ORVf9GO7emhhl7Lgd6MISgqbZr8bEuSH_VdA,70
+media_agent_mcp-2.6.3.dist-info/top_level.txt,sha256=WEa0YfchpTxZgiKn8gdxYgs-dir5HepJaTOrxAGx9nY,16
+media_agent_mcp-2.6.3.dist-info/RECORD,,