ccproxy-api 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

ccproxy/cli/options/claude_options.py

@@ -78,99 +78,7 @@ def validate_cwd(
     return value
 
 
-def max_thinking_tokens_option() -> Any:
-    """Max thinking tokens parameter."""
-    return typer.Option(
-        None,
-        "--max-thinking-tokens",
-        help="Maximum thinking tokens for Claude Code",
-        callback=validate_max_thinking_tokens,
-        rich_help_panel="Claude Settings",
-    )
-
-
-def allowed_tools_option() -> Any:
-    """Allowed tools parameter."""
-    return typer.Option(
-        None,
-        "--allowed-tools",
-        help="List of allowed tools (comma-separated)",
-        rich_help_panel="Claude Settings",
-    )
-
-
-def disallowed_tools_option() -> Any:
-    """Disallowed tools parameter."""
-    return typer.Option(
-        None,
-        "--disallowed-tools",
-        help="List of disallowed tools (comma-separated)",
-        rich_help_panel="Claude Settings",
-    )
-
-
-def claude_cli_path_option() -> Any:
-    """Claude CLI path parameter."""
-    return typer.Option(
-        None,
-        "--claude-cli-path",
-        help="Path to Claude CLI executable",
-        callback=validate_claude_cli_path,
-        rich_help_panel="Claude Settings",
-    )
-
-
-def append_system_prompt_option() -> Any:
-    """Append system prompt parameter."""
-    return typer.Option(
-        None,
-        "--append-system-prompt",
-        help="Additional system prompt to append",
-        rich_help_panel="Claude Settings",
-    )
-
-
-def permission_mode_option() -> Any:
-    """Permission mode parameter."""
-    return typer.Option(
-        None,
-        "--permission-mode",
-        help="Permission mode: default, acceptEdits, or bypassPermissions",
-        callback=validate_permission_mode,
-        rich_help_panel="Claude Settings",
-    )
-
-
-def max_turns_option() -> Any:
-    """Max turns parameter."""
-    return typer.Option(
-        None,
-        "--max-turns",
-        help="Maximum conversation turns",
-        callback=validate_max_turns,
-        rich_help_panel="Claude Settings",
-    )
-
-
-def cwd_option() -> Any:
-    """Working directory parameter."""
-    return typer.Option(
-        None,
-        "--cwd",
-        help="Working directory path",
-        callback=validate_cwd,
-        rich_help_panel="Claude Settings",
-    )
-
-
-def permission_prompt_tool_name_option() -> Any:
-    """Permission prompt tool name parameter."""
-    return typer.Option(
-        None,
-        "--permission-prompt-tool-name",
-        help="Permission prompt tool name",
-        rich_help_panel="Claude Settings",
-    )
+# Factory functions removed - use Annotated syntax directly in commands
 
 
 class ClaudeOptions:

ccproxy/cli/options/core_options.py

@@ -6,19 +6,7 @@ from typing import Any
 import typer
 
 
-def config_option() -> Any:
-    """Configuration file parameter."""
-    return typer.Option(
-        None,
-        "--config",
-        "-c",
-        help="Path to configuration file (TOML, JSON, or YAML)",
-        exists=True,
-        file_okay=True,
-        dir_okay=False,
-        readable=True,
-        rich_help_panel="Configuration",
-    )
+# Factory functions removed - use Annotated syntax directly in commands
 
 
 class CoreOptions:

ccproxy/cli/options/security_options.py

@@ -18,15 +18,7 @@ def validate_auth_token(
     return value
 
 
-def auth_token_option() -> Any:
-    """Auth token parameter."""
-    return typer.Option(
-        None,
-        "--auth-token",
-        help="Bearer token for API authentication",
-        callback=validate_auth_token,
-        rich_help_panel="Security Settings",
-    )
+# Factory functions removed - use Annotated syntax directly in commands
 
 
 class SecurityOptions:

ccproxy/cli/options/server_options.py

@@ -32,58 +32,7 @@ def validate_log_level(
     return value.upper()
 
 
-def port_option() -> Any:
-    """Port parameter."""
-    return typer.Option(
-        None,
-        "--port",
-        "-p",
-        help="Port to run the server on",
-        callback=validate_port,
-        rich_help_panel="Server Settings",
-    )
-
-
-def host_option() -> Any:
-    """Host parameter."""
-    return typer.Option(
-        None,
-        "--host",
-        "-h",
-        help="Host to bind the server to",
-        rich_help_panel="Server Settings",
-    )
-
-
-def reload_option() -> Any:
-    """Reload parameter."""
-    return typer.Option(
-        None,
-        "--reload/--no-reload",
-        help="Enable auto-reload for development",
-        rich_help_panel="Server Settings",
-    )
-
-
-def log_level_option() -> Any:
-    """Log level parameter."""
-    return typer.Option(
-        None,
-        "--log-level",
-        help="Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)",
-        callback=validate_log_level,
-        rich_help_panel="Server Settings",
-    )
-
-
-def log_file_option() -> Any:
-    """Log file parameter."""
-    return typer.Option(
-        None,
-        "--log-file",
-        help="Path to JSON log file. If specified, logs will be written to this file in JSON format",
-        rich_help_panel="Server Settings",
-    )
+# Factory functions removed - use Annotated syntax directly in commands
 
 
 class ServerOptions:

ccproxy/config/auth.py

@@ -10,9 +10,9 @@ from pydantic import BaseModel, Field, field_validator
 def _get_default_storage_paths() -> list[Path]:
     """Get default storage paths"""
     return [
-        Path("~/.config/claude/.credentials.json"),
-        Path("~/.claude/.credentials.json"),
         Path("~/.config/ccproxy/credentials.json"),
+        Path("~/.claude/.credentials.json"),
+        Path("~/.config/claude/.credentials.json"),
     ]
 
 

ccproxy/config/docker_settings.py

@@ -158,7 +158,7 @@ class DockerSettings(BaseModel):
     """Docker configuration settings for running Claude commands in containers."""
 
     docker_image: str = Field(
-        default=f"ghcr.io/caddyglow/ccproxy:{format_version(__version__, level='docker')}",
+        default=f"ghcr.io/caddyglow/ccproxy-api:{format_version(__version__, level='docker')}",
         description="Docker image to use for Claude commands",
     )
 

ccproxy/config/pricing.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 
 from pydantic import Field, field_validator
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 from ccproxy.core.system import get_xdg_cache_home
 
@@ -81,8 +81,7 @@ class PricingSettings(BaseSettings):
             raise ValueError("Source URL must start with http:// or https://")
         return v
 
-    class Config:
-        """Pydantic configuration."""
-
-        env_prefix = "PRICING__"
-        case_sensitive = False
+    model_config = SettingsConfigDict(
+        env_prefix="PRICING__",
+        case_sensitive=False,
+    )

ccproxy/config/scheduler.py

@@ -1,7 +1,7 @@
 """Scheduler configuration settings."""
 
 from pydantic import Field
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class SchedulerSettings(BaseSettings):
@@ -82,8 +82,7 @@ class SchedulerSettings(BaseSettings):
         description="Interval in seconds between stats printing",
     )
 
-    class Config:
-        """Pydantic configuration."""
-
-        env_prefix = "SCHEDULER__"
-        case_sensitive = False
+    model_config = SettingsConfigDict(
+        env_prefix="SCHEDULER__",
+        case_sensitive=False,
+    )

ccproxy/core/async_utils.py

@@ -319,7 +319,7 @@ def format_version(version: str, level: str) -> str:
         # Docker-compatible version (no + characters)
         if suffix:
             return f"{base_version}-{suffix}"
-        return base_version
+        return f"{major}.{minor}"
     elif level == "npm":
         # NPM-compatible version
         if suffix:

ccproxy/core/types.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass, field
 from enum import Enum
 from typing import Any, Optional, Union
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 
 class ProxyMethod(str, Enum):
@@ -106,10 +106,7 @@ class ProxyConfig(BaseModel):
         default=10, description="Maximum number of redirects to follow"
     )
 
-    class Config:
-        """Pydantic configuration."""
-
-        extra = "forbid"
+    model_config = ConfigDict(extra="forbid")
 
 
 class MiddlewareConfig(BaseModel):
@@ -123,7 +120,4 @@ class MiddlewareConfig(BaseModel):
         default_factory=dict, description="Additional middleware configuration"
     )
 
