Skip to content

Commit 00b332d

Browse files
committed
Use value and display
1 parent 222c13b commit 00b332d

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

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

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,16 @@ class PayloadType(StrEnum):
3232
USER_INPUT = "user_input"
3333

3434

35-
class ColumnFilterPair(BaseModel):
36-
fqn: str
37-
column: str
38-
filter_value: str | None = Field(default=None)
35+
class Choice(BaseModel):
36+
value: str
37+
display: str
3938

4039

4140
class DismabiguationRequestsPayload(PayloadBase):
4241
class Body(BaseModel):
4342
class DismabiguationRequest(BaseModel):
4443
question: str
45-
choices: list[ColumnFilterPair] | None = Field(default=None)
44+
choices: list[Choice] | None = Field(default=None)
4645

4746
disambiguation_requests: list[DismabiguationRequest]
4847

@@ -63,25 +62,33 @@ def __init__(self, **kwargs):
6362
{
6463
"question": "Which of the following do you mean?",
6564
"choices": [
66-
{"fqn": "<fqn>", "column": "product_name", "filter_value": "Road Bike"},
6765
{
68-
"fqn": "<fqn>",
69-
"column": "product_name",
70-
"filter_value": "Mountain Bike",
66+
"value": "product_name - Road Bike",
67+
"display": "Road Bike",
68+
},
69+
{
70+
"value": "product_name - Mountain Bike",
71+
"display": "Mountain Bike",
7172
},
7273
],
7374
},
7475
{
7576
"question": "Do you mean total sales by volume or number of customers?",
7677
"choices": [
77-
{"fqn": "<fqn>", "column": "sales_volume", "filter_value": None},
78-
{"fqn": "<fqn>", "column": "customer_count", "filter_value": None},
78+
{
79+
"value": "total_sales - volume",
80+
"display": "Total Sales by Volume",
81+
},
82+
{
83+
"value": "total_sales - customers",
84+
"display": "Number of Customers",
85+
},
7986
],
8087
},
8188
]
8289
)
8390

84-
print(request.model_dump())
91+
print(request.model_dump_json())
8592

8693

8794
class AnswerWithSourcesPayload(PayloadBase):

0 commit comments

Comments
 (0)