浏览代码

Fix content-type header case sensitivity (#9961)

tags/0.11.0
Hiroshi Fujita 1年前
父节点
当前提交
539fc8b760
没有帐户链接到提交者的电子邮件

+ 2
- 2
api/core/workflow/nodes/http_request/entities.py 查看文件

@property @property
def is_file(self): def is_file(self):
content_type = self.content_type content_type = self.content_type
content_disposition = self.response.headers.get("Content-Disposition", "")
content_disposition = self.response.headers.get("content-disposition", "")


return "attachment" in content_disposition or ( return "attachment" in content_disposition or (
not any(non_file in content_type for non_file in NON_FILE_CONTENT_TYPES) not any(non_file in content_type for non_file in NON_FILE_CONTENT_TYPES)


@property @property
def content_type(self) -> str: def content_type(self) -> str:
return self.headers.get("Content-Type", "")
return self.headers.get("content-type", "")


@property @property
def text(self) -> str: def text(self) -> str:

+ 2
- 1
api/core/workflow/nodes/http_request/node.py 查看文件

Extract files from response Extract files from response
""" """
files = [] files = []
is_file = response.is_file
content_type = response.content_type content_type = response.content_type
content = response.content content = response.content


if content_type:
if is_file and content_type:
# extract filename from url # extract filename from url
filename = path.basename(url) filename = path.basename(url)
# extract extension if possible # extract extension if possible

+ 34
- 0
api/tests/integration_tests/workflow/nodes/test_http.py 查看文件

assert urlencode({"Redirect": "http://example2.com"}) in result.process_data.get("request", "") assert urlencode({"Redirect": "http://example2.com"}) in result.process_data.get("request", "")
assert 'form-data; name="Redirect"\r\n\r\nhttp://example6.com' in result.process_data.get("request", "") assert 'form-data; name="Redirect"\r\n\r\nhttp://example6.com' in result.process_data.get("request", "")
# assert "http://example3.com" == resp.get("headers", {}).get("referer") # assert "http://example3.com" == resp.get("headers", {}).get("referer")


def test_image_file(monkeypatch):
from types import SimpleNamespace

monkeypatch.setattr(
"core.tools.tool_file_manager.ToolFileManager.create_file_by_raw",
lambda *args, **kwargs: SimpleNamespace(id="1"),
)

node = init_http_node(
config={
"id": "1",
"data": {
"title": "http",
"desc": "",
"method": "get",
"url": "https://cloud.dify.ai/logo/logo-site.png",
"authorization": {
"type": "no-auth",
"config": None,
},
"params": "",
"headers": "",
"body": None,
},
}
)

result = node._run()
assert result.process_data is not None
assert result.outputs is not None
resp = result.outputs
assert len(resp.get("files", [])) == 1

正在加载...
取消
保存