Merge remote-tracking branch 'origin/dev' into feature/anthropic-endpoints

Author: FammasMaz

src/proxy_app/quota_viewer.py

@@ -151,6 +151,11 @@ def get_scheme_for_host(host: str, port: int) -> str:
     return "http"
 
 
+def is_full_url(host: str) -> bool:
+    """Check if host is already a full URL (starts with http:// or https://)."""
+    return host.startswith("http://") or host.startswith("https://")
+
+
 def format_cooldown(seconds: int) -> str:
     """Format cooldown seconds as human-readable string."""
     if seconds < 60:
@@ -210,10 +215,57 @@ def _get_base_url(self) -> str:
         if not self.current_remote:
             return "http://127.0.0.1:8000"
         host = self.current_remote.get("host", "127.0.0.1")
+
+        # If host is a full URL, use it directly (strip trailing slash)
+        if is_full_url(host):
+            return host.rstrip("/")
+
+        # Otherwise construct from host:port
         port = self.current_remote.get("port", 8000)
         scheme = get_scheme_for_host(host, port)
         return f"{scheme}://{host}:{port}"
 
+    def _build_endpoint_url(self, endpoint: str) -> str:
+        """
+        Build a full endpoint URL with smart path handling.
+
+        Handles cases where base URL already contains a path (e.g., /v1):
+        - Base: "https://api.example.com/v1", Endpoint: "/v1/quota-stats"
+          -> "https://api.example.com/v1/quota-stats" (no duplication)
+        - Base: "http://localhost:8000", Endpoint: "/v1/quota-stats"
+          -> "http://localhost:8000/v1/quota-stats"
+
+        Args:
+            endpoint: The endpoint path (e.g., "/v1/quota-stats")
+
+        Returns:
+            Full URL string
+        """
+        base_url = self._get_base_url()
+        endpoint = endpoint.lstrip("/")
+
+        # Check if base URL already ends with a path segment that matches
+        # the start of the endpoint (e.g., base ends with /v1, endpoint starts with v1/)
+        from urllib.parse import urlparse
+
+        parsed = urlparse(base_url)
+        base_path = parsed.path.rstrip("/")
+
+        # If base has a path and endpoint starts with the same segment, avoid duplication
+        if base_path:
+            # e.g., base_path = "/v1", endpoint = "v1/quota-stats"
+            # We want to produce "/v1/quota-stats", not "/v1/v1/quota-stats"
+            base_segments = base_path.split("/")
+            endpoint_segments = endpoint.split("/")
+
+            # Check if first endpoint segment matches last base segment
+            if base_segments and endpoint_segments:
+                if base_segments[-1] == endpoint_segments[0]:
+                    # Skip the duplicated segment in endpoint
+                    endpoint = "/".join(endpoint_segments[1:])
+
+        return f"{base_url}/{endpoint}"
+
     def check_connection(
         self, remote: Dict[str, Any], timeout: float = 3.0
     ) -> Tuple[bool, str]:
