systemlink-cli 1.5.2__tar.gz → 1.6.2__tar.gz

{systemlink_cli-1.5.2 → systemlink_cli-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: systemlink-cli
-Version: 1.5.2
+Version: 1.6.2
 Summary: SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates.
 License-File: LICENSE
 Author: Fred Visser
@@ -15,6 +15,8 @@ Requires-Dist: keyring (>=25.6.0,<26.0.0)
 Requires-Dist: pyyaml (>=6.0.3,<7.0.0)
 Requires-Dist: questionary (>=2.1.1,<3.0.0)
 Requires-Dist: requests (>=2.32.4,<3.0.0)
+Requires-Dist: rich (>=13.7,<15)
+Requires-Dist: rich-click (>=1.8,<2)
 Requires-Dist: tabulate (>=0.10.0,<0.11.0)
 Requires-Dist: truststore (>=0.9,<0.11)
 Requires-Dist: watchdog (>=6.0.0,<7.0.0)

{systemlink_cli-1.5.2 → systemlink_cli-1.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "systemlink-cli"
-version = "1.5.2"
+version = "1.6.2"
 description = "SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates."
 authors = ["Fred Visser <fred.visser@emerson.com>"]
 packages = [{ include = "slcli" }]
@@ -35,6 +35,8 @@ truststore = ">=0.9,<0.11"
 watchdog = "^6.0.0"
 pyyaml = "^6.0.3"
 questionary = "^2.1.1"
+rich = ">=13.7,<15"
+rich-click = ">=1.8,<2"
 
 
 [tool.poetry.group.dev.dependencies]

{systemlink_cli-1.5.2 → systemlink_cli-1.6.2}/slcli/_version.py

@@ -1,4 +1,4 @@
 """Version information for slcli."""
 
 # This file is auto-generated. Do not edit manually.
-__version__ = "1.5.2"
+__version__ = "1.6.2"

{systemlink_cli-1.5.2 → systemlink_cli-1.6.2}/slcli/cli_utils.py

@@ -1,12 +1,13 @@
 """Common utility functions for all CLI commands."""
 
 import sys
-from typing import Any, Dict, List, Optional, Callable
+from typing import Any, Callable, Dict, List, Optional
 
 import click
 import questionary
 import requests
 
+from .rich_output import print_json, render_table
 from .utils import ExitCodes, handle_api_error
 
 
@@ -368,9 +369,7 @@ def paginate_list_output(
 
     # For JSON format, show all results at once (no pagination)
     if format_output.lower() == "json":
-        import json
-
-        click.echo(json.dumps(items, indent=2))
+        print_json(items)
         return
 
     # Table format with pagination
@@ -456,49 +455,14 @@ def _output_formatted_page(
     if not items:
         return
 
-    # Table format with box-drawing characters (without footer)
     if len(headers) != len(column_widths):
         raise ValueError("Headers and column_widths must have the same length")
 
-    # Top border
-    border_chars = ["┌"] + [("─" * (w + 2)) for w in column_widths]
-    border_line = border_chars[0] + border_chars[1]
-    for part in border_chars[2:]:
-        border_line += "┬" + part
-    border_line += "┐"
-    click.echo(border_line)
-
-    # Header row
-    header_parts = ["│"]
-    for header, width in zip(headers, column_widths):
-        header_parts.append(f" {header:<{width}} │")
-    click.echo("".join(header_parts))
-
-    # Middle border
-    border_chars = ["├"] + [("─" * (w + 2)) for w in column_widths]
-    border_line = border_chars[0] + border_chars[1]
-    for part in border_chars[2:]:
-        border_line += "┼" + part
-    border_line += "┤"
-    click.echo(border_line)
-
-    # Data rows
+    rows = []
     for item in items:
         row_data = row_formatter_func(item)
         if len(row_data) != len(column_widths):
             raise ValueError("Row data must match column count")
+        rows.append(row_data)
 
-        row_parts = ["│"]
-        for value, width in zip(row_data, column_widths):
-            # Truncate if necessary
-            str_value = str(value or "")[:width]
-            row_parts.append(f" {str_value:<{width}} │")
-        click.echo("".join(row_parts))
-
-    # Bottom border
-    border_chars = ["└"] + [("─" * (w + 2)) for w in column_widths]
-    border_line = border_chars[0] + border_chars[1]
-    for part in border_chars[2:]:
-        border_line += "┴" + part
-    border_line += "┘"
-    click.echo(border_line)
+    render_table(headers, column_widths, rows, show_total=False)

{systemlink_cli-1.5.2 → systemlink_cli-1.6.2}/slcli/config_click.py

@@ -14,6 +14,7 @@ from .platform import (
     check_service_status,
 )
 from .profiles import ProfileConfig, Profile, check_config_file_permissions
+from .rich_output import render_table
 from .table_utils import output_formatted_list
 from .utils import ExitCodes
 
@@ -337,65 +338,42 @@ def register_config_commands(cli: Any) -> None:
             click.echo(json.dumps(data, indent=2))
             return
 
-        # Table format
-        click.echo("┌─────────────────────────────────────────────────────────────┐")
-        click.echo("│ slcli Configuration                                         │")
-        click.echo("├─────────────────────────────────────────────────────────────┤")
-
-        if cfg.current_profile:
-            click.echo(f"│ Current Profile: {cfg.current_profile:<42} │")
-        else:
-            click.echo("│ Current Profile: (none)                                     │")
-
-        config_path_str = str(ProfileConfig.get_config_path())
-        if len(config_path_str) > 46:
-            config_path_str = config_path_str[:43] + "..."
-        click.echo(f"│ Config File: {config_path_str:<46} │")
+        rows = [
+            ["Current Profile", cfg.current_profile or "(none)"],
+            ["Config File", str(ProfileConfig.get_config_path())],
+        ]
 
-        # Show current profile details
         if cfg.current_profile and cfg.current_profile in cfg.profiles:
             profile = cfg.profiles[cfg.current_profile]
-            click.echo("├─────────────────────────────────────────────────────────────┤")
+            rows.append(["Server", profile.server])
 
-            # Server
-            server_str = profile.server
-            if len(server_str) > 47:
-                server_str = server_str[:44] + "..."
-            click.echo(f"│ Server: {server_str:<51} │")
-
-            # Web URL
             if profile.web_url:
-                web_url_str = profile.web_url
-                if len(web_url_str) > 45:
-                    web_url_str = web_url_str[:42] + "..."
-                click.echo(f"│ Web URL: {web_url_str:<50} │")
+                rows.append(["Web URL", profile.web_url])
 
-            # Platform
             if profile.platform:
-                platform_str = profile.platform or "Unknown"
-                click.echo(f"│ Platform: {platform_str:<49} │")
+                rows.append(["Platform", profile.platform or "Unknown"])
 
-            # API Key (redacted)
             if show_secrets:
-                click.echo(f"│ API Key: {profile.api_key:<50} │")
+                api_key_display = profile.api_key
             else:
-                # Show only last 4 characters
-                key = profile.api_key
-                redacted_key = "****" + key[-4:] if len(key) >= 4 else "****"
-                click.echo(f"│ API Key: {redacted_key:<50} │")
+                api_key_display = (
+                    "****" + profile.api_key[-4:] if len(profile.api_key) >= 4 else "****"
+                )
+            rows.append(["API Key", api_key_display])
 
-            # Workspace
             if profile.workspace:
-                workspace_str = profile.workspace
-                if len(workspace_str) > 45:
-                    workspace_str = workspace_str[:42] + "..."
-                click.echo(f"│ Workspace: {workspace_str:<48} │")
+                rows.append(["Workspace", profile.workspace])
 
-            # Readonly
             if profile.readonly:
-                click.echo("│ Readonly: enabled                                           │")
-
-        click.echo("└─────────────────────────────────────────────────────────────┘")
+                rows.append(["Readonly", "enabled"])
+
+        click.echo("slcli Configuration:")
+        render_table(
+            headers=["SETTING", "VALUE"],
+            column_widths=[18, 70],
+            rows=rows,
+            show_total=False,
+        )
 
         # Check for permission warning
         warning = check_config_file_permissions()

{systemlink_cli-1.5.2 → systemlink_cli-1.6.2}/slcli/main.py

@@ -2,9 +2,10 @@
 
 import json
 from pathlib import Path
+from types import ModuleType
 from typing import Optional
 
-import click
+import click as base_click
 import keyring
 import questionary
 import tomllib
@@ -25,6 +26,8 @@ from .platform import (
 )
 from .policy_click import register_policy_commands
 from .profiles import set_profile_override
+from .rich_output import install_rich_output
+from .rich_output import render_table
 from .routine_click import register_routine_commands
 from .skill_click import register_skill_commands
 from .ssl_trust import OS_TRUST_INJECTED, OS_TRUST_REASON
@@ -37,6 +40,14 @@ from .webapp_click import register_webapp_commands
 from .workitem_click import register_workitem_commands
 from .workspace_click import register_workspace_commands
 
+click: ModuleType
+try:
+    import rich_click as rich_click_module  # type: ignore[import-not-found]
+except ModuleNotFoundError:
+    click = base_click
+else:
+    click = rich_click_module
+
 
 def get_version() -> str:
     """Get version from _version.py (built binary) or pyproject.toml (development)."""
@@ -83,8 +94,10 @@ def get_ascii_art() -> str:
     help="Use a specific profile for this command",
 )
 @click.pass_context
-def cli(ctx: click.Context, version: bool, profile: Optional[str]) -> None:
+def cli(ctx: base_click.Context, version: bool, profile: Optional[str]) -> None:
     """SystemLink CLI for managing SystemLink resources."""  # noqa: D403
+    install_rich_output()
+
     if version:
         click.echo(f"slcli version {get_version()}")
         ctx.exit()
@@ -314,13 +327,7 @@ def info(format: str, skip_health: bool) -> None:
         click.echo(json.dumps(platform_info, indent=2))
         return
 
-    # Table format using box-drawing characters for key-value display.
-    # Note: This uses a custom layout rather than table_utils because table_utils
-    # is designed for list-style output (multiple uniform rows), while this command
-    # displays a single record with key-value pairs and feature availability.
-    # All text fields are truncated to prevent formatting issues with long values.
     max_value_width = 45  # Maximum width for values before truncation
-    content_width = 61  # Total width inside the box
 
     def truncate(value: str, max_len: int = max_value_width) -> str:
         """Truncate a string with ellipsis if it exceeds max length."""
@@ -328,11 +335,6 @@ def info(format: str, skip_health: bool) -> None:
             return value[: max_len - 3] + "..."
         return value
 
-    click.echo("\n┌" + "─" * content_width + "┐")
-    click.echo("│" + "SystemLink CLI Info".center(content_width) + "│")
-    click.echo("├" + "─" * content_width + "┤")
-
-    # Connection status
     if not platform_info["logged_in"]:
         status = "✗ Not logged in"
     elif platform_info.get("server_reachable") is False:
@@ -341,32 +343,27 @@ def info(format: str, skip_health: bool) -> None:
         status = "✗ API key unauthorized"
     else:
         status = "✓ Connected"
-    click.echo(f"│  Status:    {status:<48}│")
 
-    # Profile information
     profile_display = platform_info.get("active_profile_name", "None")
     if platform_info.get("profile_count", 0) > 1:
         profile_display = f"{profile_display} (1 of {platform_info['profile_count']})"
     profile_display = truncate(profile_display)
-    click.echo(f"│  Profile:   {profile_display:<48}│")
-
-    # Platform
     platform_display = truncate(platform_info.get("platform_display", "Unknown"))
-    click.echo(f"│  Platform:  {platform_display:<48}│")
-
-    # API URL
     api_url = truncate(platform_info.get("api_url", "Not configured"))
-    click.echo(f"│  API URL:   {api_url:<48}│")
-
-    # Web URL
     web_url = truncate(platform_info.get("web_url", "Not configured"))
-    click.echo(f"│  Web URL:   {web_url:<48}│")
 
-    # Default workspace
+    info_rows = [
+        ["Status", status],
+        ["Profile", profile_display],
+        ["Platform", platform_display],
+        ["API URL", api_url],
+        ["Web URL", web_url],
+    ]
+
     workspace = platform_info.get("active_profile_workspace")
     if workspace:
         workspace_display = truncate(workspace)
-        click.echo(f"│  Workspace: {workspace_display:<48}│")
+        info_rows.append(["Workspace", workspace_display])
 
     file_query_endpoint = platform_info.get("file_query_endpoint")
     if file_query_endpoint:
@@ -375,15 +372,19 @@ def info(format: str, skip_health: bool) -> None:
         else:
             file_query_display = str(file_query_endpoint)
         file_query_display = truncate(file_query_display)
-        click.echo(f"│  File Query:{file_query_display:<48}│")
+        info_rows.append(["File Query", file_query_display])
+
+    click.echo()
+    click.echo("SystemLink CLI Info:")
+    render_table(
+        headers=["SETTING", "VALUE"],
+        column_widths=[16, 48],
+        rows=info_rows,
+        show_total=False,
+    )
 
-    # Service Health section (only when services were checked)
     services = platform_info.get("services")
     if services:
-        click.echo("├" + "─" * content_width + "┤")
-        click.echo("│" + "Service Health".center(content_width) + "│")
-        click.echo("├" + "─" * content_width + "┤")
-
         status_display = {
             "ok": ("✓", "OK"),
             "fallback": ("!", "Fallback (no Elasticsearch)"),
@@ -392,12 +393,20 @@ def info(format: str, skip_health: bool) -> None:
             "error": ("✗", "Error"),
             "unreachable": ("✗", "Unreachable"),
         }
+        service_rows = []
         for svc_name, svc_status in services.items():
             icon, text = status_display.get(svc_status, ("?", svc_status))
-            display_name = truncate(svc_name, 29)
-            click.echo(f"│  {icon} {display_name:<30} {text:<26}│")
-
-    click.echo("└" + "─" * content_width + "┘\n")
+            service_rows.append([truncate(svc_name, 29), f"{icon} {text}"])
+
+        click.echo()
+        click.echo("Service Health:")
+        render_table(
+            headers=["SERVICE", "STATUS"],
+            column_widths=[26, 32],
+            rows=service_rows,
+            show_total=False,
+        )
+        click.echo()
 
 
 register_completion_command(cli)