Fix Bad Chat History Implementation (#120)

* Fix bad chat history instantiation

* Update namign

* Update chat history

* Update header

Author: BenConstable9

text_2_sql/autogen/src/autogen_text_2_sql/__init__.py

@@ -1,6 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 from autogen_text_2_sql.autogen_text_2_sql import AutoGenText2Sql
-from text_2_sql_core.payloads.agent_response import AgentRequestBody
+from text_2_sql_core.payloads.agent_request_response_pair import AgentRequestBody
 
 __all__ = ["AutoGenText2Sql", "AgentRequestBody"]

text_2_sql/autogen/src/autogen_text_2_sql/autogen_text_2_sql.py

@@ -12,14 +12,13 @@
 from autogen_text_2_sql.custom_agents.parallel_query_solving_agent import (
     ParallelQuerySolvingAgent,
 )
-from autogen_agentchat.agents import UserProxyAgent
 from autogen_agentchat.messages import TextMessage
 import json
 import os
 from datetime import datetime
 
-from text_2_sql_core.payloads.agent_response import (
-    AgentResponse,
+from text_2_sql_core.payloads.agent_request_response_pair import (
+    AgentRequestResponsePair,
     AgentRequestBody,
     AnswerWithSources,
     Source,
@@ -30,26 +29,10 @@
     ProcessingUpdateBody,
     ProcessingUpdate,
 )
-from autogen_agentchat.base import Response, TaskResult
+from autogen_agentchat.base import TaskResult
 from typing import AsyncGenerator
 
 
-class EmptyResponseUserProxyAgent(UserProxyAgent):
-    """UserProxyAgent that automatically responds with empty messages."""
-
-    def __init__(self, name):
-        super().__init__(name=name)
-        self._has_responded = False
-
-    async def on_messages_stream(self, messages, sender=None, config=None):
-        """Auto-respond with empty message and return Response object."""
-        message = TextMessage(content="", source=self.name)
-        if not self._has_responded:
-            self._has_responded = True
-            yield message
-        yield Response(chat_message=message)
-
-
 class AutoGenText2Sql:
     def __init__(self, engine_specific_rules: str, **kwargs: dict):
         self.target_engine = os.environ["Text2Sql__DatabaseEngine"].upper()
@@ -71,11 +54,7 @@ def get_all_agents(self):
 
         self.answer_agent = LLMAgentCreator.create("answer_agent")
 
-        # Auto-responding UserProxyAgent
-        self.user_proxy = EmptyResponseUserProxyAgent(name="user_proxy")
-
         agents = [
-            self.user_proxy,
             self.query_rewrite_agent,
             self.parallel_query_solving_agent,
             self.answer_agent,
@@ -182,7 +161,7 @@ async def process_question(
         self,
         request: AgentRequestBody,
         chat_history: list[ChatHistoryItem] = None,
-    ) -> AsyncGenerator[AgentResponse | ProcessingUpdate, None]:
+    ) -> AsyncGenerator[AgentRequestResponsePair | ProcessingUpdate, None]:
         """Process the complete question through the unified system.
 
         Args:
@@ -208,7 +187,10 @@ async def process_question(
             # Update input
             for idx, chat in enumerate(chat_history):
                 # For now only consider the user query
-                agent_input[f"chat_{idx}"] = chat.request.question
+                chat_history_key = f"chat_{idx}"
+                agent_input[
+                    chat_history_key
+                ] = chat.request_response_pair.request.question
 
         async for message in self.agentic_flow.run_stream(task=json.dumps(agent_input)):
             logging.debug("Message: %s", message)
@@ -250,7 +232,7 @@ async def process_question(
                     logging.error("Unexpected TaskResult: %s", message)
                     raise ValueError("Unexpected TaskResult")
 
-                payload = AgentResponse(request=request, response=response)
+                payload = AgentRequestResponsePair(request=request, response=response)
 
             if payload is not None:
                 logging.debug("Payload: %s", payload)

…xt_2_sql_core/payloads/agent_response.py …/payloads/agent_request_response_pair.pytext_2_sql/text_2_sql_core/src/text_2_sql_core/payloads/agent_response.py renamed to text_2_sql/text_2_sql_core/src/text_2_sql_core/payloads/agent_request_response_pair.py text_2_sql/text_2_sql_core/src/text_2_sql_core/payloads/agent_response.py renamed to text_2_sql/text_2_sql_core/src/text_2_sql_core/payloads/agent_request_response_pair.py

@@ -7,7 +7,7 @@
 from datetime import datetime, timezone
 
 
-class AgentResponseHeader(BaseModel):
+class AgentRequestResponseHeader(BaseModel):
     prompt_tokens: int
     completion_tokens: int
     timestamp: datetime = Field(
@@ -83,7 +83,7 @@ def add_defaults_to_injected_parameters(cls, values):
         return values
 
 
-class AgentResponse(BaseModel):
-    header: AgentResponseHeader | None = Field(default=None)
+class AgentRequestResponsePair(BaseModel):
+    header: AgentRequestResponseHeader | None = Field(default=None)
     request: AgentRequestBody
     response: AgentResponseBody

text_2_sql/text_2_sql_core/src/text_2_sql_core/payloads/chat_history.py

@@ -1,7 +1,9 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 from pydantic import BaseModel, Field
-from text_2_sql_core.payloads.agent_response import AgentResponse
+from text_2_sql_core.payloads.agent_request_response_pair import (
+    AgentRequestResponsePair,
+)
 from datetime import datetime, timezone
 
 
@@ -13,4 +15,4 @@ class ChatHistoryItem(BaseModel):
         description="Timestamp in UTC",
         default_factory=lambda: datetime.now(timezone.utc),
     )
-    agent_response: AgentResponse
+    request_response_pair: AgentRequestResponsePair