Skip to content

Commit 18550b8

Browse files
ArtuiArtui
committed
cleaning up after bad merge
1 parent 1c7f17c commit 18550b8

File tree

3 files changed

+88
-38
lines changed

3 files changed

+88
-38
lines changed

‎tests/models/test_openai_responses.py‎

Lines changed: 74 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,13 @@ async def get_location(loc_name: str) -> str:
252252
tool_name='get_location',
253253
args='{"loc_name":"Londos"}',
254254
tool_call_id=IsStr(),
255+
id='fc_67e547c540648191bc7505ac667e023f0ae6111e84dd5c08',
255256
),
256257
ToolCallPart(
257258
tool_name='get_location',
258259
args='{"loc_name":"London"}',
259260
tool_call_id=IsStr(),
261+
id='fc_67e547c55c3081919da7a3f7fe81a1030ae6111e84dd5c08',
260262
),
261263
],
262264
usage=RequestUsage(details={'reasoning_tokens': 0}),
@@ -329,7 +331,14 @@ async def get_image() -> BinaryContent:
329331
]
330332
),
331333
ModelResponse(
332-
parts=[ToolCallPart(tool_name='get_image', args='{}', tool_call_id=IsStr())],
334+
parts=[
335+
ToolCallPart(
336+
tool_name='get_image',
337+
args='{}',
338+
tool_call_id=IsStr(),
339+
id='fc_681134d47cf48191b3f62e4d28b6c3820fe7a5a4e2123dc3',
340+
)
341+
],
333342
usage=RequestUsage(input_tokens=40, output_tokens=11, details={'reasoning_tokens': 0}),
334343
model_name='gpt-4o-2024-08-06',
335344
timestamp=IsDatetime(),
@@ -343,7 +352,7 @@ async def get_image() -> BinaryContent:
343352
ToolReturnPart(
344353
tool_name='get_image',
345354
content='See file 1c8566',
346-
tool_call_id='call_FLm3B1f8QAan0KpbUXhNY8bA|fc_681134d47cf48191b3f62e4d28b6c3820fe7a5a4e2123dc3',
355+
tool_call_id='call_FLm3B1f8QAan0KpbUXhNY8bA',
347356
timestamp=IsDatetime(),
348357
),
349358
UserPromptPart(
@@ -1276,7 +1285,14 @@ async def get_user_country() -> str:
12761285
]
12771286
),
12781287
ModelResponse(
1279-
parts=[ToolCallPart(tool_name='get_user_country', args='{}', tool_call_id=IsStr())],
1288+
parts=[
1289+
ToolCallPart(
1290+
tool_name='get_user_country',
1291+
args='{}',
1292+
tool_call_id=IsStr(),
1293+
id='fc_68477f0bb8e4819cba6d781e174d77f8001fd29e2d5573f7',
1294+
)
1295+
],
12801296
usage=RequestUsage(input_tokens=62, output_tokens=12, details={'reasoning_tokens': 0}),
12811297
model_name='gpt-4o-2024-08-06',
12821298
timestamp=IsDatetime(),
@@ -1290,7 +1306,7 @@ async def get_user_country() -> str:
12901306
ToolReturnPart(
12911307
tool_name='get_user_country',
12921308
content='Mexico',
1293-
tool_call_id='call_ZWkVhdUjupo528U9dqgFeRkH|fc_68477f0bb8e4819cba6d781e174d77f8001fd29e2d5573f7',
1309+
tool_call_id='call_ZWkVhdUjupo528U9dqgFeRkH',
12941310
timestamp=IsDatetime(),
12951311
)
12961312
]
@@ -1300,7 +1316,8 @@ async def get_user_country() -> str:
13001316
ToolCallPart(
13011317
tool_name='final_result',
13021318
args='{"city":"Mexico City","country":"Mexico"}',
1303-
tool_call_id='call_iFBd0zULhSZRR908DfH73VwN|fc_68477f0c91cc819e8024e7e633f0f09401dc81d4bc91f560',
1319+
tool_call_id='call_iFBd0zULhSZRR908DfH73VwN',
1320+
id='fc_68477f0c91cc819e8024e7e633f0f09401dc81d4bc91f560',
13041321
)
13051322
],
13061323
usage=RequestUsage(input_tokens=85, output_tokens=20, details={'reasoning_tokens': 0}),
@@ -1316,7 +1333,7 @@ async def get_user_country() -> str:
13161333
ToolReturnPart(
13171334
tool_name='final_result',
13181335
content='Final result processed.',
1319-
tool_call_id='call_iFBd0zULhSZRR908DfH73VwN|fc_68477f0c91cc819e8024e7e633f0f09401dc81d4bc91f560',
1336+
tool_call_id='call_iFBd0zULhSZRR908DfH73VwN',
13201337
timestamp=IsDatetime(),
13211338
)
13221339
]
@@ -1356,7 +1373,8 @@ async def get_user_country() -> str:
13561373
ToolCallPart(
13571374
tool_name='get_user_country',
13581375
args='{}',
1359-
tool_call_id='call_aTJhYjzmixZaVGqwl5gn2Ncr|fc_68477f0dff5c819ea17a1ffbaea621e00356a60c98816d6a',
1376+
tool_call_id='call_aTJhYjzmixZaVGqwl5gn2Ncr',
1377+
id='fc_68477f0dff5c819ea17a1ffbaea621e00356a60c98816d6a',
13601378
)
13611379
],
13621380
usage=RequestUsage(input_tokens=36, output_tokens=12, details={'reasoning_tokens': 0}),
@@ -1372,7 +1390,7 @@ async def get_user_country() -> str:
13721390
ToolReturnPart(
13731391
tool_name='get_user_country',
13741392
content='Mexico',
1375-
tool_call_id='call_aTJhYjzmixZaVGqwl5gn2Ncr|fc_68477f0dff5c819ea17a1ffbaea621e00356a60c98816d6a',
1393+
tool_call_id='call_aTJhYjzmixZaVGqwl5gn2Ncr',
13761394
timestamp=IsDatetime(),
13771395
)
13781396
]
@@ -1426,7 +1444,14 @@ async def get_user_country() -> str:
14261444
]
14271445
),
14281446
ModelResponse(
1429-
parts=[ToolCallPart(tool_name='get_user_country', args='{}', tool_call_id=IsStr())],
1447+
parts=[
1448+
ToolCallPart(
1449+
tool_name='get_user_country',
1450+
args='{}',
1451+
tool_call_id=IsStr(),
1452+
id='fc_68477f0fa7c081a19a525f7c6f180f310b8591d9001d2329',
1453+
)
1454+
],
14301455
usage=RequestUsage(input_tokens=66, output_tokens=12, details={'reasoning_tokens': 0}),
14311456
model_name='gpt-4o-2024-08-06',
14321457
timestamp=IsDatetime(),
@@ -1440,7 +1465,7 @@ async def get_user_country() -> str:
14401465
ToolReturnPart(
14411466
tool_name='get_user_country',
14421467
content='Mexico',
1443-
tool_call_id='call_tTAThu8l2S9hNky2krdwijGP|fc_68477f0fa7c081a19a525f7c6f180f310b8591d9001d2329',
1468+
tool_call_id='call_tTAThu8l2S9hNky2krdwijGP',
14441469
timestamp=IsDatetime(),
14451470
)
14461471
]
@@ -1496,7 +1521,14 @@ async def get_user_country() -> str:
14961521
]
14971522
),
14981523
ModelResponse(
1499-
parts=[ToolCallPart(tool_name='get_user_country', args='{}', tool_call_id=IsStr())],
1524+
parts=[
1525+
ToolCallPart(
1526+
tool_name='get_user_country',
1527+
args='{}',
1528+
tool_call_id=IsStr(),
1529+
id='fc_68477f1168a081a3981e847cd94275080dd57d732903c563',
1530+
)
1531+
],
15001532
usage=RequestUsage(input_tokens=153, output_tokens=12, details={'reasoning_tokens': 0}),
15011533
model_name='gpt-4o-2024-08-06',
15021534
timestamp=IsDatetime(),
@@ -1510,7 +1542,7 @@ async def get_user_country() -> str:
15101542
ToolReturnPart(
15111543
tool_name='get_user_country',
15121544
content='Mexico',
1513-
tool_call_id='call_UaLahjOtaM2tTyYZLxTCbOaP|fc_68477f1168a081a3981e847cd94275080dd57d732903c563',
1545+
tool_call_id='call_UaLahjOtaM2tTyYZLxTCbOaP',
15141546
timestamp=IsDatetime(),
15151547
)
15161548
]
@@ -1569,7 +1601,14 @@ async def get_user_country() -> str:
15691601
""",
15701602
),
15711603
ModelResponse(
1572-
parts=[ToolCallPart(tool_name='get_user_country', args='{}', tool_call_id=IsStr())],
1604+
parts=[
1605+
ToolCallPart(
1606+
tool_name='get_user_country',
1607+
args='{}',
1608+
tool_call_id=IsStr(),
1609+
id='fc_68482f1b0ff081a1b37b9170ee740d1e02f8ef7f2fb42b50',
1610+
)
1611+
],
15731612
usage=RequestUsage(input_tokens=107, output_tokens=12, details={'reasoning_tokens': 0}),
15741613
model_name='gpt-4o-2024-08-06',
15751614
timestamp=IsDatetime(),
@@ -1583,7 +1622,7 @@ async def get_user_country() -> str:
15831622
ToolReturnPart(
15841623
tool_name='get_user_country',
15851624
content='Mexico',
1586-
tool_call_id='call_FrlL4M0CbAy8Dhv4VqF1Shom|fc_68482f1b0ff081a1b37b9170ee740d1e02f8ef7f2fb42b50',
1625+
tool_call_id='call_FrlL4M0CbAy8Dhv4VqF1Shom',
15871626
timestamp=IsDatetime(),
15881627
)
15891628
],
@@ -1653,7 +1692,14 @@ async def get_user_country() -> str:
16531692
""",
16541693
),
16551694
ModelResponse(
1656-
parts=[ToolCallPart(tool_name='get_user_country', args='{}', tool_call_id=IsStr())],
1695+
parts=[
1696+
ToolCallPart(
1697+
tool_name='get_user_country',
1698+
args='{}',
1699+
tool_call_id=IsStr(),
1700+
id='fc_68482f2889d481a199caa61de7ccb62c08e79646fe74d5ee',
1701+
)
1702+
],
16571703
usage=RequestUsage(input_tokens=283, output_tokens=12, details={'reasoning_tokens': 0}),
16581704
model_name='gpt-4o-2024-08-06',
16591705
timestamp=IsDatetime(),
@@ -1667,7 +1713,7 @@ async def get_user_country() -> str:
16671713
ToolReturnPart(
16681714
tool_name='get_user_country',
16691715
content='Mexico',
1670-
tool_call_id='call_my4OyoVXRT0m7bLWmsxcaCQI|fc_68482f2889d481a199caa61de7ccb62c08e79646fe74d5ee',
1716+
tool_call_id='call_my4OyoVXRT0m7bLWmsxcaCQI',
16711717
timestamp=IsDatetime(),
16721718
)
16731719
],
@@ -2201,7 +2247,8 @@ def update_plan(plan: str) -> str:
22012247
ToolCallPart(
22022248
tool_name='update_plan',
22032249
args=IsStr(),
2204-
tool_call_id='call_gL7JE6GDeGGsFubqO2XGytyO|fc_68c42d3e9e4881968b15fbb8253f58540e8bc41441c948f6',
2250+
tool_call_id='call_gL7JE6GDeGGsFubqO2XGytyO',
2251+
id='fc_68c42d3e9e4881968b15fbb8253f58540e8bc41441c948f6',
22052252
),
22062253
],
22072254
usage=RequestUsage(input_tokens=124, output_tokens=1926, details={'reasoning_tokens': 1792}),
@@ -2217,7 +2264,7 @@ def update_plan(plan: str) -> str:
22172264
ToolReturnPart(
22182265
tool_name='update_plan',
22192266
content='plan updated',
2220-
tool_call_id='call_gL7JE6GDeGGsFubqO2XGytyO|fc_68c42d3e9e4881968b15fbb8253f58540e8bc41441c948f6',
2267+
tool_call_id='call_gL7JE6GDeGGsFubqO2XGytyO',
22212268
timestamp=IsDatetime(),
22222269
)
22232270
],
@@ -3381,7 +3428,8 @@ def get_meaning_of_life() -> int:
33813428
ToolCallPart(
33823429
tool_name='get_meaning_of_life',
33833430
args='{}',
3384-
tool_call_id='call_3WCunBU7lCG1HHaLmnnRJn8I|fc_68cc4fa649ac8195b0c6c239cd2c14470548824120ffcf74',
3431+
tool_call_id='call_3WCunBU7lCG1HHaLmnnRJn8I',
3432+
id='fc_68cc4fa649ac8195b0c6c239cd2c14470548824120ffcf74',
33853433
)
33863434
],
33873435
usage=RequestUsage(input_tokens=36, output_tokens=15, details={'reasoning_tokens': 0}),
@@ -3397,7 +3445,7 @@ def get_meaning_of_life() -> int:
33973445
ToolReturnPart(
33983446
tool_name='get_meaning_of_life',
33993447
content=42,
3400-
tool_call_id='call_3WCunBU7lCG1HHaLmnnRJn8I|fc_68cc4fa649ac8195b0c6c239cd2c14470548824120ffcf74',
3448+
tool_call_id='call_3WCunBU7lCG1HHaLmnnRJn8I',
34013449
timestamp=IsDatetime(),
34023450
)
34033451
]
@@ -5737,7 +5785,8 @@ class Animal(BaseModel):
57375785
ToolCallPart(
57385786
tool_name='final_result',
57395787
args='{"species":"Axolotl","name":"Axie"}',
5740-
tool_call_id='call_eE7MHM5WMJnMt5srV69NmBJk|fc_0360827931d9421b0068dd83918a8c81a08a765e558fd5e071',
5788+
tool_call_id='call_eE7MHM5WMJnMt5srV69NmBJk',
5789+
id='fc_0360827931d9421b0068dd83918a8c81a08a765e558fd5e071',
57415790
),
57425791
],
57435792
usage=RequestUsage(input_tokens=587, output_tokens=2587, details={'reasoning_tokens': 2560}),
@@ -5753,7 +5802,7 @@ class Animal(BaseModel):
57535802
ToolReturnPart(
57545803
tool_name='final_result',
57555804
content='Final result processed.',
5756-
tool_call_id='call_eE7MHM5WMJnMt5srV69NmBJk|fc_0360827931d9421b0068dd83918a8c81a08a765e558fd5e071',
5805+
tool_call_id='call_eE7MHM5WMJnMt5srV69NmBJk',
57575806
timestamp=IsDatetime(),
57585807
)
57595808
]
@@ -5948,7 +5997,8 @@ async def get_animal() -> str:
59485997
ToolCallPart(
59495998
tool_name='get_animal',
59505999
args='{}',
5951-
tool_call_id='call_t76xO1K2zqrJkawkU3tur8vj|fc_0481074da98340df0068dd88f000688191afaf54f799b1dfaf',
6000+
tool_call_id='call_t76xO1K2zqrJkawkU3tur8vj',
6001+
id='fc_0481074da98340df0068dd88f000688191afaf54f799b1dfaf',
59526002
),
59536003
],
59546004
usage=RequestUsage(input_tokens=389, output_tokens=721, details={'reasoning_tokens': 704}),
@@ -5964,7 +6014,7 @@ async def get_animal() -> str:
59646014
ToolReturnPart(
59656015
tool_name='get_animal',
59666016
content='axolotl',
5967-
tool_call_id='call_t76xO1K2zqrJkawkU3tur8vj|fc_0481074da98340df0068dd88f000688191afaf54f799b1dfaf',
6017+
tool_call_id='call_t76xO1K2zqrJkawkU3tur8vj',
59686018
timestamp=IsDatetime(),
59696019
)
59706020
]

0 commit comments

Comments
 (0)