Merge remote-tracking branch 'origin/feat/r2' into feat/r2

# Conflicts:
#	api/core/datasource/entities/datasource_entities.py

api/core/tools/entities/tool_entities.py

@@ -7,6 +7,7 @@ from typing import Any, Optional, Union
 from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_serializer, field_validator, model_validator
 
 from core.entities.provider_entities import ProviderConfig
+from core.plugin.entities.oauth import OAuthSchema
 from core.plugin.entities.parameters import (
     PluginParameter,
     PluginParameterOption,
@@ -349,6 +350,7 @@ class ToolProviderEntity(BaseModel):
     identity: ToolProviderIdentity
     plugin_id: Optional[str] = None
     credentials_schema: list[ProviderConfig] = Field(default_factory=list)
+    oauth_schema: Optional[OAuthSchema] = Field(default=None, description="The oauth schema of the tool provider")
 
 
 class ToolProviderEntityWithPlugin(ToolProviderEntity):

api/core/workflow/nodes/datasource/datasource_node.py

@@ -68,7 +68,7 @@ class DatasourceNode(BaseNode[DatasourceNodeData]):
             return
 
         # get parameters
-        datasource_parameters = datasource_runtime.entity.parameters
+        datasource_parameters = datasource_runtime.entity.first_step_parameters
         parameters = self._generate_parameters(
             datasource_parameters=datasource_parameters,
             variable_pool=self.graph_runtime_state.variable_pool,

api/models/workflow.py

@@ -366,7 +366,7 @@ class Workflow(Base):
             self._rag_pipeline_variables = "{}"
 
         variables_dict: dict[str, Any] = json.loads(self._rag_pipeline_variables)
-        results = [v for v in variables_dict.values()]
+        results = list(variables_dict.values())
         return results
 
     @rag_pipeline_variables.setter