From 99d94abe85f3ae1e934a27032faeaa6199556286 Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Fri, 11 Jul 2025 14:43:53 +0800 Subject: [PATCH] refactor: improve image URL handling and clean up unused code in base_image_generate_node.py and tti.py --- .../impl/base_image_generate_node.py | 4 +++- .../impl/xinference_model_provider/model/tti.py | 12 +++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/apps/application/flow/step_node/image_generate_step_node/impl/base_image_generate_node.py b/apps/application/flow/step_node/image_generate_step_node/impl/base_image_generate_node.py index 8aef15397..af2a69ac4 100644 --- a/apps/application/flow/step_node/image_generate_step_node/impl/base_image_generate_node.py +++ b/apps/application/flow/step_node/image_generate_step_node/impl/base_image_generate_node.py @@ -40,7 +40,9 @@ class BaseImageGenerateNode(IImageGenerateNode): file_urls = [] for image_url in image_urls: file_name = 'generated_image.png' - file = bytes_to_uploaded_file(requests.get(image_url).content, file_name) + if isinstance(image_url, str) and image_url.startswith('http'): + image_url = requests.get(image_url).content + file = bytes_to_uploaded_file(image_url, file_name) meta = { 'debug': False if application.id else True, 'chat_id': chat_id, diff --git a/apps/models_provider/impl/xinference_model_provider/model/tti.py b/apps/models_provider/impl/xinference_model_provider/model/tti.py index 6bcec1258..f0d929eca 100644 --- a/apps/models_provider/impl/xinference_model_provider/model/tti.py +++ b/apps/models_provider/impl/xinference_model_provider/model/tti.py @@ -5,9 +5,11 @@ from openai import OpenAI from common.config.tokenizer_manage_config import TokenizerManage from common.utils.common import bytes_to_uploaded_file +from knowledge.models import FileSourceType # from dataset.serializers.file_serializers import FileSerializer from models_provider.base_model_provider import MaxKBBaseModel from models_provider.impl.base_tti import BaseTextToImage +from oss.serializers.file import FileSerializer def custom_get_token_ids(text: str): @@ -45,9 +47,6 @@ class XinferenceTextToImage(MaxKBBaseModel, BaseTextToImage): **optional_params, ) - def is_cache_model(self): - return False - def check_auth(self): self.generate_image('生成一个小猫图片') @@ -57,11 +56,6 @@ class XinferenceTextToImage(MaxKBBaseModel, BaseTextToImage): file_urls = [] # 临时文件 for img in res.data: - file = bytes_to_uploaded_file(base64.b64decode(img.b64_json), 'file_name.jpg') - meta = { - 'debug': True, - } - # file_url = FileSerializer(data={'file': file, 'meta': meta}).upload() - # file_urls.append(f'http://localhost:8080{file_url}') + file_urls.append(base64.b64decode(img.b64_json)) return file_urls