From 50928df227ceaf5b5c848bf54ab3d7ecbcbc7ef5 Mon Sep 17 00:00:00 2001
From: pandy <1272175942@qq.com>
Date: Fri, 24 Apr 2026 23:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=9B=BE=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99=E6=8A=A5=E9=94=99GPT?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 py/PD_comfyplus_image.py |  4 ++--
 py/_image_gpt_common.py  | 32 +++++++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/py/PD_comfyplus_image.py b/py/PD_comfyplus_image.py
index 16b5138..dae040c 100644
--- a/py/PD_comfyplus_image.py
+++ b/py/PD_comfyplus_image.py
@@ -1,5 +1,5 @@
 import torch
-from comfy_api_nodes.apis import GeminiPart, GeminiInlineData, GeminiMimeType
+from comfy_api_nodes.apis import GeminiPart, GeminiInlineData
 from comfy_api_nodes.util.conversions import tensor_to_base64_string
 
 class PD_ComfyPlusImage:
@@ -56,7 +56,7 @@ class PD_ComfyPlusImage:
                         # 构造为 Gemini 认证的 Part
                         new_part = GeminiPart(
                             inlineData=GeminiInlineData(
-                                mimeType=GeminiMimeType.image_png,
+                                mimeType="image/png",
                                 data=img_b64
                             )
                         )
diff --git a/py/_image_gpt_common.py b/py/_image_gpt_common.py
index f7ff34b..d7e4bce 100644
--- a/py/_image_gpt_common.py
+++ b/py/_image_gpt_common.py
@@ -20,6 +20,19 @@ GPT_IMAGE_2_PRESET_SIZES = [
     "auto",
 ]
 
+SUPPORTED_OPENAI_IMAGE_MIME_TYPES = {
+    "image/jpeg": ("image/jpeg", "jpg"),
+    "image/jpg": ("image/jpeg", "jpg"),
+    "image/png": ("image/png", "png"),
+    "image/webp": ("image/webp", "webp"),
+    "geminimimetype.image_jpeg": ("image/jpeg", "jpg"),
+    "geminimimetype.image_png": ("image/png", "png"),
+    "geminimimetype.image_webp": ("image/webp", "webp"),
+    "image_jpeg": ("image/jpeg", "jpg"),
+    "image_png": ("image/png", "png"),
+    "image_webp": ("image/webp", "webp"),
+}
+
 # USD/CNY reference rate used for RMB estimation in node info output.
 # Based on the most recent publicly indexed April 2026 daily spot pages we could verify:
 # 2026-04-03: 1 USD ≈ 6.88154 CNY
@@ -110,6 +123,18 @@ def build_openai_edit_files(image, mask=None):
     return files
 
 
+def normalize_openai_image_mime_type(mime_type):
+    enum_value = getattr(mime_type, "value", mime_type)
+    if enum_value is None:
+        return ("image/png", "png")
+
+    mime_key = str(enum_value).strip().lower()
+    if not mime_key:
+        return ("image/png", "png")
+
+    return SUPPORTED_OPENAI_IMAGE_MIME_TYPES.get(mime_key, (None, None))
+
+
 def append_gemini_input_files_to_openai_files(files, input_files):
     if not input_files:
         return files
@@ -123,8 +148,10 @@ def append_gemini_input_files_to_openai_files(files, input_files):
         if not isinstance(inline_data, dict):
             continue
 
-        mime_type = inline_data.get("mimeType") or inline_data.get("mime_type") or "image/png"
-        if not isinstance(mime_type, str) or not mime_type.startswith("image/"):
+        mime_type, extension = normalize_openai_image_mime_type(
+            inline_data.get("mimeType") or inline_data.get("mime_type")
+        )
+        if not mime_type:
             continue
 
         data_b64 = inline_data.get("data")
@@ -133,7 +160,6 @@ def append_gemini_input_files_to_openai_files(files, input_files):
 
         image_bytes = base64.b64decode(data_b64)
         field_name = "image" if image_index == 0 and len(files) == 0 else "image[]"
-        extension = mime_type.split("/")[-1] or "png"
         files.append((field_name, (f"image_{image_index}.{extension}", image_bytes, mime_type)))
         image_index += 1