wassname/Open-Assistant
1
0
Fork 0
mirror of https://github.com/wassname/Open-Assistant.git synced 2026-06-29 16:30:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Conversation messages refactor add msg ids (#500)

Browse Source 
* update ConversationMessage in protocal.py

* updated ConversationMessage instantiations in tasks.py and util.py to include message_id and frontend_message_id

* changed message_id and frontend_message_id to type UUID

* update ConversationMessage instantiation in main.py to include message_id and frontend_message_id"

* changed frontend_message_id to type str

* ran precomit
This commit is contained in:
Daniel Hug
2023-01-07 13:16:32 -05:00
committed by GitHub
parent 8e03e87367
commit f75a07301b
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/main.py
+5 -2
View File
@@ -136,9 +136,12 @@ if settings.DEBUG_USE_SEED_DATA:
conversation = protocol_schema.Conversation(
messages=[
protocol_schema.ConversationMessage(
text=msg.text, is_assistant=msg.role == "assistant"
text=cmsg.text,
is_assistant=cmsg.role == "assistant",
message_id=cmsg.id,
fronend_message_id=cmsg.frontend_message_id,
)
for msg in conversation_messages
for cmsg in conversation_messages
]
)
task = pr.store_task(
backend/oasst_backend/api/v1/tasks.py
+16 -2
View File
@@ -57,7 +57,12 @@ def generate_task(
logger.info("Generating a PrompterReplyTask.")
messages = pr.fetch_random_conversation("assistant")
task_messages = [
protocol_schema.ConversationMessage(text=msg.text, is_assistant=(msg.role == "assistant"))
protocol_schema.ConversationMessage(
text=msg.text,
is_assistant=(msg.role == "assistant"),
message_id=msg.id,
front_end_id=msg.front_end_id,
)
for msg in messages
]
@@ -68,7 +73,12 @@ def generate_task(
logger.info("Generating a AssistantReplyTask.")
messages = pr.fetch_random_conversation("prompter")
task_messages = [
protocol_schema.ConversationMessage(text=msg.text, is_assistant=(msg.role == "assistant"))
protocol_schema.ConversationMessage(
text=msg.text,
is_assistant=(msg.role == "assistant"),
message_id=msg.id,
front_end_id=msg.front_end_id,
)
for msg in messages
]
@@ -88,6 +98,8 @@ def generate_task(
protocol_schema.ConversationMessage(
text=p.text,
is_assistant=(p.role == "assistant"),
message_id=p.id,
front_end_id=p.front_end_id,
)
for p in conversation
]
@@ -107,6 +119,8 @@ def generate_task(
protocol_schema.ConversationMessage(
text=p.text,
is_assistant=(p.role == "assistant"),
message_id=p.id,
front_end_id=p.front_end_id,
)
for p in conversation
]
backend/oasst_backend/api/v1/utils.py
+6 -1
View File
@@ -22,7 +22,12 @@ def prepare_conversation(messages: list[Message]) -> protocol.Conversation:
conv_messages = []
for message in messages:
conv_messages.append(
protocol.ConversationMessage(text=message.text, is_assistant=(message.role == "assistant"))
protocol.ConversationMessage(
text=message.text,
is_assistant=(message.role == "assistant"),
message_id=message.id,
frontend_message_id=message.frontend_message_id,
)
)
return protocol.Conversation(messages=conv_messages)
oasst-shared/oasst_shared/schemas/protocol.py
+2
View File
@@ -34,6 +34,8 @@ class ConversationMessage(BaseModel):
text: str
is_assistant: bool
message_id: Optional[UUID] = None
frontend_message_id: Optional[str] = None
class Conversation(BaseModel):