Skip to content

Commit 690c4b1

Browse files
committed
fix pydantic v1 and v2 conflict in tests snapshots
1 parent 00d0814 commit 690c4b1

File tree

3 files changed

+71
-94
lines changed

3 files changed

+71
-94
lines changed

tests/lib/chat/test_completions.py

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ def test_parse_nothing(client: OpenAI, respx_mock: MockRouter, monkeypatch: pyte
5050

5151
assert print_obj(completion, monkeypatch) == snapshot(
5252
"""\
53-
ParsedChatCompletion[NoneType](
53+
ParsedChatCompletion(
5454
choices=[
55-
ParsedChoice[NoneType](
55+
ParsedChoice(
5656
finish_reason='stop',
5757
index=0,
5858
logprobs=None,
59-
message=ParsedChatCompletionMessage[NoneType](
59+
message=ParsedChatCompletionMessage(
6060
annotations=None,
6161
audio=None,
6262
content="I'm unable to provide real-time weather updates. To get the current weather in San Francisco, I
@@ -120,13 +120,13 @@ class Location(BaseModel):
120120

121121
assert print_obj(completion, monkeypatch) == snapshot(
122122
"""\
123-
ParsedChatCompletion[Location](
123+
ParsedChatCompletion(
124124
choices=[
125-
ParsedChoice[Location](
125+
ParsedChoice(
126126
finish_reason='stop',
127127
index=0,
128128
logprobs=None,
129-
message=ParsedChatCompletionMessage[Location](
129+
message=ParsedChatCompletionMessage(
130130
annotations=None,
131131
audio=None,
132132
content='{"city":"San Francisco","temperature":65,"units":"f"}',
@@ -191,13 +191,13 @@ class Location(BaseModel):
191191

192192
assert print_obj(completion, monkeypatch) == snapshot(
193193
"""\
194-
ParsedChatCompletion[Location](
194+
ParsedChatCompletion(
195195
choices=[
196-
ParsedChoice[Location](
196+
ParsedChoice(
197197
finish_reason='stop',
198198
index=0,
199199
logprobs=None,
200-
message=ParsedChatCompletionMessage[Location](
200+
message=ParsedChatCompletionMessage(
201201
annotations=None,
202202
audio=None,
203203
content='{"city":"San Francisco","temperature":65,"units":"f"}',
@@ -266,11 +266,11 @@ class ColorDetection(BaseModel):
266266

267267
assert print_obj(completion.choices[0], monkeypatch) == snapshot(
268268
"""\
269-
ParsedChoice[ColorDetection](
269+
ParsedChoice(
270270
finish_reason='stop',
271271
index=0,
272272
logprobs=None,
273-
message=ParsedChatCompletionMessage[ColorDetection](
273+
message=ParsedChatCompletionMessage(
274274
annotations=None,
275275
audio=None,
276276
content='{"color":"red","hex_color_code":"#FF0000"}',
@@ -317,11 +317,11 @@ class Location(BaseModel):
317317
assert print_obj(completion.choices, monkeypatch) == snapshot(
318318
"""\
319319
[
320-
ParsedChoice[Location](
320+
ParsedChoice(
321321
finish_reason='stop',
322322
index=0,
323323
logprobs=None,
324-
message=ParsedChatCompletionMessage[Location](
324+
message=ParsedChatCompletionMessage(
325325
annotations=None,
326326
audio=None,
327327
content='{"city":"San Francisco","temperature":64,"units":"f"}',
@@ -332,11 +332,11 @@ class Location(BaseModel):
332332
tool_calls=None
333333
)
334334
),
335-
ParsedChoice[Location](
335+
ParsedChoice(
336336
finish_reason='stop',
337337
index=1,
338338
logprobs=None,
339-
message=ParsedChatCompletionMessage[Location](
339+
message=ParsedChatCompletionMessage(
340340
annotations=None,
341341
audio=None,
342342
content='{"city":"San Francisco","temperature":65,"units":"f"}',
@@ -347,11 +347,11 @@ class Location(BaseModel):
347347
tool_calls=None
348348
)
349349
),
350-
ParsedChoice[Location](
350+
ParsedChoice(
351351
finish_reason='stop',
352352
index=2,
353353
logprobs=None,
354-
message=ParsedChatCompletionMessage[Location](
354+
message=ParsedChatCompletionMessage(
355355
annotations=None,
356356
audio=None,
357357
content='{"city":"San Francisco","temperature":63.0,"units":"f"}',
@@ -397,13 +397,13 @@ class CalendarEvent:
397397

398398
assert print_obj(completion, monkeypatch) == snapshot(
399399
"""\
400-
ParsedChatCompletion[CalendarEvent](
400+
ParsedChatCompletion(
401401
choices=[
402-
ParsedChoice[CalendarEvent](
402+
ParsedChoice(
403403
finish_reason='stop',
404404
index=0,
405405
logprobs=None,
406-
message=ParsedChatCompletionMessage[CalendarEvent](
406+
message=ParsedChatCompletionMessage(
407407
annotations=None,
408408
audio=None,
409409
content='{"name":"Science Fair","date":"Friday","participants":["Alice","Bob"]}',
@@ -462,11 +462,11 @@ def test_pydantic_tool_model_all_types(client: OpenAI, respx_mock: MockRouter, m
462462

463463
assert print_obj(completion.choices[0], monkeypatch) == snapshot(
464464
"""\
465-
ParsedChoice[Query](
465+
ParsedChoice(
466466
finish_reason='tool_calls',
467467
index=0,
468468
logprobs=None,
469-
message=ParsedChatCompletionMessage[Query](
469+
message=ParsedChatCompletionMessage(
470470
annotations=None,
471471
audio=None,
472472
content=None,
@@ -576,11 +576,11 @@ class Location(BaseModel):
576576
assert print_obj(completion.choices, monkeypatch) == snapshot(
577577
"""\
578578
[
579-
ParsedChoice[Location](
579+
ParsedChoice(
580580
finish_reason='stop',
581581
index=0,
582582
logprobs=None,
583-
message=ParsedChatCompletionMessage[Location](
583+
message=ParsedChatCompletionMessage(
584584
annotations=None,
585585
audio=None,
586586
content=None,
@@ -627,11 +627,11 @@ class GetWeatherArgs(BaseModel):
627627
assert print_obj(completion.choices, monkeypatch) == snapshot(
628628
"""\
629629
[
630-
ParsedChoice[NoneType](
630+
ParsedChoice(
631631
finish_reason='tool_calls',
632632
index=0,
633633
logprobs=None,
634-
message=ParsedChatCompletionMessage[NoneType](
634+
message=ParsedChatCompletionMessage(
635635
annotations=None,
636636
audio=None,
637637
content=None,
@@ -701,11 +701,11 @@ class GetStockPrice(BaseModel):
701701
assert print_obj(completion.choices, monkeypatch) == snapshot(
702702
"""\
703703
[
704-
ParsedChoice[NoneType](
704+
ParsedChoice(
705705
finish_reason='tool_calls',
706706
index=0,
707707
logprobs=None,
708-
message=ParsedChatCompletionMessage[NoneType](
708+
message=ParsedChatCompletionMessage(
709709
annotations=None,
710710
audio=None,
711711
content=None,
@@ -784,11 +784,11 @@ def test_parse_strict_tools(client: OpenAI, respx_mock: MockRouter, monkeypatch:
784784
assert print_obj(completion.choices, monkeypatch) == snapshot(
785785
"""\
786786
[
787-
ParsedChoice[NoneType](
787+
ParsedChoice(
788788
finish_reason='tool_calls',
789789
index=0,
790790
logprobs=None,
791-
message=ParsedChatCompletionMessage[NoneType](
791+
message=ParsedChatCompletionMessage(
792792
annotations=None,
793793
audio=None,
794794
content=None,
@@ -866,13 +866,13 @@ class Location(BaseModel):
866866
assert isinstance(message.parsed.city, str)
867867
assert print_obj(completion, monkeypatch) == snapshot(
868868
"""\
869-
ParsedChatCompletion[Location](
869+
ParsedChatCompletion(
870870
choices=[
871-
ParsedChoice[Location](
871+
ParsedChoice(
872872
finish_reason='stop',
873873
index=0,
874874
logprobs=None,
875-
message=ParsedChatCompletionMessage[Location](
875+
message=ParsedChatCompletionMessage(
876876
annotations=None,
877877
audio=None,
878878
content='{"city":"San Francisco","temperature":58,"units":"f"}',
@@ -943,13 +943,13 @@ class Location(BaseModel):
943943
assert isinstance(message.parsed.city, str)
944944
assert print_obj(completion, monkeypatch) == snapshot(
945945
"""\
946-
ParsedChatCompletion[Location](
946+
ParsedChatCompletion(
947947
choices=[
948-
ParsedChoice[Location](
948+
ParsedChoice(
949949
finish_reason='stop',
950950
index=0,
951951
logprobs=None,
952-
message=ParsedChatCompletionMessage[Location](
952+
message=ParsedChatCompletionMessage(
953953
annotations=None,
954954
audio=None,
955955
content='{"city":"San Francisco","temperature":65,"units":"f"}',

0 commit comments

Comments
 (0)