tian/kangda-robot-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
sladro 2026-02-02 22:56:07 +08:00
parent dfc4d1cfa7
commit 1719bd5463
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ruoyi-fastapi-backend/module_admin/controller/ragflow_controller.py
View File

@ -160,33 +160,38 @@ async def converse_with_chat_assistant(
logger.warning(f"意图分类失败，使用RAG服务: {e}") logger.warning(f"意图分类失败，使用RAG服务: {e}")
# ========== 3. RAG历史缓存查找 ========== # ========== 3. RAG历史缓存查找 ==========
logger.info(f'[SemanticCache] 准备执行RAG历史缓存查找 | redis={redis is not None} | chat_id={converse_params.chat_id}') # 注意：当 KB_PROVIDER=es_bm25 时，内部KB答案应直接来源于 ES 检索结果，
if redis: # 避免 rag:semantic:cache 抢答导致“curl 与 API 不一致”。
lookup_hash = get_question_hash(converse_params.question) if KBConfig.KB_PROVIDER != 'es_bm25':
logger.info(f'[SemanticCache] 开始查找 | chat_id={converse_params.chat_id} | question={converse_params.question} | hash={lookup_hash} | threshold=0.60') logger.info(f'[SemanticCache] 准备执行RAG历史缓存查找 | redis={redis is not None} | chat_id={converse_params.chat_id}')
if redis:
service = get_semantic_cache_service() lookup_hash = get_question_hash(converse_params.question)
logger.info(f'[SemanticCache] service实例: {service}') logger.info(f'[SemanticCache] 开始查找 | chat_id={converse_params.chat_id} | question={converse_params.question} | hash={lookup_hash} | threshold=0.60')
cache_result = await service.lookup(
converse_params.chat_id, service = get_semantic_cache_service()
converse_params.question, logger.info(f'[SemanticCache] service实例: {service}')
redis cache_result = await service.lookup(
) converse_params.chat_id,
logger.info(f'[SemanticCache] 查找结果 | found={cache_result is not None}') converse_params.question,
if cache_result: redis
cached_answer, cache_similarity = cache_result
logger.info(f'[RAG_SOURCE] 命中RAG会话历史 | chat_id={converse_params.chat_id} | question={converse_params.question} | similarity={cache_similarity:.2f} | answer_length={len(cached_answer)}')
logger.info(f'[SemanticCache] 流式响应使用RAG历史缓存答案，chat_id={converse_params.chat_id}')
return StreamingResponse(
stream_cached_response(cached_answer, converse_params.chat_id, start_time, cache_source='rag_history'),
media_type='text/event-stream',
headers={
'Cache-Control': 'no-cache',
'Connection': 'keep-alive',
'X-Accel-Buffering': 'no',
'Transfer-Encoding': 'chunked'
}
) )
logger.info(f'[SemanticCache] 查找结果 | found={cache_result is not None}')
if cache_result:
cached_answer, cache_similarity = cache_result
logger.info(f'[RAG_SOURCE] 命中RAG会话历史 | chat_id={converse_params.chat_id} | question={converse_params.question} | similarity={cache_similarity:.2f} | answer_length={len(cached_answer)}')
logger.info(f'[SemanticCache] 流式响应使用RAG历史缓存答案，chat_id={converse_params.chat_id}')
return StreamingResponse(
stream_cached_response(cached_answer, converse_params.chat_id, start_time, cache_source='rag_history'),
media_type='text/event-stream',
headers={
'Cache-Control': 'no-cache',
'Connection': 'keep-alive',
'X-Accel-Buffering': 'no',
'Transfer-Encoding': 'chunked'
}
)
else:
logger.info(f"[SemanticCache] skip lookup because KB_PROVIDER=es_bm25 | chat_id={converse_params.chat_id}")
# ========== 4. RAG服务调用（在这里根据 KB_PROVIDER 选择 ragflow / es_bm25） ========== # ========== 4. RAG服务调用（在这里根据 KB_PROVIDER 选择 ragflow / es_bm25） ==========
try: try:
@ -205,9 +210,8 @@ async def converse_with_chat_assistant(
) )
if KBESService.is_confident(metrics): if KBESService.is_confident(metrics):
async def cache_store_func(answer: str): # KB_PROVIDER=es_bm25 时不写入 rag:semantic:cache，避免污染后续命中
if redis and answer and len(answer.strip()) >= 10: cache_store_func = None
await _async_store_qa(converse_params.chat_id, converse_params.question, answer, redis)
return StreamingResponse( return StreamingResponse(
stream_kb_es_response( stream_kb_es_response(