-    class Config:
-        """Pydantic configuration."""
-
-        extra = "allow"
+    model_config = ConfigDict(extra="allow")

ccproxy/models/messages.py

@@ -34,8 +34,7 @@ class MetadataParams(BaseModel):
         Field(description="External identifier for the user", max_length=256),
     ] = None
 
-    class Config:
-        extra = "allow"  # Allow additional fields in metadata
+    model_config = ConfigDict(extra="allow")  # Allow additional fields in metadata
 
 
 class ToolChoiceParams(BaseModel):

ccproxy/pricing/models.py

@@ -4,7 +4,7 @@ from collections.abc import Iterator
 from decimal import Decimal
 from typing import Any
 
-from pydantic import BaseModel, Field, RootModel, field_validator
+from pydantic import BaseModel, ConfigDict, Field, RootModel, field_validator
 
 
 class ModelPricing(BaseModel):
@@ -32,11 +32,10 @@ class ModelPricing(BaseModel):
             return v
         raise TypeError(f"Cannot convert {type(v)} to Decimal")
 
-    class Config:
-        """Pydantic configuration."""
-
-        arbitrary_types_allowed = True
-        json_encoders = {Decimal: lambda v: float(v)}
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+        json_encoders={Decimal: lambda v: float(v)},
+    )
 
 
 class PricingData(RootModel[dict[str, ModelPricing]]):

