fix: structure improvements of messages

tests/api/answer/routes/test_answer.py

@@ -73,7 +73,7 @@ class TestAnswerResourcePost:
                 ),
             ), patch(
                 "application.api.answer.routes.answer.AnswerResource.process_response_stream",
-                return_value=(conv_id, "Hello", [], [], "", None),
+                return_value={"conversation_id": conv_id, "answer": "Hello", "sources": [], "tool_calls": [], "thought": "", "error": None},
             ):
                 resp = answer_client.post(
                     "/api/answer",
@@ -129,7 +129,7 @@ class TestAnswerResourcePost:
             return_value=iter([]),
         ), patch(
             "application.api.answer.routes.answer.AnswerResource.process_response_stream",
-            return_value=(None, None, None, None, None, "Stream error"),
+            return_value={"conversation_id": None, "answer": None, "sources": None, "tool_calls": None, "thought": None, "error": "Stream error"},
         ):
             resp = answer_client.post(
                 "/api/answer",
@@ -173,15 +173,7 @@ class TestAnswerResourcePost:
             return_value=iter([]),
         ), patch(
             "application.api.answer.routes.answer.AnswerResource.process_response_stream",
-            return_value=(
-                conv_id,
-                '{"key": "val"}',
-                [],
-                [],
-                "",
-                None,
-                {"structured": True, "schema": {"type": "object"}},
-            ),
+            return_value={"conversation_id": conv_id, "answer": '{"key": "val"}', "sources": [], "tool_calls": [], "thought": "", "error": None, "extra": {"structured": True, "schema": {"type": "object"}}},
         ):
             resp = answer_client.post(
                 "/api/answer",
@@ -208,14 +200,7 @@ class TestAnswerResourcePost:
             return_value=iter([]),
         ), patch(
             "application.api.answer.routes.answer.AnswerResource.process_response_stream",
-            return_value=(
-                conv_id,
-                "answer text",
-                [{"title": "src"}],
-                [{"tool": "t"}],
-                "thinking...",
-                None,
-            ),
+            return_value={"conversation_id": conv_id, "answer": "answer text", "sources": [{"title": "src"}], "tool_calls": [{"tool": "t"}], "thought": "thinking...", "error": None},
         ):
             resp = answer_client.post(
                 "/api/answer",

tests/api/answer/routes/test_base.py

@@ -481,10 +481,10 @@ class TestProcessResponseStream:
 
             result = resource.process_response_stream(iter(stream))
 
-            assert result[0] == conv_id
-            assert result[1] == "Hello world"
-            assert result[2] == [{"title": "doc1"}]
-            assert result[5] is None
+            assert result["conversation_id"] == conv_id
+            assert result["answer"] == "Hello world"
+            assert result["sources"] == [{"title": "doc1"}]
+            assert result["error"] is None
 
     def test_handles_stream_error(self, mock_mongo_db, flask_app):
         import json
@@ -500,10 +500,8 @@ class TestProcessResponseStream:
 
             result = resource.process_response_stream(iter(stream))
 
-            assert len(result) == 6
-            assert result[0] is None
-            assert result[4] == "Test error"
-            assert result[5] is None
+            assert result["conversation_id"] is None
+            assert result["error"] == "Test error"
 
     def test_handles_malformed_stream_data(self, mock_mongo_db, flask_app):
         from application.api.answer.routes.base import BaseAnswerResource

tests/api/answer/test_base_routes.py

@@ -295,10 +295,8 @@ class TestProcessResponseStreamExtended:
                 f'data: {json.dumps({"type": "end"})}\n\n',
             ]
             result = resource.process_response_stream(iter(stream))
-            assert result[1] == "{}"
-            # Structured output adds extra tuple element
-            assert len(result) == 7
-            assert result[6]["structured"] is True
+            assert result["answer"] == "{}"
+            assert result.get("extra", {}).get("structured") is True
 
     def test_handles_tool_calls_event(self, mock_mongo_db, flask_app):
         from application.api.answer.routes.base import BaseAnswerResource
@@ -312,7 +310,7 @@ class TestProcessResponseStreamExtended:
                 f'data: {json.dumps({"type": "end"})}\n\n',
             ]
             result = resource.process_response_stream(iter(stream))
-            assert result[3] == [{"name": "t1"}]
+            assert result["tool_calls"] == [{"name": "t1"}]
 
     def test_incomplete_stream(self, mock_mongo_db, flask_app):
         from application.api.answer.routes.base import BaseAnswerResource
@@ -323,7 +321,7 @@ class TestProcessResponseStreamExtended:
                 f'data: {json.dumps({"type": "answer", "answer": "partial"})}\n\n',
             ]
             result = resource.process_response_stream(iter(stream))
-            assert result[4] == "Stream ended unexpectedly"
+            assert result["error"] == "Stream ended unexpectedly"
 
     def test_handles_thought_event(self, mock_mongo_db, flask_app):
         from application.api.answer.routes.base import BaseAnswerResource
@@ -335,7 +333,7 @@ class TestProcessResponseStreamExtended:
                 f'data: {json.dumps({"type": "end"})}\n\n',
             ]
             result = resource.process_response_stream(iter(stream))
-            assert result[4] == "thinking..."
+            assert result["thought"] == "thinking..."
 
 
 @pytest.mark.unit