Skip to content

Commit 99d94ab

Browse files
committed
refactor: improve image URL handling and clean up unused code in base_image_generate_node.py and tti.py
1 parent ebb475c commit 99d94ab

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

apps/application/flow/step_node/image_generate_step_node/impl/base_image_generate_node.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ def execute(self, model_id, prompt, negative_prompt, dialogue_number, dialogue_t
4040
file_urls = []
4141
for image_url in image_urls:
4242
file_name = 'generated_image.png'
43-
file = bytes_to_uploaded_file(requests.get(image_url).content, file_name)
43+
if isinstance(image_url, str) and image_url.startswith('http'):
44+
image_url = requests.get(image_url).content
45+
file = bytes_to_uploaded_file(image_url, file_name)
4446
meta = {
4547
'debug': False if application.id else True,
4648
'chat_id': chat_id,

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55

66
from common.config.tokenizer_manage_config import TokenizerManage
77
from common.utils.common import bytes_to_uploaded_file
8+
from knowledge.models import FileSourceType
89
# from dataset.serializers.file_serializers import FileSerializer
910
from models_provider.base_model_provider import MaxKBBaseModel
1011
from models_provider.impl.base_tti import BaseTextToImage
12+
from oss.serializers.file import FileSerializer
1113

1214

1315
def custom_get_token_ids(text: str):
@@ -45,9 +47,6 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
4547
**optional_params,
4648
)
4749

48-
def is_cache_model(self):
49-
return False
50-
5150
def check_auth(self):
5251
self.generate_image('生成一个小猫图片')
5352

@@ -57,11 +56,6 @@ def generate_image(self, prompt: str, negative_prompt: str = None):
5756
file_urls = []
5857
# 临时文件
5958
for img in res.data:
60-
file = bytes_to_uploaded_file(base64.b64decode(img.b64_json), 'file_name.jpg')
61-
meta = {
62-
'debug': True,
63-
}
64-
# file_url = FileSerializer(data={'file': file, 'meta': meta}).upload()
65-
# file_urls.append(f'http://localhost:8080{file_url}')
59+
file_urls.append(base64.b64decode(img.b64_json))
6660

6761
return file_urls

0 commit comments

Comments
 (0)