AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-18 07:15:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: streamline file upload configuration handling in manager.py (#15714)

Browse Source 
Signed-off-by: -LAN- <laipz8200@outlook.com>
This commit is contained in:
-LAN- 2025-03-13 16:32:49 +08:00 committed by GitHub
parent 5f9d236d22
commit 49c952a631
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/core/app/app_config/features/file_upload/manager.py
View File

@ -17,17 +17,15 @@ class FileUploadConfigManager:
if file_upload_dict: if file_upload_dict:
if file_upload_dict.get("enabled"): if file_upload_dict.get("enabled"):
transform_methods = file_upload_dict.get("allowed_file_upload_methods", []) transform_methods = file_upload_dict.get("allowed_file_upload_methods", [])
data = { file_upload_dict["image_config"] = {
"image_config": { "number_limits": file_upload_dict.get("number_limits", 1),
"number_limits": file_upload_dict["number_limits"], "transfer_methods": transform_methods,
"transfer_methods": transform_methods,
}
} }
if is_vision: 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 @classmethod
def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]: def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]:

8
api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py
View File

@ -18,7 +18,9 @@ def test_convert_with_vision():
number_limits=5, number_limits=5,
transfer_methods=[FileTransferMethod.REMOTE_URL], transfer_methods=[FileTransferMethod.REMOTE_URL],
detail=ImagePromptMessageContent.DETAIL.HIGH, detail=ImagePromptMessageContent.DETAIL.HIGH,
) ),
allowed_file_upload_methods=[FileTransferMethod.REMOTE_URL],
number_limits=5,
) )
assert result == expected assert result == expected
@ -33,7 +35,9 @@ def test_convert_without_vision():
} }
result = FileUploadConfigManager.convert(config, is_vision=False) result = FileUploadConfigManager.convert(config, is_vision=False)
expected = FileUploadConfig( 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 assert result == expected