Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dify
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai-tech
dify
Commits
b6b58da2
Unverified
Commit
b6b58da2
authored
Mar 08, 2024
by
Yeuoly
Committed by
GitHub
Mar 08, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
enhance: custom tool timeout (#2754)
parent
40c646cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
api_tool.py
api/core/tools/tool/api_tool.py
+8
-7
No files found.
api/core/tools/tool/api_tool.py
View file @
b6b58da2
...
@@ -12,6 +12,7 @@ from core.tools.entities.tool_entities import ToolInvokeMessage
...
@@ -12,6 +12,7 @@ from core.tools.entities.tool_entities import ToolInvokeMessage
from
core.tools.errors
import
ToolProviderCredentialValidationError
from
core.tools.errors
import
ToolProviderCredentialValidationError
from
core.tools.tool.tool
import
Tool
from
core.tools.tool.tool
import
Tool
API_TOOL_DEFAULT_TIMEOUT
=
(
10
,
60
)
class
ApiTool
(
Tool
):
class
ApiTool
(
Tool
):
api_bundle
:
ApiBasedToolBundle
api_bundle
:
ApiBasedToolBundle
...
@@ -211,19 +212,19 @@ class ApiTool(Tool):
...
@@ -211,19 +212,19 @@ class ApiTool(Tool):
# do http request
# do http request
if
method
==
'get'
:
if
method
==
'get'
:
response
=
ssrf_proxy
.
get
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
timeout
=
10
,
follow_redirects
=
True
)
response
=
ssrf_proxy
.
get
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
timeout
=
API_TOOL_DEFAULT_TIMEOUT
,
follow_redirects
=
True
)
elif
method
==
'post'
:
elif
method
==
'post'
:
response
=
ssrf_proxy
.
post
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
data
=
body
,
timeout
=
10
,
follow_redirects
=
True
)
response
=
ssrf_proxy
.
post
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
data
=
body
,
timeout
=
API_TOOL_DEFAULT_TIMEOUT
,
follow_redirects
=
True
)
elif
method
==
'put'
:
elif
method
==
'put'
:
response
=
ssrf_proxy
.
put
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
data
=
body
,
timeout
=
10
,
follow_redirects
=
True
)
response
=
ssrf_proxy
.
put
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
data
=
body
,
timeout
=
API_TOOL_DEFAULT_TIMEOUT
,
follow_redirects
=
True
)
elif
method
==
'delete'
:
elif
method
==
'delete'
:
response
=
ssrf_proxy
.
delete
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
data
=
body
,
timeout
=
10
,
allow_redirects
=
True
)
response
=
ssrf_proxy
.
delete
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
data
=
body
,
timeout
=
API_TOOL_DEFAULT_TIMEOUT
,
allow_redirects
=
True
)
elif
method
==
'patch'
:
elif
method
==
'patch'
:
response
=
ssrf_proxy
.
patch
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
data
=
body
,
timeout
=
10
,
follow_redirects
=
True
)
response
=
ssrf_proxy
.
patch
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
data
=
body
,
timeout
=
API_TOOL_DEFAULT_TIMEOUT
,
follow_redirects
=
True
)
elif
method
==
'head'
:
elif
method
==
'head'
:
response
=
ssrf_proxy
.
head
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
timeout
=
10
,
follow_redirects
=
True
)
response
=
ssrf_proxy
.
head
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
timeout
=
API_TOOL_DEFAULT_TIMEOUT
,
follow_redirects
=
True
)
elif
method
==
'options'
:
elif
method
==
'options'
:
response
=
ssrf_proxy
.
options
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
timeout
=
10
,
follow_redirects
=
True
)
response
=
ssrf_proxy
.
options
(
url
,
params
=
params
,
headers
=
headers
,
cookies
=
cookies
,
timeout
=
API_TOOL_DEFAULT_TIMEOUT
,
follow_redirects
=
True
)
else
:
else
:
raise
ValueError
(
f
'Invalid http method {method}'
)
raise
ValueError
(
f
'Invalid http method {method}'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment