Merge branch 'feat/workflow-backend' into deploy/dev

langgenius · Mar 21, 2024 · 930d8b5 · 930d8b5
2 parents 8648cf0 + fa673f9
commit 930d8b5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/api/core/workflow/nodes/http_request/entities.py b/api/core/workflow/nodes/http_request/entities.py
@@ -33,7 +33,7 @@ def check_config(cls, v, values):
                 return v
 
     class Body(BaseModel):
-        type: Literal['none', 'form-data', 'x-www-form-urlencoded', 'raw', 'json']
+        type: Literal['none', 'form-data', 'x-www-form-urlencoded', 'raw-text', 'json']
         data: Union[None, str]
 
     variables: list[VariableSelector]

diff --git a/api/core/workflow/nodes/http_request/http_executor.py b/api/core/workflow/nodes/http_request/http_executor.py
@@ -275,7 +275,7 @@ def _init_template(self, node_data: HttpRequestNodeData, variables: dict[str, An
                     self.headers['Content-Type'] = f'multipart/form-data; boundary={self.boundary}'
                 else:
                     self.body = urlencode(body)
-            elif node_data.body.type in ['json', 'raw']:
+            elif node_data.body.type in ['json', 'raw-text']:
                 self.body = original_body
             elif node_data.body.type == 'none':
                 self.body = ''

diff --git a/docker/docker-compose.middleware.yaml b/docker/docker-compose.middleware.yaml
@@ -61,6 +61,7 @@ services:
       # The DifySandbox configurations
       API_KEY: dify-sandbox
       GIN_MODE: 'release'
+      WORKER_TIMEOUT: 15
     ports:
       - "8194:8194"
 

diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -299,6 +299,7 @@ services:
       # The DifySandbox configurations
       API_KEY: dify-sandbox
       GIN_MODE: release
+      WORKER_TIMEOUT: 15
     ports:
       - "8194:8194"