outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: raise http request node error on httpx.request error (#11954)

Browse Source 
Signed-off-by: -LAN- <laipz8200@outlook.com>
This commit is contained in:
-LAN- 2024-12-22 10:41:53 +08:00 committed by GitHub
parent 5db8addcc6
commit 2c4df108e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/core/ops/ops_trace_manager.py
View File

@ -355,7 +355,13 @@ class TraceTask:
def conversation_trace(self, **kwargs): def conversation_trace(self, **kwargs):
return kwargs return kwargs
def workflow_trace(self, workflow_run: WorkflowRun, conversation_id, user_id): def workflow_trace(self, workflow_run: WorkflowRun | None, conversation_id, user_id):
if not workflow_run:
raise ValueError("Workflow run not found")
db.session.merge(workflow_run)
db.sessoin.refresh(workflow_run)
workflow_id = workflow_run.workflow_id workflow_id = workflow_run.workflow_id
tenant_id = workflow_run.tenant_id tenant_id = workflow_run.tenant_id
workflow_run_id = workflow_run.id workflow_run_id = workflow_run.id

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

@ -249,6 +249,8 @@ class Executor:
# request_args = {k: v for k, v in request_args.items() if v is not None} # request_args = {k: v for k, v in request_args.items() if v is not None}
try: try:
response = getattr(ssrf_proxy, self.method)(**request_args) response = getattr(ssrf_proxy, self.method)(**request_args)
except httpx.RequestError as e:
raise HttpRequestNodeError(str(e))
except ssrf_proxy.MaxRetriesExceededError as e: except ssrf_proxy.MaxRetriesExceededError as e:
raise HttpRequestNodeError(str(e)) raise HttpRequestNodeError(str(e))
return response return response