Update interaction payload

Author: BenConstable9

text_2_sql/autogen/src/autogen_text_2_sql/autogen_text_2_sql.py

@@ -21,7 +21,7 @@
 from text_2_sql_core.payloads.interaction_payloads import (
     QuestionPayload,
     AnswerWithSourcesPayload,
-    DismabiguationRequestPayload,
+    DismabiguationRequestsPayload,
     ProcessingUpdatePayload,
     InteractionPayload,
     PayloadType,
@@ -104,10 +104,10 @@ def agentic_flow(self):
 
     def extract_disambiguation_request(
         self, messages: list
-    ) -> DismabiguationRequestPayload:
+    ) -> DismabiguationRequestsPayload:
         """Extract the disambiguation request from the answer."""
         disambiguation_request = messages[-1].content
-        return DismabiguationRequestPayload(
+        return DismabiguationRequestsPayload(
             disambiguation_request=disambiguation_request,
         )
 
@@ -179,7 +179,8 @@ def extract_answer_payload(self, messages: list) -> AnswerWithSourcesPayload:
                 for sql_query_result in sql_query_result_list:
                     if not isinstance(sql_query_result, dict):
                         logging.error(
-                            f"Expected dict for sql_query_result, got {type(sql_query_result)}"
+                            "Expected dict for sql_query_result, got %s",
+                            type(sql_query_result),
                         )
                         continue
 

text_2_sql/text_2_sql_core/src/text_2_sql_core/payloads/interaction_payloads.py

@@ -32,13 +32,16 @@ class PayloadType(StrEnum):
     QUESTION = "question"
 
 
-class DismabiguationRequestPayload(PayloadBase):
+class ColumnFilterPair(BaseModel):
+    column: str
+    filter_value: str | None = Field(default=None)
+
+
+class DismabiguationRequestsPayload(PayloadBase):
     class Body(BaseModel):
         class DismabiguationRequest(BaseModel):
             question: str
-            matching_columns: list[str]
-            matching_filter_values: list[str]
-            other_user_choices: list[str]
+            choices: list[ColumnFilterPair] | None = Field(default=None)
 
         disambiguation_requests: list[DismabiguationRequest]
 
@@ -119,6 +122,6 @@ def __init__(self, **kwargs):
 
 
 class InteractionPayload(RootModel):
-    root: QuestionPayload | ProcessingUpdatePayload | DismabiguationRequestPayload | AnswerWithSourcesPayload = Field(
+    root: QuestionPayload | ProcessingUpdatePayload | DismabiguationRequestsPayload | AnswerWithSourcesPayload = Field(
         ..., discriminator="payload_type"
     )