Commit 3c0e05d
committed
feat: consolidate agent control-plane onto AgentClient; fix worker credential delivery
Refactors the agent runtime's server access onto the standard client stack and
fixes worker credential resolution to the server's runtimeMetadata contract.
AgentClient (interface + Orkes impl)
- Add `conductor.client.agent_client.AgentClient` (ABC) + `OrkesAgentClient`
following the WorkflowClient/OrkesWorkflowClient pattern, built on the shared
ApiClient (sync) / AsyncApiClient (async) so JWT mint / X-Authorization / TTL
refresh / 401-retry are reused, not re-implemented. SSE reuses the ApiClient
token via a new public `get_authentication_headers()`.
- `OrkesClients.get_agent_client()` returns the new client.
- Delete the duplicate transport (`client/ai/agent_api_client.py`) and the DX
wrapper (`ai/agents/runtime/http_client.py`); AgentRuntime uses the one client
for all /agent/* calls (start/deploy/compile/status/execution/respond/stop/
signal/SSE), sync and async.
AgentRuntime / Configuration
- `AgentRuntime(configuration: Configuration = None, *, settings: AgentConfig = None)`:
server config comes solely from the standard Configuration; AgentConfig carries
runtime behaviour only. Remove the custom `to_conductor_configuration()` bridge
and the private log-level poke.
- `Configuration` host resolution falls back CONDUCTOR_SERVER_URL -> AGENTSPAN_SERVER_URL.
Worker credentials via runtimeMetadata (conductor-oss PR #1255 contract)
- Add `Task.runtime_metadata` and `TaskDef.runtime_metadata` model fields.
- Stamp `TaskDef.runtimeMetadata` from a tool/agent's declared credentials at
registration so the SDK's overwrite-registration no longer wipes the value the
server compiles.
- Worker dispatch (+ langchain/langgraph/claude_agent_sdk wrappers) reads the
host-resolved secrets off `Task.runtimeMetadata` instead of the retired
execution-token / POST /workers/secrets path. Retire WorkerCredentialFetcher,
`_extract_execution_token`, `_get_credential_fetcher`; `resolve_credentials(task, names)`
now reads runtimeMetadata.
Remove server auto-start
- Delete `runtime/server.py` and the `auto_start_server` / AGENTSPAN_AUTO_START_SERVER
config surface; runtime no longer probes or launches a local server.
CLI tools spawn-safety
- `cli_config._make_cli_tool` builds the `run_command` worker from a module-level
`_CliCommandRunner` instance (not a <locals> closure), so registration's
spawn-safety probe passes.
Tests / docs / examples
- New: orkes_agent_client, task/taskdef runtimeMetadata serde, runtime_metadata
registration, e2e suite26 (worker credentials + CLI spawn-safety) unit/e2e tests.
- Update credential/dispatch/runtime/sse/signals tests to the new contracts;
rewrite e2e suite24 for the transport-only client + runtime DX.
- Docs + examples updated (GH_TOKEN, Configuration-based AgentRuntime).1 parent 612821b commit 3c0e05d
55 files changed
Lines changed: 1874 additions & 2817 deletions
File tree
- docs/agents
- e2e
- examples/agents
- src/conductor
- ai/agents
- frameworks
- runtime
- credentials
- client
- ai
- configuration
- http
- models
- orkes
- tests
- integration/ai
- serdesertest
- unit
- ai
- credentials
- orkes
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
16 | 19 | | |
17 | 20 | | |
18 | 21 | | |
| 22 | + | |
19 | 23 | | |
20 | | - | |
| 24 | + | |
21 | 25 | | |
22 | 26 | | |
23 | 27 | | |
24 | | - | |
25 | | - | |
26 | | - | |
| 28 | + | |
| 29 | + | |
27 | 30 | | |
28 | 31 | | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
33 | 36 | | |
34 | 37 | | |
35 | 38 | | |
36 | 39 | | |
37 | 40 | | |
38 | | - | |
39 | | - | |
| 41 | + | |
| 42 | + | |
40 | 43 | | |
41 | 44 | | |
42 | 45 | | |
| |||
45 | 48 | | |
46 | 49 | | |
47 | 50 | | |
48 | | - | |
| 51 | + | |
49 | 52 | | |
50 | 53 | | |
51 | 54 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
23 | 27 | | |
24 | 28 | | |
25 | 29 | | |
| |||
269 | 273 | | |
270 | 274 | | |
271 | 275 | | |
272 | | - | |
273 | | - | |
274 | | - | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
275 | 283 | | |
276 | 284 | | |
277 | 285 | | |
278 | | - | |
279 | | - | |
280 | | - | |
281 | | - | |
282 | | - | |
283 | | - | |
284 | | - | |
285 | | - | |
286 | | - | |
287 | | - | |
288 | | - | |
289 | | - | |
290 | | - | |
291 | | - | |
292 | | - | |
293 | | - | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
294 | 298 | | |
295 | 299 | | |
296 | 300 | | |
297 | 301 | | |
298 | 302 | | |
299 | 303 | | |
300 | | - | |
| 304 | + | |
301 | 305 | | |
302 | 306 | | |
303 | 307 | | |
304 | | - | |
| 308 | + | |
| 309 | + | |
305 | 310 | | |
306 | 311 | | |
307 | | - | |
308 | | - | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
309 | 316 | | |
310 | 317 | | |
311 | 318 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | 18 | | |
24 | 19 | | |
25 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
5 | 8 | | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
12 | 16 | | |
13 | | - | |
14 | | - | |
15 | | - | |
| 17 | + | |
| 18 | + | |
16 | 19 | | |
17 | 20 | | |
18 | 21 | | |
| |||
63 | 66 | | |
64 | 67 | | |
65 | 68 | | |
66 | | - | |
| 69 | + | |
67 | 70 | | |
68 | 71 | | |
69 | 72 | | |
70 | 73 | | |
71 | 74 | | |
72 | | - | |
73 | | - | |
74 | 75 | | |
75 | 76 | | |
76 | | - | |
| 77 | + | |
77 | 78 | | |
78 | 79 | | |
79 | 80 | | |
80 | 81 | | |
81 | 82 | | |
82 | 83 | | |
83 | | - | |
| 84 | + | |
84 | 85 | | |
85 | 86 | | |
86 | 87 | | |
| |||
145 | 146 | | |
146 | 147 | | |
147 | 148 | | |
148 | | - | |
| 149 | + | |
149 | 150 | | |
150 | 151 | | |
151 | 152 | | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
0 commit comments