From 49c952a63125269b322091602fd4b37e060efd4e Mon Sep 17 00:00:00 2001 From: -LAN- Date: Thu, 13 Mar 2025 16:32:49 +0800 Subject: [PATCH] fix: streamline file upload configuration handling in manager.py (#15714) Signed-off-by: -LAN- --- .../app/app_config/features/file_upload/manager.py | 12 +++++------- .../app_config/features/file_upload/test_manager.py | 8 ++++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/api/core/app/app_config/features/file_upload/manager.py b/api/core/app/app_config/features/file_upload/manager.py index 0dc4efc47a..bcc69e8ec6 100644 --- a/api/core/app/app_config/features/file_upload/manager.py +++ b/api/core/app/app_config/features/file_upload/manager.py @@ -17,17 +17,15 @@ class FileUploadConfigManager: if file_upload_dict: if file_upload_dict.get("enabled"): transform_methods = file_upload_dict.get("allowed_file_upload_methods", []) - data = { - "image_config": { - "number_limits": file_upload_dict["number_limits"], - "transfer_methods": transform_methods, - } + file_upload_dict["image_config"] = { + "number_limits": file_upload_dict.get("number_limits", 1), + "transfer_methods": transform_methods, } if is_vision: - data["image_config"]["detail"] = file_upload_dict.get("image", {}).get("detail", "low") + file_upload_dict["image_config"]["detail"] = file_upload_dict.get("image", {}).get("detail", "high") - return FileUploadConfig.model_validate(data) + return FileUploadConfig.model_validate(file_upload_dict) @classmethod def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]: diff --git a/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py b/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py index 50a612ec5f..2acf8815a5 100644 --- a/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py +++ b/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py @@ -18,7 +18,9 @@ def test_convert_with_vision(): number_limits=5, transfer_methods=[FileTransferMethod.REMOTE_URL], detail=ImagePromptMessageContent.DETAIL.HIGH, - ) + ), + allowed_file_upload_methods=[FileTransferMethod.REMOTE_URL], + number_limits=5, ) assert result == expected @@ -33,7 +35,9 @@ def test_convert_without_vision(): } result = FileUploadConfigManager.convert(config, is_vision=False) expected = FileUploadConfig( - image_config=ImageConfig(number_limits=5, transfer_methods=[FileTransferMethod.REMOTE_URL]) + image_config=ImageConfig(number_limits=5, transfer_methods=[FileTransferMethod.REMOTE_URL]), + allowed_file_upload_methods=[FileTransferMethod.REMOTE_URL], + number_limits=5, ) assert result == expected