Skip to content

Commit 7e23649

Browse files
moritzwilkschmoritzwilksch
committed
run + iter 
1 parent 667f3a8 commit 7e23649

File tree

6 files changed

+54
-54
lines changed

6 files changed

+54
-54
lines changed

‎pydantic_ai_slim/pydantic_ai/_cli.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,15 +228,15 @@ async def run_chat(
228228
prog_name: str,
229229
config_dir: Path | None = None,
230230
deps: AgentDepsT = None,
231-
message_history: list[ModelMessage] | None = None,
231+
message_history: Sequence[ModelMessage] | None = None,
232232
) -> int:
233233
prompt_history_path = (config_dir or PYDANTIC_AI_HOME) / PROMPT_HISTORY_FILENAME
234234
prompt_history_path.parent.mkdir(parents=True, exist_ok=True)
235235
prompt_history_path.touch(exist_ok=True)
236236
session: PromptSession[Any] = PromptSession(history=FileHistory(str(prompt_history_path)))
237237

238238
multiline = False
239-
messages: list[ModelMessage] = message_history[:] if message_history else []
239+
messages: list[ModelMessage] = list(message_history) if message_history else []
240240

241241
while True:
242242
try:
@@ -272,7 +272,7 @@ async def ask_agent(
272272
console: Console,
273273
code_theme: str,
274274
deps: AgentDepsT = None,
275-
messages: list[ModelMessage] | None = None,
275+
messages: Sequence[ModelMessage] | None = None,
276276
) -> list[ModelMessage]:
277277
status = Status('[dim]Working on it…[/dim]', console=console)
278278

