Skip to content

Commit 48493ea

Browse files
committed
fix: enhance image URL handling in response processing for multiple formats
1 parent 9c720b4 commit 48493ea

2 files changed

Lines changed: 18 additions & 5 deletions

File tree

  • apps/models_provider/impl
    • gemini_model_provider/model
    • volcanic_engine_model_provider/model

apps/models_provider/impl/gemini_model_provider/model/tti.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from openai import OpenAI
55

66
from common.config.tokenizer_manage_config import TokenizerManage
7+
from common.utils.logger import maxkb_logger
78
from models_provider.base_model_provider import MaxKBBaseModel
89
from models_provider.impl.base_tti import BaseTextToImage
910

@@ -78,7 +79,7 @@ def generate_image(self, prompt: str, negative_prompt: str = None):
7879

7980
for part in response.parts:
8081
if part.text is not None:
81-
print(part.text)
82+
maxkb_logger.info(part.text)
8283
elif part.inline_data is not None:
8384
image_bytes = part.inline_data.data
8485
img_base64 = base64.b64encode(image_bytes).decode("utf-8")

apps/models_provider/impl/volcanic_engine_model_provider/model/tti.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,20 @@ def generate_image(self, prompt: str, negative_prompt: str = None):
6060
prompt=prompt,
6161
**self.params
6262
)
63-
if imagesResponse.data[0].url:
64-
file_urls.append(imagesResponse.data[0].url)
65-
elif imagesResponse.data[0].b64_json:
66-
file_urls.append(imagesResponse.data[0].b64_json)
63+
# 如果 data 是列表,遍历所有图片
64+
if isinstance(imagesResponse.data, list):
65+
for item in imagesResponse.data:
66+
# 优先使用 URL,其次使用 base64
67+
if hasattr(item, 'url') and item.url:
68+
file_urls.append(item.url)
69+
elif hasattr(item, 'b64_json') and item.b64_json:
70+
file_urls.append(item.b64_json)
71+
else:
72+
# 如果 data 是单个对象
73+
item = imagesResponse.data
74+
if hasattr(item, 'url') and item.url:
75+
file_urls.append(item.url)
76+
elif hasattr(item, 'b64_json') and item.b64_json:
77+
file_urls.append(item.b64_json)
78+
6779
return file_urls

0 commit comments

Comments
 (0)