mirror of
https://github.com/langgenius/dify.git
synced 2026-05-10 05:56:31 +08:00
Keep direct provider_id consumers unchanged
This commit is contained in:
parent
26fedca865
commit
34ef10c818
@ -392,7 +392,6 @@ class WorkflowBasedAppRunner:
|
||||
process_data = node_run_result.process_data
|
||||
outputs = node_run_result.outputs
|
||||
execution_metadata = node_run_result.metadata
|
||||
provider_id = event.provider_id or str(event.extras.get("provider_id", ""))
|
||||
self._publish_event(
|
||||
QueueNodeRetryEvent(
|
||||
node_execution_id=event.id,
|
||||
@ -408,13 +407,11 @@ class WorkflowBasedAppRunner:
|
||||
error=event.error,
|
||||
execution_metadata=execution_metadata,
|
||||
retry_index=event.retry_index,
|
||||
extras=dict(event.extras),
|
||||
provider_type=event.provider_type,
|
||||
provider_id=provider_id,
|
||||
provider_id=event.provider_id,
|
||||
)
|
||||
)
|
||||
elif isinstance(event, NodeRunStartedEvent):
|
||||
provider_id = event.provider_id or str(event.extras.get("provider_id", ""))
|
||||
self._publish_event(
|
||||
QueueNodeStartedEvent(
|
||||
node_execution_id=event.id,
|
||||
@ -425,9 +422,8 @@ class WorkflowBasedAppRunner:
|
||||
in_iteration_id=event.in_iteration_id,
|
||||
in_loop_id=event.in_loop_id,
|
||||
agent_strategy=event.agent_strategy,
|
||||
extras=dict(event.extras),
|
||||
provider_type=event.provider_type,
|
||||
provider_id=provider_id,
|
||||
provider_id=event.provider_id,
|
||||
)
|
||||
)
|
||||
elif isinstance(event, NodeRunSucceededEvent):
|
||||
|
||||
@ -315,7 +315,6 @@ class QueueNodeStartedEvent(AppQueueEvent):
|
||||
in_loop_id: str | None = None
|
||||
start_at: datetime
|
||||
agent_strategy: AgentNodeStrategyInit | None = None
|
||||
extras: dict[str, object] = Field(default_factory=dict)
|
||||
|
||||
# Legacy provider fields kept for existing start-event consumers.
|
||||
provider_type: str # should be a core.tools.entities.tool_entities.ToolProviderType
|
||||
|
||||
@ -472,7 +472,6 @@ class NodeRetryStreamResponse(StreamResponse):
|
||||
iteration_id: str | None = None
|
||||
loop_id: str | None = None
|
||||
retry_index: int = 0
|
||||
extras: dict[str, object] = Field(default_factory=dict)
|
||||
|
||||
event: StreamEvent = StreamEvent.NODE_RETRY
|
||||
workflow_run_id: str
|
||||
@ -503,7 +502,6 @@ class NodeRetryStreamResponse(StreamResponse):
|
||||
"iteration_id": self.data.iteration_id,
|
||||
"loop_id": self.data.loop_id,
|
||||
"retry_index": self.data.retry_index,
|
||||
"extras": {},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@ -737,7 +737,6 @@ class TestWorkflowResponseConverterServiceApiTruncation:
|
||||
assert not response.data.inputs_truncated
|
||||
assert not response.data.process_data_truncated
|
||||
assert not response.data.outputs_truncated
|
||||
assert response.data.extras == {}
|
||||
|
||||
def test_trigger_plugin_start_event_uses_provider_id_for_icon(self):
|
||||
converter = self.create_test_converter(InvokeFrom.WEB_APP)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user