‎pydantic_ai_slim/pydantic_ai/agent/__init__.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ def iter(
415415
user_prompt: str | Sequence[_messages.UserContent] | None = None,
416416
*,
417417
output_type: None = None,
418-
message_history: list[_messages.ModelMessage] | None = None,
418+
message_history: Sequence[_messages.ModelMessage] | None = None,
419419
deferred_tool_results: DeferredToolResults | None = None,
420420
model: models.Model | models.KnownModelName | str | None = None,
421421
deps: AgentDepsT = None,
@@ -432,7 +432,7 @@ def iter(
432432
user_prompt: str | Sequence[_messages.UserContent] | None = None,
433433
*,
434434
output_type: OutputSpec[RunOutputDataT],
435-
message_history: list[_messages.ModelMessage] | None = None,
435+
message_history: Sequence[_messages.ModelMessage] | None = None,
436436
deferred_tool_results: DeferredToolResults | None = None,
437437
model: models.Model | models.KnownModelName | str | None = None,
438438
deps: AgentDepsT = None,
@@ -449,7 +449,7 @@ async def iter(
449449
user_prompt: str | Sequence[_messages.UserContent] | None = None,
450450
*,
451451
output_type: OutputSpec[RunOutputDataT] | None = None,
452-
message_history: list[_messages.ModelMessage] | None = None,
452+
message_history: Sequence[_messages.ModelMessage] | None = None,
453453
deferred_tool_results: DeferredToolResults | None = None,
454454
model: models.Model | models.KnownModelName | str | None = None,
455455
deps: AgentDepsT = None,
@@ -566,7 +566,7 @@ async def main():
566566
# Build the initial state
567567
usage = usage or _usage.RunUsage()
568568
state = _agent_graph.GraphAgentState(
569-
message_history=message_history[:] if message_history else [],
569+
message_history=list(message_history) if message_history else [],
570570
usage=usage,
571571
retries=0,
572572
run_step=0,
@@ -684,13 +684,13 @@ def _run_span_end_attributes(
684684
'all_messages_events': json.dumps(
685685
[
686686
InstrumentedModel.event_to_dict(e)
687-
for e in settings.messages_to_otel_events(state.message_history)
687+
for e in settings.messages_to_otel_events(list(state.message_history))
688688
]
689689
)
690690
}
691691
else:
692692
attrs = {
693-
'pydantic_ai.all_messages': json.dumps(settings.messages_to_otel_messages(state.message_history)),
693+
'pydantic_ai.all_messages': json.dumps(settings.messages_to_otel_messages(list(state.message_history))),
694694
**settings.system_instructions_attributes(literal_instructions),
695695
}
696696

‎pydantic_ai_slim/pydantic_ai/agent/abstract.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ async def run(
126126
user_prompt: str | Sequence[_messages.UserContent] | None = None,
127127
*,
128128
output_type: None = None,
129-
message_history: list[_messages.ModelMessage] | None = None,
129+
message_history: Sequence[_messages.ModelMessage] | None = None,
130130
deferred_tool_results: DeferredToolResults | None = None,
131131
model: models.Model | models.KnownModelName | str | None = None,
132132
deps: AgentDepsT = None,
@@ -144,7 +144,7 @@ async def run(
144144
user_prompt: str | Sequence[_messages.UserContent] | None = None,
145145
*,
146146
output_type: OutputSpec[RunOutputDataT],
147-
message_history: list[_messages.ModelMessage] | None = None,
147+
message_history: Sequence[_messages.ModelMessage] | None = None,
148148
deferred_tool_results: DeferredToolResults | None = None,
149149
model: models.Model | models.KnownModelName | str | None = None,
150150
deps: AgentDepsT = None,
@@ -161,7 +161,7 @@ async def run(
161161
user_prompt: str | Sequence[_messages.UserContent] | None = None,
162162
*,
163163
output_type: OutputSpec[RunOutputDataT] | None = None,
164-
message_history: list[_messages.ModelMessage] | None = None,
164+
message_history: Sequence[_messages.ModelMessage] | None = None,
165165
deferred_tool_results: DeferredToolResults | None = None,
166166
model: models.Model | models.KnownModelName | str | None = None,
167167
deps: AgentDepsT = None,
@@ -240,7 +240,7 @@ def run_sync(
240240
user_prompt: str | Sequence[_messages.UserContent] | None = None,
241241
*,
242242
output_type: None = None,
243-
message_history: list[_messages.ModelMessage] | None = None,
243+
message_history: Sequence[_messages.ModelMessage] | None = None,
244244
deferred_tool_results: DeferredToolResults | None = None,
245245
model: models.Model | models.KnownModelName | str | None = None,
246246
deps: AgentDepsT = None,
@@ -258,7 +258,7 @@ def run_sync(
258258
user_prompt: str | Sequence[_messages.UserContent] | None = None,
259259
*,
260260
output_type: OutputSpec[RunOutputDataT],
261-
message_history: list[_messages.ModelMessage] | None = None,
261+
message_history: Sequence[_messages.ModelMessage] | None = None,
262262
deferred_tool_results: DeferredToolResults | None = None,
263263
model: models.Model | models.KnownModelName | str | None = None,
264264
deps: AgentDepsT = None,
@@ -275,7 +275,7 @@ def run_sync(
275275
user_prompt: str | Sequence[_messages.UserContent] | None = None,
276276
*,
277277
output_type: OutputSpec[RunOutputDataT] | None = None,
278-
message_history: list[_messages.ModelMessage] | None = None,
278+
message_history: Sequence[_messages.ModelMessage] | None = None,
279279
deferred_tool_results: DeferredToolResults | None = None,
280280
model: models.Model | models.KnownModelName | str | None = None,
281281
deps: AgentDepsT = None,
@@ -346,7 +346,7 @@ def run_stream(
346346
user_prompt: str | Sequence[_messages.UserContent] | None = None,
347347
*,
348348
output_type: None = None,
349-
message_history: list[_messages.ModelMessage] | None = None,
349+
message_history: Sequence[_messages.ModelMessage] | None = None,
350350
deferred_tool_results: DeferredToolResults | None = None,
351351
model: models.Model | models.KnownModelName | str | None = None,
352352
deps: AgentDepsT = None,
@@ -364,7 +364,7 @@ def run_stream(
364364
user_prompt: str | Sequence[_messages.UserContent] | None = None,
365365
*,
366366
output_type: OutputSpec[RunOutputDataT],
367-
message_history: list[_messages.ModelMessage] | None = None,
367+
message_history: Sequence[_messages.ModelMessage] | None = None,
368368
deferred_tool_results: DeferredToolResults | None = None,
369369
model: models.Model | models.KnownModelName | str | None = None,
370370
deps: AgentDepsT = None,
@@ -382,7 +382,7 @@ async def run_stream( # noqa C901
382382
user_prompt: str | Sequence[_messages.UserContent] | None = None,
383383
*,
384384
output_type: OutputSpec[RunOutputDataT] | None = None,
385-
message_history: list[_messages.ModelMessage] | None = None,
385+
message_history: Sequence[_messages.ModelMessage] | None = None,
386386
deferred_tool_results: DeferredToolResults | None = None,
387387
model: models.Model | models.KnownModelName | str | None = None,
388388
deps: AgentDepsT = None,
@@ -493,7 +493,7 @@ async def stream_to_final(
493493
raise exceptions.AgentRunError('Agent run produced final results') # pragma: no cover
494494
yielded = True
495495

496-
messages = graph_ctx.state.message_history.copy()
496+
messages = list(graph_ctx.state.message_history)
497497

498498
async def on_complete() -> None:
499499
"""Called when the stream has completed.
@@ -521,7 +521,7 @@ async def on_complete() -> None:
521521
messages.append(_messages.ModelRequest(parts))
522522

523523
yield StreamedRunResult(
524-
messages,
524+
list(messages),
525525
graph_ctx.deps.new_message_index,
526526
stream,
527527
on_complete,
@@ -558,7 +558,7 @@ def iter(
558558
user_prompt: str | Sequence[_messages.UserContent] | None = None,
559559
*,
560560
output_type: None = None,
561-
message_history: list[_messages.ModelMessage] | None = None,
561+
message_history: Sequence[_messages.ModelMessage] | None = None,
562562
deferred_tool_results: DeferredToolResults | None = None,
563563
model: models.Model | models.KnownModelName | str | None = None,
564564
deps: AgentDepsT = None,
@@ -575,7 +575,7 @@ def iter(
575575
user_prompt: str | Sequence[_messages.UserContent] | None = None,
576576
*,
577577
output_type: OutputSpec[RunOutputDataT],
578-
message_history: list[_messages.ModelMessage] | None = None,
578+
message_history: Sequence[_messages.ModelMessage] | None = None,
579579
deferred_tool_results: DeferredToolResults | None = None,
580580
model: models.Model | models.KnownModelName | str | None = None,
581581
deps: AgentDepsT = None,
@@ -593,7 +593,7 @@ async def iter(
593593
user_prompt: str | Sequence[_messages.UserContent] | None = None,
594594
*,
595595
output_type: OutputSpec[RunOutputDataT] | None = None,
596-
message_history: list[_messages.ModelMessage] | None = None,
596+
message_history: Sequence[_messages.ModelMessage] | None = None,
597597
deferred_tool_results: DeferredToolResults | None = None,
598598
model: models.Model | models.KnownModelName | str | None = None,
599599
deps: AgentDepsT = None,
@@ -944,7 +944,7 @@ async def to_cli(
944944
self: Self,
945945
deps: AgentDepsT = None,
946946
prog_name: str = 'pydantic-ai',
947-
message_history: list[_messages.ModelMessage] | None = None,
947+
message_history: Sequence[_messages.ModelMessage] | None = None,
948948
) -> None:
949949
"""Run the agent in a CLI chat interface.
950950
@@ -981,7 +981,7 @@ def to_cli_sync(
981981
self: Self,
982982
deps: AgentDepsT = None,
983983
prog_name: str = 'pydantic-ai',
984-
message_history: list[_messages.ModelMessage] | None = None,
984+
message_history: Sequence[_messages.ModelMessage] | None = None,
985985
) -> None:
986986
"""Run the agent in a CLI chat interface with the non-async interface.
987987

‎pydantic_ai_slim/pydantic_ai/agent/wrapper.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def iter(
7272
user_prompt: str | Sequence[_messages.UserContent] | None = None,
7373
*,
7474
output_type: None = None,
75-
message_history: list[_messages.ModelMessage] | None = None,
75+
message_history: Sequence[_messages.ModelMessage] | None = None,
7676
deferred_tool_results: DeferredToolResults | None = None,
7777
model: models.Model | models.KnownModelName | str | None = None,
7878
deps: AgentDepsT = None,
@@ -89,7 +89,7 @@ def iter(
8989
user_prompt: str | Sequence[_messages.UserContent] | None = None,
9090
*,
9191
output_type: OutputSpec[RunOutputDataT],
92-
message_history: list[_messages.ModelMessage] | None = None,
92+
message_history: Sequence[_messages.ModelMessage] | None = None,
9393
deferred_tool_results: DeferredToolResults | None = None,
9494
model: models.Model | models.KnownModelName | str | None = None,
9595
deps: AgentDepsT = None,
@@ -106,7 +106,7 @@ async def iter(
106106
user_prompt: str | Sequence[_messages.UserContent] | None = None,
107107
*,
108108
output_type: OutputSpec[RunOutputDataT] | None = None,
109-
message_history: list[_messages.ModelMessage] | None = None,
109+
message_history: Sequence[_messages.ModelMessage] | None = None,
110110
deferred_tool_results: DeferredToolResults | None = None,
111111
model: models.Model | models.KnownModelName | str | None = None,
112112
deps: AgentDepsT = None,

‎pydantic_ai_slim/pydantic_ai/durable_exec/dbos/_agent.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ async def wrapped_run_workflow(
111111
user_prompt: str | Sequence[_messages.UserContent] | None = None,
112112
*,
113113
output_type: OutputSpec[RunOutputDataT] | None = None,
114-
message_history: list[_messages.ModelMessage] | None = None,
114+
message_history: Sequence[_messages.ModelMessage] | None = None,
115115
deferred_tool_results: DeferredToolResults | None = None,
116116
model: models.Model | models.KnownModelName | str | None = None,
117117
deps: AgentDepsT,
@@ -148,7 +148,7 @@ def wrapped_run_sync_workflow(
148148
user_prompt: str | Sequence[_messages.UserContent] | None = None,
149149
*,
150150
output_type: OutputSpec[RunOutputDataT] | None = None,
151-
message_history: list[_messages.ModelMessage] | None = None,
151+
message_history: Sequence[_messages.ModelMessage] | None = None,
152152
deferred_tool_results: DeferredToolResults | None = None,
153153
model: models.Model | models.KnownModelName | str | None = None,
154154
deps: AgentDepsT,
@@ -236,7 +236,7 @@ async def run(
236236
user_prompt: str | Sequence[_messages.UserContent] | None = None,
237237
*,
238238
output_type: None = None,
239-
message_history: list[_messages.ModelMessage] | None = None,
239+
message_history: Sequence[_messages.ModelMessage] | None = None,
240240
deferred_tool_results: DeferredToolResults | None = None,
241241
model: models.Model | models.KnownModelName | str | None = None,
242242
deps: AgentDepsT = None,
@@ -254,7 +254,7 @@ async def run(
254254
user_prompt: str | Sequence[_messages.UserContent] | None = None,
255255
*,
256256
output_type: OutputSpec[RunOutputDataT],
257-
message_history: list[_messages.ModelMessage] | None = None,
257+
message_history: Sequence[_messages.ModelMessage] | None = None,
258258
deferred_tool_results: DeferredToolResults | None = None,
259259
model: models.Model | models.KnownModelName | str | None = None,
260260
deps: AgentDepsT = None,
@@ -271,7 +271,7 @@ async def run(
271271
user_prompt: str | Sequence[_messages.UserContent] | None = None,
272272
*,
273273
output_type: OutputSpec[RunOutputDataT] | None = None,
274-
message_history: list[_messages.ModelMessage] | None = None,
274+
message_history: Sequence[_messages.ModelMessage] | None = None,
275275
deferred_tool_results: DeferredToolResults | None = None,
276276
model: models.Model | models.KnownModelName | str | None = None,
277277
deps: AgentDepsT = None,
@@ -340,7 +340,7 @@ def run_sync(
340340
user_prompt: str | Sequence[_messages.UserContent] | None = None,
341341
*,
342342
output_type: None = None,
343-
message_history: list[_messages.ModelMessage] | None = None,
343+
message_history: Sequence[_messages.ModelMessage] | None = None,
344344
deferred_tool_results: DeferredToolResults | None = None,
345345
model: models.Model | models.KnownModelName | str | None = None,
346346
deps: AgentDepsT = None,
@@ -358,7 +358,7 @@ def run_sync(
358358
user_prompt: str | Sequence[_messages.UserContent] | None = None,
359359
*,
360360
output_type: OutputSpec[RunOutputDataT],
361-
message_history: list[_messages.ModelMessage] | None = None,
361+
message_history: Sequence[_messages.ModelMessage] | None = None,
362362
deferred_tool_results: DeferredToolResults | None = None,
363363
model: models.Model | models.KnownModelName | str | None = None,
364364
deps: AgentDepsT = None,
@@ -375,7 +375,7 @@ def run_sync(
375375
user_prompt: str | Sequence[_messages.UserContent] | None = None,
376376
*,
377377
output_type: OutputSpec[RunOutputDataT] | None = None,
378-
message_history: list[_messages.ModelMessage] | None = None,
378+
message_history: Sequence[_messages.ModelMessage] | None = None,
379379
deferred_tool_results: DeferredToolResults | None = None,
380380
model: models.Model | models.KnownModelName | str | None = None,
381381
deps: AgentDepsT = None,
@@ -443,7 +443,7 @@ def run_stream(
443443
user_prompt: str | Sequence[_messages.UserContent] | None = None,
444444
*,
445445
output_type: None = None,
446-
message_history: list[_messages.ModelMessage] | None = None,
446+
message_history: Sequence[_messages.ModelMessage] | None = None,
447447
deferred_tool_results: DeferredToolResults | None = None,
448448
model: models.Model | models.KnownModelName | str | None = None,
449449
deps: AgentDepsT = None,
@@ -461,7 +461,7 @@ def run_stream(
461461
user_prompt: str | Sequence[_messages.UserContent] | None = None,
462462
*,
463463
output_type: OutputSpec[RunOutputDataT],
464-
message_history: list[_messages.ModelMessage] | None = None,
464+
message_history: Sequence[_messages.ModelMessage] | None = None,
465465
deferred_tool_results: DeferredToolResults | None = None,
466466
model: models.Model | models.KnownModelName | str | None = None,
467467
deps: AgentDepsT = None,
@@ -479,7 +479,7 @@ async def run_stream(
479479
user_prompt: str | Sequence[_messages.UserContent] | None = None,
480480
*,
481481
output_type: OutputSpec[RunOutputDataT] | None = None,
482-
message_history: list[_messages.ModelMessage] | None = None,
482+
message_history: Sequence[_messages.ModelMessage] | None = None,
483483
deferred_tool_results: DeferredToolResults | None = None,
484484
model: models.Model | models.KnownModelName | str | None = None,
485485
deps: AgentDepsT = None,
@@ -553,7 +553,7 @@ def iter(
553553
user_prompt: str | Sequence[_messages.UserContent] | None = None,
554554
*,
555555
output_type: None = None,
556-
message_history: list[_messages.ModelMessage] | None = None,
556+
message_history: Sequence[_messages.ModelMessage] | None = None,
557557
deferred_tool_results: DeferredToolResults | None = None,
558558
model: models.Model | models.KnownModelName | str | None = None,
559559
deps: AgentDepsT = None,
@@ -571,7 +571,7 @@ def iter(
571571
user_prompt: str | Sequence[_messages.UserContent] | None = None,
572572
*,
573573
output_type: OutputSpec[RunOutputDataT],
574-
message_history: list[_messages.ModelMessage] | None = None,
574+
message_history: Sequence[_messages.ModelMessage] | None = None,
575575
deferred_tool_results: DeferredToolResults | None = None,
576576
model: models.Model | models.KnownModelName | str | None = None,
577577
deps: AgentDepsT = None,
@@ -589,7 +589,7 @@ async def iter(
589589
user_prompt: str | Sequence[_messages.UserContent] | None = None,
590590
*,
591591
output_type: OutputSpec[RunOutputDataT] | None = None,
592-
message_history: list[_messages.ModelMessage] | None = None,
592+
message_history: Sequence[_messages.ModelMessage] | None = None,
593593
deferred_tool_results: DeferredToolResults | None = None,
594594
model: models.Model | models.KnownModelName | str | None = None,
595595
deps: AgentDepsT = None,

0 commit comments

Comments
 (0)