Skip to content
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

Jump to bottom

handle image file types from openai #694

Merged
merged 2 commits into from
Sep 27, 2024
Merged

handle image file types from openai #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0d6fd5
handle image file types from openai
snopoke Sep 26, 2024
aa91862
update tests
snopoke Sep 26, 2024
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
76 changes: 42 additions & 34 deletions apps/service_providers/llm_service/runnables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,11 @@ def _save_response_annotations(self, output, thread_id, run_id) -> tuple[str, di
client = self.state.raw_client
generated_files = []

# This output is a concatanation of all messages in this run
output_message = output
if isinstance(output, str):
output_message = output
else:
output_message = "\n".join(content.text.value for content in output if content.type == "text")

team = self.state.session.team
assistant_file_ids = ToolResources.objects.filter(assistant=self.state.experiment.assistant).values_list(
"files"
Expand All @@ -349,38 +352,43 @@ def _save_response_annotations(self, output, thread_id, run_id) -> tuple[str, di
file_ids = set()
for message in client.beta.threads.messages.list(thread_id, run_id=run_id):
for message_content in message.content:
annotations = message_content.text.annotations
for idx, annotation in enumerate(annotations):
file_id = None
file_ref_text = annotation.text
if annotation.type == "file_citation":
file_citation = annotation.file_citation
file_id = file_citation.file_id
file_name, file_link = self._get_file_name_and_link_for_citation(
file_id=file_id, forbidden_file_ids=assistant_files_ids
)

# Original citation text example:【6:0†source】
output_message = output_message.replace(file_ref_text, f" [{file_name}]({file_link})")

elif annotation.type == "file_path":
file_path = annotation.file_path
file_id = file_path.file_id
created_file = get_and_store_openai_file(
client=client,
file_name=annotation.text.split("/")[-1],
file_id=file_id,
team_id=self.state.experiment.team_id,
)
# Original citation text example: sandbox:/mnt/data/the_file.csv. This is the link part in what
# looks like [Download the CSV file](sandbox:/mnt/data/the_file.csv)
session_id = self.state.session.id
output_message = output_message.replace(
file_ref_text, f"file:{team.slug}:{session_id}:{created_file.id}"
)
generated_files.append(created_file)

file_ids.add(file_id)
if message_content.type == "image_file":
# Ignore these for now. Typically, they are also referenced in the text content
pass
elif message_content.type == "text":
annotations = message_content.text.annotations
for idx, annotation in enumerate(annotations):
file_id = None
file_ref_text = annotation.text
if annotation.type == "file_citation":
file_citation = annotation.file_citation
file_id = file_citation.file_id
file_name, file_link = self._get_file_name_and_link_for_citation(
file_id=file_id, forbidden_file_ids=assistant_files_ids
)

# Original citation text example:【6:0†source】
output_message = output_message.replace(file_ref_text, f" [{file_name}]({file_link})")

elif annotation.type == "file_path":
file_path = annotation.file_path
file_id = file_path.file_id
created_file = get_and_store_openai_file(
client=client,
file_name=annotation.text.split("/")[-1],
file_id=file_id,
team_id=self.state.experiment.team_id,
)
# Original citation text example: sandbox:/mnt/data/the_file.csv.
# This is the link part in what looks like
# [Download the CSV file](sandbox:/mnt/data/the_file.csv)
session_id = self.state.session.id
output_message = output_message.replace(
file_ref_text, f"file:{team.slug}:{session_id}:{created_file.id}"
)
generated_files.append(created_file)

file_ids.add(file_id)

# Attach the generated files to the chat object as an annotation
if generated_files:
Expand Down
8 changes: 6 additions & 2 deletions apps/service_providers/tests/test_assistant_runnable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import openai
import pytest
from openai.types.beta.threads import ImageFile, ImageFileContentBlock, Run
from openai.types.beta.threads import Message as ThreadMessage
from openai.types.beta.threads import Run
from openai.types.beta.threads.file_citation_annotation import FileCitation, FileCitationAnnotation
from openai.types.beta.threads.file_path_annotation import FilePath, FilePathAnnotation
from openai.types.beta.threads.text import Text
Expand Down Expand Up @@ -493,10 +493,14 @@ def _create_thread_messages(
metadata={},
created_at=0,
content=[
ImageFileContentBlock(
type="image_file",
image_file=ImageFile(file_id="test_file_id"),
),
TextContentBlock(
text=Text(annotations=annotations if annotations else [], value=list(message.values())[0]),
type="text",
)
),
],
object="thread.message",
role=list(message)[0],
Expand Down
Loading