@@ -228,9 +280,18 @@ def check_connection(
             Tuple of (is_online, status_message)
         """
         host = remote.get("host", "127.0.0.1")
-        port = remote.get("port", 8000)
-        scheme = get_scheme_for_host(host, port)
-        url = f"{scheme}://{host}:{port}/"
+
+        # If host is a full URL, extract scheme and netloc to hit root
+        if is_full_url(host):
+            from urllib.parse import urlparse
+
+            parsed = urlparse(host)
+            # Hit the root domain, not the path (e.g., /v1 would 404)
+            url = f"{parsed.scheme}://{parsed.netloc}/"
+        else:
+            port = remote.get("port", 8000)
+            scheme = get_scheme_for_host(host, port)
+            url = f"{scheme}://{host}:{port}/"
 
         headers = {}
         if remote.get("api_key"):
@@ -262,7 +323,7 @@ def fetch_stats(self, provider: Optional[str] = None) -> Optional[Dict[str, Any]
         Returns:
             Stats dict or None on failure
         """
-        url = f"{self._get_base_url()}/v1/quota-stats"
+        url = self._build_endpoint_url("/v1/quota-stats")
         if provider:
             url += f"?provider={provider}"
 
@@ -437,7 +498,7 @@ def post_action(
         Returns:
             Response dict or None on failure
         """
-        url = f"{self._get_base_url()}/v1/quota-stats"
+        url = self._build_endpoint_url("/v1/quota-stats")
         payload = {
             "action": action,
             "scope": scope,
@@ -517,6 +578,14 @@ def show_summary_screen(self):
         remote_host = self.current_remote.get("host", "") if self.current_remote else ""
         remote_port = self.current_remote.get("port", "") if self.current_remote else ""
 
+        # Format connection display - handle full URLs
+        if is_full_url(remote_host):
+            connection_display = remote_host
+        elif remote_port:
+            connection_display = f"{remote_host}:{remote_port}"
+        else:
+            connection_display = remote_host
+
         # Calculate data age
         data_age = ""
         if self.cached_stats and self.cached_stats.get("timestamp"):
@@ -535,7 +604,7 @@ def show_summary_screen(self):
         )
         self.console.print("━" * 78)
         self.console.print(
-            f"Connected to: [bold]{remote_name}[/bold] ({remote_host}:{remote_port}) "
+            f"Connected to: [bold]{remote_name}[/bold] ({connection_display}) "
             f"[green]✅[/green] | {data_age}"
         )
         self.console.print()
@@ -1118,7 +1187,15 @@ def show_switch_remote_screen(self):
         for idx, (remote, is_online, status_msg) in enumerate(remote_status, 1):
             name = remote.get("name", "Unknown")
             host = remote.get("host", "")
-            port = remote.get("port", 8000)
+            port = remote.get("port", "")
+
+            # Format connection display - handle full URLs
+            if is_full_url(host):
+                connection_display = host
+            elif port:
+                connection_display = f"{host}:{port}"
+            else:
+                connection_display = host
 
             is_current = name == current_name
             current_marker = " (current)" if is_current else ""
@@ -1129,7 +1206,7 @@ def show_switch_remote_screen(self):
                 status_icon = f"[red]⚠️ {status_msg}[/red]"
 
             self.console.print(
-                f"   {idx}. {name:<20} {host}:{port:<6} {status_icon}{current_marker}"
+                f"   {idx}. {name:<20} {connection_display:<30} {status_icon}{current_marker}"
             )
 
         self.console.print()
@@ -1253,23 +1330,37 @@ def _add_remote_dialog(self):
         """Dialog to add a new remote."""
         self.console.print()
         self.console.print("[bold]Add New Remote[/bold]")
+        self.console.print(
+            "[dim]For full URLs (e.g., https://api.example.com/v1), leave port empty[/dim]"
+        )
         self.console.print()
 
         name = Prompt.ask("Name", default="").strip()
         if not name:
             self.console.print("[dim]Cancelled.[/dim]")
             return
 
-        host = Prompt.ask("Host", default="").strip()
+        host = Prompt.ask("Host (or full URL)", default="").strip()
         if not host:
             self.console.print("[dim]Cancelled.[/dim]")
             return
 
-        port_str = Prompt.ask("Port", default="8000").strip()
-        try:
-            port = int(port_str)
-        except ValueError:
-            port = 8000
+        # For full URLs, default to empty port
+        if is_full_url(host):
+            port_default = ""
+        else:
+            port_default = "8000"
+
+        port_str = Prompt.ask(
+            "Port (empty for full URLs)", default=port_default
+        ).strip()
+        if port_str == "":
+            port = ""
+        else:
+            try:
+                port = int(port_str)
+            except ValueError:
+                port = 8000
 
         api_key = Prompt.ask("API Key (optional)", default="").strip() or None
 
@@ -1284,16 +1375,30 @@ def _edit_remote_dialog(self, remote: Dict[str, Any]):
         """Dialog to edit an existing remote."""
         self.console.print()
         self.console.print(f"[bold]Edit Remote: {remote['name']}[/bold]")
-        self.console.print("[dim]Press Enter to keep current value[/dim]")
+        self.console.print(
+            "[dim]Press Enter to keep current value. For full URLs, leave port empty.[/dim]"
+        )
         self.console.print()
 
         new_name = Prompt.ask("Name", default=remote["name"]).strip()
-        new_host = Prompt.ask("Host", default=remote.get("host", "")).strip()
-        new_port_str = Prompt.ask("Port", default=str(remote.get("port", 8000))).strip()
-        try:
-            new_port = int(new_port_str)
-        except ValueError:
-            new_port = remote.get("port", 8000)
+        new_host = Prompt.ask(
+            "Host (or full URL)", default=remote.get("host", "")
+        ).strip()
+
+        # Get current port, handle empty string
+        current_port = remote.get("port", "")
+        port_default = str(current_port) if current_port != "" else ""
+
+        new_port_str = Prompt.ask(
+            "Port (empty for full URLs)", default=port_default
+        ).strip()
+        if new_port_str == "":
+            new_port = ""
+        else:
+            try:
+                new_port = int(new_port_str)
+            except ValueError:
+                new_port = current_port if current_port != "" else 8000
 
         current_key = remote.get("api_key", "") or ""
         display_key = f"{current_key[:8]}..." if len(current_key) > 8 else current_key

src/proxy_app/quota_viewer_config.py

@@ -9,7 +9,7 @@
 
 import json
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 
 class QuotaViewerConfig:
@@ -109,7 +109,7 @@ def add_remote(
         self,
         name: str,
         host: str,
-        port: int = 8000,
+        port: Optional[Union[int, str]] = 8000,
         api_key: Optional[str] = None,
         is_default: bool = False,
     ) -> bool:
@@ -118,8 +118,8 @@ def add_remote(
 
         Args:
             name: Display name for the remote
-            host: Hostname or IP address
-            port: Port number (default 8000)
+            host: Hostname, IP address, or full URL (e.g., https://api.example.com/v1)
+            port: Port number (default 8000). Can be None or empty string for full URLs.
             api_key: Optional API key for authentication
             is_default: Whether this should be the default remote
 
@@ -135,10 +135,18 @@ def add_remote(
             for remote in self.config.get("remotes", []):
                 remote["is_default"] = False
 
+        # Normalize port - allow empty/None for full URL hosts
+        if port == "" or port is None:
+            normalized_port = ""
+        else:
+            normalized_port = (
+                int(port) if isinstance(port, str) and port.isdigit() else port
+            )
+
         remote = {
             "name": name,
             "host": host,
-            "port": port,
+            "port": normalized_port,
             "api_key": api_key,
             "is_default": is_default,
         }
@@ -152,6 +160,7 @@ def update_remote(self, name: str, **kwargs) -> bool:
         Args:
             name: Name of the remote to update
             **kwargs: Fields to update (host, port, api_key, is_default, new_name)
+                      port can be int, str, or empty string for full URL hosts
 
         Returns:
             True on success, False if remote not found