Merge 4dd75aca47 into 49a1fae555

api/controllers/mcp/mcp.py

@@ -163,7 +163,7 @@ class MCPAppApi(Resource):
 
     def _create_variable_entity(self, item: dict) -> VariableEntity:
         """Create a single VariableEntity from raw form item"""
-        variable_type = item.get("type", "") or list(item.keys())[0]
+        variable_type = item.get("type", "") or next(iter(item), "")
         variable = item[variable_type]
 
         return VariableEntity(

api/core/app/app_config/easy_ui_based_app/dataset/manager.py

@@ -54,7 +54,7 @@ class DatasetConfigManager:
             for tool in agent_dict.get("tools", []):
                 if len(tool) == 1:
                     # old standard
-                    key = list(tool.keys())[0]
+                    key = next(iter(tool))
 
                     if key != "dataset":
                         continue
@@ -211,7 +211,9 @@ class DatasetConfigManager:
             PlanningStrategy.REACT_ROUTER,
         }:
             for tool in config.get("agent_mode", {}).get("tools", []):
-                key = list(tool.keys())[0]
+                if not tool:
+                    continue
+                key = next(iter(tool))
                 if key == "dataset":
                     # old style, use tool name as key
                     tool_item = tool[key]

api/core/app/app_config/easy_ui_based_app/variables/manager.py

@@ -45,7 +45,9 @@ class BasicVariablesConfigManager:
 
         # variables and external_data_tools
         for variables in config.get("user_input_form", []):
-            variable_type = list(variables.keys())[0]
+            if not variables:
+                continue
+            variable_type = next(iter(variables))
             if variable_type == VariableEntityType.EXTERNAL_DATA_TOOL:
                 variable = variables[variable_type]
                 if "config" not in variable:
@@ -112,7 +114,9 @@ class BasicVariablesConfigManager:
 
         variables = []
         for item in config["user_input_form"]:
-            key = list(item.keys())[0]
+            if not item:
+                continue
+            key = next(iter(item))
             # if key not in {"text-input", "select", "paragraph", "number", "external_data_tool"}:
             if key not in {
                 VariableEntityType.TEXT_INPUT,

api/core/app/apps/agent_chat/app_config_manager.py

@@ -200,7 +200,9 @@ class AgentChatAppConfigManager(BaseAppConfigManager):
             raise ValueError("tools in agent_mode must be a list of objects")
 
         for tool in agent_mode["tools"]:
-            key = list(tool.keys())[0]
+            if not tool:
+                continue
+            key = next(iter(tool))
             if key in OLD_TOOLS:
                 # old style, use tool name as key
                 tool_item = tool[key]

api/events/event_handlers/update_app_dataset_join_when_app_model_config_updated.py

@@ -55,8 +55,8 @@ def get_dataset_ids_from_model_config(app_model_config: AppModelConfig) -> set[s
         if len(list(tool.keys())) != 1:
             continue
 
-        tool_type = list(tool.keys())[0]
-        tool_config = cast(dict[str, Any], list(tool.values())[0])
+        tool_type = next(iter(tool))
+        tool_config = cast(dict[str, Any], next(iter(tool.values())))
         if tool_type == "dataset":
             dataset_id = tool_config.get("id")
             if isinstance(dataset_id, str):