glaip-sdk 0.0.17__py3-none-any.whl → 0.0.19__py3-none-any.whl

glaip_sdk/utils/rendering/renderer/base.py

@@ -45,16 +45,21 @@ from glaip_sdk.utils.rendering.steps import StepManager
 # Configure logger
 logger = logging.getLogger("glaip_sdk.run_renderer")
 
+# Constants
+LESS_THAN_1MS = "[<1ms]"
+
 
 @dataclass
 class RendererState:
     """Internal state for the renderer."""
 
-    buffer: list[str] = None
+    buffer: list[str] | None = None
     final_text: str = ""
     streaming_started_at: float | None = None
     printed_final_panel: bool = False
     finalizing_ui: bool = False
+    final_duration_seconds: float | None = None
+    final_duration_text: str | None = None
 
     def __post_init__(self) -> None:
         """Initialize renderer state after dataclass creation.
@@ -212,59 +217,76 @@ class RichStreamRenderer:
 
         # Handle different event types
         if kind == "status":
-            # Status events
-            status = ev.get("status")
-            if status == "streaming_started":
-                self.state.streaming_started_at = monotonic()
-            return
-
+            self._handle_status_event(ev)
         elif kind == "content":
-            # Content streaming events
-            if content:
-                self.state.buffer.append(content)
-                self._ensure_live()
-            return
-
+            self._handle_content_event(content)
         elif kind == "final_response":
-            # Final response events
-            if content:
-                self.state.buffer.append(content)
-                self.state.final_text = content
-                self._ensure_live()
+            self._handle_final_response_event(content, metadata)
+        elif kind in {"agent_step", "agent_thinking_step"}:
+            self._handle_agent_step_event(ev)
+        else:
+            # Update live display for unhandled events
+            self._ensure_live()
 
-                # In verbose mode, show the final result in a panel
-                if self.verbose and content and content.strip():
-                    final_panel = create_final_panel(content, theme=self.cfg.theme)
-                    self.console.print(final_panel)
-                    self.state.printed_final_panel = True
-            return
+    def _handle_status_event(self, ev: dict[str, Any]) -> None:
+        """Handle status events."""
+        status = ev.get("status")
+        if status == "streaming_started":
+            self.state.streaming_started_at = monotonic()
 
-        elif kind in {"agent_step", "agent_thinking_step"}:
-            # Agent step events
-            # Note: Thinking gaps are primarily a visual aid. Keep minimal here.
-
-            # Extract tool information
-            (
-                tool_name,
-                tool_args,
-                tool_out,
-                tool_calls_info,
-            ) = self.stream_processor.parse_tool_calls(ev)
-
-            # Track tools and sub-agents
-            self.stream_processor.track_tools_and_agents(
-                tool_name, tool_calls_info, is_delegation_tool
-            )
+    def _handle_content_event(self, content: str) -> None:
+        """Handle content streaming events."""
+        if content:
+            self.state.buffer.append(content)
+            self._ensure_live()
+
+    def _handle_final_response_event(
+        self, content: str, metadata: dict[str, Any]
+    ) -> None:
+        """Handle final response events."""
+        if content:
+            self.state.buffer.append(content)
+            self.state.final_text = content
 
-            # Handle tool execution
-            self._handle_agent_step(ev, tool_name, tool_args, tool_out, tool_calls_info)
+            meta_payload = metadata.get("metadata") or {}
+            self._update_final_duration(meta_payload.get("time"))
+
+            self._ensure_live()
+
+            # In verbose mode, show the final result in a panel
+            if self.verbose and content.strip():
+                final_panel = create_final_panel(
+                    content,
+                    title=self._final_panel_title(),
+                    theme=self.cfg.theme,
+                )
+                self.console.print(final_panel)
+                self.state.printed_final_panel = True
+
+    def _handle_agent_step_event(self, ev: dict[str, Any]) -> None:
+        """Handle agent step events."""
+        # Extract tool information
+        (
+            tool_name,
+            tool_args,
+            tool_out,
+            tool_calls_info,
+        ) = self.stream_processor.parse_tool_calls(ev)
+
+        # Track tools and sub-agents
+        self.stream_processor.track_tools_and_agents(
+            tool_name, tool_calls_info, is_delegation_tool
+        )
+
+        # Handle tool execution
+        self._handle_agent_step(ev, tool_name, tool_args, tool_out, tool_calls_info)
 
         # Update live display
         self._ensure_live()
 
     def _finish_running_steps(self) -> None:
         """Mark any running steps as finished to avoid lingering spinners."""
-        for st in list(self.steps.by_id.values()):
+        for st in self.steps.by_id.values():
             if not is_step_finished(st):
                 st.finish(None)
 
@@ -289,14 +311,31 @@ class RichStreamRenderer:
         if self.verbose and not self.state.printed_final_panel:
             body = ("".join(self.state.buffer) or "").strip()
             if body:
-                final_panel = create_final_panel(body, theme=self.cfg.theme)
+                final_panel = create_final_panel(
+                    body,
+                    title=self._final_panel_title(),
+                    theme=self.cfg.theme,
+                )
                 self.console.print(final_panel)
                 self.state.printed_final_panel = True
 
-    def on_complete(self, _stats: RunStats) -> None:
+    def on_complete(self, stats: RunStats) -> None:
         """Handle completion event."""
         self.state.finalizing_ui = True
 
+        if isinstance(stats, RunStats):
+            duration = None
+            try:
+                if stats.finished_at is not None and stats.started_at is not None:
+                    duration = max(
+                        0.0, float(stats.finished_at) - float(stats.started_at)
+                    )
+            except Exception:
+                duration = None
+
+            if duration is not None:
+                self._update_final_duration(duration, overwrite=True)
+
         # Mark any running steps as finished to avoid lingering spinners
         self._finish_running_steps()
 
@@ -394,15 +433,23 @@ class RichStreamRenderer:
         if not self.verbose:
             final_content = (self.state.final_text or "").strip()
             if final_content:
+                title = self._final_panel_title()
                 return create_final_panel(
                     final_content,
-                    title="Final Result",
+                    title=title,
                     theme=self.cfg.theme,
                 )
         # Dynamic title with spinner + elapsed/hints
         title = self._format_enhanced_main_title()
         return create_main_panel(body, title, self.cfg.theme)
 
+    def _final_panel_title(self) -> str:
+        """Compose title for the final result panel including duration."""
+        title = "Final Result"
+        if self.state.final_duration_text:
+            title = f"{title} · {self.state.final_duration_text}"
+        return title
+
     def apply_verbosity(self, verbose: bool) -> None:
         """Update verbose behaviour at runtime."""
         if self.verbose == verbose:
@@ -507,27 +554,43 @@ class RichStreamRenderer:
         """Process additional tool calls to avoid duplicates."""
         for call_name, call_args, _ in tool_calls_info or []:
             if call_name and call_name != tool_name:
-                self._ensure_tool_panel(call_name, call_args, task_id, context_id)
-                if is_delegation_tool(call_name):
-                    st2 = self.steps.start_or_get(
-                        task_id=task_id,
-                        context_id=context_id,
-                        kind="delegate",
-                        name=call_name,
-                        args=call_args,
-                    )
-                else:
-                    st2 = self.steps.start_or_get(
-                        task_id=task_id,
-                        context_id=context_id,
-                        kind="tool",
-                        name=call_name,
-                        args=call_args,
-                    )
-                if self.stream_processor.server_elapsed_time is not None and st2:
-                    self._step_server_start_times[st2.step_id] = (
-                        self.stream_processor.server_elapsed_time
-                    )
+                self._process_single_tool_call(
+                    call_name, call_args, task_id, context_id
+                )
+
+    def _process_single_tool_call(
+        self, call_name: str, call_args: Any, task_id: str, context_id: str
+    ) -> None:
+        """Process a single additional tool call."""
+        self._ensure_tool_panel(call_name, call_args, task_id, context_id)
+
+        st2 = self._create_step_for_tool_call(call_name, call_args, task_id, context_id)
+
+        if self.stream_processor.server_elapsed_time is not None and st2:
+            self._step_server_start_times[st2.step_id] = (
+                self.stream_processor.server_elapsed_time
+            )
+
+    def _create_step_for_tool_call(
+        self, call_name: str, call_args: Any, task_id: str, context_id: str
+    ) -> Any:
+        """Create appropriate step for tool call."""
+        if is_delegation_tool(call_name):
+            return self.steps.start_or_get(
+                task_id=task_id,
+                context_id=context_id,
+                kind="delegate",
+                name=call_name,
+                args=call_args,
+            )
+        else:
+            return self.steps.start_or_get(
+                task_id=task_id,
+                context_id=context_id,
+                kind="tool",
+                name=call_name,
+                args=call_args,
+            )
 
     def _detect_tool_completion(
         self, metadata: dict, content: str
@@ -941,19 +1004,19 @@ class RichStreamRenderer:
         """Format step status with elapsed time or duration."""
         if is_step_finished(step):
             if step.duration_ms is None:
-                return "[<1ms]"
+                return LESS_THAN_1MS
             elif step.duration_ms >= 1000:
                 return f"[{step.duration_ms / 1000:.2f}s]"
             elif step.duration_ms > 0:
                 return f"[{step.duration_ms}ms]"
-            return "[<1ms]"
+            return LESS_THAN_1MS
         else:
             # Calculate elapsed time for running steps
             elapsed = self._calculate_step_elapsed_time(step)
             if elapsed >= 1:
                 return f"[{elapsed:.2f}s]"
             ms = int(elapsed * 1000)
-            return f"[{ms}ms]" if ms > 0 else "[<1ms]"
+            return f"[{ms}ms]" if ms > 0 else LESS_THAN_1MS
 
     def _calculate_step_elapsed_time(self, step: Step) -> float:
         """Calculate elapsed time for a running step."""
@@ -1024,6 +1087,29 @@ class RichStreamRenderer:
             and sid not in self.stream_processor.current_event_finished_panels
         )
 
+    def _update_final_duration(
+        self, duration: float | None, *, overwrite: bool = False
+    ) -> None:
+        """Store formatted duration for eventual final panels."""
+        if duration is None:
+            return
+
+        try:
+            duration_val = max(0.0, float(duration))
+        except Exception:
+            return
+
+        existing = self.state.final_duration_seconds
+
+        if not overwrite and existing is not None:
+            return
+
+        if overwrite and existing is not None:
+            duration_val = max(existing, duration_val)
+
+        self.state.final_duration_seconds = duration_val
+        self.state.final_duration_text = self._format_elapsed_time(duration_val)
+
     def _calculate_elapsed_time(self, meta: dict[str, Any]) -> str:
         """Calculate elapsed time string for running tools."""
         server_elapsed = self.stream_processor.server_elapsed_time

{glaip_sdk-0.0.17.dist-info → glaip_sdk-0.0.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glaip-sdk
-Version: 0.0.17
+Version: 0.0.19
 Summary: Python SDK for GL AIP (GDP Labs AI Agent Package) - Simplified CLI Design
 License: MIT
 Author: Raymond Christopher

{glaip_sdk-0.0.17.dist-info → glaip_sdk-0.0.19.dist-info}/RECORD

@@ -7,7 +7,7 @@ glaip_sdk/cli/auth.py,sha256=eYdtGmJ3XgiO96hq_69GF6b3W-aRWZrDQ-6bHuaRX4M,13517
 glaip_sdk/cli/commands/__init__.py,sha256=x0CZlZbZHoHvuzfoTWIyEch6WmNnbPzxajrox6riYp0,173
 glaip_sdk/cli/commands/agents.py,sha256=FtWGhbl4QRlqxXFNMEnZUpw5mjQ0KPjY0_6o0hYyoaU,41251
 glaip_sdk/cli/commands/configure.py,sha256=h2GgBpnBWYHAhp3zqkAiy8QNgwPD_7pToZBZRpuMoNM,7869
-glaip_sdk/cli/commands/mcps.py,sha256=V41Te3IG8jNFRMb1v1XQV1t461uxpPsrmDFIO6cZPOk,28185
+glaip_sdk/cli/commands/mcps.py,sha256=wqUbkQ6qUUhr6B0n2jJxPUkbxHwfsEnYvdLKew_qorM,36800
 glaip_sdk/cli/commands/models.py,sha256=G1ce-wZOfvMP6SMnIVuSQ89CF444Kz8Ja6nrNOQXCqU,1729
 glaip_sdk/cli/commands/tools.py,sha256=YfkB7HRBGcAOC6N-wXTV5Ch5XTXqjKTtyq-Cfb0-18c,18908
 glaip_sdk/cli/config.py,sha256=jCLJxTBAnOU6EJI6JjcpwUTEAWCJRoALbMrhOvvAofc,946
@@ -19,24 +19,24 @@ glaip_sdk/cli/masking.py,sha256=BOZjwUqxQf3LQlYgUMwq7UYgve8x4_1Qk04ixiJJPZ8,4399
 glaip_sdk/cli/mcp_validators.py,sha256=SeDbgXkRuBXyDtCmUMpL-1Vh7fmGldz-shAaHhOqbCc,10125
 glaip_sdk/cli/pager.py,sha256=n9ypOGPPSaseJlwPG1X38qSz1yV3pjRWunzA4xx5E7M,8052
 glaip_sdk/cli/parsers/__init__.py,sha256=Ycd4HDfYmA7GUGFt0ndBPBo5uTbv15XsXnYUj-a89ug,183
-glaip_sdk/cli/parsers/json_input.py,sha256=6NqzVM5l8g0pwCNLKeTVL9SeLM9W_Fl4H__X0dfaQEA,4039
+glaip_sdk/cli/parsers/json_input.py,sha256=ZBhJNUR4bKDX3A5s9lRvuCicaztvQyP0lWuiNYMIO08,5721
 glaip_sdk/cli/resolution.py,sha256=jXUNpKKhs30n7Ke0uz1Hbny5DTo2_sxvchIhTbeBubE,2393
 glaip_sdk/cli/rich_helpers.py,sha256=ByUOmK16IisoXWE7nEiI55BF1KWDrm6KCYAxqHu0XOU,825
 glaip_sdk/cli/slash/__init__.py,sha256=Vdv6Y8bu-pA8dxDlyP4XrhudBPivztUozhLAz9vaLig,682
 glaip_sdk/cli/slash/agent_session.py,sha256=-woZkqH70YUSaEHDF9XpxP-cbh36Jx7yuJW7aA3JszI,7078
-glaip_sdk/cli/slash/prompt.py,sha256=2CLAfdmX6yQedcNLnwZ4g6QFoV9TVv8il9OF8iaJwdc,7977
-glaip_sdk/cli/slash/session.py,sha256=JsTHZB8gPFFdcp_bhtw-nig37Z61OWK_okPMx47H86c,31484
+glaip_sdk/cli/slash/prompt.py,sha256=Cfd6nL1T-F51WNuRCO09RxXfuJn0I1OyBi5dx3xKtaY,8407
+glaip_sdk/cli/slash/session.py,sha256=WZKAwkio1DMK72r6myR8Ou7weIS5JsQutbtVMox7ctc,32515
 glaip_sdk/cli/update_notifier.py,sha256=nfQ-jRQKn-nZyt7EhxNfZq9Z7nBrYjZJKAgAtuHffnw,3410
 glaip_sdk/cli/utils.py,sha256=pgbV0f5rdjAHeZ-ULCntH7HUG6FdFB9kODv0a9puB40,35503
 glaip_sdk/cli/validators.py,sha256=USbBgY86AwuDHO-Q_g8g7hu-ot4NgITBsWjTWIl62ms,5569
 glaip_sdk/client/__init__.py,sha256=nYLXfBVTTWwKjP0e63iumPYO4k5FifwWaELQPaPIKIg,188
 glaip_sdk/client/_agent_payloads.py,sha256=sYlMzrfAdd8KC37qxokLy2uDd3aOhzQirnv7UYlvwYc,16385
-glaip_sdk/client/agents.py,sha256=GpDlxzhUQaMn9IUq_kCsbZo5TBfwWXFYs1bbpPLiSok,35492
+glaip_sdk/client/agents.py,sha256=-ORfxYaoX6JkgGS9B7ZCQmr1o9H5KEr0GesbfeiSros,37594
 glaip_sdk/client/base.py,sha256=OPRlAWhZ77rUK0MRGA83-zW5NVhxJ1RgdfcfGOYr8rI,16267
-glaip_sdk/client/main.py,sha256=tfyyx9utReq7nXdtHKOCXQIUXXeZ1-D6u4OGTu6h8Es,8632
+glaip_sdk/client/main.py,sha256=tELAA36rzthnNKTgwZ6lLPb3Au8Wh1mF8Kz-9N-YtCg,8652
 glaip_sdk/client/mcps.py,sha256=-O-I15qjbwfSA69mouHY6g5_qgPWC4rM98VJLpOkh1A,8975
 glaip_sdk/client/run_rendering.py,sha256=fXUj1FBw8n-nAzjI_zaG7-Ap_UXXe0z4tMdL7m2R7Ek,9213
-glaip_sdk/client/tools.py,sha256=n8DIiOOf1YU_j9JK3Bx2-rDnkpckPi0MI9Ok2s1kwa4,16634
+glaip_sdk/client/tools.py,sha256=rWxfNO30sS468513IoE5PfEaqNq6HBwmcHVh4FzhvYQ,17532
 glaip_sdk/client/validators.py,sha256=NtPsWjQLjj25LiUnmR-WuS8lL5p4MVRaYT9UVRmj9bo,8809
 glaip_sdk/config/constants.py,sha256=B9CSlYG8LYjQuo_vNpqy-eSks3ej37FMcvJMy6d_F4U,888
 glaip_sdk/exceptions.py,sha256=ILquxC4QGPFR9eY6RpeXzkQsblfsvZMGFqz38ZjeW3E,2345
@@ -45,16 +45,16 @@ glaip_sdk/payload_schemas/__init__.py,sha256=fJamlkpS3IfS9xyKAQaUbnalvrtG5Ied69O
 glaip_sdk/payload_schemas/agent.py,sha256=nlizuv2w4SVzmMJSE90rE6Ll0Hfpcr5hvPsW_NtXCV0,3204
 glaip_sdk/rich_components.py,sha256=veaps1hrSkC3nSVunAevvynSux8Cg3yFEDmbJk66p7w,1267
 glaip_sdk/utils/__init__.py,sha256=fmVGcUFa7G0CCfSMSqfNU2BqFl36G1gOFyDfTvtJfVw,926
-glaip_sdk/utils/agent_config.py,sha256=b7_J5DELyk0b_XEoi7tsxbS3wqzAKbMa-3_C-65pPIY,6791
+glaip_sdk/utils/agent_config.py,sha256=p3uK5qC0M5uQv9uY7-U8ej11Vh81fwKAPSsYcRoNdlk,7342
 glaip_sdk/utils/client_utils.py,sha256=x27kHQNOxvyVN5GLUiymi0eHzkXRKw-x3s0q0VkMvY4,13938
 glaip_sdk/utils/display.py,sha256=94s9lYF_8ra8jpeqOkbVrUm8oidtCE6OtucyxLQPKmU,3105
 glaip_sdk/utils/general.py,sha256=V5hJrIpYDvDsldU_nChHpuvV2AwhFLUI7Qvcaihq_8A,2270
 glaip_sdk/utils/import_export.py,sha256=jEhl5U6hWWMR1wo5AXpV-_jN_56DcWcemOa2UaFHapk,5217
 glaip_sdk/utils/rendering/__init__.py,sha256=vXjwk5rPhhfPyD8S0DnV4GFFEtPJp4HCCg1Um9SXfs0,70
-glaip_sdk/utils/rendering/formatting.py,sha256=I8nN4H3DxTOYIExn6gozcxyAn_GO1lSztbcrSCkcscg,7351
+glaip_sdk/utils/rendering/formatting.py,sha256=mS4xvbNy1NSH4nXm8mKj03jEXMNinxfbtVJGYf3sXlk,7770
 glaip_sdk/utils/rendering/models.py,sha256=AM9JbToyA3zrAzXQYjh6oxjBkgZDfWEbs5MmNKODnOY,2259
 glaip_sdk/utils/rendering/renderer/__init__.py,sha256=EXwVBmGkSYcype4ocAXo69Z1kXu0gpNXmhH5LW0_B7A,2939
-glaip_sdk/utils/rendering/renderer/base.py,sha256=HGljrxMcDq4QCsWcwR45qZYjKWZprBunnZJYYea8FTQ,42764
+glaip_sdk/utils/rendering/renderer/base.py,sha256=Tk-N0Fpi4kyuJYb-YaYEAytpho2vcWBKdDmzqIK_Pto,45543
 glaip_sdk/utils/rendering/renderer/config.py,sha256=-P35z9JO_1ypJXAqxJ1ybHraH4i-I1LPopeW3Lh7ACE,785
 glaip_sdk/utils/rendering/renderer/console.py,sha256=4cLOw4Q1fkHkApuj6dWW8eYpeYdcT0t2SO5MbVt5UTc,1844
 glaip_sdk/utils/rendering/renderer/debug.py,sha256=FEYxAu4ZB0CjrJKevqQ2TKDgElA2cf6GqZXCNm12sNQ,3721
@@ -67,7 +67,7 @@ glaip_sdk/utils/rich_utils.py,sha256=-Ij-1bIJvnVAi6DrfftchIlMcvOTjVmSE0Qqax0EY_s
 glaip_sdk/utils/run_renderer.py,sha256=d_VMI6LbvHPUUeRmGqh5wK_lHqDEIAcym2iqpbtDad0,1365
 glaip_sdk/utils/serialization.py,sha256=AFbucakFaCtQDfcgsm2gHZ1iZDA8OaJSZUsS6FhWFR0,12820
 glaip_sdk/utils/validation.py,sha256=QNORcdyvuliEs4EH2_mkDgmoyT9utgl7YNhaf45SEf8,6992
-glaip_sdk-0.0.17.dist-info/METADATA,sha256=z1GiwKAgE5eXkCbBfUXrQuMZBUQ14XWuOZhgj5ugyAw,5164
-glaip_sdk-0.0.17.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-glaip_sdk-0.0.17.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
-glaip_sdk-0.0.17.dist-info/RECORD,,
+glaip_sdk-0.0.19.dist-info/METADATA,sha256=CxTXRqseeY6CsuhudOT_ddbxuK5WLfkkM6oSaaMSxdY,5164
+glaip_sdk-0.0.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+glaip_sdk-0.0.19.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
+glaip_sdk-0.0.19.dist-info/RECORD,,