Skip to content

fix generated media history URLs #6383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhonggang666 wants to merge 1 commit into
base: v2
Choose a base branch
from
+54 −3
Open

fix generated media history URLs #6383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apps/application/flow/step_node/image_generate_step_node/impl/base_image_generate_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ def generate_history_ai_message(self, chat_record):
return chat_record.get_ai_message()
image_list = val['image_list']
return AIMessage(content=[
*[{'type': 'image_url', 'image_url': {'url': f'{file_url}'}} for file_url in image_list]
*[
{'type': 'image_url', 'image_url': {'url': image_url}}
for image_url in self.get_image_url_list(image_list)
]
])
return chat_record.get_ai_message()

Expand Down Expand Up @@ -116,6 +119,20 @@ def generate_message_list(self, question: str, history_message):
question
]

@staticmethod
def get_image_url_list(image_list):
image_url_list = []
for image in image_list or []:
if isinstance(image, dict):
image_url = image.get('url') or (
f"./oss/file/{image.get('file_id')}" if image.get('file_id') else None
)
else:
image_url = image
if image_url:
image_url_list.append(image_url)
return image_url_list

def upload_file(self, file):
if [WorkflowMode.KNOWLEDGE, WorkflowMode.KNOWLEDGE_LOOP].__contains__(
self.workflow_manage.flow.workflow_mode):
Expand Down
19 changes: 18 additions & 1 deletion apps/application/flow/step_node/image_to_video_step_node/impl/base_image_to_video_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,10 @@ def generate_history_ai_message(self, chat_record):
return chat_record.get_ai_message()
image_list = val['image_list']
return AIMessage(content=[
*[{'type': 'image_url', 'image_url': {'url': f'{file_url}'}} for file_url in image_list]
*[
{'type': 'image_url', 'image_url': {'url': image_url}}
for image_url in self.get_image_url_list(image_list)
]
])
return chat_record.get_ai_message()

Expand Down Expand Up @@ -181,6 +184,20 @@ def generate_message_list(self, question: str, history_message):
question
]

@staticmethod
def get_image_url_list(image_list):
image_url_list = []
for image in image_list or []:
if isinstance(image, dict):
image_url = image.get('url') or (
f"./oss/file/{image.get('file_id')}" if image.get('file_id') else None
)
else:
image_url = image
if image_url:
image_url_list.append(image_url)
return image_url_list

@staticmethod
def reset_message_list(message_list: List[BaseMessage], answer_text):
result = [{'role': 'user' if isinstance(message, HumanMessage) else 'ai', 'content': message.content} for
Expand Down
19 changes: 18 additions & 1 deletion apps/application/flow/step_node/text_to_video_step_node/impl/base_text_to_video_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,10 @@ def generate_history_ai_message(self, chat_record):
return chat_record.get_ai_message()
image_list = val['image_list']
return AIMessage(content=[
*[{'type': 'image_url', 'image_url': {'url': f'{file_url}'}} for file_url in image_list]
*[
{'type': 'image_url', 'image_url': {'url': image_url}}
for image_url in self.get_image_url_list(image_list)
]
])
return chat_record.get_ai_message()

Expand Down Expand Up @@ -157,6 +160,20 @@ def generate_message_list(self, question: str, history_message):
question
]

@staticmethod
def get_image_url_list(image_list):
image_url_list = []
for image in image_list or []:
if isinstance(image, dict):
image_url = image.get('url') or (
f"./oss/file/{image.get('file_id')}" if image.get('file_id') else None
)
else:
image_url = image
if image_url:
image_url_list.append(image_url)
return image_url_list

@staticmethod
def reset_message_list(message_list: List[BaseMessage], answer_text):
result = [{'role': 'user' if isinstance(message, HumanMessage) else 'ai', 'content': message.content} for
Expand Down
Loading