Merge branch 'feat/r2' into deploy/rag-dev

api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py

@@ -39,6 +39,7 @@ from libs.helper import TimestampField, uuid_value
 from libs.login import current_user, login_required
 from models.account import Account
 from models.dataset import Pipeline
+from models.model import EndUser
 from services.errors.app import WorkflowHashNotEqualError
 from services.errors.llm import InvokeRateLimitError
 from services.rag_pipeline.pipeline_generate_service import PipelineGenerateService

api/services/rag_pipeline/rag_pipeline.py

@@ -676,7 +676,7 @@ class RagPipelineService:
                 item["variable"]: item for item in variables
             }
         else:
-            variables_map = {}
+            return []
         datasource_parameters = datasource_node_data.get("datasource_parameters", {})
         user_input_variables = []
         for key, value in datasource_parameters.items():
@@ -708,7 +708,7 @@ class RagPipelineService:
                 item["variable"]: item for item in variables
             }
         else:
-            variables = {}
+            return []
         datasource_parameters = datasource_node_data.get("datasource_parameters", {})
 
         user_input_variables = []