Skip to content

Commit 7ddb18d

Browse files
moritzwilkschmoritzwilksch
committed
run + iter 
1 parent c0e83d9 commit 7ddb18d

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
@@ -430,7 +430,7 @@ def iter(
430430
user_prompt: str | Sequence[_messages.UserContent] | None = None,
431431
*,
432432
output_type: None = None,
433-
message_history: list[_messages.ModelMessage] | None = None,
433+
message_history: Sequence[_messages.ModelMessage] | None = None,
434434
deferred_tool_results: DeferredToolResults | None = None,
435435
model: models.Model | models.KnownModelName | str | None = None,
436436
deps: AgentDepsT = None,
@@ -447,7 +447,7 @@ def iter(
447447
user_prompt: str | Sequence[_messages.UserContent] | None = None,
448448
*,
449449
output_type: OutputSpec[RunOutputDataT],
450-
message_history: list[_messages.ModelMessage] | None = None,
450+
message_history: Sequence[_messages.ModelMessage] | None = None,
451451
deferred_tool_results: DeferredToolResults | None = None,
452452
model: models.Model | models.KnownModelName | str | None = None,
453453
deps: AgentDepsT = None,
@@ -464,7 +464,7 @@ async def iter(
464464
user_prompt: str | Sequence[_messages.UserContent] | None = None,
465465
*,
466466
output_type: OutputSpec[RunOutputDataT] | None = None,
467-
message_history: list[_messages.ModelMessage] | None = None,
467+
message_history: Sequence[_messages.ModelMessage] | None = None,
468468
deferred_tool_results: DeferredToolResults | None = None,
469469
model: models.Model | models.KnownModelName | str | None = None,
470470
deps: AgentDepsT = None,
@@ -581,7 +581,7 @@ async def main():
581581
# Build the initial state
582582
usage = usage or _usage.RunUsage()
583583
state = _agent_graph.GraphAgentState(
584-
message_history=message_history[:] if message_history else [],
584+
message_history=list(message_history) if message_history else [],
585585
usage=usage,
586586
retries=0,
587587
run_step=0,
@@ -689,13 +689,13 @@ def _run_span_end_attributes(
689689
'all_messages_events': json.dumps(
690690
[
691691
InstrumentedModel.event_to_dict(e)
692-
for e in settings.messages_to_otel_events(state.message_history)
692+
for e in settings.messages_to_otel_events(list(state.message_history))
693693
]
694694
)
695695
}
696696
else:
697697
attrs = {
698-
'pydantic_ai.all_messages': json.dumps(settings.messages_to_otel_messages(state.message_history)),
698+
'pydantic_ai.all_messages': json.dumps(settings.messages_to_otel_messages(list(state.message_history))),
699699
**settings.system_instructions_attributes(self._instructions),
700700
}
701701

‎pydantic_ai_slim/pydantic_ai/agent/abstract.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ async def run(
117117
user_prompt: str | Sequence[_messages.UserContent] | None = None,
118118
*,
119119
output_type: None = None,
120-
message_history: list[_messages.ModelMessage] | None = None,
120+
message_history: Sequence[_messages.ModelMessage] | None = None,
121121
deferred_tool_results: DeferredToolResults | None = None,
122122
model: models.Model | models.KnownModelName | str | None = None,
123123
deps: AgentDepsT = None,
@@ -135,7 +135,7 @@ async def run(
135135
user_prompt: str | Sequence[_messages.UserContent] | None = None,
136136
*,
137137
output_type: OutputSpec[RunOutputDataT],
138-
message_history: list[_messages.ModelMessage] | None = None,
138+
message_history: Sequence[_messages.ModelMessage] | None = None,
139139
deferred_tool_results: DeferredToolResults | None = None,
140140
model: models.Model | models.KnownModelName | str | None = None,
141141
deps: AgentDepsT = None,
@@ -152,7 +152,7 @@ async def run(
152152
user_prompt: str | Sequence[_messages.UserContent] | None = None,
153153
*,
154154
output_type: OutputSpec[RunOutputDataT] | None = None,
155-
message_history: list[_messages.ModelMessage] | None = None,
155+
message_history: Sequence[_messages.ModelMessage] | None = None,
156156
deferred_tool_results: DeferredToolResults | None = None,
157157
model: models.Model | models.KnownModelName | str | None = None,
158158
deps: AgentDepsT = None,
@@ -231,7 +231,7 @@ def run_sync(
231231
user_prompt: str | Sequence[_messages.UserContent] | None = None,
232232
*,
233233
output_type: None = None,
234-
message_history: list[_messages.ModelMessage] | None = None,
234+
message_history: Sequence[_messages.ModelMessage] | None = None,
235235
deferred_tool_results: DeferredToolResults | None = None,
236236
model: models.Model | models.KnownModelName | str | None = None,
237237
deps: AgentDepsT = None,
@@ -249,7 +249,7 @@ def run_sync(
249249
user_prompt: str | Sequence[_messages.UserContent] | None = None,
250250
*,
251251
output_type: OutputSpec[RunOutputDataT],
252-
message_history: list[_messages.ModelMessage] | None = None,
252+
message_history: Sequence[_messages.ModelMessage] | None = None,
253253
deferred_tool_results: DeferredToolResults | None = None,
254254
model: models.Model | models.KnownModelName | str | None = None,
255255
deps: AgentDepsT = None,
@@ -266,7 +266,7 @@ def run_sync(
266266
user_prompt: str | Sequence[_messages.UserContent] | None = None,
267267
*,
268268
output_type: OutputSpec[RunOutputDataT] | None = None,
269-
message_history: list[_messages.ModelMessage] | None = None,
269+
message_history: Sequence[_messages.ModelMessage] | None = None,
270270
deferred_tool_results: DeferredToolResults | None = None,
271271
model: models.Model | models.KnownModelName | str | None = None,
272272
deps: AgentDepsT = None,
@@ -337,7 +337,7 @@ def run_stream(
337337
user_prompt: str | Sequence[_messages.UserContent] | None = None,
338338
*,
339339
output_type: None = None,
340-
message_history: list[_messages.ModelMessage] | None = None,
340+
message_history: Sequence[_messages.ModelMessage] | None = None,
341341
deferred_tool_results: DeferredToolResults | None = None,
342342
model: models.Model | models.KnownModelName | str | None = None,
343343
deps: AgentDepsT = None,
@@ -355,7 +355,7 @@ def run_stream(
355355
user_prompt: str | Sequence[_messages.UserContent] | None = None,
356356
*,
357357
output_type: OutputSpec[RunOutputDataT],
358-
message_history: list[_messages.ModelMessage] | None = None,
358+
message_history: Sequence[_messages.ModelMessage] | None = None,
359359
deferred_tool_results: DeferredToolResults | None = None,
360360
model: models.Model | models.KnownModelName | str | None = None,
361361
deps: AgentDepsT = None,
@@ -373,7 +373,7 @@ async def run_stream( # noqa C901
373373
user_prompt: str | Sequence[_messages.UserContent] | None = None,
374374
*,
375375
output_type: OutputSpec[RunOutputDataT] | None = None,
376-
message_history: list[_messages.ModelMessage] | None = None,
376+
message_history: Sequence[_messages.ModelMessage] | None = None,
377377
deferred_tool_results: DeferredToolResults | None = None,
378378
model: models.Model | models.KnownModelName | str | None = None,
379379
deps: AgentDepsT = None,
@@ -484,7 +484,7 @@ async def stream_to_final(
484484
raise exceptions.AgentRunError('Agent run produced final results') # pragma: no cover
485485
yielded = True
486486

487-
messages = graph_ctx.state.message_history.copy()
487+
messages = list(graph_ctx.state.message_history)
488488

489489
async def on_complete() -> None:
490490
"""Called when the stream has completed.
@@ -512,7 +512,7 @@ async def on_complete() -> None:
512512
messages.append(_messages.ModelRequest(parts))
513513

514514
yield StreamedRunResult(
515-
messages,
515+
list(messages),
516516
graph_ctx.deps.new_message_index,
517517
stream,
518518
on_complete,
@@ -549,7 +549,7 @@ def iter(
549549
user_prompt: str | Sequence[_messages.UserContent] | None = None,
550550
*,
551551
output_type: None = None,
552-
message_history: list[_messages.ModelMessage] | None = None,
552+
message_history: Sequence[_messages.ModelMessage] | None = None,
553553
deferred_tool_results: DeferredToolResults | None = None,
554554
model: models.Model | models.KnownModelName | str | None = None,
555555
deps: AgentDepsT = None,
@@ -566,7 +566,7 @@ def iter(
566566
user_prompt: str | Sequence[_messages.UserContent] | None = None,
567567
*,
568568
output_type: OutputSpec[RunOutputDataT],
569-
message_history: list[_messages.ModelMessage] | None = None,
569+
message_history: Sequence[_messages.ModelMessage] | None = None,
570570
deferred_tool_results: DeferredToolResults | None = None,
571571
model: models.Model | models.KnownModelName | str | None = None,
572572
deps: AgentDepsT = None,
@@ -584,7 +584,7 @@ async def iter(
584584
user_prompt: str | Sequence[_messages.UserContent] | None = None,
585585
*,
586586
output_type: OutputSpec[RunOutputDataT] | None = None,
587-
message_history: list[_messages.ModelMessage] | None = None,
587+
message_history: Sequence[_messages.ModelMessage] | None = None,
588588
deferred_tool_results: DeferredToolResults | None = None,
589589
model: models.Model | models.KnownModelName | str | None = None,
590590
deps: AgentDepsT = None,
@@ -933,7 +933,7 @@ async def to_cli(
933933
self: Self,
934934
deps: AgentDepsT = None,
935935
prog_name: str = 'pydantic-ai',
936-
message_history: list[_messages.ModelMessage] | None = None,
936+
message_history: Sequence[_messages.ModelMessage] | None = None,
937937
) -> None:
938938
"""Run the agent in a CLI chat interface.
939939
@@ -970,7 +970,7 @@ def to_cli_sync(
970970
self: Self,
971971
deps: AgentDepsT = None,
972972
prog_name: str = 'pydantic-ai',
973-
message_history: list[_messages.ModelMessage] | None = None,
973+
message_history: Sequence[_messages.ModelMessage] | None = None,
974974
) -> None:
975975
"""Run the agent in a CLI chat interface with the non-async interface.
976976

‎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
@@ -110,7 +110,7 @@ async def wrapped_run_workflow(
110110
user_prompt: str | Sequence[_messages.UserContent] | None = None,
111111
*,
112112
output_type: OutputSpec[RunOutputDataT] | None = None,
113-
message_history: list[_messages.ModelMessage] | None = None,
113+
message_history: Sequence[_messages.ModelMessage] | None = None,
114114
deferred_tool_results: DeferredToolResults | None = None,
115115
model: models.Model | models.KnownModelName | str | None = None,
116116
deps: AgentDepsT,
@@ -147,7 +147,7 @@ def wrapped_run_sync_workflow(
147147
user_prompt: str | Sequence[_messages.UserContent] | None = None,
148148
*,
149149
output_type: OutputSpec[RunOutputDataT] | None = None,
150-
message_history: list[_messages.ModelMessage] | None = None,
150+
message_history: Sequence[_messages.ModelMessage] | None = None,
151151
deferred_tool_results: DeferredToolResults | None = None,
152152
model: models.Model | models.KnownModelName | str | None = None,
153153
deps: AgentDepsT,
@@ -235,7 +235,7 @@ async def run(
235235
user_prompt: str | Sequence[_messages.UserContent] | None = None,
236236
*,
237237
output_type: None = None,
238-
message_history: list[_messages.ModelMessage] | None = None,
238+
message_history: Sequence[_messages.ModelMessage] | None = None,
239239
deferred_tool_results: DeferredToolResults | None = None,
240240
model: models.Model | models.KnownModelName | str | None = None,
241241
deps: AgentDepsT = None,
@@ -253,7 +253,7 @@ async def run(
253253
user_prompt: str | Sequence[_messages.UserContent] | None = None,
254254
*,
255255
output_type: OutputSpec[RunOutputDataT],
256-
message_history: list[_messages.ModelMessage] | None = None,
256+
message_history: Sequence[_messages.ModelMessage] | None = None,
257257
deferred_tool_results: DeferredToolResults | None = None,
258258
model: models.Model | models.KnownModelName | str | None = None,
259259
deps: AgentDepsT = None,
@@ -270,7 +270,7 @@ async def run(
270270
user_prompt: str | Sequence[_messages.UserContent] | None = None,
271271
*,
272272
output_type: OutputSpec[RunOutputDataT] | None = None,
273-
message_history: list[_messages.ModelMessage] | None = None,
273+
message_history: Sequence[_messages.ModelMessage] | None = None,
274274
deferred_tool_results: DeferredToolResults | None = None,
275275
model: models.Model | models.KnownModelName | str | None = None,
276276
deps: AgentDepsT = None,
@@ -339,7 +339,7 @@ def run_sync(
339339
user_prompt: str | Sequence[_messages.UserContent] | None = None,
340340
*,
341341
output_type: None = None,
342-
message_history: list[_messages.ModelMessage] | None = None,
342+
message_history: Sequence[_messages.ModelMessage] | None = None,
343343
deferred_tool_results: DeferredToolResults | None = None,
344344
model: models.Model | models.KnownModelName | str | None = None,
345345
deps: AgentDepsT = None,
@@ -357,7 +357,7 @@ def run_sync(
357357
user_prompt: str | Sequence[_messages.UserContent] | None = None,
358358
*,
359359
output_type: OutputSpec[RunOutputDataT],
360-
message_history: list[_messages.ModelMessage] | None = None,
360+
message_history: Sequence[_messages.ModelMessage] | None = None,
361361
deferred_tool_results: DeferredToolResults | None = None,
362362
model: models.Model | models.KnownModelName | str | None = None,
363363
deps: AgentDepsT = None,
@@ -374,7 +374,7 @@ def run_sync(
374374
user_prompt: str | Sequence[_messages.UserContent] | None = None,
375375
*,
376376
output_type: OutputSpec[RunOutputDataT] | None = None,
377-
message_history: list[_messages.ModelMessage] | None = None,
377+
message_history: Sequence[_messages.ModelMessage] | None = None,
378378
deferred_tool_results: DeferredToolResults | None = None,
379379
model: models.Model | models.KnownModelName | str | None = None,
380380
deps: AgentDepsT = None,
@@ -442,7 +442,7 @@ def run_stream(
442442
user_prompt: str | Sequence[_messages.UserContent] | None = None,
443443
*,
444444
output_type: None = None,
445-
message_history: list[_messages.ModelMessage] | None = None,
445+
message_history: Sequence[_messages.ModelMessage] | None = None,
446446
deferred_tool_results: DeferredToolResults | None = None,
447447
model: models.Model | models.KnownModelName | str | None = None,
448448
deps: AgentDepsT = None,
@@ -460,7 +460,7 @@ def run_stream(
460460
user_prompt: str | Sequence[_messages.UserContent] | None = None,
461461
*,
462462
output_type: OutputSpec[RunOutputDataT],
463-
message_history: list[_messages.ModelMessage] | None = None,
463+
message_history: Sequence[_messages.ModelMessage] | None = None,
464464
deferred_tool_results: DeferredToolResults | None = None,
465465
model: models.Model | models.KnownModelName | str | None = None,
466466
deps: AgentDepsT = None,
@@ -478,7 +478,7 @@ async def run_stream(
478478
user_prompt: str | Sequence[_messages.UserContent] | None = None,
479479
*,
480480
output_type: OutputSpec[RunOutputDataT] | None = None,
481-
message_history: list[_messages.ModelMessage] | None = None,
481+
message_history: Sequence[_messages.ModelMessage] | None = None,
482482
deferred_tool_results: DeferredToolResults | None = None,
483483
model: models.Model | models.KnownModelName | str | None = None,
484484
deps: AgentDepsT = None,
@@ -552,7 +552,7 @@ def iter(
552552
user_prompt: str | Sequence[_messages.UserContent] | None = None,
553553
*,
554554
output_type: None = None,
555-
message_history: list[_messages.ModelMessage] | None = None,
555+
message_history: Sequence[_messages.ModelMessage] | None = None,
556556
deferred_tool_results: DeferredToolResults | None = None,
557557
model: models.Model | models.KnownModelName | str | None = None,
558558
deps: AgentDepsT = None,
@@ -570,7 +570,7 @@ def iter(
570570
user_prompt: str | Sequence[_messages.UserContent] | None = None,
571571
*,
572572
output_type: OutputSpec[RunOutputDataT],
573-
message_history: list[_messages.ModelMessage] | None = None,
573+
message_history: Sequence[_messages.ModelMessage] | None = None,
574574
deferred_tool_results: DeferredToolResults | None = None,
575575
model: models.Model | models.KnownModelName | str | None = None,
576576
deps: AgentDepsT = None,
@@ -588,7 +588,7 @@ async def iter(
588588
user_prompt: str | Sequence[_messages.UserContent] | None = None,
589589
*,
590590
output_type: OutputSpec[RunOutputDataT] | None = None,
591-
message_history: list[_messages.ModelMessage] | None = None,
591+
message_history: Sequence[_messages.ModelMessage] | None = None,
592592
deferred_tool_results: DeferredToolResults | None = None,
593593
model: models.Model | models.KnownModelName | str | None = None,
594594
deps: AgentDepsT = None,

0 commit comments

Comments
 (0)