Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 23 additions & 5 deletions apps/application/workflow/nodes/ai_chat_node/ai_chat_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,18 @@ def _get_history_message(history_chat_record, dialogue_number, dialogue_type, ru

def _process_images(image):
images = []
image_list = []
if isinstance(image, str) and image.startswith("http"):
images.append({"type": "image_url", "image_url": {"url": image}})
image_list.append({"url": image})
elif image is not None and len(image) > 0:
for img in image:
if "file_id" in img:
file_id = img["file_id"]
file = QuerySet(File).filter(id=file_id).first()
if file is None:
continue
image_list.append({"url": f"./oss/file/{file.id}"})
image_bytes = file.get_bytes()
base64_image = base64.b64encode(image_bytes).decode("utf-8")
image_format = guess_image_format(image_bytes)
Expand All @@ -231,7 +236,8 @@ def _process_images(image):
)
elif "url" in img and img["url"].startswith("http"):
images.append({"type": "image_url", "image_url": {"url": img["url"]}})
return images
image_list.append({"url": img["url"]})
return images, image_list


def _get_upstream_knowledge_images(workflow_manage, node_id):
Expand Down Expand Up @@ -263,18 +269,24 @@ def _get_upstream_knowledge_images(workflow_manage, node_id):

def _process_videos(video, video_model):
videos = []
video_list = []
if isinstance(video, str) and video.startswith("http"):
videos.append({"type": "video_url", "video_url": {"url": video}})
video_list.append({"url": video})
elif video is not None and len(video) > 0:
for v in video:
if "file_id" in v:
file_id = v["file_id"]
file = QuerySet(File).filter(id=file_id).first()
if file is None:
continue
video_list.append({"url": f"./oss/file/{file.id}"})
url = video_model.upload_file_and_get_url(file.get_bytes(), file.file_name)
videos.append({"type": "video_url", "video_url": {"url": url}})
elif "url" in v and v["url"].startswith("http"):
videos.append({"type": "video_url", "video_url": {"url": v["url"]}})
return videos
video_list.append({"url": v["url"]})
return videos, video_list


class AIChatNode(INode):
Expand Down Expand Up @@ -435,17 +447,23 @@ def execute(self):

def _generate_prompt_question(self, question_str, model, vision, image_list, video_list):
images = []
_image_list = []
_video_list = []
videos = []
if vision:
if image_list:
image = self.workflow_manage.get_reference_field(image_list[0], image_list[1:])
images = _process_images(image)
images, _image_list = _process_images(image)
recalled_images = _get_upstream_knowledge_images(self.workflow_manage, self.get_node_id())
if recalled_images:
images.extend(_process_images(recalled_images))
_recalled_images, _recalled_image_list = _process_images(recalled_images)
images.extend(_recalled_images)
_image_list.extend(_recalled_image_list)
if video_list:
video = self.workflow_manage.get_reference_field(video_list[0], video_list[1:])
videos = _process_videos(video, model)
videos, _video_list = _process_videos(video, model)
self.data["image_list"] = _image_list
self.data["video_list"] = _video_list
return HumanMessage(content=[*videos, *images, {"type": "text", "text": question_str}])

async def _stream_response(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ def _parse_arguments(arguments) -> dict:
def _user_parts(item: dict) -> list:
parts = []
images = item.get("images") or []
parts.extend(_process_images([{"url": i} if isinstance(i, str) else i for i in images]))
image_parts, _ = _process_images([{"url": i} if isinstance(i, str) else i for i in images])
parts.extend(image_parts)
for video in item.get("videos") or []:
url = video if isinstance(video, str) else (video or {}).get("url")
if url:
Expand Down
Loading