Fix bugs in api (#3624)

### What problem does this PR solve?

#3488

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)

---------

Co-authored-by: liuhua <10215101452@stu.ecun.edu.cn>
Co-authored-by: Kevin Hu <kevinhu.sh@gmail.com>
This commit is contained in:
liuhua 2024-11-25 15:25:48 +08:00 committed by GitHub
parent b2c33b4df7
commit 86e48179a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions

View File

@ -111,7 +111,7 @@ def create(tenant_id):
req['prompt_config'] = {} req['prompt_config'] = {}
for key in key_list_2: for key in key_list_2:
temp = req['prompt_config'].get(key) temp = req['prompt_config'].get(key)
if not temp: if (not temp and key == 'system') or (key not in req["prompt_config"]):
req['prompt_config'][key] = default_prompt[key] req['prompt_config'][key] = default_prompt[key]
for p in req['prompt_config']["parameters"]: for p in req['prompt_config']["parameters"]:
if p["optional"]: if p["optional"]:

View File

@ -413,7 +413,7 @@ def list_session(chat_id,tenant_id):
"document_id": chunk["doc_id"], "document_id": chunk["doc_id"],
"document_name": chunk["docnm_kwd"], "document_name": chunk["docnm_kwd"],
"dataset_id": chunk["kb_id"], "dataset_id": chunk["kb_id"],
"image_id": chunk["img_id"], "image_id": chunk["image_id"],
"similarity": chunk["similarity"], "similarity": chunk["similarity"],
"vector_similarity": chunk["vector_similarity"], "vector_similarity": chunk["vector_similarity"],
"term_similarity": chunk["term_similarity"], "term_similarity": chunk["term_similarity"],

View File

@ -17,11 +17,11 @@ class Session(Base):
self.__session_type = "agent" self.__session_type = "agent"
super().__init__(rag, res_dict) super().__init__(rag, res_dict)
def ask(self, question): def ask(self, question,stream=True):
if self.__session_type == "agent": if self.__session_type == "agent":
res=self._ask_agent(question) res=self._ask_agent(question,stream)
elif self.__session_type == "chat": elif self.__session_type == "chat":
res=self._ask_chat(question) res=self._ask_chat(question,stream)
for line in res.iter_lines(): for line in res.iter_lines():
line = line.decode("utf-8") line = line.decode("utf-8")
if line.startswith("{"): if line.startswith("{"):
@ -43,11 +43,11 @@ class Session(Base):
yield message yield message
def _ask_chat(self, question: str, stream: bool = False): def _ask_chat(self, question: str, stream: bool):
res = self.post(f"/chats/{self.chat_id}/completions", res = self.post(f"/chats/{self.chat_id}/completions",
{"question": question, "stream": True,"session_id":self.id}, stream=stream) {"question": question, "stream": True,"session_id":self.id}, stream=stream)
return res return res
def _ask_agent(self,question:str,stream:bool=False): def _ask_agent(self,question:str,stream:bool):
res = self.post(f"/agents/{self.agent_id}/completions", res = self.post(f"/agents/{self.agent_id}/completions",
{"question": question, "stream": True,"session_id":self.id}, stream=stream) {"question": question, "stream": True,"session_id":self.id}, stream=stream)
return res return res