diff --git a/server/routers/knowledge_router.py b/server/routers/knowledge_router.py index 35841605..515a8afc 100644 --- a/server/routers/knowledge_router.py +++ b/server/routers/knowledge_router.py @@ -100,9 +100,7 @@ async def create_database( reranker_cfg = params.get("reranker_config") if reranker_cfg: if kb == "milvus": - logger.info( - "reranker_config is deprecated, please use query_params.options instead" - ) + logger.info("reranker_config is deprecated, please use query_params.options instead") else: logger.warning(f"{kb} does not support reranker, ignoring 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()}") raise HTTPException(status_code=500, detail=str(e)) + def _merge_saved_options(params: dict, saved_options: dict) -> dict: """将用户保存的配置合并到默认配置中""" for option in params.get("options", []): diff --git a/src/knowledge/implementations/milvus.py b/src/knowledge/implementations/milvus.py index 704cc18c..4300f3a3 100644 --- a/src/knowledge/implementations/milvus.py +++ b/src/knowledge/implementations/milvus.py @@ -565,9 +565,7 @@ class MilvusKB(KnowledgeBase): key=lambda item: item.get("rerank_score", item.get("score", 0.0)), reverse=True ) elapsed = time.time() - rerank_start - logger.info( - f"Reranking completed for {db_id} in {elapsed:.3f}s with model {reranker_model}" - ) + logger.info(f"Reranking completed for {db_id} in {elapsed:.3f}s with model {reranker_model}") finally: await reranker.aclose() diff --git a/test/api/test_knowledge_router.py b/test/api/test_knowledge_router.py index e5d3eeb2..482b1f90 100644 --- a/test/api/test_knowledge_router.py +++ b/test/api/test_knowledge_router.py @@ -101,14 +101,14 @@ async def test_admin_can_create_vector_db_with_reranker(test_client, admin_heade "recall_top_k": 20, } update_response = await test_client.put( - f"/api/knowledge/databases/{db_id}/query-params", - json=update_params, - headers=admin_headers + f"/api/knowledge/databases/{db_id}/query-params", json=update_params, headers=admin_headers ) 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 params_payload2 = params_response2.json()