Update api_routes_v2.py

api_routes_v2.py

@@ -875,7 +875,10 @@ async def get_session_history(
                     
                     # Extract tools/components
                     components = pipeline_def.get("components") or pipeline_def.get("pipeline_steps", [])
-                    tools_list = [comp.get("tool_name", "unknown") for comp in components]
+                    tools_list = [
+                        comp.get("tool_name", comp.get("tool", "unknown"))
+                        for comp in components
+                    ]
                     
                     enhanced_pipe["tools"] = tools_list
                     enhanced_pipe["component_count"] = len(components)
@@ -1125,7 +1128,7 @@ async def chat_unified(
                 # Extract user-facing output
                 result_text = _extract_user_facing_text(result)
                 friendly = f"🎉 Pipeline completed successfully!"
-                output = {"component_summary": "Pipeline executed successfully", "steps": len(proposed.get("pipeline_steps", []))}
+                output = {"component_summary": "Pipeline executed successfully", "steps": len(proposed.get("pipeline_steps", proposed.get("components", [])))}
                 final_output = {"text": result_text, "result": result}
                 
                 api_data = {
@@ -1204,13 +1207,27 @@ async def chat_unified(
                     prefer_bedrock=bool(prefer_bedrock),
                 )
 
+                # FIX: Ensure pipeline has both 'components' and 'pipeline_steps' for compatibility
+                if "components" in pipeline and "pipeline_steps" not in pipeline:
+                    pipeline["pipeline_steps"] = pipeline["components"]
+                elif "pipeline_steps" in pipeline and "components" not in pipeline:
+                    pipeline["components"] = pipeline["pipeline_steps"]
+
                 # V3: Create pipeline record in S3 and MongoDB
                 pipeline_id = _create_pipeline_record(chat_id, pipeline, status="proposed", created_from="request")
+                
+                # Update session with pipeline that includes pipeline_id
                 session_manager.update_session(chat_id, {"proposed_pipeline": pipeline, "state": "pipeline_proposed"})
 
+                # Get steps list from either field
+                steps_list = pipeline.get("pipeline_steps", pipeline.get("components", []))
                 pipeline_name = pipeline.get("pipeline_name", "Document Processing")
-                steps_list = pipeline.get("pipeline_steps", [])
-                steps_summary = "\n".join([f"  {i+1}. {step.get('tool', 'Unknown')}" for i, step in enumerate(steps_list)])
+                
+                # Create steps summary with proper tool name extraction
+                steps_summary = "\n".join([
+                    f"  {i+1}. {step.get('tool_name', step.get('tool', 'Unknown'))}"
+                    for i, step in enumerate(steps_list)
+                ])
 
                 friendly = (
                     f"🎯 **Pipeline Created: {pipeline_name}**\n"
@@ -1245,7 +1262,10 @@ async def chat_unified(
                     "pipeline_id": pipeline_id,
                     "pipeline_name": pipeline_name,
                     "steps_count": len(steps_list),
-                    "tools": [step.get("tool", "unknown") for step in steps_list]
+                    "tools": [
+                        step.get("tool_name", step.get("tool", "unknown"))
+                        for step in steps_list
+                    ]
                 }
                 
                 return _assistant_response_payload(
@@ -1288,6 +1308,13 @@ async def chat_unified(
                         file_path=session.get("current_file"),
                         prefer_bedrock=bool(prefer_bedrock)
                     )
+                    
+                    # FIX: Ensure pipeline has both 'components' and 'pipeline_steps' for compatibility
+                    if "components" in new_pipeline and "pipeline_steps" not in new_pipeline:
+                        new_pipeline["pipeline_steps"] = new_pipeline["components"]
+                    elif "pipeline_steps" in new_pipeline and "components" not in new_pipeline:
+                        new_pipeline["components"] = new_pipeline["pipeline_steps"]
+                    
                     # V3: Create pipeline record for edited pipeline
                     pipeline_id = _create_pipeline_record(chat_id, new_pipeline, status="proposed", created_from="edit")
                     session_manager.update_session(chat_id, {"proposed_pipeline": new_pipeline, "state": "pipeline_proposed"})
@@ -1301,12 +1328,18 @@ async def chat_unified(
                         "pipeline": new_pipeline
                     }
                     
+                    # Get steps list for output
+                    steps_list = new_pipeline.get("pipeline_steps", new_pipeline.get("components", []))
+                    
                     # Create output summary for modified pipeline
                     output = {
                         "pipeline_id": pipeline_id,
                         "pipeline_name": new_pipeline.get("pipeline_name", "Document Processing"),
-                        "steps_count": len(new_pipeline.get("pipeline_steps", [])),
-                        "tools": [step.get("tool", "unknown") for step in new_pipeline.get("pipeline_steps", [])],
+                        "steps_count": len(steps_list),
+                        "tools": [
+                            step.get("tool_name", step.get("tool", "unknown"))
+                            for step in steps_list
+                        ],
                         "modification": "edited"
                     }
                     
@@ -1500,15 +1533,27 @@ async def chat_unified_stream(
                     prefer_bedrock=bool(prefer_bedrock),
                 )
                 
+                # FIX: Ensure pipeline has both 'components' and 'pipeline_steps' for compatibility
+                if "components" in pipeline and "pipeline_steps" not in pipeline:
+                    pipeline["pipeline_steps"] = pipeline["components"]
+                elif "pipeline_steps" in pipeline and "components" not in pipeline:
+                    pipeline["components"] = pipeline["pipeline_steps"]
+                
                 # V3 LIFECYCLE: Create pipeline record in S3 + MongoDB immediately
                 pipeline_id = _create_pipeline_record(chat_id, pipeline, status="proposed", created_from="request")
                 
                 # Update session with proposed pipeline
                 session_manager.update_session(chat_id, {"proposed_pipeline": pipeline, "state": "pipeline_proposed"})
 
+                # Get steps list from either field
+                steps_list = pipeline.get("pipeline_steps", pipeline.get("components", []))
                 pipeline_name = pipeline.get("pipeline_name", "Document Processing")
-                steps_list = pipeline.get("pipeline_steps", [])
-                steps_summary = "\n".join([f"  {i+1}. {step.get('tool', 'Unknown')}" for i, step in enumerate(steps_list)])
+                
+                # Create steps summary with proper tool name extraction
+                steps_summary = "\n".join([
+                    f"  {i+1}. {step.get('tool_name', step.get('tool', 'Unknown'))}"
+                    for i, step in enumerate(steps_list)
+                ])
 
                 friendly = (
                     f"🎯 **Pipeline Created: {pipeline_name}**\n"
@@ -1527,14 +1572,22 @@ async def chat_unified_stream(
                         "pipeline_id": pipeline_id,
                         "pipeline_name": pipeline_name,
                         "steps_count": len(steps_list),
-                        "tools": [step.get("tool", "unknown") for step in steps_list]
+                        "tools": [
+                            step.get("tool_name", step.get("tool", "unknown"))
+                            for step in steps_list
+                        ]
                     }
                 })
                 return
             except Exception as e:
                 friendly = f"❌ Error generating pipeline: {str(e)}"
                 _add_and_mirror_message(chat_id, "assistant", friendly)
-                yield emit({"type": "assistant_final", "content": friendly, "error": str(e)})
+                yield emit({
+                    "type": "assistant_final", 
+                    "content": friendly, 
+                    "error": str(e),
+                    "exception": str(e)
+                })
                 return
 
         # Pipeline proposed
@@ -1706,12 +1759,23 @@ async def chat_unified_stream(
                         file_path=session_local.get("current_file"),
                         prefer_bedrock=bool(prefer_bedrock)
                     )
+                    
+                    # FIX: Ensure pipeline has both 'components' and 'pipeline_steps' for compatibility
+                    if "components" in new_pipeline and "pipeline_steps" not in new_pipeline:
+                        new_pipeline["pipeline_steps"] = new_pipeline["components"]
+                    elif "pipeline_steps" in new_pipeline and "components" not in new_pipeline:
+                        new_pipeline["components"] = new_pipeline["pipeline_steps"]
+                    
                     # V3: Create pipeline record for edited pipeline
                     pipeline_id = _create_pipeline_record(chat_id, new_pipeline, status="proposed", created_from="edit")
                     session_manager.update_session(chat_id, {"proposed_pipeline": new_pipeline, "state": "pipeline_proposed"})
                     formatted = format_pipeline_for_display(new_pipeline)
                     friendly = formatted + f"\n\n```json\n{json.dumps(new_pipeline, indent=2)}\n```"
                     _add_and_mirror_message(chat_id, "assistant", friendly)
+                    
+                    # Get steps list for output
+                    steps_list = new_pipeline.get("pipeline_steps", new_pipeline.get("components", []))
+                    
                     yield emit({
                         "type": "assistant_final", 
                         "content": friendly, 
@@ -1719,8 +1783,11 @@ async def chat_unified_stream(
                         "output": {
                             "pipeline_id": pipeline_id,
                             "pipeline_name": new_pipeline.get("pipeline_name", "Document Processing"),
-                            "steps_count": len(new_pipeline.get("pipeline_steps", [])),
-                            "tools": [step.get("tool", "unknown") for step in new_pipeline.get("pipeline_steps", [])],
+                            "steps_count": len(steps_list),
+                            "tools": [
+                                step.get("tool_name", step.get("tool", "unknown"))
+                                for step in steps_list
+                            ],
                             "modification": "edited"
                         }
                     })