From d76d8a00f7590dcafeba819a7529fcfcc0b95df9 Mon Sep 17 00:00:00 2001 From: crazywoola <427733928@qq.com> Date: Fri, 27 Jun 2025 09:27:32 +0800 Subject: [PATCH] fix: lint --- .../service_api/dataset/dataset.py | 30 +++++++------ .../service_api/dataset/document.py | 42 +++++++++++-------- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/api/controllers/service_api/dataset/dataset.py b/api/controllers/service_api/dataset/dataset.py index 672d10a826..bbd78a12c8 100644 --- a/api/controllers/service_api/dataset/dataset.py +++ b/api/controllers/service_api/dataset/dataset.py @@ -138,15 +138,17 @@ class DatasetListApi(DatasetApiResource): DatasetService.check_embedding_model_setting( tenant_id, args.get("embedding_model_provider"), args.get("embedding_model") ) - if (args.get("retrieval_model") and - args.get("retrieval_model").get("reranking_model") and - args.get("retrieval_model").get("reranking_model").get("reranking_provider_name")): + if ( + args.get("retrieval_model") + and args.get("retrieval_model").get("reranking_model") + and args.get("retrieval_model").get("reranking_model").get("reranking_provider_name") + ): DatasetService.check_reranking_model_setting( - tenant_id, - args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), - args.get("retrieval_model").get("reranking_model").get("reranking_model_name") + tenant_id, + args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), + args.get("retrieval_model").get("reranking_model").get("reranking_model_name"), ) - + try: dataset = DatasetService.create_empty_dataset( tenant_id=tenant_id, @@ -287,13 +289,15 @@ class DatasetApi(DatasetApiResource): DatasetService.check_embedding_model_setting( dataset.tenant_id, data.get("embedding_model_provider"), data.get("embedding_model") ) - if (data.get("retrieval_model") and - data.get("retrieval_model").get("reranking_model") and - data.get("retrieval_model").get("reranking_model").get("reranking_provider_name")): + if ( + data.get("retrieval_model") + and data.get("retrieval_model").get("reranking_model") + and data.get("retrieval_model").get("reranking_model").get("reranking_provider_name") + ): DatasetService.check_reranking_model_setting( - dataset.tenant_id, - data.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), - data.get("retrieval_model").get("reranking_model").get("reranking_model_name") + dataset.tenant_id, + data.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), + data.get("retrieval_model").get("reranking_model").get("reranking_model_name"), ) # The role of the current user in the ta table must be admin, owner, editor, or dataset_operator diff --git a/api/controllers/service_api/dataset/document.py b/api/controllers/service_api/dataset/document.py index fa75700355..6213fad173 100644 --- a/api/controllers/service_api/dataset/document.py +++ b/api/controllers/service_api/dataset/document.py @@ -79,13 +79,15 @@ class DocumentAddByTextApi(DatasetApiResource): DatasetService.check_embedding_model_setting( tenant_id, args.get("embedding_model_provider"), args.get("embedding_model") ) - if (args.get("retrieval_model") and - args.get("retrieval_model").get("reranking_model") and - args.get("retrieval_model").get("reranking_model").get("reranking_provider_name")): + if ( + args.get("retrieval_model") + and args.get("retrieval_model").get("reranking_model") + and args.get("retrieval_model").get("reranking_model").get("reranking_provider_name") + ): DatasetService.check_reranking_model_setting( - tenant_id, - args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), - args.get("retrieval_model").get("reranking_model").get("reranking_model_name") + tenant_id, + args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), + args.get("retrieval_model").get("reranking_model").get("reranking_model_name"), ) upload_file = FileService.upload_text(text=str(text), text_name=str(name)) @@ -138,13 +140,15 @@ class DocumentUpdateByTextApi(DatasetApiResource): if not dataset: raise ValueError("Dataset does not exist.") - if (args.get("retrieval_model") and - args.get("retrieval_model").get("reranking_model") and - args.get("retrieval_model").get("reranking_model").get("reranking_provider_name")): + if ( + args.get("retrieval_model") + and args.get("retrieval_model").get("reranking_model") + and args.get("retrieval_model").get("reranking_model").get("reranking_provider_name") + ): DatasetService.check_reranking_model_setting( - tenant_id, - args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), - args.get("retrieval_model").get("reranking_model").get("reranking_model_name") + tenant_id, + args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), + args.get("retrieval_model").get("reranking_model").get("reranking_model_name"), ) # indexing_technique is already set in dataset since this is an update @@ -215,13 +219,15 @@ class DocumentAddByFileApi(DatasetApiResource): DatasetService.check_embedding_model_setting( tenant_id, args["embedding_model_provider"], args["embedding_model"] ) - if ("retrieval_model" in args and - args["retrieval_model"].get("reranking_model") and - args["retrieval_model"].get("reranking_model").get("reranking_provider_name")): + if ( + "retrieval_model" in args + and args["retrieval_model"].get("reranking_model") + and args["retrieval_model"].get("reranking_model").get("reranking_provider_name") + ): DatasetService.check_reranking_model_setting( - tenant_id, - args["retrieval_model"].get("reranking_model").get("reranking_provider_name"), - args["retrieval_model"].get("reranking_model").get("reranking_model_name") + tenant_id, + args["retrieval_model"].get("reranking_model").get("reranking_provider_name"), + args["retrieval_model"].get("reranking_model").get("reranking_model_name"), ) # save file info