ngskcloud
/
gcgj-dify-1.7.0
17
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: lint

Browse Source
pull/21582/head
crazywoola 11 months ago
parent ebdf9c1f15
commit d76d8a00f7
2 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File

30
api/controllers/service_api/dataset/dataset.py
Unescape Escape View File

@ -138,15 +138,17 @@ class DatasetListApi(DatasetApiResource):
DatasetService.check_embedding_model_setting( DatasetService.check_embedding_model_setting(
tenant_id, args.get("embedding_model_provider"), args.get("embedding_model") tenant_id, args.get("embedding_model_provider"), args.get("embedding_model")
) )
if (args.get("retrieval_model") and if (
args.get("retrieval_model").get("reranking_model") and args.get("retrieval_model")
args.get("retrieval_model").get("reranking_model").get("reranking_provider_name")): 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( DatasetService.check_reranking_model_setting(
tenant_id, tenant_id,
args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"),
args.get("retrieval_model").get("reranking_model").get("reranking_model_name") args.get("retrieval_model").get("reranking_model").get("reranking_model_name"),
) )
try: try:
dataset = DatasetService.create_empty_dataset( dataset = DatasetService.create_empty_dataset(
tenant_id=tenant_id, tenant_id=tenant_id,
@ -287,13 +289,15 @@ class DatasetApi(DatasetApiResource):
DatasetService.check_embedding_model_setting( DatasetService.check_embedding_model_setting(
dataset.tenant_id, data.get("embedding_model_provider"), data.get("embedding_model") dataset.tenant_id, data.get("embedding_model_provider"), data.get("embedding_model")
) )
if (data.get("retrieval_model") and if (
data.get("retrieval_model").get("reranking_model") and data.get("retrieval_model")
data.get("retrieval_model").get("reranking_model").get("reranking_provider_name")): 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( DatasetService.check_reranking_model_setting(
dataset.tenant_id, dataset.tenant_id,
data.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), data.get("retrieval_model").get("reranking_model").get("reranking_provider_name"),
data.get("retrieval_model").get("reranking_model").get("reranking_model_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 # The role of the current user in the ta table must be admin, owner, editor, or dataset_operator

42
api/controllers/service_api/dataset/document.py
Unescape Escape View File

@ -79,13 +79,15 @@ class DocumentAddByTextApi(DatasetApiResource):
DatasetService.check_embedding_model_setting( DatasetService.check_embedding_model_setting(
tenant_id, args.get("embedding_model_provider"), args.get("embedding_model") tenant_id, args.get("embedding_model_provider"), args.get("embedding_model")
) )
if (args.get("retrieval_model") and if (
args.get("retrieval_model").get("reranking_model") and args.get("retrieval_model")
args.get("retrieval_model").get("reranking_model").get("reranking_provider_name")): 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( DatasetService.check_reranking_model_setting(
tenant_id, tenant_id,
args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"),
args.get("retrieval_model").get("reranking_model").get("reranking_model_name") args.get("retrieval_model").get("reranking_model").get("reranking_model_name"),
) )
upload_file = FileService.upload_text(text=str(text), text_name=str(name)) upload_file = FileService.upload_text(text=str(text), text_name=str(name))
@ -138,13 +140,15 @@ class DocumentUpdateByTextApi(DatasetApiResource):
if not dataset: if not dataset:
raise ValueError("Dataset does not exist.") raise ValueError("Dataset does not exist.")
if (args.get("retrieval_model") and if (
args.get("retrieval_model").get("reranking_model") and args.get("retrieval_model")
args.get("retrieval_model").get("reranking_model").get("reranking_provider_name")): 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( DatasetService.check_reranking_model_setting(
tenant_id, tenant_id,
args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"), args.get("retrieval_model").get("reranking_model").get("reranking_provider_name"),
args.get("retrieval_model").get("reranking_model").get("reranking_model_name") args.get("retrieval_model").get("reranking_model").get("reranking_model_name"),
) )
# indexing_technique is already set in dataset since this is an update # indexing_technique is already set in dataset since this is an update
@ -215,13 +219,15 @@ class DocumentAddByFileApi(DatasetApiResource):
DatasetService.check_embedding_model_setting( DatasetService.check_embedding_model_setting(
tenant_id, args["embedding_model_provider"], args["embedding_model"] tenant_id, args["embedding_model_provider"], args["embedding_model"]
) )
if ("retrieval_model" in args and if (
args["retrieval_model"].get("reranking_model") and "retrieval_model" in args
args["retrieval_model"].get("reranking_model").get("reranking_provider_name")): and args["retrieval_model"].get("reranking_model")
and args["retrieval_model"].get("reranking_model").get("reranking_provider_name")
):
DatasetService.check_reranking_model_setting( DatasetService.check_reranking_model_setting(
tenant_id, tenant_id,
args["retrieval_model"].get("reranking_model").get("reranking_provider_name"), args["retrieval_model"].get("reranking_model").get("reranking_provider_name"),
args["retrieval_model"].get("reranking_model").get("reranking_model_name") args["retrieval_model"].get("reranking_model").get("reranking_model_name"),
) )
# save file info # save file info

Write Preview
Loading…
Cancel
Save