Skip to content

Commit 0162dee

Browse files
authored
fix(ChatKnowledge): summary support zhipu message_converter (#1085)
1 parent 0936856 commit 0162dee

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

dbgpt/app/knowledge/service.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,9 @@ async def document_summary(self, request: DocumentSummaryRequest):
400400
assembler = SummaryAssembler(
401401
knowledge=knowledge,
402402
model_name=request.model_name,
403-
llm_client=DefaultLLMClient(worker_manager=worker_manager),
403+
llm_client=DefaultLLMClient(
404+
worker_manager=worker_manager, auto_convert_message=True
405+
),
404406
language=CFG.LANGUAGE,
405407
chunk_parameters=chunk_parameters,
406408
)

dbgpt/rag/extractor/summary.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
the summary should be as concise as possible and not overly lengthy.Please keep the answer within approximately 200 characters.
1919
"""
2020

21-
REFINE_SUMMARY_TEMPLATE_ZH = """我们已经提供了一个到某一点的现有总结:{context}\n 请根据你之前推理的内容进行最终的总结,总结回答的时候最好按照1.2.3.进行. 注意:请用<中文>来进行总结。"""
21+
REFINE_SUMMARY_TEMPLATE_ZH = """我们已经提供了一个到某一点的现有总结:{context}\n 请根据你之前推理的内容进行总结,总结回答的时候最好按照1.2.3.进行. 注意:请用<中文>来进行总结。"""
2222

2323
REFINE_SUMMARY_TEMPLATE_EN = """
2424
We have provided an existing summary up to a certain point: {context}, We have the opportunity to refine the existing summary (only if needed) with some more context below.
@@ -144,7 +144,7 @@ async def _llm_run_tasks(
144144
from dbgpt.core import ModelMessage
145145

146146
prompt = prompt_template.format(context=chunk_text)
147-
messages = [ModelMessage(role=ModelMessageRoleType.SYSTEM, content=prompt)]
147+
messages = [ModelMessage(role=ModelMessageRoleType.HUMAN, content=prompt)]
148148
request = ModelRequest(model=self._model_name, messages=messages)
149149
tasks.append(self._llm_client.generate(request))
150150
summary_results = await run_async_tasks(

examples/awel/simple_rag_summary_example.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,23 @@
2121
2222
.. code-block:: shell
2323
24-
DBGPT_SERVER="http://127.0.0.1:5000"
25-
FILE_PATH="{your_file_path}"
2624
curl -X POST http://127.0.0.1:5555/api/v1/awel/trigger/examples/rag/summary \
2725
-H "Content-Type: application/json" -d '{
28-
"file_path": $FILE_PATH
26+
"url": "https://docs.dbgpt.site/docs/awel"
2927
}'
3028
"""
3129
from typing import Dict
3230

3331
from dbgpt._private.pydantic import BaseModel, Field
3432
from dbgpt.core.awel import DAG, HttpTrigger, MapOperator
3533
from dbgpt.model import OpenAILLMClient
34+
from dbgpt.rag.knowledge.base import KnowledgeType
3635
from dbgpt.rag.operator.knowledge import KnowledgeOperator
3736
from dbgpt.rag.operator.summary import SummaryAssemblerOperator
3837

3938

4039
class TriggerReqBody(BaseModel):
41-
file_path: str = Field(..., description="file_path")
40+
url: str = Field(..., description="url")
4241

4342

4443
class RequestHandleOperator(MapOperator[TriggerReqBody, Dict]):
@@ -47,7 +46,7 @@ def __init__(self, **kwargs):
4746

4847
async def map(self, input_value: TriggerReqBody) -> Dict:
4948
params = {
50-
"file_path": input_value.file_path,
49+
"url": input_value.url,
5150
}
5251
print(f"Receive input value: {input_value}")
5352
return params
@@ -58,9 +57,9 @@ async def map(self, input_value: TriggerReqBody) -> Dict:
5857
"/examples/rag/summary", methods="POST", request_body=TriggerReqBody
5958
)
6059
request_handle_task = RequestHandleOperator()
61-
path_operator = MapOperator(lambda request: request["file_path"])
60+
path_operator = MapOperator(lambda request: request["url"])
6261
# build knowledge operator
63-
knowledge_operator = KnowledgeOperator()
62+
knowledge_operator = KnowledgeOperator(knowledge_type=KnowledgeType.URL)
6463
# build summary assembler operator
6564
summary_operator = SummaryAssemblerOperator(
6665
llm_client=OpenAILLMClient(), language="en"

0 commit comments

Comments
 (0)