mirror of
https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git
synced 2025-08-15 14:56:00 +08:00
Resolve 8475 support rerank model from infinity (#10939)
Co-authored-by: linyanxu <linyanxu2@qq.com>
This commit is contained in:
parent
01014a6a84
commit
1a6b961b5f
@ -64,7 +64,7 @@ class OAICompatRerankModel(RerankModel):
|
|||||||
|
|
||||||
# TODO: Do we need truncate docs to avoid llama.cpp return error?
|
# TODO: Do we need truncate docs to avoid llama.cpp return error?
|
||||||
|
|
||||||
data = {"model": model_name, "query": query, "documents": docs, "top_n": top_n}
|
data = {"model": model_name, "query": query, "documents": docs, "top_n": top_n, "return_documents": True}
|
||||||
|
|
||||||
try:
|
try:
|
||||||
response = post(str(URL(url) / "rerank"), headers=headers, data=dumps(data), timeout=60)
|
response = post(str(URL(url) / "rerank"), headers=headers, data=dumps(data), timeout=60)
|
||||||
@ -83,7 +83,13 @@ class OAICompatRerankModel(RerankModel):
|
|||||||
index = result["index"]
|
index = result["index"]
|
||||||
|
|
||||||
# Retrieve document text (fallback if llama.cpp rerank doesn't return it)
|
# Retrieve document text (fallback if llama.cpp rerank doesn't return it)
|
||||||
text = result.get("document", {}).get("text", docs[index])
|
text = docs[index]
|
||||||
|
document = result.get("document", {})
|
||||||
|
if document:
|
||||||
|
if isinstance(document, dict):
|
||||||
|
text = document.get("text", docs[index])
|
||||||
|
elif isinstance(document, str):
|
||||||
|
text = document
|
||||||
|
|
||||||
# Normalize the score
|
# Normalize the score
|
||||||
normalized_score = (result["relevance_score"] - min_score) / score_range
|
normalized_score = (result["relevance_score"] - min_score) / score_range
|
||||||
|
Loading…
x
Reference in New Issue
Block a user