From 153d7f417352bea93294e832dee211dee0e36556 Mon Sep 17 00:00:00 2001 From: Hongjun Li <103014488+returnToInnocence@users.noreply.github.com> Date: Tue, 19 Nov 2024 11:24:24 +0800 Subject: [PATCH] fix(llm): answer prompt None value effect (#116) Solve the problem that the final result is not as expected when the `answer_prompt` in the body parameter of `/rag` api is `None` or an empty string --------- Co-authored-by: imbajin --- hugegraph-llm/src/hugegraph_llm/api/models/rag_requests.py | 4 ++-- hugegraph-llm/src/hugegraph_llm/api/rag_api.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hugegraph-llm/src/hugegraph_llm/api/models/rag_requests.py b/hugegraph-llm/src/hugegraph_llm/api/models/rag_requests.py index d8328591..dcf19db4 100644 --- a/hugegraph-llm/src/hugegraph_llm/api/models/rag_requests.py +++ b/hugegraph-llm/src/hugegraph_llm/api/models/rag_requests.py @@ -30,7 +30,7 @@ class RAGRequest(BaseModel): rerank_method: Literal["bleu", "reranker"] = "bleu" near_neighbor_first: bool = False custom_priority_info: str = "" - answer_prompt: str = "" + answer_prompt: Optional[str] = None class GraphRAGRequest(BaseModel): @@ -43,7 +43,7 @@ class GraphRAGRequest(BaseModel): rerank_method: Literal["bleu", "reranker"] = "bleu" near_neighbor_first: bool = False custom_priority_info: str = "" - answer_prompt: str = "" + answer_prompt: Optional[str] = None class GraphConfigRequest(BaseModel): diff --git a/hugegraph-llm/src/hugegraph_llm/api/rag_api.py b/hugegraph-llm/src/hugegraph_llm/api/rag_api.py index 26f42e5a..e5c43751 100644 --- a/hugegraph-llm/src/hugegraph_llm/api/rag_api.py +++ b/hugegraph-llm/src/hugegraph_llm/api/rag_api.py @@ -27,7 +27,7 @@ RerankerConfigRequest, GraphRAGRequest, ) from hugegraph_llm.api.models.rag_response import RAGResponse -from hugegraph_llm.config import settings +from hugegraph_llm.config import settings, prompt from hugegraph_llm.utils.log import log @@ -63,7 +63,7 @@ def rag_answer_api(req: RAGRequest): req.rerank_method, req.near_neighbor_first, req.custom_priority_info, - req.answer_prompt + req.answer_prompt or prompt.answer_prompt ) return { key: value