router-maestro 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

router_maestro/__init__.py

@@ -1,3 +1,3 @@
 """Router-Maestro: Multi-model routing and load balancing system."""
 
-__version__ = "0.1.3"
+__version__ = "0.1.5"

router_maestro/cli/config.py

@@ -15,9 +15,17 @@ from rich.table import Table
 from router_maestro.cli.client import ServerNotRunningError, get_admin_client
 from router_maestro.config.server import get_current_context_api_key
 
-app = typer.Typer(no_args_is_help=True)
+app = typer.Typer(invoke_without_command=True)
 console = Console()
 
+# Available CLI tools for configuration
+CLI_TOOLS = {
+    "claude-code": {
+        "name": "Claude Code",
+        "description": "Generate settings.json for Claude Code CLI",
+    },
+}
+
 
 def get_claude_code_paths() -> dict[str, Path]:
     """Get Claude Code settings paths."""
@@ -27,6 +35,33 @@ def get_claude_code_paths() -> dict[str, Path]:
     }
 
 
+@app.callback(invoke_without_command=True)
+def config_callback(ctx: typer.Context) -> None:
+    """Generate configuration for CLI tools (interactive selection if not specified)."""
+    if ctx.invoked_subcommand is not None:
+        return
+
+    # Interactive selection
+    console.print("\n[bold]Available CLI tools:[/bold]")
+    tools = list(CLI_TOOLS.items())
+    for i, (key, info) in enumerate(tools, 1):
+        console.print(f"  {i}. {info['name']} - {info['description']}")
+
+    console.print()
+    choice = Prompt.ask(
+        "Select tool to configure",
+        choices=[str(i) for i in range(1, len(tools) + 1)],
+        default="1",
+    )
+
+    idx = int(choice) - 1
+    tool_key = tools[idx][0]
+
+    # Dispatch to the appropriate command
+    if tool_key == "claude-code":
+        claude_code_config()
+
+
 @app.command(name="claude-code")
 def claude_code_config() -> None:
     """Generate Claude Code CLI settings.json for router-maestro."""
@@ -104,19 +139,29 @@ def claude_code_config() -> None:
     )
     anthropic_url = f"{base_url}/api/anthropic"
 
