@@ -211,8 +211,8 @@ def test_parse_query_result_with_data():
211211 },
212212 "result" : {
213213 "data_array" : [
214- [ "1" , " Alice", " 2023-10-01T00:00:00Z"] ,
215- [ "2" , " Bob", " 2023-10-02T00:00:00Z"] ,
214+ { "values" : [{ "string_value" : "1" }, { "string_value" : " Alice"}, { "string_value" : " 2023-10-01T00:00:00Z"}]} ,
215+ { "values" : [{ "string_value" : "2" }, { "string_value" : " Bob"}, { "string_value" : " 2023-10-02T00:00:00Z"}]} ,
216216 ]
217217 },
218218 }
@@ -240,8 +240,8 @@ def test_parse_query_result_with_null_values():
240240 },
241241 "result" : {
242242 "data_array" : [
243- [ "1" , None , " 2023-10-01T00:00:00Z"] ,
244- [ "2" , " Bob" , None ],
243+ { "values" : [{ "string_value" : "1" } , None , { "string_value" : " 2023-10-01T00:00:00Z"}]} ,
244+ { "values" : [{ "string_value" : "2" }, { "string_value" : " Bob"} , None ]} ,
245245 ]
246246 },
247247 }
@@ -272,16 +272,16 @@ def test_parse_query_result_trims_data(truncate_results):
272272 },
273273 "result" : {
274274 "data_array" : [
275- [ "1" , " Alice", " 2023-10-01T00:00:00Z"] ,
276- [ "2" , " Bob", " 2023-10-02T00:00:00Z"] ,
277- [ "3" , " Charlie", " 2023-10-03T00:00:00Z"] ,
278- [ "4" , " David", " 2023-10-04T00:00:00Z"] ,
279- [ "5" , " Eve", " 2023-10-05T00:00:00Z"] ,
280- [ "6" , " Frank", " 2023-10-06T00:00:00Z"] ,
281- [ "7" , " Grace", " 2023-10-07T00:00:00Z"] ,
282- [ "8" , " Hank", " 2023-10-08T00:00:00Z"] ,
283- [ "9" , " Ivy", " 2023-10-09T00:00:00Z"] ,
284- [ " 10", " Jack", " 2023-10-10T00:00:00Z"] ,
275+ { "values" : [{ "string_value" : "1" }, { "string_value" : " Alice"}, { "string_value" : " 2023-10-01T00:00:00Z"}]} ,
276+ { "values" : [{ "string_value" : "2" }, { "string_value" : " Bob"}, { "string_value" : " 2023-10-02T00:00:00Z"}]} ,
277+ { "values" : [{ "string_value" : "3" }, { "string_value" : " Charlie"}, { "string_value" : " 2023-10-03T00:00:00Z"}]} ,
278+ { "values" : [{ "string_value" : "4" }, { "string_value" : " David"}, { "string_value" : " 2023-10-04T00:00:00Z"}]} ,
279+ { "values" : [{ "string_value" : "5" }, { "string_value" : " Eve"}, { "string_value" : " 2023-10-05T00:00:00Z"}]} ,
280+ { "values" : [{ "string_value" : "6" }, { "string_value" : " Frank"}, { "string_value" : " 2023-10-06T00:00:00Z"}]} ,
281+ { "values" : [{ "string_value" : "7" }, { "string_value" : " Grace"}, { "string_value" : " 2023-10-07T00:00:00Z"}]} ,
282+ { "values" : [{ "string_value" : "8" }, { "string_value" : " Hank"}, { "string_value" : " 2023-10-08T00:00:00Z"}]} ,
283+ { "values" : [{ "string_value" : "9" }, { "string_value" : " Ivy"}, { "string_value" : " 2023-10-09T00:00:00Z"}]} ,
284+ { "values" : [{ "string_value" : " 10"}, { "string_value" : " Jack"}, { "string_value" : " 2023-10-10T00:00:00Z"}]} ,
285285 ]
286286 },
287287 }
@@ -381,12 +381,15 @@ def test_parse_query_result_trims_large_data(max_tokens):
381381 "Jack" ,
382382 ]
383383
384+ # Generate data in MCP format
384385 data_array = [
385- [
386- str (i + 1 ),
387- random .choice (names ),
388- (base_date + timedelta (days = random .randint (0 , 365 ))).strftime ("%Y-%m-%dT%H:%M:%SZ" ),
389- ]
386+ {
387+ "values" : [
388+ {"string_value" : str (i + 1 )},
389+ {"string_value" : random .choice (names )},
390+ {"string_value" : (base_date + timedelta (days = random .randint (0 , 365 ))).strftime ("%Y-%m-%dT%H:%M:%SZ" )},
391+ ]
392+ }
390393 for i in range (1000 )
391394 ]
392395
@@ -408,10 +411,10 @@ def test_parse_query_result_trims_large_data(max_tokens):
408411
409412 expected_df = pd .DataFrame (
410413 {
411- "id" : [int (row [0 ]) for row in data_array ],
412- "name" : [row [1 ] for row in data_array ],
414+ "id" : [int (row ["values" ][ 0 ][ "string_value" ]) for row in data_array ],
415+ "name" : [row ["values" ][ 1 ][ "string_value" ] for row in data_array ],
413416 "created_at" : [
414- datetime .strptime (row [2 ], "%Y-%m-%dT%H:%M:%SZ" ) for row in data_array
417+ datetime .strptime (row ["values" ][ 2 ][ "string_value" ], "%Y-%m-%dT%H:%M:%SZ" ) for row in data_array
415418 ],
416419 }
417420 )
@@ -453,13 +456,13 @@ def test_parse_query_result_with_timestamp_formats():
453456 "manifest" : {"schema" : {"columns" : [{"name" : "created_at" , "type_name" : "TIMESTAMP" }]}},
454457 "result" : {
455458 "data_array" : [
456- [ " 2023-10-01T14:30:45"] , # %Y-%m-%dT%H:%M:%S
457- [ " 2023-10-02 09:15:22"] , # %Y-%m-%d %H:%M:%S
458- [ " 2023-10-03T16:45"] , # %Y-%m-%dT%H:%M
459- [ " 2023-10-04 11:20"] , # %Y-%m-%d %H:%M
460- [ " 2023-10-05T08"] , # %Y-%m-%dT%H
461- [ " 2023-10-06 19"] , # %Y-%m-%d %H
462- [ " 2023-10-07"] , # %Y-%m-%d
459+ { "values" : [{ "string_value" : " 2023-10-01T14:30:45"}]} , # %Y-%m-%dT%H:%M:%S
460+ { "values" : [{ "string_value" : " 2023-10-02 09:15:22"}]} , # %Y-%m-%d %H:%M:%S
461+ { "values" : [{ "string_value" : " 2023-10-03T16:45"}]} , # %Y-%m-%dT%H:%M
462+ { "values" : [{ "string_value" : " 2023-10-04 11:20"}]} , # %Y-%m-%d %H:%M
463+ { "values" : [{ "string_value" : " 2023-10-05T08"}]} , # %Y-%m-%dT%H
464+ { "values" : [{ "string_value" : " 2023-10-06 19"}]} , # %Y-%m-%d %H
465+ { "values" : [{ "string_value" : " 2023-10-07"}]} , # %Y-%m-%d
463466 ]
464467 },
465468 }
0 commit comments