ccproxy/services/claude_sdk_service.py

@@ -18,6 +18,7 @@ from ccproxy.auth.manager import AuthManager
 from ccproxy.claude_sdk.client import ClaudeSDKClient
 from ccproxy.claude_sdk.converter import MessageConverter
 from ccproxy.claude_sdk.options import OptionsHandler
+from ccproxy.config.settings import Settings
 from ccproxy.core.errors import (
     ClaudeProxyError,
     ServiceUnavailableError,
@@ -44,6 +45,7 @@ class ClaudeSDKService:
         sdk_client: ClaudeSDKClient | None = None,
         auth_manager: AuthManager | None = None,
         metrics: PrometheusMetrics | None = None,
+        settings: Settings | None = None,
     ) -> None:
         """
         Initialize Claude SDK service.
@@ -52,12 +54,14 @@ class ClaudeSDKService:
             sdk_client: Claude SDK client instance
             auth_manager: Authentication manager (optional)
             metrics: Prometheus metrics instance (optional)
+            settings: Application settings (optional)
         """
         self.sdk_client = sdk_client or ClaudeSDKClient()
         self.auth_manager = auth_manager
         self.metrics = metrics
+        self.settings = settings
         self.message_converter = MessageConverter()
-        self.options_handler = OptionsHandler()
+        self.options_handler = OptionsHandler(settings=settings)
 
     async def create_completion(
         self,

ccproxy/services/proxy_service.py

@@ -446,7 +446,10 @@ class ProxyService:
     async def _get_access_token(self) -> str:
         """Get access token for upstream authentication.
 
-        Tries configured auth_token first, then falls back to OAuth credentials.
+        Uses OAuth credentials from Claude CLI for upstream authentication.
+
+        NOTE: The SECURITY__AUTH_TOKEN is only for authenticating incoming requests,
+        not for upstream authentication.
 
         Returns:
             Valid access token
@@ -454,12 +457,8 @@ class ProxyService:
         Raises:
             HTTPException: If no valid token is available
         """
-        # First try to get configured auth_token from settings
-        if self.settings.security.auth_token:
-            logger.debug("using_configured_auth_token")
-            return self.settings.security.auth_token
-
-        # Fall back to OAuth credentials
+        # Always use OAuth credentials for upstream authentication
+        # The SECURITY__AUTH_TOKEN is only for client authentication, not upstream
         try:
             access_token = await self.credentials_manager.get_access_token()
             if not access_token:

{ccproxy_api-0.1.0.dist-info → ccproxy_api-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccproxy-api
-Version: 0.1.0
+Version: 0.1.2
 Summary: API server that provides an Anthropic and OpenAI compatible interface over Claude Code, allowing to use your Claude OAuth account or over the API.
 License-File: LICENSE
 Requires-Python: >=3.11
@@ -43,14 +43,26 @@ It includes a translation layer to support both Anthropic and OpenAI-compatible
 # The official claude-code CLI is required for SDK mode
 npm install -g @anthropic-ai/claude-code
 
-# Install ccproxy
-pipx install git+https://github.com/caddyglow/ccproxy-api.git@dev
+# run it with uv
+uvx ccproxy-api
+
+# run it with pipx
+pipx run ccproxy-api
+
+# install with uv
+uv tool install ccproxy-api
+
+# Install ccproxy with pip
+pipx install ccproxy-api
 
 # Optional: Enable shell completion
 eval "$(ccproxy --show-completion zsh)"  # For zsh
 eval "$(ccproxy --show-completion bash)" # For bash
 ```
 
+
+For dev version replace `ccproxy-api` with `git+https://github.com/caddyglow/ccproxy-api.git@dev`
+
 ## Authentication
 
 The proxy uses two different authentication mechanisms depending on the mode.
@@ -61,12 +73,23 @@ The proxy uses two different authentication mechanisms depending on the mode.
     claude /login
     ```
 
+    It's also possible now to get a long live token to avoid renewing issues
+    using
+    ```sh
+    ```bash
+    claude setup-token`
+
 2.  **ccproxy (`api` mode):**
     This mode uses its own OAuth2 flow to obtain credentials for direct API access.
     ```bash
     ccproxy auth login
     ```
-    You can check the status of these credentials with `ccproxy auth validate` and `ccproxy auth info`.
+
+    If you are already connected with Claude CLI the credentials should be found automatically
+
+You can check the status of these credentials with `ccproxy auth validate` and `ccproxy auth info`.
+
+Warning is show on start up if no credentials are setup.
 
 ## Usage
 
@@ -102,6 +125,38 @@ export ANTHROPIC_BASE_URL="http://localhost:8000/api"
 export ANTHROPIC_API_KEY="dummy-key"
 ```
 
+
+## Using with Aider
+
+CCProxy works seamlessly with Aider and other AI coding assistants:
+
+### Anthropic Mode
+```bash
+export ANTHROPIC_API_KEY=dummy
+export ANTHROPIC_BASE_URL=http://127.0.0.1:8000/api
+aider --model claude-sonnet-4-20250514
+```
+
+### OpenAI Mode with Model Mapping
+
+If your tool only supports OpenAI settings, ccproxy automatically maps OpenAI models to Claude:
+
+```bash
+export OPENAI_API_KEY=dummy
+export OPENAI_BASE_URL=http://127.0.0.1:8000/api/v1
+aider --model o3-mini
+```
+
+### API Mode (Direct Proxy)
+
+For minimal interference and direct API access:
+
+```bash
+export OPENAI_API_KEY=dummy
+export OPENAI_BASE_URL=http://127.0.0.1:8000/api/v1
+aider --model o3-mini
+```
+
 ### `curl` Example
 
 ```bash
@@ -185,16 +240,16 @@ You can enable token authentication for the proxy. This supports multiple header
 **1. Generate a Token:**
 ```bash
 ccproxy generate-token
-# Output: AUTH_TOKEN=abc123xyz789...
+# Output: SECURITY__AUTH_TOKEN=abc123xyz789...
 ```
 
 **2. Configure the Token:**
 ```bash
 # Set environment variable
-export AUTH_TOKEN=abc123xyz789...
+export SECURITY__AUTH_TOKEN=abc123xyz789...
 
 # Or add to .env file
-echo "AUTH_TOKEN=abc123xyz789..." >> .env
+echo "SECURITY__AUTH_TOKEN=abc123xyz789..." >> .env
 ```
 
 **3. Use in Requests:**