-    config = {
-        "env": {
-            "ANTHROPIC_BASE_URL": anthropic_url,
-            "ANTHROPIC_AUTH_TOKEN": auth_token,
-            "ANTHROPIC_MODEL": main_model,
-            "ANTHROPIC_SMALL_FAST_MODEL": fast_model,
-            "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC": "1",
-        }
+    env_config = {
+        "ANTHROPIC_BASE_URL": anthropic_url,
+        "ANTHROPIC_AUTH_TOKEN": auth_token,
+        "ANTHROPIC_MODEL": main_model,
+        "ANTHROPIC_SMALL_FAST_MODEL": fast_model,
+        "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC": "1",
     }
 
+    # Load existing settings to preserve other sections (e.g., MCP servers)
+    existing_config: dict = {}
+    if settings_path.exists():
+        try:
+            with open(settings_path, encoding="utf-8") as f:
+                existing_config = json.load(f)
+        except (json.JSONDecodeError, OSError):
+            pass  # If file is corrupted, start fresh
+
+    # Merge: update env section while preserving other sections
+    existing_config["env"] = env_config
+
     settings_path.parent.mkdir(parents=True, exist_ok=True)
     with open(settings_path, "w", encoding="utf-8") as f:
-        json.dump(config, f, indent=2)
+        json.dump(existing_config, f, indent=2)
 
     console.print(
         Panel(

router_maestro/routing/router.py

@@ -382,7 +382,7 @@ class Router:
         try:
             await provider.ensure_token()
             if is_stream:
-                stream = provider.chat_completion_stream(actual_request)
+                stream = await provider.chat_completion_stream(actual_request)
                 logger.info("Stream request routed to %s", provider_name)
                 return stream, provider_name
             else:
@@ -417,7 +417,7 @@ class Router:
                 try:
                     await other_provider.ensure_token()
                     if is_stream:
-                        stream = other_provider.chat_completion_stream(fallback_request)
+                        stream = await other_provider.chat_completion_stream(fallback_request)
                         logger.info("Stream fallback succeeded via %s", other_name)
                         return stream, other_name
                     else:

router_maestro/server/routes/anthropic.py

@@ -26,6 +26,7 @@ from router_maestro.utils import (
     get_logger,
     map_openai_stop_reason_to_anthropic,
 )
+from router_maestro.utils.tokens import AnthropicStopReason
 
 logger = get_logger("server.routes.anthropic")
 
@@ -106,7 +107,7 @@ async def count_tokens(request: AnthropicCountTokensRequest):
 
     # Count messages
     for msg in request.messages:
-        content = msg.content if hasattr(msg, "content") else msg.get("content", "")
+        content = msg.content
         if isinstance(content, str):
             total_chars += len(content)
         elif isinstance(content, list):
@@ -115,12 +116,12 @@ async def count_tokens(request: AnthropicCountTokensRequest):
                     if block.get("type") == "text":
                         total_chars += len(block.get("text", ""))
                 elif hasattr(block, "text"):
-                    total_chars += len(block.text)
+                    total_chars += len(block.text)  # type: ignore[union-attr]
 
     return {"input_tokens": estimate_tokens_from_char_count(total_chars)}
 
 
-def _map_finish_reason(reason: str | None) -> str | None:
+def _map_finish_reason(reason: str | None) -> AnthropicStopReason | None:
     """Map OpenAI finish reason to Anthropic stop reason."""
     return map_openai_stop_reason_to_anthropic(reason)
 
@@ -144,7 +145,7 @@ def _estimate_input_tokens(request: AnthropicMessagesRequest) -> int:
 
     # Count messages
     for msg in request.messages:
-        content = msg.content if hasattr(msg, "content") else msg.get("content", "")
+        content = msg.content
         if isinstance(content, str):
             total_chars += len(content)
         elif isinstance(content, list):
@@ -161,7 +162,7 @@ def _estimate_input_tokens(request: AnthropicMessagesRequest) -> int:
                                 if isinstance(tc, dict) and tc.get("type") == "text":
                                     total_chars += len(tc.get("text", ""))
                 elif hasattr(block, "text"):
-                    total_chars += len(block.text)
+                    total_chars += len(block.text)  # type: ignore[union-attr]
 
     # Count tools definitions if present
     if request.tools:

router_maestro/utils/tokens.py

@@ -1,8 +1,14 @@
 """Token estimation utilities."""
 
+from typing import Literal
+
 # Approximate characters per token for English text
 CHARS_PER_TOKEN = 4
 
+AnthropicStopReason = Literal[
+    "end_turn", "max_tokens", "stop_sequence", "tool_use", "pause_turn", "refusal"
+]
+
 
 def estimate_tokens(text: str) -> int:
     """Estimate token count from text.
@@ -31,7 +37,9 @@ def estimate_tokens_from_char_count(char_count: int) -> int:
     return char_count // CHARS_PER_TOKEN
 
 
-def map_openai_stop_reason_to_anthropic(openai_reason: str | None) -> str | None:
+def map_openai_stop_reason_to_anthropic(
+    openai_reason: str | None,
+) -> AnthropicStopReason | None:
     """Map OpenAI finish reason to Anthropic stop reason.
 
     Args:
@@ -42,7 +50,7 @@ def map_openai_stop_reason_to_anthropic(openai_reason: str | None) -> str | None
     """
     if openai_reason is None:
         return None
-    mapping = {
+    mapping: dict[str, AnthropicStopReason] = {
         "stop": "end_turn",
         "length": "max_tokens",
         "tool_calls": "tool_use",

{router_maestro-0.1.3.dist-info → router_maestro-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: router-maestro
-Version: 0.1.3
+Version: 0.1.5
 Summary: Multi-model routing and load balancing system with OpenAI-compatible API
 Author-email: Kanwen Li <likanwen@icloud.com>
 License-Expression: MIT
@@ -132,8 +132,8 @@ router-maestro config claude-code
 
 Models are identified using the format `{provider}/{model-id}`:
 
-| Example | Description |
-|---------|-------------|
+| Example                           | Description                         |
+| --------------------------------- | ----------------------------------- |
 | `github-copilot/gpt-4o` | GPT-4o via GitHub Copilot |
 | `github-copilot/claude-sonnet-4` | Claude Sonnet 4 via GitHub Copilot |
 | `openai/gpt-4-turbo` | GPT-4 Turbo via OpenAI |
@@ -164,8 +164,8 @@ router-maestro model priority list
 
 **Fallback** triggers when a request fails with a retryable error (429, 5xx):
 
-| Strategy | Behavior |
-|----------|----------|
+| Strategy     | Behavior                             |
+| ------------ | ------------------------------------ |
 | `priority` | Try next model in priorities list |
 | `same-model` | Try same model on different provider |
 | `none` | Fail immediately |
@@ -195,8 +195,8 @@ POST /v1/chat/completions  {"model": "anthropic/claude-3-5-sonnet", ...}
 
 A **context** is a named connection profile that stores an endpoint URL and API key. Contexts let you manage multiple Router-Maestro deployments from a single CLI.
 
-| Context | Use Case |
-|---------|----------|
+| Context  | Use Case                                   |
+| -------- | ------------------------------------------ |
 | `local` | Default context for `router-maestro server start` |
 | `docker` | Connect to a local Docker container |
 | `my-vps` | Connect to a remote VPS deployment |
@@ -216,25 +216,25 @@ router-maestro model list
 
 ### Server
 
-| Command | Description |
-|---------|-------------|
-| `server start --port 8080` | Start the server |
+| Command                    | Description        |
+| -------------------------- | ------------------ |
+| `server start --port 8080` | Start the server   |
 | `server stop` | Stop the server |
 | `server info` | Show server status |
 
 ### Authentication
 
-| Command | Description |
-|---------|-------------|
-| `auth login [provider]` | Authenticate with a provider |
+| Command                 | Description                    |
+| ----------------------- | ------------------------------ |
+| `auth login [provider]` | Authenticate with a provider   |
 | `auth logout <provider>` | Remove authentication |
 | `auth list` | List authenticated providers |
 
 ### Models
 
-| Command | Description |
-|---------|-------------|
-| `model list` | List available models |
+| Command                            | Description            |
+| ---------------------------------- | ---------------------- |
+| `model list`                       | List available models  |
 | `model refresh` | Refresh models cache |
 | `model priority list` | Show priorities |
 | `model priority <model> --position <n>` | Set priority |
@@ -242,9 +242,9 @@ router-maestro model list
 
 ### Contexts (Remote Management)
 
-| Command | Description |
-|---------|-------------|
-| `context show` | Show current context |
+| Command                                              | Description          |
+| ---------------------------------------------------- | -------------------- |
+| `context show`                                       | Show current context |
 | `context list` | List all contexts |
 | `context set <name>` | Switch context |
 | `context add <name> --endpoint <url> --api-key <key>` | Add remote context |
@@ -252,8 +252,8 @@ router-maestro model list
 
 ### Other
 
-| Command | Description |
-|---------|-------------|
+| Command              | Description                   |
+| -------------------- | ----------------------------- |
 | `config claude-code` | Generate Claude Code settings |
 
 ## API Reference
@@ -301,8 +301,8 @@ POST /api/admin/models/refresh   # Refresh model cache
 
 Following XDG Base Directory specification:
 
-| Type | Path | Contents |
-|------|------|----------|
+| Type       | Path                               | Contents                     |
+| ---------- | ---------------------------------- | ---------------------------- |
 | **Config** | `~/.config/router-maestro/` | |
 | | `providers.json` | Custom provider definitions |
 | | `priorities.json` | Model priorities and fallback |
@@ -340,8 +340,8 @@ export OLLAMA_API_KEY="sk-..."
 
 Configuration files are automatically reloaded every 5 minutes:
 
-| File | Auto-Reload |
-|------|-------------|
+| File               | Auto-Reload      |
+| ------------------ | ---------------- |
 | `priorities.json` | ✓ (5 min) |
 | `providers.json` | ✓ (5 min) |
 | `auth.json` | Requires restart |
@@ -405,6 +405,7 @@ router-maestro model list
 The Docker Compose setup includes Traefik for automatic HTTPS via Let's Encrypt with DNS challenge.
 
 For detailed configuration options including:
+
 - Other DNS providers (Route53, DigitalOcean, etc.)
 - HTTP challenge setup
 - Traefik dashboard configuration

{router_maestro-0.1.3.dist-info → router_maestro-0.1.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-router_maestro/__init__.py,sha256=uL361mf7XE2DqHpdJ9tIuNVF8iku3OIPbWlNADxwL5s,92
+router_maestro/__init__.py,sha256=E3wx7rchrL5OkqXGemj0n4c8To9tSZh-9KiPk7jpf5o,92
 router_maestro/__main__.py,sha256=cUHr8B7JBiv5HhnN6l2iayDkGSBpI5Kf4I3jv9I_I3o,121
 router_maestro/auth/__init__.py,sha256=0JgD1w2gtGSkj809kgSKQanYYkncg6eF-hHoz-jQPgo,353
 router_maestro/auth/github_oauth.py,sha256=acQlAA2Zh6c8KQYdzXbC4ww0EJ41AgvbI5ixpFuNoRg,5060
@@ -7,7 +7,7 @@ router_maestro/auth/storage.py,sha256=TCLxgQ1lWcWD4xJXJzx5OMpvuAun_LSRItK0zhR6H0
 router_maestro/cli/__init__.py,sha256=yIAshaHpLL0WrDFmRpoMRM2EUe75x0wmM5NlGW3C89s,37
 router_maestro/cli/auth.py,sha256=eq5LBUohbMnHS4dZeyvq4OQAjzdrJ-StP2FGuUhkKa0,5940
 router_maestro/cli/client.py,sha256=mRzpsA_Dxn-Xq7W1_t6EiyddMI0a3cvuTL6-2JuV4mE,9383
-router_maestro/cli/config.py,sha256=lVmMlUASUynbqOQawuQQhi8C3h2OvGScZvaeIArZ2ns,4662
+router_maestro/cli/config.py,sha256=SGrWdd59eX1F8KzhHMJ_u2AkYfFuYlyLl6Nfz6u_rNk,6100
 router_maestro/cli/context.py,sha256=EPbT7fReIW17veU76CSAcv8QjzMsCIPm1QDBlGsV8fQ,4549
 router_maestro/cli/main.py,sha256=5yiK4Q149goSB2KKzgMuF5EpcC8FBzOUCkEt8wY5NAU,1314
 router_maestro/cli/model.py,sha256=2IG3IpQWh8Ejdv5Htcgr90O2v2UAa80TU15oOniPdvk,9054
@@ -26,7 +26,7 @@ router_maestro/providers/copilot.py,sha256=NieOXBecwymSnB1Nm_JKVvzeZyZnO8g6Y1kNa
 router_maestro/providers/openai.py,sha256=Bsq5mzAVf4CawH2Tn80y3-MyLLVeZ3VsPxGDNH1t_Nk,7647
 router_maestro/providers/openai_compat.py,sha256=ef4RttKVZUTBiRed4BEuC2Jg8vr5GM7YqPUtFYeAhZo,6383
 router_maestro/routing/__init__.py,sha256=eCEQVbg1LAfcSVLQZpZtYf8ImbOhFIaR7POUb1pCbXM,169
-router_maestro/routing/router.py,sha256=4T-yBI9fCRKXeyjeVT6aSfALj2OMaNwsn11qXntno-o,20390
+router_maestro/routing/router.py,sha256=uPk_sSyxdcmq-b-LJgPwtQOLNXDAvjDjs2A8po7MqQE,20402
 router_maestro/server/__init__.py,sha256=YzExJfP0jw6hXx84lo0yPVU0wG17B16SfdyEpjstpxk,128
 router_maestro/server/app.py,sha256=rI2TuCS_STzmzdds5Tq2vzoP9y9bpRFJJwNs5e8uTbU,2707
 router_maestro/server/oauth_sessions.py,sha256=r_VM6vAtbo5HAmXjYt6XoECBcWGxqABKGbVmW8HoCz0,4625
@@ -35,7 +35,7 @@ router_maestro/server/middleware/__init__.py,sha256=PhtP2E04wApnOUBLE76mrOa0sSHp
 router_maestro/server/middleware/auth.py,sha256=Ak3k5cC8m4qPGUIheuOB--QiFvs6GIAcTRJqtCGCjAA,2018
 router_maestro/server/routes/__init__.py,sha256=eGEpNCnSRVQC1pFL7_evDmZfkMrviuI-n1okAS-YnhM,397
 router_maestro/server/routes/admin.py,sha256=oub4hDrYaytuorXkJzmz0YZ4Z2rcyNuwKcK_4IGvcDY,8942
-router_maestro/server/routes/anthropic.py,sha256=T5-rHBPDyPxP4Cs0yzm7Kvvn-zgV6jspnZdoSVDeH2w,8041
+router_maestro/server/routes/anthropic.py,sha256=3ILc6m9UlqSsRsWXZYk7DWSu1o5LI7FZgoqPo16D56U,8063
 router_maestro/server/routes/chat.py,sha256=vyYX1ILhgAb9HYD87h1U3c5btpplqkTaejA81pWg4Oo,4752
 router_maestro/server/routes/models.py,sha256=PTSXojNFN9j90Bke74ZO6sEsfIc8u_4A69eW1QzFIbc,716
 router_maestro/server/schemas/__init__.py,sha256=VmJZoTMLb-bF33m79urhbejVdLfjDGMqCJP5QvWbHsU,1176
@@ -44,9 +44,9 @@ router_maestro/server/schemas/anthropic.py,sha256=hNl6rZ7AX-HdLxtsd0cWpZjpIyK1Ak
 router_maestro/server/schemas/openai.py,sha256=s2487RYIn1h-CIaUpLue9BScDaTsafbVg5yc-kKhfME,2141
 router_maestro/utils/__init__.py,sha256=oSQyV--FueMPggRfjWWVnAKtjkcZWFOm9hCTymu0oZU,409
 router_maestro/utils/logging.py,sha256=gJWoRYibAxCWn4VmTmnrwpBRzQ7Uu5YIEk5zDiF9X_k,2393
-router_maestro/utils/tokens.py,sha256=t2E5BrrE5X3VCgw-rYFMkic7heJ0huj9rrOXAIlKq8o,1330
-router_maestro-0.1.3.dist-info/METADATA,sha256=vk_n3Hqc8v9d6uBHNcZgjlA5oSvfcLZSwhD2sMXai1o,11343
-router_maestro-0.1.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-router_maestro-0.1.3.dist-info/entry_points.txt,sha256=zoFUxxvNcFe0nTgpRbIdygIDEOla3KbvW6HbOCOlgv4,63
-router_maestro-0.1.3.dist-info/licenses/LICENSE,sha256=Ea86BSGu7_tpLAuzif_JmM9zjMoKQEf95VVF9sZw3Jo,1084
-router_maestro-0.1.3.dist-info/RECORD,,
+router_maestro/utils/tokens.py,sha256=U5PXJv_6ba5xgMBG0c5qB96Yu6uLscSUjMWYTdNests,1530
+router_maestro-0.1.5.dist-info/METADATA,sha256=xqHRuMfsP0uG-H9Vv89iWmH0-wjaMrdGvuov1WH4juA,12161
+router_maestro-0.1.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+router_maestro-0.1.5.dist-info/entry_points.txt,sha256=zoFUxxvNcFe0nTgpRbIdygIDEOla3KbvW6HbOCOlgv4,63
+router_maestro-0.1.5.dist-info/licenses/LICENSE,sha256=Ea86BSGu7_tpLAuzif_JmM9zjMoKQEf95VVF9sZw3Jo,1084
+router_maestro-0.1.5.dist-info/RECORD,,