glaip-sdk 0.6.5b3__py3-none-any.whl → 0.7.17__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- glaip_sdk/__init__.py +42 -5
- glaip_sdk/agents/base.py +362 -39
- glaip_sdk/branding.py +113 -2
- glaip_sdk/cli/account_store.py +15 -0
- glaip_sdk/cli/auth.py +14 -8
- glaip_sdk/cli/commands/accounts.py +1 -1
- glaip_sdk/cli/commands/agents/__init__.py +116 -0
- glaip_sdk/cli/commands/agents/_common.py +562 -0
- glaip_sdk/cli/commands/agents/create.py +155 -0
- glaip_sdk/cli/commands/agents/delete.py +64 -0
- glaip_sdk/cli/commands/agents/get.py +89 -0
- glaip_sdk/cli/commands/agents/list.py +129 -0
- glaip_sdk/cli/commands/agents/run.py +264 -0
- glaip_sdk/cli/commands/agents/sync_langflow.py +72 -0
- glaip_sdk/cli/commands/agents/update.py +112 -0
- glaip_sdk/cli/commands/common_config.py +15 -12
- glaip_sdk/cli/commands/configure.py +2 -3
- glaip_sdk/cli/commands/mcps/__init__.py +94 -0
- glaip_sdk/cli/commands/mcps/_common.py +459 -0
- glaip_sdk/cli/commands/mcps/connect.py +82 -0
- glaip_sdk/cli/commands/mcps/create.py +152 -0
- glaip_sdk/cli/commands/mcps/delete.py +73 -0
- glaip_sdk/cli/commands/mcps/get.py +212 -0
- glaip_sdk/cli/commands/mcps/list.py +69 -0
- glaip_sdk/cli/commands/mcps/tools.py +235 -0
- glaip_sdk/cli/commands/mcps/update.py +190 -0
- glaip_sdk/cli/commands/models.py +2 -4
- glaip_sdk/cli/commands/shared/__init__.py +21 -0
- glaip_sdk/cli/commands/shared/formatters.py +91 -0
- glaip_sdk/cli/commands/tools/__init__.py +69 -0
- glaip_sdk/cli/commands/tools/_common.py +80 -0
- glaip_sdk/cli/commands/tools/create.py +228 -0
- glaip_sdk/cli/commands/tools/delete.py +61 -0
- glaip_sdk/cli/commands/tools/get.py +103 -0
- glaip_sdk/cli/commands/tools/list.py +69 -0
- glaip_sdk/cli/commands/tools/script.py +49 -0
- glaip_sdk/cli/commands/tools/update.py +102 -0
- glaip_sdk/cli/commands/transcripts/__init__.py +90 -0
- glaip_sdk/cli/commands/transcripts/_common.py +9 -0
- glaip_sdk/cli/commands/transcripts/clear.py +5 -0
- glaip_sdk/cli/commands/transcripts/detail.py +5 -0
- glaip_sdk/cli/commands/{transcripts.py → transcripts_original.py} +2 -1
- glaip_sdk/cli/commands/update.py +163 -17
- glaip_sdk/cli/config.py +1 -0
- glaip_sdk/cli/core/output.py +12 -7
- glaip_sdk/cli/entrypoint.py +20 -0
- glaip_sdk/cli/main.py +127 -39
- glaip_sdk/cli/pager.py +3 -3
- glaip_sdk/cli/resolution.py +2 -1
- glaip_sdk/cli/slash/accounts_controller.py +112 -32
- glaip_sdk/cli/slash/agent_session.py +5 -2
- glaip_sdk/cli/slash/prompt.py +11 -0
- glaip_sdk/cli/slash/remote_runs_controller.py +3 -1
- glaip_sdk/cli/slash/session.py +375 -25
- glaip_sdk/cli/slash/tui/__init__.py +28 -1
- glaip_sdk/cli/slash/tui/accounts.tcss +97 -6
- glaip_sdk/cli/slash/tui/accounts_app.py +1107 -126
- glaip_sdk/cli/slash/tui/clipboard.py +195 -0
- glaip_sdk/cli/slash/tui/context.py +92 -0
- glaip_sdk/cli/slash/tui/indicators.py +341 -0
- glaip_sdk/cli/slash/tui/keybind_registry.py +235 -0
- glaip_sdk/cli/slash/tui/layouts/__init__.py +14 -0
- glaip_sdk/cli/slash/tui/layouts/harlequin.py +184 -0
- glaip_sdk/cli/slash/tui/loading.py +43 -21
- glaip_sdk/cli/slash/tui/remote_runs_app.py +152 -20
- glaip_sdk/cli/slash/tui/terminal.py +407 -0
- glaip_sdk/cli/slash/tui/theme/__init__.py +15 -0
- glaip_sdk/cli/slash/tui/theme/catalog.py +79 -0
- glaip_sdk/cli/slash/tui/theme/manager.py +112 -0
- glaip_sdk/cli/slash/tui/theme/tokens.py +55 -0
- glaip_sdk/cli/slash/tui/toast.py +388 -0
- glaip_sdk/cli/transcript/history.py +1 -1
- glaip_sdk/cli/transcript/viewer.py +5 -3
- glaip_sdk/cli/tui_settings.py +125 -0
- glaip_sdk/cli/update_notifier.py +215 -7
- glaip_sdk/cli/validators.py +1 -1
- glaip_sdk/client/__init__.py +2 -1
- glaip_sdk/client/_schedule_payloads.py +89 -0
- glaip_sdk/client/agents.py +290 -16
- glaip_sdk/client/base.py +25 -0
- glaip_sdk/client/hitl.py +136 -0
- glaip_sdk/client/main.py +7 -5
- glaip_sdk/client/mcps.py +44 -13
- glaip_sdk/client/payloads/agent/__init__.py +23 -0
- glaip_sdk/client/{_agent_payloads.py → payloads/agent/requests.py} +28 -48
- glaip_sdk/client/payloads/agent/responses.py +43 -0
- glaip_sdk/client/run_rendering.py +414 -3
- glaip_sdk/client/schedules.py +439 -0
- glaip_sdk/client/tools.py +57 -26
- glaip_sdk/config/constants.py +22 -2
- glaip_sdk/guardrails/__init__.py +80 -0
- glaip_sdk/guardrails/serializer.py +89 -0
- glaip_sdk/hitl/__init__.py +48 -0
- glaip_sdk/hitl/base.py +64 -0
- glaip_sdk/hitl/callback.py +43 -0
- glaip_sdk/hitl/local.py +121 -0
- glaip_sdk/hitl/remote.py +523 -0
- glaip_sdk/models/__init__.py +47 -1
- glaip_sdk/models/_provider_mappings.py +101 -0
- glaip_sdk/models/_validation.py +97 -0
- glaip_sdk/models/agent.py +2 -1
- glaip_sdk/models/agent_runs.py +2 -1
- glaip_sdk/models/constants.py +141 -0
- glaip_sdk/models/model.py +170 -0
- glaip_sdk/models/schedule.py +224 -0
- glaip_sdk/payload_schemas/agent.py +1 -0
- glaip_sdk/payload_schemas/guardrails.py +34 -0
- glaip_sdk/registry/tool.py +273 -66
- glaip_sdk/runner/__init__.py +76 -0
- glaip_sdk/runner/base.py +84 -0
- glaip_sdk/runner/deps.py +115 -0
- glaip_sdk/runner/langgraph.py +1055 -0
- glaip_sdk/runner/logging_config.py +77 -0
- glaip_sdk/runner/mcp_adapter/__init__.py +13 -0
- glaip_sdk/runner/mcp_adapter/base_mcp_adapter.py +43 -0
- glaip_sdk/runner/mcp_adapter/langchain_mcp_adapter.py +257 -0
- glaip_sdk/runner/mcp_adapter/mcp_config_builder.py +116 -0
- glaip_sdk/runner/tool_adapter/__init__.py +18 -0
- glaip_sdk/runner/tool_adapter/base_tool_adapter.py +44 -0
- glaip_sdk/runner/tool_adapter/langchain_tool_adapter.py +242 -0
- glaip_sdk/schedules/__init__.py +22 -0
- glaip_sdk/schedules/base.py +291 -0
- glaip_sdk/tools/base.py +67 -14
- glaip_sdk/utils/__init__.py +1 -0
- glaip_sdk/utils/a2a/__init__.py +34 -0
- glaip_sdk/utils/a2a/event_processor.py +188 -0
- glaip_sdk/utils/agent_config.py +8 -2
- glaip_sdk/utils/bundler.py +138 -2
- glaip_sdk/utils/import_resolver.py +43 -11
- glaip_sdk/utils/rendering/renderer/base.py +58 -0
- glaip_sdk/utils/runtime_config.py +120 -0
- glaip_sdk/utils/sync.py +31 -11
- glaip_sdk/utils/tool_detection.py +301 -0
- glaip_sdk/utils/tool_storage_provider.py +140 -0
- {glaip_sdk-0.6.5b3.dist-info → glaip_sdk-0.7.17.dist-info}/METADATA +49 -38
- glaip_sdk-0.7.17.dist-info/RECORD +224 -0
- {glaip_sdk-0.6.5b3.dist-info → glaip_sdk-0.7.17.dist-info}/WHEEL +2 -1
- glaip_sdk-0.7.17.dist-info/entry_points.txt +2 -0
- glaip_sdk-0.7.17.dist-info/top_level.txt +1 -0
- glaip_sdk/cli/commands/agents.py +0 -1509
- glaip_sdk/cli/commands/mcps.py +0 -1356
- glaip_sdk/cli/commands/tools.py +0 -576
- glaip_sdk/cli/utils.py +0 -263
- glaip_sdk-0.6.5b3.dist-info/RECORD +0 -145
- glaip_sdk-0.6.5b3.dist-info/entry_points.txt +0 -3
|
@@ -9,9 +9,12 @@ from __future__ import annotations
|
|
|
9
9
|
|
|
10
10
|
import json
|
|
11
11
|
import logging
|
|
12
|
-
from collections.abc import Callable
|
|
12
|
+
from collections.abc import AsyncIterable, Callable
|
|
13
13
|
from time import monotonic
|
|
14
|
-
from typing import Any
|
|
14
|
+
from typing import TYPE_CHECKING, Any
|
|
15
|
+
|
|
16
|
+
if TYPE_CHECKING:
|
|
17
|
+
from glaip_sdk.hitl.remote import RemoteHITLHandler
|
|
15
18
|
|
|
16
19
|
import httpx
|
|
17
20
|
from rich.console import Console as _Console
|
|
@@ -30,6 +33,7 @@ from glaip_sdk.utils.rendering.renderer import (
|
|
|
30
33
|
from glaip_sdk.utils.rendering.state import TranscriptBuffer
|
|
31
34
|
|
|
32
35
|
NO_AGENT_RESPONSE_FALLBACK = "No agent response received."
|
|
36
|
+
_FINAL_EVENT_TYPES = {"final_response", "error", "step_limit_exceeded"}
|
|
33
37
|
|
|
34
38
|
|
|
35
39
|
def _coerce_to_string(value: Any) -> str:
|
|
@@ -129,6 +133,7 @@ class AgentRunRenderingManager:
|
|
|
129
133
|
timeout_seconds: float,
|
|
130
134
|
agent_name: str | None,
|
|
131
135
|
meta: dict[str, Any],
|
|
136
|
+
hitl_handler: RemoteHITLHandler | None = None,
|
|
132
137
|
) -> tuple[str, dict[str, Any], float | None, float | None]:
|
|
133
138
|
"""Process streaming events and accumulate response."""
|
|
134
139
|
final_text = ""
|
|
@@ -152,10 +157,132 @@ class AgentRunRenderingManager:
|
|
|
152
157
|
final_text,
|
|
153
158
|
stats_usage,
|
|
154
159
|
meta,
|
|
160
|
+
hitl_handler=hitl_handler,
|
|
155
161
|
)
|
|
156
162
|
|
|
157
163
|
if controller and getattr(controller, "enabled", False):
|
|
158
164
|
controller.poll(renderer)
|
|
165
|
+
parsed_event = self._parse_event(event)
|
|
166
|
+
if parsed_event and self._is_final_event(parsed_event):
|
|
167
|
+
break
|
|
168
|
+
finally:
|
|
169
|
+
if controller and getattr(controller, "enabled", False):
|
|
170
|
+
controller.on_stream_complete()
|
|
171
|
+
|
|
172
|
+
finished_monotonic = monotonic()
|
|
173
|
+
return final_text, stats_usage, started_monotonic, finished_monotonic
|
|
174
|
+
|
|
175
|
+
async def _consume_event_stream(
|
|
176
|
+
self,
|
|
177
|
+
event_stream: AsyncIterable[dict[str, Any]],
|
|
178
|
+
renderer: RichStreamRenderer,
|
|
179
|
+
final_text: str,
|
|
180
|
+
stats_usage: dict[str, Any],
|
|
181
|
+
meta: dict[str, Any],
|
|
182
|
+
skip_final_render: bool,
|
|
183
|
+
last_rendered_content: str | None,
|
|
184
|
+
controller: Any | None,
|
|
185
|
+
) -> tuple[str, dict[str, Any], float | None]:
|
|
186
|
+
"""Consume event stream and update state.
|
|
187
|
+
|
|
188
|
+
Args:
|
|
189
|
+
event_stream: Async iterable yielding SSE-like event dicts.
|
|
190
|
+
renderer: Renderer to use for displaying events.
|
|
191
|
+
final_text: Current accumulated final text.
|
|
192
|
+
stats_usage: Usage statistics dictionary.
|
|
193
|
+
meta: Metadata dictionary.
|
|
194
|
+
skip_final_render: If True, skip rendering final_response events.
|
|
195
|
+
last_rendered_content: Last rendered content to avoid duplicates.
|
|
196
|
+
controller: Controller instance.
|
|
197
|
+
|
|
198
|
+
Returns:
|
|
199
|
+
Tuple of (final_text, stats_usage, started_monotonic).
|
|
200
|
+
"""
|
|
201
|
+
started_monotonic: float | None = None
|
|
202
|
+
|
|
203
|
+
async for event in event_stream:
|
|
204
|
+
if started_monotonic is None:
|
|
205
|
+
started_monotonic = monotonic()
|
|
206
|
+
|
|
207
|
+
parsed_event = self._parse_event(event)
|
|
208
|
+
if parsed_event is None:
|
|
209
|
+
continue
|
|
210
|
+
|
|
211
|
+
final_text, stats_usage = self._handle_parsed_event(
|
|
212
|
+
parsed_event,
|
|
213
|
+
renderer,
|
|
214
|
+
final_text,
|
|
215
|
+
stats_usage,
|
|
216
|
+
meta,
|
|
217
|
+
skip_final_render=skip_final_render,
|
|
218
|
+
last_rendered_content=last_rendered_content,
|
|
219
|
+
)
|
|
220
|
+
|
|
221
|
+
content_str = self._extract_content_string(parsed_event)
|
|
222
|
+
if content_str:
|
|
223
|
+
last_rendered_content = content_str
|
|
224
|
+
|
|
225
|
+
if controller and getattr(controller, "enabled", False):
|
|
226
|
+
controller.poll(renderer)
|
|
227
|
+
if parsed_event and self._is_final_event(parsed_event):
|
|
228
|
+
break
|
|
229
|
+
|
|
230
|
+
return final_text, stats_usage, started_monotonic
|
|
231
|
+
|
|
232
|
+
async def async_process_stream_events(
|
|
233
|
+
self,
|
|
234
|
+
event_stream: AsyncIterable[dict[str, Any]],
|
|
235
|
+
renderer: RichStreamRenderer,
|
|
236
|
+
meta: dict[str, Any],
|
|
237
|
+
*,
|
|
238
|
+
skip_final_render: bool = True,
|
|
239
|
+
) -> tuple[str, dict[str, Any], float | None, float | None]:
|
|
240
|
+
"""Process streaming events from an async event source.
|
|
241
|
+
|
|
242
|
+
This method provides unified stream processing for both remote (HTTP)
|
|
243
|
+
and local (LangGraph) agent execution, ensuring consistent behavior.
|
|
244
|
+
|
|
245
|
+
Args:
|
|
246
|
+
event_stream: Async iterable yielding SSE-like event dicts.
|
|
247
|
+
Each event should have a "data" key with JSON string, or be
|
|
248
|
+
a pre-parsed dict with "content", "metadata", etc.
|
|
249
|
+
renderer: Renderer to use for displaying events.
|
|
250
|
+
meta: Metadata dictionary for renderer context.
|
|
251
|
+
skip_final_render: If True, skip rendering final_response events
|
|
252
|
+
(they are rendered separately via finalize_renderer).
|
|
253
|
+
|
|
254
|
+
Returns:
|
|
255
|
+
Tuple of (final_text, stats_usage, started_monotonic, finished_monotonic).
|
|
256
|
+
"""
|
|
257
|
+
final_text = ""
|
|
258
|
+
stats_usage: dict[str, Any] = {}
|
|
259
|
+
started_monotonic: float | None = None
|
|
260
|
+
last_rendered_content: str | None = None
|
|
261
|
+
|
|
262
|
+
controller = getattr(renderer, "transcript_controller", None)
|
|
263
|
+
if controller and getattr(controller, "enabled", False):
|
|
264
|
+
controller.on_stream_start(renderer)
|
|
265
|
+
|
|
266
|
+
try:
|
|
267
|
+
final_text, stats_usage, started_monotonic = await self._consume_event_stream(
|
|
268
|
+
event_stream,
|
|
269
|
+
renderer,
|
|
270
|
+
final_text,
|
|
271
|
+
stats_usage,
|
|
272
|
+
meta,
|
|
273
|
+
skip_final_render,
|
|
274
|
+
last_rendered_content,
|
|
275
|
+
controller,
|
|
276
|
+
)
|
|
277
|
+
except Exception as e:
|
|
278
|
+
err_msg = str(e)
|
|
279
|
+
reason = getattr(getattr(e, "result", None), "reason", None)
|
|
280
|
+
if reason:
|
|
281
|
+
final_text = f"⚠️ Guardrail violation: {reason}"
|
|
282
|
+
elif "⚠️ Guardrail violation" in err_msg or "Content blocked by guardrails" in err_msg:
|
|
283
|
+
final_text = err_msg
|
|
284
|
+
else:
|
|
285
|
+
raise e
|
|
159
286
|
finally:
|
|
160
287
|
if controller and getattr(controller, "enabled", False):
|
|
161
288
|
controller.on_stream_complete()
|
|
@@ -163,6 +290,229 @@ class AgentRunRenderingManager:
|
|
|
163
290
|
finished_monotonic = monotonic()
|
|
164
291
|
return final_text, stats_usage, started_monotonic, finished_monotonic
|
|
165
292
|
|
|
293
|
+
def _parse_event(self, event: dict[str, Any]) -> dict[str, Any] | None:
|
|
294
|
+
"""Parse an SSE event dict into a usable format.
|
|
295
|
+
|
|
296
|
+
Args:
|
|
297
|
+
event: Raw event dict, either with "data" key (SSE format) or
|
|
298
|
+
pre-parsed with "content", "metadata", etc.
|
|
299
|
+
|
|
300
|
+
Returns:
|
|
301
|
+
Parsed event dict, or None if parsing fails.
|
|
302
|
+
"""
|
|
303
|
+
if "data" in event:
|
|
304
|
+
try:
|
|
305
|
+
return json.loads(event["data"])
|
|
306
|
+
except json.JSONDecodeError:
|
|
307
|
+
self._logger.debug("Non-JSON SSE fragment skipped")
|
|
308
|
+
return None
|
|
309
|
+
# Already parsed (e.g., from local runner)
|
|
310
|
+
return event if event else None
|
|
311
|
+
|
|
312
|
+
def _handle_parsed_event(
|
|
313
|
+
self,
|
|
314
|
+
ev: dict[str, Any],
|
|
315
|
+
renderer: RichStreamRenderer,
|
|
316
|
+
final_text: str,
|
|
317
|
+
stats_usage: dict[str, Any],
|
|
318
|
+
meta: dict[str, Any],
|
|
319
|
+
*,
|
|
320
|
+
skip_final_render: bool = True,
|
|
321
|
+
last_rendered_content: str | None = None,
|
|
322
|
+
) -> tuple[str, dict[str, Any]]:
|
|
323
|
+
"""Handle a parsed event and update accumulators.
|
|
324
|
+
|
|
325
|
+
Args:
|
|
326
|
+
ev: Parsed event dictionary.
|
|
327
|
+
renderer: Renderer instance.
|
|
328
|
+
final_text: Current accumulated final text.
|
|
329
|
+
stats_usage: Usage statistics dictionary.
|
|
330
|
+
meta: Metadata dictionary.
|
|
331
|
+
skip_final_render: If True, skip rendering final_response events.
|
|
332
|
+
last_rendered_content: Last rendered content to avoid duplicates.
|
|
333
|
+
|
|
334
|
+
Returns:
|
|
335
|
+
Tuple of (updated_final_text, updated_stats_usage).
|
|
336
|
+
"""
|
|
337
|
+
kind = self._get_event_kind(ev)
|
|
338
|
+
|
|
339
|
+
# Dispatch to specialized handlers based on event kind
|
|
340
|
+
handler = self._get_event_handler(kind, ev)
|
|
341
|
+
if handler:
|
|
342
|
+
return handler(ev, renderer, final_text, stats_usage, meta, skip_final_render)
|
|
343
|
+
|
|
344
|
+
# Default: handle content events
|
|
345
|
+
return self._handle_content_event_async(ev, renderer, final_text, stats_usage, last_rendered_content)
|
|
346
|
+
|
|
347
|
+
def _get_event_handler(
|
|
348
|
+
self,
|
|
349
|
+
kind: str | None,
|
|
350
|
+
ev: dict[str, Any],
|
|
351
|
+
) -> Callable[..., tuple[str, dict[str, Any]]] | None:
|
|
352
|
+
"""Get the appropriate handler for an event kind.
|
|
353
|
+
|
|
354
|
+
Args:
|
|
355
|
+
kind: Event kind string.
|
|
356
|
+
ev: Event dictionary (for checking is_final flag).
|
|
357
|
+
|
|
358
|
+
Returns:
|
|
359
|
+
Handler function or None for default content handling.
|
|
360
|
+
"""
|
|
361
|
+
if kind == "usage":
|
|
362
|
+
return self._handle_usage_event
|
|
363
|
+
if kind == "final_response" or ev.get("is_final"):
|
|
364
|
+
return self._handle_final_response_event
|
|
365
|
+
if kind == "run_info":
|
|
366
|
+
return self._handle_run_info_event_wrapper
|
|
367
|
+
if kind in ("artifact", "status_update"):
|
|
368
|
+
return self._handle_render_only_event
|
|
369
|
+
return None
|
|
370
|
+
|
|
371
|
+
def _handle_usage_event(
|
|
372
|
+
self,
|
|
373
|
+
ev: dict[str, Any],
|
|
374
|
+
_renderer: RichStreamRenderer,
|
|
375
|
+
final_text: str,
|
|
376
|
+
stats_usage: dict[str, Any],
|
|
377
|
+
_meta: dict[str, Any],
|
|
378
|
+
_skip_final_render: bool,
|
|
379
|
+
) -> tuple[str, dict[str, Any]]:
|
|
380
|
+
"""Handle usage events."""
|
|
381
|
+
stats_usage.update(ev.get("usage") or {})
|
|
382
|
+
return final_text, stats_usage
|
|
383
|
+
|
|
384
|
+
def _handle_final_response_event(
|
|
385
|
+
self,
|
|
386
|
+
ev: dict[str, Any],
|
|
387
|
+
renderer: RichStreamRenderer,
|
|
388
|
+
final_text: str,
|
|
389
|
+
stats_usage: dict[str, Any],
|
|
390
|
+
_meta: dict[str, Any],
|
|
391
|
+
skip_final_render: bool,
|
|
392
|
+
) -> tuple[str, dict[str, Any]]:
|
|
393
|
+
"""Handle final_response events."""
|
|
394
|
+
content = ev.get("content")
|
|
395
|
+
if content:
|
|
396
|
+
final_text = str(content)
|
|
397
|
+
if not skip_final_render:
|
|
398
|
+
renderer.on_event(ev)
|
|
399
|
+
return final_text, stats_usage
|
|
400
|
+
|
|
401
|
+
def _handle_run_info_event_wrapper(
|
|
402
|
+
self,
|
|
403
|
+
ev: dict[str, Any],
|
|
404
|
+
renderer: RichStreamRenderer,
|
|
405
|
+
final_text: str,
|
|
406
|
+
stats_usage: dict[str, Any],
|
|
407
|
+
meta: dict[str, Any],
|
|
408
|
+
_skip_final_render: bool,
|
|
409
|
+
) -> tuple[str, dict[str, Any]]:
|
|
410
|
+
"""Handle run_info events."""
|
|
411
|
+
self._handle_run_info_event(ev, meta, renderer)
|
|
412
|
+
return final_text, stats_usage
|
|
413
|
+
|
|
414
|
+
def _handle_render_only_event(
|
|
415
|
+
self,
|
|
416
|
+
ev: dict[str, Any],
|
|
417
|
+
renderer: RichStreamRenderer,
|
|
418
|
+
final_text: str,
|
|
419
|
+
stats_usage: dict[str, Any],
|
|
420
|
+
_meta: dict[str, Any],
|
|
421
|
+
_skip_final_render: bool,
|
|
422
|
+
) -> tuple[str, dict[str, Any]]:
|
|
423
|
+
"""Handle events that only need rendering (artifact, status_update)."""
|
|
424
|
+
renderer.on_event(ev)
|
|
425
|
+
return final_text, stats_usage
|
|
426
|
+
|
|
427
|
+
def _handle_content_event_async(
|
|
428
|
+
self,
|
|
429
|
+
ev: dict[str, Any],
|
|
430
|
+
renderer: RichStreamRenderer,
|
|
431
|
+
final_text: str,
|
|
432
|
+
stats_usage: dict[str, Any],
|
|
433
|
+
last_rendered_content: str | None,
|
|
434
|
+
) -> tuple[str, dict[str, Any]]:
|
|
435
|
+
"""Handle content events with deduplication."""
|
|
436
|
+
content = ev.get("content")
|
|
437
|
+
if content:
|
|
438
|
+
content_str = str(content)
|
|
439
|
+
if not content_str.startswith("Artifact received:"):
|
|
440
|
+
kind = self._get_event_kind(ev)
|
|
441
|
+
# Skip accumulating content for status updates and agent steps
|
|
442
|
+
if kind in ("agent_step", "status_update"):
|
|
443
|
+
renderer.on_event(ev)
|
|
444
|
+
return final_text, stats_usage
|
|
445
|
+
|
|
446
|
+
if self._is_token_event(ev):
|
|
447
|
+
renderer.on_event(ev)
|
|
448
|
+
final_text = f"{final_text}{content_str}"
|
|
449
|
+
else:
|
|
450
|
+
if content_str != last_rendered_content:
|
|
451
|
+
renderer.on_event(ev)
|
|
452
|
+
final_text = content_str
|
|
453
|
+
else:
|
|
454
|
+
renderer.on_event(ev)
|
|
455
|
+
return final_text, stats_usage
|
|
456
|
+
|
|
457
|
+
def _get_event_kind(self, ev: dict[str, Any]) -> str | None:
|
|
458
|
+
"""Extract normalized event kind from parsed event.
|
|
459
|
+
|
|
460
|
+
Args:
|
|
461
|
+
ev: Parsed event dictionary.
|
|
462
|
+
|
|
463
|
+
Returns:
|
|
464
|
+
Event kind string or None.
|
|
465
|
+
"""
|
|
466
|
+
metadata = ev.get("metadata") or {}
|
|
467
|
+
kind = metadata.get("kind")
|
|
468
|
+
if kind:
|
|
469
|
+
return str(kind)
|
|
470
|
+
event_type = ev.get("event_type")
|
|
471
|
+
return str(event_type) if event_type else None
|
|
472
|
+
|
|
473
|
+
def _is_token_event(self, ev: dict[str, Any]) -> bool:
|
|
474
|
+
"""Return True when the event represents token streaming output.
|
|
475
|
+
|
|
476
|
+
Args:
|
|
477
|
+
ev: Parsed event dictionary.
|
|
478
|
+
|
|
479
|
+
Returns:
|
|
480
|
+
True when the event is a token chunk, otherwise False.
|
|
481
|
+
"""
|
|
482
|
+
metadata = ev.get("metadata") or {}
|
|
483
|
+
kind = metadata.get("kind")
|
|
484
|
+
return str(kind).lower() == "token"
|
|
485
|
+
|
|
486
|
+
def _is_final_event(self, ev: dict[str, Any]) -> bool:
|
|
487
|
+
"""Return True when the event marks stream termination.
|
|
488
|
+
|
|
489
|
+
Args:
|
|
490
|
+
ev: Parsed event dictionary.
|
|
491
|
+
|
|
492
|
+
Returns:
|
|
493
|
+
True when the event is terminal, otherwise False.
|
|
494
|
+
"""
|
|
495
|
+
if ev.get("is_final") is True or ev.get("final") is True:
|
|
496
|
+
return True
|
|
497
|
+
kind = self._get_event_kind(ev)
|
|
498
|
+
return kind in _FINAL_EVENT_TYPES
|
|
499
|
+
|
|
500
|
+
def _extract_content_string(self, event: dict[str, Any]) -> str | None:
|
|
501
|
+
"""Extract textual content from a parsed event.
|
|
502
|
+
|
|
503
|
+
Args:
|
|
504
|
+
event: Parsed event dictionary.
|
|
505
|
+
|
|
506
|
+
Returns:
|
|
507
|
+
Content string or None.
|
|
508
|
+
"""
|
|
509
|
+
if not event:
|
|
510
|
+
return None
|
|
511
|
+
content = event.get("content")
|
|
512
|
+
if content:
|
|
513
|
+
return str(content)
|
|
514
|
+
return None
|
|
515
|
+
|
|
166
516
|
def _capture_request_id(
|
|
167
517
|
self,
|
|
168
518
|
stream_response: httpx.Response,
|
|
@@ -206,6 +556,7 @@ class AgentRunRenderingManager:
|
|
|
206
556
|
final_text: str,
|
|
207
557
|
stats_usage: dict[str, Any],
|
|
208
558
|
meta: dict[str, Any],
|
|
559
|
+
hitl_handler: RemoteHITLHandler | None = None,
|
|
209
560
|
) -> tuple[str, dict[str, Any]]:
|
|
210
561
|
"""Process a single streaming event.
|
|
211
562
|
|
|
@@ -215,6 +566,7 @@ class AgentRunRenderingManager:
|
|
|
215
566
|
final_text: Accumulated text so far.
|
|
216
567
|
stats_usage: Usage statistics dictionary.
|
|
217
568
|
meta: Metadata dictionary.
|
|
569
|
+
hitl_handler: Optional HITL handler for approval callbacks.
|
|
218
570
|
|
|
219
571
|
Returns:
|
|
220
572
|
Tuple of (updated_final_text, updated_stats_usage).
|
|
@@ -225,6 +577,17 @@ class AgentRunRenderingManager:
|
|
|
225
577
|
self._logger.debug("Non-JSON SSE fragment skipped")
|
|
226
578
|
return final_text, stats_usage
|
|
227
579
|
|
|
580
|
+
# Handle HITL event (non-blocking via thread)
|
|
581
|
+
if hitl_handler and self._is_hitl_pending_event(ev):
|
|
582
|
+
try:
|
|
583
|
+
hitl_handler.handle_hitl_event(ev)
|
|
584
|
+
except Exception as e:
|
|
585
|
+
# Log but don't crash stream
|
|
586
|
+
self._logger.error(
|
|
587
|
+
f"HITL handler error: {e}",
|
|
588
|
+
exc_info=True,
|
|
589
|
+
)
|
|
590
|
+
|
|
228
591
|
kind = (ev.get("metadata") or {}).get("kind")
|
|
229
592
|
renderer.on_event(ev)
|
|
230
593
|
|
|
@@ -239,7 +602,9 @@ class AgentRunRenderingManager:
|
|
|
239
602
|
if handled is not None:
|
|
240
603
|
return handled
|
|
241
604
|
|
|
242
|
-
|
|
605
|
+
# Only accumulate content for actual content events, not status updates or agent steps
|
|
606
|
+
# Status updates (agent_step) should be rendered but not accumulated in final_text
|
|
607
|
+
if ev.get("content") and kind not in ("agent_step", "status_update"):
|
|
243
608
|
final_text = self._handle_content_event(ev, final_text)
|
|
244
609
|
|
|
245
610
|
return final_text, stats_usage
|
|
@@ -285,9 +650,25 @@ class AgentRunRenderingManager:
|
|
|
285
650
|
"""
|
|
286
651
|
content = ev.get("content", "")
|
|
287
652
|
if not content.startswith("Artifact received:"):
|
|
653
|
+
if self._is_token_event(ev):
|
|
654
|
+
return f"{final_text}{content}"
|
|
288
655
|
return content
|
|
289
656
|
return final_text
|
|
290
657
|
|
|
658
|
+
@staticmethod
|
|
659
|
+
def _is_hitl_pending_event(event: dict[str, Any]) -> bool:
|
|
660
|
+
"""Check if event is a pending HITL approval request.
|
|
661
|
+
|
|
662
|
+
Args:
|
|
663
|
+
event: Parsed event dictionary.
|
|
664
|
+
|
|
665
|
+
Returns:
|
|
666
|
+
True if event is a pending HITL request.
|
|
667
|
+
"""
|
|
668
|
+
metadata = event.get("metadata", {})
|
|
669
|
+
hitl_meta = metadata.get("hitl", {})
|
|
670
|
+
return hitl_meta.get("required") is True and hitl_meta.get("decision") == "pending"
|
|
671
|
+
|
|
291
672
|
def _handle_run_info_event(
|
|
292
673
|
self,
|
|
293
674
|
ev: dict[str, Any],
|
|
@@ -413,3 +794,33 @@ def compute_timeout_seconds(kwargs: dict[str, Any]) -> float:
|
|
|
413
794
|
if not specified in kwargs.
|
|
414
795
|
"""
|
|
415
796
|
return kwargs.get("timeout", DEFAULT_AGENT_RUN_TIMEOUT)
|
|
797
|
+
|
|
798
|
+
|
|
799
|
+
def finalize_render_manager(
|
|
800
|
+
manager: AgentRunRenderingManager,
|
|
801
|
+
renderer: RichStreamRenderer,
|
|
802
|
+
final_text: str,
|
|
803
|
+
stats_usage: dict[str, Any],
|
|
804
|
+
started_monotonic: float | None,
|
|
805
|
+
finished_monotonic: float | None,
|
|
806
|
+
) -> str:
|
|
807
|
+
"""Helper to finalize renderer via manager and return final text.
|
|
808
|
+
|
|
809
|
+
Args:
|
|
810
|
+
manager: The rendering manager instance.
|
|
811
|
+
renderer: Renderer to finalize.
|
|
812
|
+
final_text: Final text content.
|
|
813
|
+
stats_usage: Usage statistics dictionary.
|
|
814
|
+
started_monotonic: Start time (monotonic).
|
|
815
|
+
finished_monotonic: Finish time (monotonic).
|
|
816
|
+
|
|
817
|
+
Returns:
|
|
818
|
+
Final text string.
|
|
819
|
+
"""
|
|
820
|
+
return manager.finalize_renderer(
|
|
821
|
+
renderer,
|
|
822
|
+
final_text,
|
|
823
|
+
stats_usage,
|
|
824
|
+
started_monotonic,
|
|
825
|
+
finished_monotonic,
|
|
826
|
+
)
|