update

routes/llm.py

@@ -2,7 +2,6 @@ import json
 import logging
 import os
 from typing import Annotated, AsyncGenerator, List, Optional
-import asyncio
 
 from fastapi import APIRouter, Depends, HTTPException
 from fastapi.responses import StreamingResponse
@@ -71,16 +70,13 @@ def insert_search_results_to_message(
     return False
 
 def try_insert_search_results(
-    chat_request: ChatRequest, search_results: List[str], entities: List[List[str]]
+    chat_request: ChatRequest, search_results: str,
 ) -> bool:
-    i = 0
     for msg in reversed(chat_request.history):
-        if msg.role == "user" and not msg.searchResults:
-            msg.searchResults = search_results[i]
-            msg.searchEntities = entities[i]
-            i += 1
-    if i == len(search_results):
-        return True
+        if msg.role == "user":
+            msg.searchResults = search_results
+            msg.searchEntities = []
+            return True
     return False
 
 def try_insert_reasoning(
@@ -125,7 +121,6 @@ def collapse_history_to_first_message(chat_request: ChatRequest) -> ChatRequest:
         searchResults=''
     )
     return ChatRequest(history=[new_message])
-
         
 async def sse_generator(request: ChatRequest, llm_api: DeepInfraApi, system_prompt: str, 
                         predict_params: LlmPredictParams,
@@ -136,6 +131,17 @@ async def sse_generator(request: ChatRequest, llm_api: DeepInfraApi, system_prom
     Генератор для стриминга ответа LLM через SSE.
     """
     try:
+        old_history = request.history
+        new_history = [Message(
+            role=msg.role,
+            content=msg.content,
+            reasoning=msg.reasoning,
+            searchResults=msg.searchResults[:500] + "..." if msg.searchResults else None,
+            searchEntities=[],
+        ) for msg in old_history]
+        request.history = new_history
+        
+        
         qe_result = await dialogue_service.get_qe_result(request.history)
         try_insert_reasoning(request, qe_result.debug_message)
         
@@ -164,22 +170,13 @@ async def sse_generator(request: ChatRequest, llm_api: DeepInfraApi, system_prom
             dataset = dataset_service.get_current_dataset()
             if dataset is None:
                 raise HTTPException(status_code=400, detail="Dataset not found")
-            previous_entities = [msg.searchEntities for msg in request.history if msg.searchEntities is not None]
-            previous_entities, chunk_ids, scores = entity_service.search_similar(qe_result.search_query, 
-                                                                                 dataset.id, previous_entities)
+            _, chunk_ids, scores = entity_service.search_similar(
+                qe_result.search_query, 
+                dataset.id, 
+                [],
+            )
             text_chunks = entity_service.build_text(chunk_ids, scores)
             
-            
-            async def build_text_async(entities):
-                return await asyncio.to_thread(entity_service.build_text, entities)
-
-            # all_text_chunks = [text_chunks] + [entity_service.build_text(entities) for entities in previous_entities]
-            tasks = [build_text_async(entities) for entities in previous_entities]
-            built_texts = await asyncio.gather(*tasks)
-            
-            all_text_chunks = [text_chunks] + built_texts
-            all_entities = [chunk_ids] + previous_entities
-            
             search_results_event = {
                 "event": "search_results",
                 "data": {
@@ -191,7 +188,7 @@ async def sse_generator(request: ChatRequest, llm_api: DeepInfraApi, system_prom
 
             # new_message = f'<search-results>\n{text_chunks}\n</search-results>\n{last_query.content}'
             
-            try_insert_search_results(request, all_text_chunks, all_entities)
+            try_insert_search_results(request, text_chunks)
     except Exception as e:
         logger.error(f"Error in SSE chat stream while searching: {str(e)}", stack_info=True)
         yield "data: {\"event\": \"error\", \"data\":\""+str(e)+"\" }\n\n"