Skip to content

Commit 49c952a

Browse files
authored
fix: streamline file upload configuration handling in manager.py (langgenius#15714)
Signed-off-by: -LAN- <[email protected]>
1 parent 5f9d236 commit 49c952a

File tree

2 files changed

+11
-9
lines changed
  • api

2 files changed

+11
-9
lines changed

api/core/app/app_config/features/file_upload/manager.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@ def convert(cls, config: Mapping[str, Any], is_vision: bool = True):
1717
if file_upload_dict:
1818
if file_upload_dict.get("enabled"):
1919
transform_methods = file_upload_dict.get("allowed_file_upload_methods", [])
20-
data = {
21-
"image_config": {
22-
"number_limits": file_upload_dict["number_limits"],
23-
"transfer_methods": transform_methods,
24-
}
20+
file_upload_dict["image_config"] = {
21+
"number_limits": file_upload_dict.get("number_limits", 1),
22+
"transfer_methods": transform_methods,
2523
}
2624

2725
if is_vision:
28-
data["image_config"]["detail"] = file_upload_dict.get("image", {}).get("detail", "low")
26+
file_upload_dict["image_config"]["detail"] = file_upload_dict.get("image", {}).get("detail", "high")
2927

30-
return FileUploadConfig.model_validate(data)
28+
return FileUploadConfig.model_validate(file_upload_dict)
3129

3230
@classmethod
3331
def validate_and_set_defaults(cls, config: dict) -> tuple[dict, list[str]]:

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ def test_convert_with_vision():
1818
number_limits=5,
1919
transfer_methods=[FileTransferMethod.REMOTE_URL],
2020
detail=ImagePromptMessageContent.DETAIL.HIGH,
21-
)
21+
),
22+
allowed_file_upload_methods=[FileTransferMethod.REMOTE_URL],
23+
number_limits=5,
2224
)
2325
assert result == expected
2426

@@ -33,7 +35,9 @@ def test_convert_without_vision():
3335
}
3436
result = FileUploadConfigManager.convert(config, is_vision=False)
3537
expected = FileUploadConfig(
36-
image_config=ImageConfig(number_limits=5, transfer_methods=[FileTransferMethod.REMOTE_URL])
38+
image_config=ImageConfig(number_limits=5, transfer_methods=[FileTransferMethod.REMOTE_URL]),
39+
allowed_file_upload_methods=[FileTransferMethod.REMOTE_URL],
40+
number_limits=5,
3741
)
3842
assert result == expected
3943

0 commit comments

Comments
 (0)