qbraid-cli 0.8.5a1__py3-none-any.whl → 0.12.0a0__py3-none-any.whl

qbraid_cli/configure/app.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2024, qBraid Development Team
+# Copyright (c) 2025, qBraid Development Team
 # All rights reserved.
 
 """
@@ -7,7 +7,9 @@ Module defining commands in the 'qbraid configure' namespace.
 """
 
 import typer
+from rich import box
 from rich.console import Console
+from rich.table import Table
 
 from qbraid_cli.configure.actions import default_action
 
@@ -36,7 +38,7 @@ def configure(ctx: typer.Context):
 def configure_set(
     name: str = typer.Argument(..., help="Config name"),
     value: str = typer.Argument(..., help="Config value"),
-    profile: str = typer.Option("default", help="Profile name"),
+    profile: str = typer.Option("default", "--profile", "-p", help="Profile name"),
 ):
     """Set configuration value in qbraidrc file."""
     # pylint: disable-next=import-outside-toplevel
@@ -53,6 +55,62 @@ def configure_set(
     typer.echo("Configuration updated successfully.")
 
 
+@configure_app.command(name="get")
+def configure_get(
+    name: str = typer.Argument(..., help="Config name"),
+    profile: str = typer.Option("default", "--profile", "-p", help="Profile name"),
+):
+    """Get configuration value from qbraidrc file."""
+    # pylint: disable-next=import-outside-toplevel
+    from qbraid_core.config import load_config
+
+    config = load_config()
+
+    if profile not in config:
+        typer.echo(f"Profile '{profile}' not found in configuration.")
+        raise typer.Exit(1)
+
+    if name not in config[profile]:
+        typer.echo(f"Configuration '{name}' not found in profile '{profile}'.")
+        raise typer.Exit(1)
+
+    typer.echo(config[profile][name])
+
+
+@configure_app.command(name="list")
+def configure_list():
+    """List all configuration values in qbraidrc."""
+    # pylint: disable-next=import-outside-toplevel
+    from qbraid_core.config import load_config
+
+    config = load_config()
+    console = Console()
+    profile = "default"
+
+    if profile not in config:
+        typer.echo("Default profile not found in configuration.")
+        raise typer.Exit(1)
+
+    if not config[profile]:
+        typer.echo("No configuration values found in default profile.")
+        return
+
+    table = Table(show_edge=False, box=box.MINIMAL)
+    table.add_column("Name", style="cyan")
+    table.add_column("Value", style="green")
+
+    sensitive_keys = {"api-key", "refresh-token"}
+
+    for name, value in config[profile].items():
+        if name in sensitive_keys and value:
+            masked_value = f"*****{str(value)[-3:]}"
+        else:
+            masked_value = str(value)
+        table.add_row(name, masked_value)
+
+    console.print(table)
+
+
 @configure_app.command(name="magic")
 def configure_magic():
     """Enable qBraid IPython magic commands."""
@@ -73,5 +131,92 @@ def configure_magic():
     console.print(f"\n\t{in_1}\n\n\t{in_2}\n")
 
 
+@configure_app.command(name="claude")
+def configure_claude(
+    action: str = typer.Argument(
+        ...,
+        help="Action to perform: 'add', 'remove', or 'show'",
+    ),
+    overwrite: bool = typer.Option(
+        False,
+        "--overwrite",
+        help="Overwrite existing MCP server configuration",
+    ),
+):
+    """
+    Manage qBraid MCP server in Claude Desktop configuration.
+
+    Add, remove, or show the qBraid MCP server in your Claude Desktop config
+    (claude_desktop_config.json).
+    """
+    # pylint: disable-next=import-outside-toplevel
+    from qbraid_cli.configure.claude_config import (
+        add_qbraid_mcp_server,
+        get_claude_config_path,
+        get_qbraid_mcp_server_config,
+        remove_qbraid_mcp_server,
+    )
+
+    console = Console()
+
+    # Validate action
+    valid_actions = ["add", "remove", "show"]
+    if action not in valid_actions:
+        console.print(
+            f"[red]Error:[/red] Invalid action '{action}'. "
+            f"Must be one of: {', '.join(valid_actions)}"
+        )
+        raise typer.Exit(1)
+
+    # Check if Claude config exists (except for show which can work without it)
+    if action != "show":
+        config_path = get_claude_config_path()
+        if config_path is None:
+            console.print(
+                "[yellow]Warning:[/yellow] Claude Desktop config file not found.\n"
+                "Expected locations:\n"
+                "  - macOS: ~/Library/Application Support/Claude/claude_desktop_config.json\n"
+                "  - Windows: %APPDATA%\\Claude\\claude_desktop_config.json\n"
+                "  - Linux: ~/.config/Claude/claude_desktop_config.json\n\n"
+                "Creating new config file..."
+            )
+
+    # Perform action
+    if action == "add":
+        success, message = add_qbraid_mcp_server(overwrite=overwrite)
+        if success:
+            console.print(f"[green]Success:[/green] {message}")
+            console.print(
+                "\n[yellow]Note:[/yellow] You may need to restart Claude Desktop "
+                "for changes to take effect."
+            )
+        else:
+            console.print(f"[red]Error:[/red] {message}")
+            raise typer.Exit(1)
+
+    elif action == "remove":
+        success, message = remove_qbraid_mcp_server()
+        if success:
+            console.print(f"[green]Success:[/green] {message}")
+            console.print(
+                "\n[yellow]Note:[/yellow] You may need to restart Claude Desktop "
+                "for changes to take effect."
+            )
+        else:
+            console.print(f"[red]Error:[/red] {message}")
+            raise typer.Exit(1)
+
+    elif action == "show":
+        server_config = get_qbraid_mcp_server_config()
+        if server_config is None:
+            console.print("No qBraid MCP server found in Claude Desktop configuration.")
+            return
+
+        console.print("\n[cyan]qBraid MCP Server Configuration:[/cyan]\n")
+        console.print(f"  Command: {server_config.get('command', 'N/A')}")
+        console.print(f"  Args: {server_config.get('args', [])}")
+        console.print()
+
+
 if __name__ == "__main__":
     configure_app()

qbraid_cli/configure/claude_config.py

@@ -0,0 +1,215 @@
+# Copyright (c) 2025, qBraid Development Team
+# All rights reserved.
+
+"""
+Utility functions for managing Claude Desktop configuration.
+
+This module provides cross-platform support for locating and updating
+the claude_desktop_config.json file used by Claude Desktop.
+"""
+
+import json
+import os
+import platform
+import shutil
+from pathlib import Path
+from typing import Optional
+
+
+def get_claude_config_path() -> Optional[Path]:
+    """
+    Get the path to the Claude Desktop configuration file.
+
+    Returns the platform-specific path to claude_desktop_config.json:
+    - macOS: ~/Library/Application Support/Claude/claude_desktop_config.json
+    - Windows: %APPDATA%\\Claude\\claude_desktop_config.json
+    - Linux: ~/.config/Claude/claude_desktop_config.json
+
+    Returns:
+        Path to the config file if it exists, None otherwise
+    """
+    system = platform.system()
+
+    if system == "Darwin":  # macOS
+        config_path = Path.home() / "Library" / "Application Support" / "Claude"
+    elif system == "Windows":
+        appdata = os.environ.get("APPDATA")
+        if not appdata:
+            return None
+        config_path = Path(appdata) / "Claude"
+    elif system == "Linux":
+        config_path = Path.home() / ".config" / "Claude"
+    else:
+        return None
+
+    config_file = config_path / "claude_desktop_config.json"
+    return config_file if config_file.exists() else None
+
+
+def load_claude_config() -> dict:
+    """
+    Load the Claude Desktop configuration file.
+
+    Returns:
+        Configuration dictionary. If file doesn't exist, returns empty dict.
+
+    Raises:
+        json.JSONDecodeError: If config file exists but contains invalid JSON
+        OSError: If there are permission issues reading the file
+    """
+    config_path = get_claude_config_path()
+
+    if config_path is None or not config_path.exists():
+        return {}
+
+    with open(config_path, "r", encoding="utf-8") as f:
+        return json.load(f)
+
+
+def save_claude_config(config: dict) -> Path:
+    """
+    Save the Claude Desktop configuration file.
+
+    Creates the configuration directory if it doesn't exist.
+
+    Args:
+        config: Configuration dictionary to save
+
+    Returns:
+        Path to the saved configuration file
+
+    Raises:
+        OSError: If there are permission issues or the platform is unsupported
+    """
+    system = platform.system()
+
+    if system == "Darwin":  # macOS
+        config_dir = Path.home() / "Library" / "Application Support" / "Claude"
+    elif system == "Windows":
+        appdata = os.environ.get("APPDATA")
+        if not appdata:
+            raise OSError("APPDATA environment variable not set")
+        config_dir = Path(appdata) / "Claude"
+    elif system == "Linux":
+        config_dir = Path.home() / ".config" / "Claude"
+    else:
+        raise OSError(f"Unsupported platform: {system}")
+
+    # Create directory if it doesn't exist
+    config_dir.mkdir(parents=True, exist_ok=True)
+
+    config_file = config_dir / "claude_desktop_config.json"
+
+    # Write config with pretty formatting
+    with open(config_file, "w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2, ensure_ascii=False)
+        f.write("\n")  # Add trailing newline
+
+    return config_file
+
+
+def add_qbraid_mcp_server(overwrite: bool = False) -> tuple[bool, str]:
+    """
+    Add qBraid MCP server configuration to Claude Desktop config.
+
+    Args:
+        overwrite: If True, overwrite existing qbraid entry
+
+    Returns:
+        Tuple of (success: bool, message: str)
+    """
+    # Get the full path to qbraid executable
+    qbraid_path = shutil.which("qbraid")
+    if not qbraid_path:
+        return (
+            False,
+            "Could not find qbraid executable in PATH. "
+            "Please ensure qbraid-cli is installed and accessible.",
+        )
+
+    try:
+        config = load_claude_config()
+    except json.JSONDecodeError as e:
+        return False, f"Invalid JSON in Claude config file: {e}"
+    except OSError as e:
+        return False, f"Error reading Claude config file: {e}"
+
+    # Initialize mcpServers section if it doesn't exist
+    if "mcpServers" not in config:
+        config["mcpServers"] = {}
+
+    # Determine server name
+    server_name = "qbraid"
+
+    # Check if server already exists
+    if server_name in config["mcpServers"] and not overwrite:
+        return (
+            False,
+            f"MCP server '{server_name}' already exists in config. "
+            "Use --overwrite to replace it.",
+        )
+
+    # Build server configuration with full path to qbraid
+    server_config = {"command": qbraid_path, "args": ["mcp", "serve"]}
+
+    # Add server to config
+    config["mcpServers"][server_name] = server_config
+
+    # Save config
+    try:
+        config_path = save_claude_config(config)
+        action = "Updated" if server_name in config["mcpServers"] else "Added"
+        return True, f"{action} MCP server '{server_name}' in [cyan]{config_path}[/cyan]"
+    except OSError as e:
+        return False, f"Error saving Claude config file: {e}"
+
+
+def remove_qbraid_mcp_server() -> tuple[bool, str]:
+    """
+    Remove qBraid MCP server configuration from Claude Desktop config.
+
+    Returns:
+        Tuple of (success: bool, message: str)
+    """
+    try:
+        config = load_claude_config()
+    except json.JSONDecodeError as e:
+        return False, f"Invalid JSON in Claude config file: {e}"
+    except OSError as e:
+        return False, f"Error reading Claude config file: {e}"
+
+    if "mcpServers" not in config:
+        return False, "No mcpServers section found in Claude config"
+
+    server_name = "qbraid"
+
+    if server_name not in config["mcpServers"]:
+        return False, f"MCP server '{server_name}' not found in config"
+
+    # Remove server
+    del config["mcpServers"][server_name]
+
+    # Save config
+    try:
+        config_path = save_claude_config(config)
+        return True, f"Removed MCP server '{server_name}' from [cyan]{config_path}[/cyan]"
+    except OSError as e:
+        return False, f"Error saving Claude config file: {e}"
+
+
+def get_qbraid_mcp_server_config() -> Optional[dict]:
+    """
+    Get qBraid MCP server configuration from Claude Desktop config.
+
+    Returns:
+        Server configuration dict if found, None otherwise
+    """
+    try:
+        config = load_claude_config()
+    except (json.JSONDecodeError, OSError):
+        return None
+
+    if "mcpServers" not in config:
+        return None
+
+    return config["mcpServers"].get("qbraid")

qbraid_cli/devices/app.py

@@ -12,9 +12,9 @@ import typer
 from rich.console import Console
 
 from qbraid_cli.devices.validation import validate_provider, validate_status, validate_type
-from qbraid_cli.handlers import run_progress_task
+from qbraid_cli.handlers import print_formatted_data, run_progress_task
 
-devices_app = typer.Typer(help="Manage qBraid quantum devices.")
+devices_app = typer.Typer(help="Manage qBraid quantum devices.", no_args_is_help=True)
 
 
 @devices_app.command(name="list")
@@ -29,7 +29,10 @@ def devices_list(  # pylint: disable=too-many-branches
         None,
         "--provider",
         "-p",
-        help="'AWS'|'IBM'|'IonQ'|'Rigetti'|'OQC'|'QuEra'",
+        help=(
+            "'AWS'|'IBM'|'IonQ'|'Rigetti'|'OQC'|'QuEra'|'IQM'|"
+            "'NEC'|'qBraid'|'Azure'|'Pasqal'|'Quantinuum'|'Equal1'"
+        ),
         callback=validate_provider,
     ),
 ) -> None:
@@ -60,7 +63,7 @@ def devices_list(  # pylint: disable=too-many-branches
     header_3 = "ID"
     header_4 = "Status"
     console.print(
-        f"\n[bold]{header_1.ljust(12)}{header_2.ljust(35)}{header_3.ljust(41)}{header_4}[/bold]"
+        f"[bold]{header_1.ljust(12)}{header_2.ljust(35)}{header_3.ljust(41)}{header_4}[/bold]"
     )
     for device_provider, device_name, device_id, device_status in device_data:
         if device_status == "ONLINE":
@@ -76,5 +79,25 @@ def devices_list(  # pylint: disable=too-many-branches
     console.print(f"\n{msg}", style="italic", justify="left")
 
 
+@devices_app.command(name="get")
+def devices_get(
+    device_id: str = typer.Argument(..., help="The ID of the device to get."),
+    fmt: bool = typer.Option(
+        True, "--no-fmt", help="Disable rich console formatting (output raw data)"
+    ),
+) -> None:
+    """Get a qBraid quantum device."""
+
+    def get_device():
+        from qbraid_core.services.quantum import QuantumClient
+
+        client = QuantumClient()
+        return client.get_device(device_id)
+
+    data: dict[str, Any] = run_progress_task(get_device)
+
+    print_formatted_data(data, fmt)
+
+
 if __name__ == "__main__":
     devices_app()

qbraid_cli/envs/activate.py

@@ -14,11 +14,15 @@ import typer
 
 def find_shell_rc(shell_path: str) -> str:
     """Finds an existing shell configuration file in the user's home directory."""
-    if "bash" not in shell_path:
+    shell_name = Path(shell_path).name
+    
+    if "bash" in shell_name:
+        possible_files = [".bashrc", ".bash_profile", ".bash_login"]
+    elif "zsh" in shell_name:
+        possible_files = [".zshrc", ".zshenv", ".zprofile"]
+    else:
         raise ValueError(f"Unsupported shell: {shell_path}")
 
-    possible_files = [".bashrc", ".bash_profile", ".bash_login"]
-
     for file_name in possible_files:
         rc_file = Path.home() / file_name
         if rc_file.exists():
@@ -52,14 +56,40 @@ def activate_pyvenv(venv_path: Path):
     if shell_path is None:
         print_activate_command(venv_path)
         return  # Return early since we can't proceed without a shell
+    
+    shell_name = Path(shell_path).name
+    
     try:
         shell_rc = find_shell_rc(shell_path)
     except (FileNotFoundError, ValueError):
         print_activate_command(venv_path)
         return  # Return early since no suitable shell rc file was found
+    
     bin_path = str(venv_path / "bin")
-
-    os.system(
-        f"cat {shell_rc} {bin_path}/activate > {bin_path}/activate2 && "
-        f"{shell_path} --rcfile {bin_path}/activate2"
-    )
+    activate_script = f"{bin_path}/activate"
+    
+    # Combine shell rc and activate script, then launch new shell
+    # This works for both bash and zsh
+    combined_script = f"{bin_path}/activate2"
+    
+    # Create combined script with shell rc and activate script
+    with open(combined_script, "w") as f:
+        f.write(f"# Combined shell rc and activate script\n")
+        with open(shell_rc, "r") as rc:
+            f.write(rc.read())
+        f.write(f"\n# Activate virtual environment\n")
+        with open(activate_script, "r") as act:
+            f.write(act.read())
+    
+    if "zsh" in shell_name:
+        # For zsh, use -d to skip global zshenv/zshrc, then source our combined file
+        # Then exec zsh to get an interactive shell
+        os.system(
+            f"{shell_path} -d -c 'source {combined_script}; exec zsh'"
+        )
+    elif "bash" in shell_name:
+        # For bash, use --rcfile
+        os.system(f"{shell_path} --rcfile {combined_script}")
+    else:
+        # Fallback for other shells
+        print_activate_command(venv_path)