Skip to content

Commit 8ba0f2f

Browse files
eavanvalkenburgeavanvalkenburg
committed
refactor: rename agent run input aliases for #3613 
1 parent 62b7db2 commit 8ba0f2f

12 files changed

Lines changed: 66 additions & 69 deletions

File tree

‎python/packages/a2a/agent_framework_a2a/_agent.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
normalize_messages,
4141
prepend_agent_framework_to_user_agent,
4242
)
43-
from agent_framework._types import AgentRunMessagesOrNone
43+
from agent_framework._types import AgentRunInputsOrNone
4444
from agent_framework.observability import AgentTelemetryLayer
4545

4646
__all__ = ["A2AAgent", "A2AContinuationToken"]
@@ -209,7 +209,7 @@ async def __aexit__(
209209
@overload
210210
def run(
211211
self,
212-
messages: AgentRunMessagesOrNone = None,
212+
messages: AgentRunInputsOrNone = None,
213213
*,
214214
stream: Literal[False] = ...,
215215
session: AgentSession | None = None,
@@ -221,7 +221,7 @@ def run(
221221
@overload
222222
def run(
223223
self,
224-
messages: AgentRunMessagesOrNone = None,
224+
messages: AgentRunInputsOrNone = None,
225225
*,
226226
stream: Literal[True],
227227
session: AgentSession | None = None,
@@ -232,7 +232,7 @@ def run(
232232

233233
def run(
234234
self,
235-
messages: AgentRunMessagesOrNone = None,
235+
messages: AgentRunInputsOrNone = None,
236236
*,
237237
stream: bool = False,
238238
session: AgentSession | None = None,

‎python/packages/claude/agent_framework_claude/_agent.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
normalize_messages,
2424
)
2525
from agent_framework._settings import load_settings
26-
from agent_framework._types import AgentRunMessagesOrNone, normalize_tools
26+
from agent_framework._types import AgentRunInputsOrNone, normalize_tools
2727
from agent_framework.exceptions import ServiceException
2828
from claude_agent_sdk import (
2929
AssistantMessage,
@@ -557,7 +557,7 @@ def _format_prompt(self, messages: list[Message] | None) -> str:
557557
@overload
558558
def run(
559559
self,
560-
messages: AgentRunMessagesOrNone = None,
560+
messages: AgentRunInputsOrNone = None,
561561
*,
562562
stream: Literal[True],
563563
session: AgentSession | None = None,
@@ -568,7 +568,7 @@ def run(
568568
@overload
569569
async def run(
570570
self,
571-
messages: AgentRunMessagesOrNone = None,
571+
messages: AgentRunInputsOrNone = None,
572572
*,
573573
stream: Literal[False] = ...,
574574
session: AgentSession | None = None,
@@ -578,7 +578,7 @@ async def run(
578578

579579
def run(
580580
self,
581-
messages: AgentRunMessagesOrNone = None,
581+
messages: AgentRunInputsOrNone = None,
582582
*,
583583
stream: bool = False,
584584
session: AgentSession | None = None,
@@ -612,7 +612,7 @@ def run(
612612

613613
async def _get_stream(
614614
self,
615-
messages: AgentRunMessagesOrNone = None,
615+
messages: AgentRunInputsOrNone = None,
616616
*,
617617
session: AgentSession | None = None,
618618
options: OptionsT | MutableMapping[str, Any] | None = None,

‎python/packages/copilotstudio/agent_framework_copilotstudio/_agent.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
normalize_messages,
1919
)
2020
from agent_framework._settings import load_settings
21-
from agent_framework._types import AgentRunMessagesOrNone
21+
from agent_framework._types import AgentRunInputsOrNone
2222
from agent_framework.exceptions import ServiceException, ServiceInitializationError
2323
from microsoft_agents.copilotstudio.client import AgentType, ConnectionSettings, CopilotClient, PowerPlatformCloud
2424

@@ -188,7 +188,7 @@ def __init__(
188188
@overload
189189
def run(
190190
self,
191-
messages: AgentRunMessagesOrNone = None,
191+
messages: AgentRunInputsOrNone = None,
192192
*,
193193
stream: Literal[False] = False,
194194
session: AgentSession | None = None,
@@ -198,7 +198,7 @@ def run(
198198
@overload
199199
def run(
200200
self,
201-
messages: AgentRunMessagesOrNone = None,
201+
messages: AgentRunInputsOrNone = None,
202202
*,
203203
stream: Literal[True],
204204
session: AgentSession | None = None,
@@ -207,7 +207,7 @@ def run(
207207

208208
def run(
209209
self,
210-
messages: AgentRunMessagesOrNone = None,
210+
messages: AgentRunInputsOrNone = None,
211211
*,
212212
stream: bool = False,
213213
session: AgentSession | None = None,
@@ -237,7 +237,7 @@ def run(
237237

238238
async def _run_impl(
239239
self,
240-
messages: AgentRunMessagesOrNone = None,
240+
messages: AgentRunInputsOrNone = None,
241241
*,
242242
session: AgentSession | None = None,
243243
**kwargs: Any,
@@ -262,7 +262,7 @@ async def _run_impl(
262262

263263
def _run_stream_impl(
264264
self,
265-
messages: AgentRunMessagesOrNone = None,
265+
messages: AgentRunInputsOrNone = None,
266266
*,
267267
session: AgentSession | None = None,
268268
**kwargs: Any,

‎python/packages/core/agent_framework/_agents.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
from ._types import (
4242
AgentResponse,
4343
AgentResponseUpdate,
44-
AgentRunMessagesOrNone,
44+
AgentRunInputsOrNone,
4545
ChatResponse,
4646
ChatResponseUpdate,
4747
Message,
@@ -231,7 +231,7 @@ def get_session(self, *, service_session_id, **kwargs):
231231
@overload
232232
def run(
233233
self,
234-
messages: AgentRunMessagesOrNone = None,
234+
messages: AgentRunInputsOrNone = None,
235235
*,
236236
stream: Literal[False] = ...,
237237
session: AgentSession | None = None,
@@ -243,7 +243,7 @@ def run(
243243
@overload
244244
def run(
245245
self,
246-
messages: AgentRunMessagesOrNone = None,
246+
messages: AgentRunInputsOrNone = None,
247247
*,
248248
stream: Literal[True],
249249
session: AgentSession | None = None,
@@ -254,7 +254,7 @@ def run(
254254

255255
def run(
256256
self,
257-
messages: AgentRunMessagesOrNone = None,
257+
messages: AgentRunInputsOrNone = None,
258258
*,
259259
stream: bool = False,
260260
session: AgentSession | None = None,
@@ -764,7 +764,7 @@ def _update_agent_name_and_description(self) -> None:
764764
@overload
765765
def run(
766766
self,
767-
messages: AgentRunMessagesOrNone = None,
767+
messages: AgentRunInputsOrNone = None,
768768
*,
769769
stream: Literal[False] = ...,
770770
session: AgentSession | None = None,
@@ -781,7 +781,7 @@ def run(
781781
@overload
782782
def run(
783783
self,
784-
messages: AgentRunMessagesOrNone = None,
784+
messages: AgentRunInputsOrNone = None,
785785
*,
786786
stream: Literal[False] = ...,
787787
session: AgentSession | None = None,
@@ -798,7 +798,7 @@ def run(
798798
@overload
799799
def run(
800800
self,
801-
messages: AgentRunMessagesOrNone = None,
801+
messages: AgentRunInputsOrNone = None,
802802
*,
803803
stream: Literal[True],
804804
session: AgentSession | None = None,
@@ -814,7 +814,7 @@ def run(
814814

815815
def run(
816816
self,
817-
messages: AgentRunMessagesOrNone = None,
817+
messages: AgentRunInputsOrNone = None,
818818
*,
819819
stream: bool = False,
820820
session: AgentSession | None = None,
@@ -1001,7 +1001,7 @@ def _extract_conversation_id_from_streaming_response(response: AgentResponse[Any
10011001
async def _prepare_run_context(
10021002
self,
10031003
*,
1004-
messages: AgentRunMessagesOrNone,
1004+
messages: AgentRunInputsOrNone,
10051005
session: AgentSession | None,
10061006
tools: FunctionTool
10071007
| Callable[..., Any]

‎python/packages/core/agent_framework/_middleware.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from ._types import (
1515
AgentResponse,
1616
AgentResponseUpdate,
17-
AgentRunMessagesOrNone,
17+
AgentRunInputsOrNone,
1818
ChatResponse,
1919
ChatResponseUpdate,
2020
Message,
@@ -1096,7 +1096,7 @@ def __init__(
10961096
@overload
10971097
def run(
10981098
self,
1099-
messages: AgentRunMessagesOrNone = None,
1099+
messages: AgentRunInputsOrNone = None,
11001100
*,
11011101
stream: Literal[False] = ...,
11021102
session: AgentSession | None = None,
@@ -1108,7 +1108,7 @@ def run(
11081108
@overload
11091109
def run(
11101110
self,
1111-
messages: AgentRunMessagesOrNone = None,
1111+
messages: AgentRunInputsOrNone = None,
11121112
*,
11131113
stream: Literal[False] = ...,
11141114
session: AgentSession | None = None,
@@ -1120,7 +1120,7 @@ def run(
11201120
@overload
11211121
def run(
11221122
self,
1123-
messages: AgentRunMessagesOrNone = None,
1123+
messages: AgentRunInputsOrNone = None,
11241124
*,
11251125
stream: Literal[True],
11261126
session: AgentSession | None = None,
@@ -1131,7 +1131,7 @@ def run(
11311131

11321132
def run(
11331133
self,
1134-
messages: AgentRunMessagesOrNone = None,
1134+
messages: AgentRunInputsOrNone = None,
11351135
*,
11361136
stream: bool = False,
11371137
session: AgentSession | None = None,

‎python/packages/core/agent_framework/_types.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
__all__ = [
3131
"AgentResponse",
3232
"AgentResponseUpdate",
33-
"AgentRunMessages",
34-
"AgentRunMessagesOrNone",
33+
"AgentRunInputs",
34+
"AgentRunInputsOrNone",
3535
"Annotation",
3636
"ChatOptions",
3737
"ChatResponse",
@@ -1538,12 +1538,12 @@ def text(self) -> str:
15381538
return " ".join(content.text for content in self.contents if content.type == "text") # type: ignore[misc]
15391539

15401540

1541-
AgentRunMessages = str | Content | Message | Sequence[str | Content | Message]
1542-
AgentRunMessagesOrNone = AgentRunMessages | None
1541+
AgentRunInputs = str | Content | Message | Sequence[str | Content | Message]
1542+
AgentRunInputsOrNone = AgentRunInputs | None
15431543

15441544

15451545
def prepare_messages(
1546-
messages: AgentRunMessages,
1546+
messages: AgentRunInputs,
15471547
system_instructions: str | Sequence[str] | None = None,
15481548
) -> list[Message]:
15491549
"""Convert various message input formats into a list of Message objects.
@@ -1582,7 +1582,7 @@ def prepare_messages(
15821582

15831583

15841584
def normalize_messages(
1585-
messages: AgentRunMessagesOrNone = None,
1585+
messages: AgentRunInputsOrNone = None,
15861586
) -> list[Message]:
15871587
"""Normalize message inputs to a list of Message objects.
15881588

‎python/packages/core/agent_framework/_workflows/_agent.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
from .._types import (
2323
AgentResponse,
2424
AgentResponseUpdate,
25-
AgentRunMessages,
26-
AgentRunMessagesOrNone,
25+
AgentRunInputs,
26+
AgentRunInputsOrNone,
2727
Content,
2828
Message,
2929
ResponseStream,
@@ -147,7 +147,7 @@ def pending_requests(self) -> dict[str, WorkflowEvent[Any]]:
147147
@overload
148148
def run(
149149
self,
150-
messages: AgentRunMessagesOrNone = None,
150+
messages: AgentRunInputsOrNone = None,
151151
*,
152152
stream: Literal[True],
153153
session: AgentSession | None = None,
@@ -159,7 +159,7 @@ def run(
159159
@overload
160160
async def run(
161161
self,
162-
messages: AgentRunMessagesOrNone = None,
162+
messages: AgentRunInputsOrNone = None,
163163
*,
164164
stream: Literal[False] = ...,
165165
session: AgentSession | None = None,
@@ -170,7 +170,7 @@ async def run(
170170

171171
def run(
172172
self,
173-
messages: AgentRunMessagesOrNone = None,
173+
messages: AgentRunInputsOrNone = None,
174174
*,
175175
stream: bool = False,
176176
session: AgentSession | None = None,
@@ -216,7 +216,7 @@ def run(
216216

217217
async def _run_impl(
218218
self,
219-
messages: AgentRunMessages,
219+
messages: AgentRunInputs,
220220
response_id: str,
221221
session: AgentSession | None,
222222
checkpoint_id: str | None = None,
@@ -272,7 +272,7 @@ async def _run_impl(
272272

273273
async def _run_stream_impl(
274274
self,
275-
messages: AgentRunMessages,
275+
messages: AgentRunInputs,
276276
response_id: str,
277277
session: AgentSession | None,
278278
checkpoint_id: str | None = None,

‎python/packages/core/agent_framework/_workflows/_message_utils.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"""Shared helpers for normalizing workflow message inputs."""
44

55
from agent_framework import Content, Message
6-
from agent_framework._types import AgentRunMessagesOrNone
6+
from agent_framework._types import AgentRunInputsOrNone
77

88

99
def normalize_messages_input(
10-
messages: AgentRunMessagesOrNone = None,
10+
messages: AgentRunInputsOrNone = None,
1111
) -> list[Message]:
1212
"""Normalize heterogeneous message inputs to a list of Message objects.
1313

0 commit comments

Comments
 (0)