refac
This commit is contained in:
1 parent
f1ded9409a
commit
a9617ca218
4 files changed
+13
-2
No files matched your search
@@ -834,7 +834,7 @@ class ChatTable:
|
|||||||
history['messages'][message_id]['statusHistory'] = status_history
|
history['messages'][message_id]['statusHistory'] = status_history
|
||||||
|
|
||||||
chat['history'] = history
|
chat['history'] = history
|
||||||
return await self.update_chat_by_id(id, chat)
|
return await self.update_chat_by_id(id, chat, touch=False)
|
||||||
|
|
||||||
async def add_message_files_by_id_and_message_id(self, id: str, message_id: str, files: list[dict]) -> list[dict]:
|
async def add_message_files_by_id_and_message_id(self, id: str, message_id: str, files: list[dict]) -> list[dict]:
|
||||||
async with get_async_db_context() as session:
|
async with get_async_db_context() as session:
|
||||||
|
|||||||
@@ -997,6 +997,7 @@ async def get_event_emitter(request_info, update_db=True):
|
|||||||
{
|
{
|
||||||
'embeds': embeds,
|
'embeds': embeds,
|
||||||
},
|
},
|
||||||
|
touch=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
elif event_type == 'files':
|
elif event_type == 'files':
|
||||||
@@ -1014,6 +1015,7 @@ async def get_event_emitter(request_info, update_db=True):
|
|||||||
{
|
{
|
||||||
'files': files,
|
'files': files,
|
||||||
},
|
},
|
||||||
|
touch=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
elif event_type in ('source', 'citation'):
|
elif event_type in ('source', 'citation'):
|
||||||
@@ -1033,6 +1035,7 @@ async def get_event_emitter(request_info, update_db=True):
|
|||||||
{
|
{
|
||||||
'sources': sources,
|
'sources': sources,
|
||||||
},
|
},
|
||||||
|
touch=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
if 'user_id' in request_info and 'chat_id' in request_info and 'message_id' in request_info:
|
if 'user_id' in request_info and 'chat_id' in request_info and 'message_id' in request_info:
|
||||||
|
|||||||
@@ -115,6 +115,7 @@ async def compact_messages_for_request(
|
|||||||
chat_id,
|
chat_id,
|
||||||
checkpoint_message_id,
|
checkpoint_message_id,
|
||||||
{'contextSummary': summary},
|
{'contextSummary': summary},
|
||||||
|
touch=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
log.info(
|
log.info(
|
||||||
@@ -172,7 +173,9 @@ async def compact_chat_branch(request, user, chat: Any, model_id: str, models: d
|
|||||||
previous_summary,
|
previous_summary,
|
||||||
config['prompt_template'],
|
config['prompt_template'],
|
||||||
)
|
)
|
||||||
await Chats.upsert_message_to_chat_by_id_and_message_id(chat.id, current_id, {'contextSummary': summary})
|
await Chats.upsert_message_to_chat_by_id_and_message_id(
|
||||||
|
chat.id, current_id, {'contextSummary': summary}, touch=False
|
||||||
|
)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'ok': True,
|
'ok': True,
|
||||||
|
|||||||
@@ -3465,6 +3465,7 @@ async def non_streaming_chat_response_handler(response, ctx):
|
|||||||
{
|
{
|
||||||
'selectedModelId': response_data['selected_model_id'],
|
'selectedModelId': response_data['selected_model_id'],
|
||||||
},
|
},
|
||||||
|
touch=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
choices = response_data.get('choices', [])
|
choices = response_data.get('choices', [])
|
||||||
@@ -4061,6 +4062,7 @@ async def streaming_chat_response_handler(response, ctx):
|
|||||||
{
|
{
|
||||||
'selectedModelId': model_id,
|
'selectedModelId': model_id,
|
||||||
},
|
},
|
||||||
|
touch=False,
|
||||||
)
|
)
|
||||||
await event_emitter(
|
await event_emitter(
|
||||||
{
|
{
|
||||||
@@ -5261,12 +5263,14 @@ async def streaming_chat_response_handler(response, ctx):
|
|||||||
metadata['chat_id'],
|
metadata['chat_id'],
|
||||||
metadata['message_id'],
|
metadata['message_id'],
|
||||||
{'done': True, 'usage': usage},
|
{'done': True, 'usage': usage},
|
||||||
|
touch=False,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
await Chats.upsert_message_to_chat_by_id_and_message_id(
|
await Chats.upsert_message_to_chat_by_id_and_message_id(
|
||||||
metadata['chat_id'],
|
metadata['chat_id'],
|
||||||
metadata['message_id'],
|
metadata['message_id'],
|
||||||
{'done': True},
|
{'done': True},
|
||||||
|
touch=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Send a webhook notification if the user is not active
|
# Send a webhook notification if the user is not active
|
||||||
@@ -5333,6 +5337,7 @@ async def streaming_chat_response_handler(response, ctx):
|
|||||||
metadata['chat_id'],
|
metadata['chat_id'],
|
||||||
metadata['message_id'],
|
metadata['message_id'],
|
||||||
{'done': True},
|
{'done': True},
|
||||||
|
touch=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in new issue
Block a user