feat(docker): ensure patch is only applied once at container startup\n\n- Use git apply --check before applying my_endnode_streaming.patch in api and worker services\n- Prevents errors from repeated patch application\n- Improves robustness for automated deployment with custom patches

pull/21981/head
YiQiu Jia 11 months ago
parent 151fe3d02e
commit 7dcfc171cc

@ -537,8 +537,15 @@ services:
redis: redis:
condition: service_started condition: service_started
volumes: volumes:
# Mount the storage directory to the container, for storing user files.
- ./volumes/app/storage:/app/api/storage - ./volumes/app/storage:/app/api/storage
- ../my_endnode_streaming.patch:/app/my_endnode_streaming.patch
command: >
sh -c "if [ -f /app/my_endnode_streaming.patch ]; then \
cd /app && \
git apply --check my_endnode_streaming.patch && \
git apply my_endnode_streaming.patch || echo 'Patch already applied or not applicable'; \
fi; \
exec /start-api.sh"
networks: networks:
- ssrf_proxy_network - ssrf_proxy_network
- default - default
@ -564,8 +571,15 @@ services:
redis: redis:
condition: service_started condition: service_started
volumes: volumes:
# Mount the storage directory to the container, for storing user files.
- ./volumes/app/storage:/app/api/storage - ./volumes/app/storage:/app/api/storage
- ../my_endnode_streaming.patch:/app/my_endnode_streaming.patch
command: >
sh -c "if [ -f /app/my_endnode_streaming.patch ]; then \
cd /app && \
git apply --check my_endnode_streaming.patch && \
git apply my_endnode_streaming.patch || echo 'Patch already applied or not applicable'; \
fi; \
exec /start-worker.sh"
networks: networks:
- ssrf_proxy_network - ssrf_proxy_network
- default - default

@ -0,0 +1,48 @@
diff --git a/api/core/workflow/nodes/end/end_stream_processor.py b/api/core/workflow/nodes/end/end_stream_processor.py
index a6fb2ffc1..fcf4011da 100644
--- a/api/core/workflow/nodes/end/end_stream_processor.py
+++ b/api/core/workflow/nodes/end/end_stream_processor.py
@@ -42,23 +42,26 @@ class EndStreamProcessor(StreamProcessor):
yield event
continue
- if event.route_node_state.node_id in self.current_stream_chunk_generating_node_ids:
- stream_out_end_node_ids = self.current_stream_chunk_generating_node_ids[
- event.route_node_state.node_id
- ]
- else:
- stream_out_end_node_ids = self._get_stream_out_end_node_ids(event)
- self.current_stream_chunk_generating_node_ids[event.route_node_state.node_id] = (
- stream_out_end_node_ids
- )
-
- if stream_out_end_node_ids:
- if self.has_output and event.node_id not in self.output_node_ids:
- event.chunk_content = "\n" + event.chunk_content
-
- self.output_node_ids.add(event.node_id)
- self.has_output = True
- yield event
+ # Iterate all variable selectors for all end nodes; stream if matched
+ matched = False # Flag to indicate if a match is found
+ for end_node_id, value_selectors_list in self.end_stream_param.end_stream_variable_selector_mapping.items():
+ # Loop through all variable selectors configured for the current end node
+ for value_selector in value_selectors_list:
+ # Check if the current event's from_variable_selector matches the configured selector
+ if event.from_variable_selector == value_selector:
+ # If there was previous output and this node hasn't output yet, prepend a newline
+ if self.has_output and event.node_id not in self.output_node_ids:
+ event.chunk_content = "\n" + event.chunk_content
+ # Mark this node as having output to avoid duplicate newlines
+ self.output_node_ids.add(event.node_id)
+ # Set the flag indicating output has occurred
+ self.has_output = True
+ # Stream the current event
+ yield event
+ matched = True # Set matched flag to break out of loops
+ break # Exit inner loop after match
+ if matched:
+ break # Exit outer loop after match
elif isinstance(event, NodeRunSucceededEvent):
yield event
if event.route_node_state.node_id in self.current_stream_chunk_generating_node_ids:
Loading…
Cancel
Save