style: auto-format with ruff [skip ci]
This commit is contained in:
parent
05a67c24f8
commit
9ffc058d6d
@ -100,9 +100,7 @@ async def create_database(
|
|||||||
reranker_cfg = params.get("reranker_config")
|
reranker_cfg = params.get("reranker_config")
|
||||||
if reranker_cfg:
|
if reranker_cfg:
|
||||||
if kb == "milvus":
|
if kb == "milvus":
|
||||||
logger.info(
|
logger.info("reranker_config is deprecated, please use query_params.options instead")
|
||||||
"reranker_config is deprecated, please use query_params.options instead"
|
|
||||||
)
|
|
||||||
else:
|
else:
|
||||||
logger.warning(f"{kb} does not support reranker, ignoring reranker_config")
|
logger.warning(f"{kb} does not support reranker, ignoring reranker_config")
|
||||||
# 移除 reranker_config,不再保存
|
# 移除 reranker_config,不再保存
|
||||||
@ -767,6 +765,7 @@ async def get_knowledge_base_query_params(db_id: str, current_user: User = Depen
|
|||||||
logger.error(f"获取知识库查询参数失败 {e}, {traceback.format_exc()}")
|
logger.error(f"获取知识库查询参数失败 {e}, {traceback.format_exc()}")
|
||||||
raise HTTPException(status_code=500, detail=str(e))
|
raise HTTPException(status_code=500, detail=str(e))
|
||||||
|
|
||||||
|
|
||||||
def _merge_saved_options(params: dict, saved_options: dict) -> dict:
|
def _merge_saved_options(params: dict, saved_options: dict) -> dict:
|
||||||
"""将用户保存的配置合并到默认配置中"""
|
"""将用户保存的配置合并到默认配置中"""
|
||||||
for option in params.get("options", []):
|
for option in params.get("options", []):
|
||||||
|
|||||||
@ -565,9 +565,7 @@ class MilvusKB(KnowledgeBase):
|
|||||||
key=lambda item: item.get("rerank_score", item.get("score", 0.0)), reverse=True
|
key=lambda item: item.get("rerank_score", item.get("score", 0.0)), reverse=True
|
||||||
)
|
)
|
||||||
elapsed = time.time() - rerank_start
|
elapsed = time.time() - rerank_start
|
||||||
logger.info(
|
logger.info(f"Reranking completed for {db_id} in {elapsed:.3f}s with model {reranker_model}")
|
||||||
f"Reranking completed for {db_id} in {elapsed:.3f}s with model {reranker_model}"
|
|
||||||
)
|
|
||||||
finally:
|
finally:
|
||||||
await reranker.aclose()
|
await reranker.aclose()
|
||||||
|
|
||||||
|
|||||||
@ -101,14 +101,14 @@ async def test_admin_can_create_vector_db_with_reranker(test_client, admin_heade
|
|||||||
"recall_top_k": 20,
|
"recall_top_k": 20,
|
||||||
}
|
}
|
||||||
update_response = await test_client.put(
|
update_response = await test_client.put(
|
||||||
f"/api/knowledge/databases/{db_id}/query-params",
|
f"/api/knowledge/databases/{db_id}/query-params", json=update_params, headers=admin_headers
|
||||||
json=update_params,
|
|
||||||
headers=admin_headers
|
|
||||||
)
|
)
|
||||||
assert update_response.status_code == 200, update_response.text
|
assert update_response.status_code == 200, update_response.text
|
||||||
|
|
||||||
# 再次获取参数,验证保存成功
|
# 再次获取参数,验证保存成功
|
||||||
params_response2 = await test_client.get(f"/api/knowledge/databases/{db_id}/query-params", headers=admin_headers)
|
params_response2 = await test_client.get(
|
||||||
|
f"/api/knowledge/databases/{db_id}/query-params", headers=admin_headers
|
||||||
|
)
|
||||||
assert params_response2.status_code == 200, params_response2.text
|
assert params_response2.status_code == 200, params_response2.text
|
||||||
|
|
||||||
params_payload2 = params_response2.json()
|
params_payload2 = params_response2.json()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user