yangdx
commited on
Commit
·
d164828
1
Parent(s):
24a06f6
修复rag调用参数不正确问题
Browse files
lightrag/api/lightrag_ollama.py
CHANGED
@@ -658,31 +658,14 @@ def create_app(args):
|
|
658 |
# 解析查询模式
|
659 |
cleaned_query, mode = parse_query_mode(query)
|
660 |
|
661 |
-
# 构建系统提示词(如果有历史消息)
|
662 |
-
system_prompt = None
|
663 |
-
history_messages = []
|
664 |
-
if len(messages) > 1:
|
665 |
-
# 如果第一条消息是系统消息,提取为system_prompt
|
666 |
-
if messages[0].role == "system":
|
667 |
-
system_prompt = messages[0].content
|
668 |
-
messages = messages[1:]
|
669 |
-
|
670 |
-
# 收集历史消息(除了最后一条)
|
671 |
-
history_messages = [(msg.role, msg.content) for msg in messages[:-1]]
|
672 |
-
|
673 |
# 调用RAG进行查询
|
674 |
-
|
675 |
-
|
|
|
676 |
mode=mode,
|
677 |
stream=request.stream,
|
678 |
)
|
679 |
-
|
680 |
-
if system_prompt is not None:
|
681 |
-
kwargs["system_prompt"] = system_prompt
|
682 |
-
if history_messages:
|
683 |
-
kwargs["history_messages"] = history_messages
|
684 |
-
|
685 |
-
response = await rag.aquery(cleaned_query, **kwargs)
|
686 |
|
687 |
if request.stream:
|
688 |
async def stream_generator():
|
|
|
658 |
# 解析查询模式
|
659 |
cleaned_query, mode = parse_query_mode(query)
|
660 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
661 |
# 调用RAG进行查询
|
662 |
+
response = await rag.aquery(
|
663 |
+
cleaned_query,
|
664 |
+
param=QueryParam(
|
665 |
mode=mode,
|
666 |
stream=request.stream,
|
667 |
)
|
668 |
+
)
|
|
|
|
|
|
|
|
|
|
|
|
|
669 |
|
670 |
if request.stream:
|
671 |
async def stream_generator():
|