glaip-sdk 0.0.16__py3-none-any.whl → 0.0.18__py3-none-any.whl

glaip_sdk/__init__.py

@@ -1,4 +1,4 @@
-"""GL AIP SDK - Python SDK for GDP Labs AI Agent Package.
+"""GL AIP - Python SDK for GDP Labs AI Agent Package.
 
 Authors:
     Raymond Christopher (raymond.christopher@gdplabs.id)

glaip_sdk/branding.py

@@ -42,7 +42,7 @@ LABEL = "bold"
 
 
 class AIPBranding:
-    """GL AIP SDK branding utilities with ASCII banner and version display."""
+    """GL AIP branding utilities with ASCII banner and version display."""
 
     # GL AIP ASCII art - Modern block style with enhanced visibility
     AIP_LOGO = r"""

glaip_sdk/cli/commands/agents.py

@@ -12,7 +12,6 @@ from typing import Any
 
 import click
 from rich.console import Console
-from rich.text import Text
 
 from glaip_sdk.cli.agent_config import (
     merge_agent_config_with_cli_args as merge_import_with_cli_args,
@@ -45,6 +44,7 @@ from glaip_sdk.cli.io import (
     load_resource_from_file_with_validation as load_resource_from_file,
 )
 from glaip_sdk.cli.resolution import resolve_resource_reference
+from glaip_sdk.cli.rich_helpers import markup_text, print_markup
 from glaip_sdk.cli.utils import (
     _fuzzy_pick_for_resources,
     build_renderer,
@@ -275,7 +275,7 @@ def _format_fallback_agent_data(client: Any, agent: Any) -> dict:
 def _display_agent_details(ctx: Any, client: Any, agent: Any) -> None:
     """Display full agent details using raw API data to preserve ALL fields."""
     if agent is None:
-        handle_rich_output(ctx, Text("[red]❌ No agent provided[/red]"))
+        handle_rich_output(ctx, markup_text("[red]❌ No agent provided[/red]"))
         return
 
     # Try to fetch and format raw agent data first
@@ -297,7 +297,8 @@ def _display_agent_details(ctx: Any, client: Any, agent: Any) -> None:
     else:
         # Fall back to Pydantic model data if raw fetch fails
         handle_rich_output(
-            ctx, Text("[yellow]Falling back to Pydantic model data[/yellow]")
+            ctx,
+            markup_text("[yellow]Falling back to Pydantic model data[/yellow]"),
         )
 
         with spinner_context(
@@ -495,18 +496,19 @@ def get(ctx: Any, agent_ref: str, select: int | None, export: str | None) -> Non
             except Exception as e:
                 handle_rich_output(
                     ctx,
-                    Text(
+                    markup_text(
                         f"[yellow]⚠️  Could not fetch full agent details: {e}[/yellow]"
                     ),
                 )
                 handle_rich_output(
-                    ctx, Text("[yellow]⚠️  Proceeding with available data[/yellow]")
+                    ctx,
+                    markup_text("[yellow]⚠️  Proceeding with available data[/yellow]"),
                 )
 
             export_resource_to_file(agent, export_path, detected_format)
             handle_rich_output(
                 ctx,
-                Text(
+                markup_text(
                     f"[green]✅ Complete agent configuration exported to: {export_path} (format: {detected_format})[/green]"
                 ),
             )
@@ -619,7 +621,7 @@ def _save_run_transcript(save: str | None, result: Any, working_console: Any) ->
 
     with open(save, "w", encoding="utf-8") as f:
         f.write(content)
-    console.print(Text(f"[green]Full debug output saved to: {save}[/green]"))
+    print_markup(f"[green]Full debug output saved to: {save}[/green]", console=console)
 
 
 @agents_group.command()
@@ -1306,8 +1308,6 @@ def sync_langflow(ctx: Any, base_url: str | None, api_key: str | None) -> None:
 
         # Show success message for non-JSON output
         if get_ctx_value(ctx, "view") != "json":
-            from rich.text import Text
-
             # Extract some useful info from the result
             success_count = result.get("data", {}).get("created_count", 0) + result.get(
                 "data", {}
@@ -1316,7 +1316,7 @@ def sync_langflow(ctx: Any, base_url: str | None, api_key: str | None) -> None:
 
             handle_rich_output(
                 ctx,
-                Text(
+                markup_text(
                     f"[green]✅ Successfully synced {success_count} LangFlow agents ({total_count} total processed)[/green]"
                 ),
             )

glaip_sdk/cli/commands/configure.py

@@ -14,6 +14,7 @@ from glaip_sdk import Client
 from glaip_sdk._version import __version__ as _SDK_VERSION
 from glaip_sdk.branding import AIPBranding
 from glaip_sdk.cli.config import CONFIG_FILE, load_config, save_config
+from glaip_sdk.cli.rich_helpers import markup_text
 from glaip_sdk.cli.utils import command_hint
 from glaip_sdk.rich_components import AIPTable
 
@@ -88,7 +89,9 @@ def get_config(key: str) -> None:
     config = load_config()
 
     if key not in config:
-        console.print(Text(f"[yellow]Configuration key '{key}' not found.[/yellow]"))
+        console.print(
+            markup_text(f"[yellow]Configuration key '{key}' not found.[/yellow]")
+        )
         raise click.ClickException(f"Configuration key not found: {key}")
 
     value = config[key]
@@ -108,7 +111,9 @@ def unset_config(key: str) -> None:
     config = load_config()
 
     if key not in config:
-        console.print(Text(f"[yellow]Configuration key '{key}' not found.[/yellow]"))
+        console.print(
+            markup_text(f"[yellow]Configuration key '{key}' not found.[/yellow]")
+        )
         return
 
     del config[key]

glaip_sdk/cli/commands/mcps.py

@@ -11,7 +11,6 @@ from typing import Any
 
 import click
 from rich.console import Console
-from rich.text import Text
 
 from glaip_sdk.cli.context import detect_export_format, get_ctx_value, output_flags
 from glaip_sdk.cli.display import (
@@ -33,6 +32,7 @@ from glaip_sdk.cli.mcp_validators import (
 )
 from glaip_sdk.cli.parsers.json_input import parse_json_input
 from glaip_sdk.cli.resolution import resolve_resource_reference
+from glaip_sdk.cli.rich_helpers import print_markup
 from glaip_sdk.cli.utils import (
     coerce_to_row,
     get_client,
@@ -481,21 +481,23 @@ def _handle_mcp_export(
         ):
             mcp = client.mcps.get_mcp_by_id(mcp.id)
     except Exception as e:
-        console.print(
-            Text(f"[yellow]⚠️  Could not fetch full MCP details: {e}[/yellow]")
+        print_markup(
+            f"[yellow]⚠️  Could not fetch full MCP details: {e}[/yellow]",
+            console=console,
+        )
+        print_markup(
+            "[yellow]⚠️  Proceeding with available data[/yellow]", console=console
         )
-        console.print(Text("[yellow]⚠️  Proceeding with available data[/yellow]"))
 
     # Determine if we should prompt for secrets
     prompt_for_secrets = not no_auth_prompt and sys.stdin.isatty()
 
     # Warn user if non-interactive mode forces placeholder usage
     if not no_auth_prompt and not sys.stdin.isatty():
-        console.print(
-            Text(
-                "[yellow]⚠️  Non-interactive mode detected. "
-                "Using placeholder values for secrets.[/yellow]"
-            )
+        print_markup(
+            "[yellow]⚠️  Non-interactive mode detected. "
+            "Using placeholder values for secrets.[/yellow]",
+            console=console,
         )
 
     # Build and write export payload
@@ -528,11 +530,10 @@ def _handle_mcp_export(
             )
             write_resource_export(export_path, export_payload, detected_format)
 
-    console.print(
-        Text(
-            f"[green]✅ Complete MCP configuration exported to: "
-            f"{export_path} (format: {detected_format})[/green]"
-        )
+    print_markup(
+        f"[green]✅ Complete MCP configuration exported to: "
+        f"{export_path} (format: {detected_format})[/green]",
+        console=console,
     )
 
 
@@ -732,11 +733,9 @@ def connect(ctx: Any, config_file: str) -> None:
 
         view = get_ctx_value(ctx, "view", "rich")
         if view != "json":
-            console.print(
-                Text(
-                    f"[yellow]Connecting to MCP with config from "
-                    f"{config_file}...[/yellow]"
-                )
+            print_markup(
+                f"[yellow]Connecting to MCP with config from {config_file}...[/yellow]",
+                console=console,
             )
 
         # Test connection using config

glaip_sdk/cli/commands/tools.py

@@ -11,7 +11,6 @@ from typing import Any
 
 import click
 from rich.console import Console
-from rich.text import Text
 
 from glaip_sdk.cli.context import detect_export_format, get_ctx_value, output_flags
 from glaip_sdk.cli.display import (
@@ -33,6 +32,7 @@ from glaip_sdk.cli.io import (
     load_resource_from_file_with_validation as load_resource_from_file,
 )
 from glaip_sdk.cli.resolution import resolve_resource_reference
+from glaip_sdk.cli.rich_helpers import markup_text, print_markup
 from glaip_sdk.cli.utils import (
     coerce_to_row,
     get_client,
@@ -349,11 +349,13 @@ def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None
                 ):
                     tool = client.get_tool_by_id(tool.id)
             except Exception as e:
-                console.print(
-                    Text(f"[yellow]⚠️  Could not fetch full tool details: {e}[/yellow]")
+                print_markup(
+                    f"[yellow]⚠️  Could not fetch full tool details: {e}[/yellow]",
+                    console=console,
                 )
-                console.print(
-                    Text("[yellow]⚠️  Proceeding with available data[/yellow]")
+                print_markup(
+                    "[yellow]⚠️  Proceeding with available data[/yellow]",
+                    console=console,
                 )
 
             with spinner_context(
@@ -362,10 +364,9 @@ def get(ctx: Any, tool_ref: str, select: int | None, export: str | None) -> None
                 console_override=console,
             ):
                 export_resource_to_file(tool, export_path, detected_format)
-            console.print(
-                Text(
-                    f"[green]✅ Complete tool configuration exported to: {export_path} (format: {detected_format})[/green]"
-                )
+            print_markup(
+                f"[green]✅ Complete tool configuration exported to: {export_path} (format: {detected_format})[/green]",
+                console=console,
             )
 
         # Try to fetch raw API data first to preserve ALL fields
@@ -473,7 +474,8 @@ def update(
                     tool.id, file, framework=tool.framework
                 )
             handle_rich_output(
-                ctx, Text(f"[green]✓[/green] Tool code updated from {file}")
+                ctx,
+                markup_text(f"[green]✓[/green] Tool code updated from {file}"),
             )
         elif update_data:
             # Update metadata only (native tools only)
@@ -487,9 +489,13 @@ def update(
                 console_override=console,
             ):
                 updated_tool = tool.update(**update_data)
-            handle_rich_output(ctx, Text("[green]✓[/green] Tool metadata updated"))
+            handle_rich_output(
+                ctx, markup_text("[green]✓[/green] Tool metadata updated")
+            )
         else:
-            handle_rich_output(ctx, Text("[yellow]No updates specified[/yellow]"))
+            handle_rich_output(
+                ctx, markup_text("[yellow]No updates specified[/yellow]")
+            )
             return
 
         handle_json_output(ctx, updated_tool.model_dump())
@@ -574,5 +580,5 @@ def script(ctx: Any, tool_id: str) -> None:
     except Exception as e:
         handle_json_output(ctx, error=e)
         if get_ctx_value(ctx, "view") != "json":
-            console.print(Text(f"[red]Error getting tool script: {e}[/red]"))
+            print_markup(f"[red]Error getting tool script: {e}[/red]", console=console)
         raise click.ClickException(str(e))

glaip_sdk/cli/display.py

@@ -15,6 +15,7 @@ from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
 
+from glaip_sdk.cli.rich_helpers import markup_text, print_markup
 from glaip_sdk.cli.utils import command_hint
 from glaip_sdk.rich_components import AIPPanel
 
@@ -61,7 +62,7 @@ def display_update_success(resource_type: str, resource_name: str) -> Text:
     Returns:
         Rich Text object for display
     """
