Austin/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2024-11-16 03:32:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

feat(http-request-executor): enhance file handling in HTTP requests (#9944)

Browse Source
This commit is contained in:
-LAN- 2024-10-28 17:51:01 +08:00 committed by GitHub
parent 7056009b6a
commit 4da0b70694
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/core/workflow/nodes/http_request/executor.py
View File

@ -33,7 +33,7 @@ class Executor:
params: Mapping[str, str] | None params: Mapping[str, str] | None
content: str | bytes | None content: str | bytes | None
data: Mapping[str, Any] | None data: Mapping[str, Any] | None
files: Mapping[str, bytes] | None files: Mapping[str, tuple[str | None, bytes, str]] | None
json: Any json: Any
headers: dict[str, str] headers: dict[str, str]
auth: HttpRequestNodeAuthorization auth: HttpRequestNodeAuthorization
@ -141,7 +141,11 @@ class Executor:
files = {k: self.variable_pool.get_file(selector) for k, selector in file_selectors.items()} files = {k: self.variable_pool.get_file(selector) for k, selector in file_selectors.items()}
files = {k: v for k, v in files.items() if v is not None} files = {k: v for k, v in files.items() if v is not None}
files = {k: variable.value for k, variable in files.items()} files = {k: variable.value for k, variable in files.items()}
files = {k: file_manager.download(v) for k, v in files.items() if v.related_id is not None} files = {
k: (v.filename, file_manager.download(v), v.mime_type or "application/octet-stream")
for k, v in files.items()
if v.related_id is not None
}
self.data = form_data self.data = form_data
self.files = files self.files = files

2
api/tests/unit_tests/core/workflow/nodes/test_http_request_node.py
View File

@ -192,7 +192,7 @@ def test_http_request_node_form_with_file(monkeypatch):
def attr_checker(*args, **kwargs): def attr_checker(*args, **kwargs):
assert kwargs["data"] == {"name": "test"} assert kwargs["data"] == {"name": "test"}
assert kwargs["files"] == {"file": b"test"} assert kwargs["files"] == {"file": (None, b"test", "application/octet-stream")}
return httpx.Response(200, content=b"") return httpx.Response(200, content=b"")
monkeypatch.setattr( monkeypatch.setattr(