mirror of
https://github.com/infiniflow/ragflow.git
synced 2025-11-11 23:54:46 +00:00
Refa: Structure Ask Message (#8276)
### What problem does this PR solve? Refactoring codes for SDK ### Type of change - [x] Refactoring
This commit is contained in:
parent
df17294865
commit
545ea229b6
@ -50,33 +50,28 @@ class Session(Base):
|
|||||||
json_data = json.loads(line[5:])
|
json_data = json.loads(line[5:])
|
||||||
if json_data["data"] is True or json_data["data"].get("running_status"):
|
if json_data["data"] is True or json_data["data"].get("running_status"):
|
||||||
continue
|
continue
|
||||||
answer = json_data["data"]["answer"]
|
message = self._structure_answer(json_data)
|
||||||
reference = json_data["data"].get("reference", {})
|
|
||||||
temp_dict = {
|
|
||||||
"content": answer,
|
|
||||||
"role": "assistant"
|
|
||||||
}
|
|
||||||
if reference and "chunks" in reference:
|
|
||||||
chunks = reference["chunks"]
|
|
||||||
temp_dict["reference"] = chunks
|
|
||||||
message = Message(self.rag, temp_dict)
|
|
||||||
yield message
|
yield message
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
json_data = json.loads(res.text)
|
json_data = json.loads(res.text)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
raise Exception(f"Invalid response {res}")
|
raise Exception(f"Invalid response {res}")
|
||||||
answer = json_data["data"]["answer"]
|
return self._structure_answer(json_data)
|
||||||
reference = json_data["data"].get("reference", {})
|
|
||||||
temp_dict = {
|
|
||||||
"content": answer,
|
def _structure_answer(self, json_data):
|
||||||
"role": "assistant"
|
answer = json_data["data"]["answer"]
|
||||||
}
|
reference = json_data["data"].get("reference", {})
|
||||||
if reference and "chunks" in reference:
|
temp_dict = {
|
||||||
chunks = reference["chunks"]
|
"content": answer,
|
||||||
temp_dict["reference"] = chunks
|
"role": "assistant"
|
||||||
message = Message(self.rag, temp_dict)
|
}
|
||||||
return message
|
if reference and "chunks" in reference:
|
||||||
|
chunks = reference["chunks"]
|
||||||
|
temp_dict["reference"] = chunks
|
||||||
|
message = Message(self.rag, temp_dict)
|
||||||
|
return message
|
||||||
|
|
||||||
def _ask_chat(self, question: str, stream: bool, **kwargs):
|
def _ask_chat(self, question: str, stream: bool, **kwargs):
|
||||||
json_data = {"question": question, "stream": stream, "session_id": self.id}
|
json_data = {"question": question, "stream": stream, "session_id": self.id}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user