additional forgotten renamings

This commit is contained in:
Andreas Köpf
2022-12-31 00:18:55 +01:00
committed by Andreas Köpf
parent 5f16a8f780
commit 26ae43e945
3 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -143,7 +143,7 @@ if settings.DEBUG_USE_SEED_DATA:
for msg in dummy_messages:
task = pr.fetch_task_by_frontend_message_id(msg.task_message_id)
if task and not task.ack:
logger.warning("Deleting unacknowledged seed data work package")
logger.warning("Deleting unacknowledged seed data task")
db.delete(task)
task = None
if not task:
+1 -1
View File
@@ -33,7 +33,7 @@ class OasstErrorCode(IntEnum):
INVALID_RANKING_VALUE = 2003
INVALID_TASK_TYPE = 2004
USER_NOT_SPECIFIED = 2005
NO_THREADS_FOUND = 2006
NO_MESSAGE_TREE_FOUND = 2006
NO_REPLIES_FOUND = 2007
TASK_NOT_FOUND = 2100
TASK_EXPIRED = 2101
+7 -7
View File
@@ -421,7 +421,7 @@ class PromptRepository:
"""
mt_messages = self.fetch_random_message_tree(last_message_role)
if not mt_messages:
raise OasstError("No message_tree found", OasstErrorCode.NO_THREADS_FOUND)
raise OasstError("No message tree found", OasstErrorCode.NO_MESSAGE_TREE_FOUND)
if last_message_role:
conv_messages = [m for m in mt_messages if m.role == last_message_role]
conv_messages = [random.choice(conv_messages)]
@@ -460,18 +460,18 @@ class PromptRepository:
message_tree = self.fetch_message_tree(replies[0].message_tree_id)
message_tree = {p.id: p for p in message_tree}
thread_messages = [message_tree[replies[0].parent_id]]
conversation = [message_tree[replies[0].parent_id]]
while True:
if not thread_messages[-1].parent_id:
if not conversation[-1].parent_id:
# reached start of the conversation
break
parent_message = message_tree[thread_messages[-1].parent_id]
thread_messages.append(parent_message)
parent_message = message_tree[conversation[-1].parent_id]
conversation.append(parent_message)
thread_messages = reversed(thread_messages)
conversation = reversed(conversation)
return thread_messages, replies
return conversation, replies
def fetch_message(self, message_id: UUID) -> Optional[Message]:
return self.db.query(Message).filter(Message.id == message_id).one()