-    return Text(
+    return markup_text(
         f"[green]✅ {resource_type} '{resource_name}' updated successfully[/green]"
     )
 
@@ -76,7 +77,7 @@ def display_deletion_success(resource_type: str, resource_name: str) -> Text:
     Returns:
         Rich Text object for display
     """
-    return Text(
+    return markup_text(
         f"[green]✅ {resource_type} '{resource_name}' deleted successfully[/green]"
     )
 
@@ -89,8 +90,8 @@ def display_api_error(error: Exception, operation: str = "operation") -> None:
         operation: Description of the operation that failed
     """
     error_type = type(error).__name__
-    console.print(Text(f"[red]Error during {operation}: {error}[/red]"))
-    console.print(Text(f"[dim]Error type: {error_type}[/dim]"))
+    print_markup(f"[red]Error during {operation}: {error}[/red]", console=console)
+    print_markup(f"[dim]Error type: {error_type}[/dim]", console=console)
 
 
 def print_api_error(e: Exception) -> None:

glaip_sdk/cli/rich_helpers.py

@@ -0,0 +1,29 @@
+"""Shared helpers for creating and printing Rich markup content.
+
+Authors:
+    Raymond Christopher (raymond.christopher@gdplabs.id)
+"""
+
+from __future__ import annotations
+
+from typing import Any
+
+from rich.console import Console
+from rich.markup import MarkupError
+from rich.text import Text
+
+
+def markup_text(message: str, **kwargs: Any) -> Text:
+    """Create a Rich Text instance from markup with graceful fallback."""
+    try:
+        return Text.from_markup(message, **kwargs)
+    except MarkupError:
+        return Text(message, **kwargs)
+
+
+def print_markup(
+    message: str, *, console: Console | None = None, **kwargs: Any
+) -> None:
+    """Print markup-aware text to the provided console (default: new Console)."""
+    target_console = console or Console()
+    target_console.print(markup_text(message, **kwargs))

glaip_sdk/cli/slash/prompt.py

@@ -194,28 +194,43 @@ def _iter_command_completions(
     prefix = text[1:]
     seen: set[str] = set()
 
-    if (
-        session.get_contextual_commands()
-        and not session.should_include_global_commands()
-    ):
+    # Early return for contextual commands scenario
+    if not _should_include_commands(session):
         return []
 
     commands = sorted(session._unique_commands.values(), key=lambda c: c.name)
 
     for cmd in commands:
-        for alias in (cmd.name, *cmd.aliases):
-            if alias in seen or alias.startswith("?"):
-                continue
-            if prefix and not alias.startswith(prefix):
-                continue
-            seen.add(alias)
-            label = f"/{alias}"
-            yield Completion(
-                text=label,
-                start_position=-len(text),
-                display=label,
-                display_meta=cmd.help,
-            )
+        yield from _generate_command_completions(cmd, prefix, text, seen)
+
+
+def _should_include_commands(session: SlashSession) -> bool:
+    """Check if commands should be included in completions."""
+    return not (
+        session.get_contextual_commands()
+        and not session.should_include_global_commands()
+    )
+
+
+def _generate_command_completions(
+    cmd: Any, prefix: str, text: str, seen: set[str]
+) -> Iterable[Completion]:
+    """Generate completion items for a single command."""
+    for alias in (cmd.name, *cmd.aliases):
+        if alias in seen or alias.startswith("?"):
+            continue
+
+        if prefix and not alias.startswith(prefix):
+            continue
+
+        seen.add(alias)
+        label = f"/{alias}"
+        yield Completion(
+            text=label,
+            start_position=-len(text),
+            display=label,
+            display_meta=cmd.help,
+        )
 
 
 def _iter_contextual_completions(

glaip_sdk/cli/slash/session.py

@@ -297,51 +297,80 @@ class SlashSession:
         return True
 
     def _cmd_agents(self, args: list[str], _invoked_from_agent: bool) -> bool:
+        client = self._get_client_or_fail()
+        if not client:
+            return True
+
+        agents = self._get_agents_or_fail(client)
+        if not agents:
+            return True
+
+        picked_agent = self._resolve_or_pick_agent(client, agents, args)
+
+        if not picked_agent:
+            return True
+
+        return self._run_agent_session(picked_agent)
+
+    def _get_client_or_fail(self) -> Any:
+        """Get client or handle failure and return None."""
         try:
-            client = self._get_client()
+            return self._get_client()
         except click.ClickException as exc:
             self.console.print(f"[red]{exc}[/red]")
-            return True
+            return None
 
+    def _get_agents_or_fail(self, client: Any) -> list:
+        """Get agents list or handle failure and return empty list."""
         try:
             agents = client.list_agents()
+            if not agents:
+                self._handle_no_agents()
+            return agents
         except Exception as exc:  # pragma: no cover - API failures
             self.console.print(f"[red]Failed to load agents: {exc}[/red]")
-            return True
+            return []
 
-        if not agents:
-            hint = command_hint("agents create", slash_command=None, ctx=self.ctx)
-            if hint:
-                self.console.print(
-                    f"[yellow]No agents available. Use `{hint}` to add one.[/yellow]"
-                )
-            else:
-                self.console.print("[yellow]No agents available.[/yellow]")
-            return True
+    def _handle_no_agents(self) -> None:
+        """Handle case when no agents are available."""
+        hint = command_hint("agents create", slash_command=None, ctx=self.ctx)
+        if hint:
+            self.console.print(
+                f"[yellow]No agents available. Use `{hint}` to add one.[/yellow]"
+            )
+        else:
+            self.console.print("[yellow]No agents available.[/yellow]")
 
+    def _resolve_or_pick_agent(self, client: Any, agents: list, args: list[str]) -> Any:
+        """Resolve agent from args or pick interactively."""
         if args:
             picked_agent = self._resolve_agent_from_ref(client, agents, args[0])
             if picked_agent is None:
                 self.console.print(
                     f"[yellow]Could not resolve agent '{args[0]}'. Try `/agents` to browse interactively.[/yellow]"
                 )
-                return True
+                return None
         else:
             picked_agent = _fuzzy_pick_for_resources(agents, "agent", "")
 
-        if not picked_agent:
-            return True
+        return picked_agent
 
+    def _run_agent_session(self, picked_agent: Any) -> bool:
+        """Run agent session and show follow-up actions."""
         self._remember_agent(picked_agent)
-
         AgentRunSession(self, picked_agent).run()
 
-        # Refresh the main palette header and surface follow-up actions so the
-        # user has immediate cues after leaving the agent context.
+        # Refresh the main palette header and surface follow-up actions
         self._render_header()
 
+        self._show_agent_followup_actions(picked_agent)
+        return True
+
+    def _show_agent_followup_actions(self, picked_agent: Any) -> None:
+        """Show follow-up action hints after agent session."""
         agent_id = str(getattr(picked_agent, "id", ""))
         agent_label = getattr(picked_agent, "name", "") or agent_id or "this agent"
+
         hints: list[tuple[str, str]] = []
         if agent_id:
             hints.append((f"/agents {agent_id}", f"Reopen {agent_label}"))
@@ -351,8 +380,8 @@ class SlashSession:
                 (self.STATUS_COMMAND, "Check connection"),
             ]
         )
+
         self._show_quick_actions(hints, title="Next actions")
-        return True
 
     def _cmd_exit(self, _args: list[str], invoked_from_agent: bool) -> bool:
         if invoked_from_agent:
@@ -710,12 +739,12 @@ class SlashSession:
 
         if full:
             lines = [
-                self._branding.get_welcome_banner(),
-                "",
-                f"[dim]API URL[/dim]: {api_url or 'Not configured'}",
-                f"[dim]Credentials[/dim]: {status}",
-                f"[dim]Verbose mode[/dim]: {'on' if self._verbose_enabled else 'off'}",
-                "[dim]Tip[/dim]: Press Ctrl+T or run `/verbose` to toggle verbose streaming.",
+                f"GL AIP v{self._branding.version} · GDP Labs AI Agents Package",
+                f"API: {api_url or 'Not configured'} · Credentials: {status}",
+                (
+                    f"Verbose: {'on' if self._verbose_enabled else 'off'} "
+                    "(Ctrl+T toggles verbose streaming)"
+                ),
             ]
             extra: list[str] = []
             self._add_agent_info_to_header(extra, active_agent)

glaip_sdk/cli/utils.py

@@ -19,8 +19,8 @@ import click
 from rich.console import Console, Group
 from rich.markdown import Markdown
 from rich.pretty import Pretty
-from rich.text import Text
 
+from glaip_sdk.cli.rich_helpers import markup_text
 from glaip_sdk.rich_components import AIPPanel
 
 # Optional interactive deps (fuzzy palette)
@@ -557,7 +557,7 @@ def output_result(
     if panel_title:
         console.print(AIPPanel(renderable, title=panel_title))
     else:
-        console.print(Text(f"[cyan]{title}:[/cyan]"))
+        console.print(markup_text(f"[cyan]{title}:[/cyan]"))
         console.print(renderable)
 
 
@@ -635,7 +635,7 @@ def _build_table_group(
     table = _create_table(columns, title)
     for row in rows:
         table.add_row(*[str(row.get(key, "N/A")) for key, _, _, _ in columns])
-    footer = Text.from_markup(f"\n[dim]Total {len(rows)} items[/dim]")
+    footer = markup_text(f"\n[dim]Total {len(rows)} items[/dim]")
     return Group(table, footer)
 
 
@@ -665,7 +665,7 @@ def _handle_markdown_output(
 
 def _handle_empty_items(title: str) -> None:
     """Handle case when no items are found."""
-    console.print(Text.from_markup(f"[yellow]No {title.lower()} found.[/yellow]"))
+    console.print(markup_text(f"[yellow]No {title.lower()} found.[/yellow]"))
 
 
 def _should_use_fuzzy_picker() -> bool:
@@ -707,7 +707,7 @@ def _print_selection_tip(title: str) -> None:
     tip_cmd = _resource_tip_command(title)
     if tip_cmd:
         console.print(
-            Text.from_markup(f"\n[dim]Tip: use `{tip_cmd} <ID>` for details[/dim]")
+            markup_text(f"\n[dim]Tip: use `{tip_cmd} <ID>` for details[/dim]")
         )
 
 
@@ -1092,7 +1092,7 @@ def _handle_fallback_numeric_ambiguity(
     safe_ref = ref.replace("{", "{{").replace("}", "}}")
 
     console.print(
-        Text(
+        markup_text(
             f"[yellow]Multiple {safe_resource_type}s found matching '{safe_ref}':[/yellow]"
         )
     )