ccproxy-api 0.2.2__tar.gz → 0.2.4__tar.gz

{ccproxy_api-0.2.2 → ccproxy_api-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccproxy-api
-Version: 0.2.2
+Version: 0.2.4
 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
@@ -20,6 +20,7 @@ Requires-Dist: typing-extensions>=4.0.0
 Requires-Dist: uvicorn>=0.34.0
 Provides-Extra: plugins-claude
 Requires-Dist: claude-agent-sdk>=0.1.0; extra == 'plugins-claude'
+Requires-Dist: keyring>=25.0.0; extra == 'plugins-claude'
 Requires-Dist: qrcode>=8.2; extra == 'plugins-claude'
 Provides-Extra: plugins-codex
 Requires-Dist: pyjwt>=2.10.1; extra == 'plugins-codex'

{ccproxy_api-0.2.2 → ccproxy_api-0.2.4}/ccproxy/core/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.2'
-__version_tuple__ = version_tuple = (0, 2, 2)
+__version__ = version = '0.2.4'
+__version_tuple__ = version_tuple = (0, 2, 4)
 
 __commit_id__ = commit_id = None

{ccproxy_api-0.2.2 → ccproxy_api-0.2.4}/ccproxy/plugins/claude_shared/model_defaults.py

@@ -7,11 +7,11 @@ from ccproxy.models.provider import ModelCard, ModelMappingRule
 
 DEFAULT_CLAUDE_MODEL_CARDS: list[ModelCard] = [
     ModelCard(
-        id="claude-sonnet-4-5-20250929",
+        id="claude-sonnet-4-6",
         created=1722816000,
         owned_by="anthropic",
         permission=[],
-        root="claude-sonnet-4-5-20250929",
+        root="claude-sonnet-4-6",
         parent=None,
     ),
     ModelCard(
@@ -23,11 +23,11 @@ DEFAULT_CLAUDE_MODEL_CARDS: list[ModelCard] = [
         parent=None,
     ),
     ModelCard(
-        id="claude-opus-4-1-20250805",
+        id="claude-opus-4-6",
         created=1722816000,
         owned_by="anthropic",
         permission=[],
-        root="claude-opus-4-1-20250805",
+        root="claude-opus-4-6",
         parent=None,
     ),
     ModelCard(
@@ -105,7 +105,7 @@ DEFAULT_CLAUDE_MODEL_MAPPINGS: list[ModelMappingRule] = [
     ),
     ModelMappingRule(
         match="gpt-4o",
-        target="claude-3-7-sonnet-20250219",
+        target="claude-sonnet-4-6",
         kind="prefix",
     ),
     ModelMappingRule(
@@ -125,19 +125,22 @@ DEFAULT_CLAUDE_MODEL_MAPPINGS: list[ModelMappingRule] = [
     ),
     ModelMappingRule(
         match="o1",
-        target="claude-opus-4-20250514",
+        target="claude-opus-4-6",
         kind="prefix",
     ),
     ModelMappingRule(
         match="o3-mini",
-        target="claude-opus-4-20250514",
+        target="claude-opus-4-6",
         kind="exact",
     ),
     ModelMappingRule(
         match="gpt-5",
-        target="claude-sonnet-4-20250514",
+        target="claude-sonnet-4-6",
         kind="prefix",
     ),
+    ModelMappingRule(match="sonnet", target="claude-sonnet-4-6"),
+    ModelMappingRule(match="opus", target="claude-opus-4-6"),
+    ModelMappingRule(match="haiku", target="claude-haiku-4-5-20251001"),
     ModelMappingRule(
         match="claude-3-5-sonnet-latest",
         target="claude-3-5-sonnet-20241022",

{ccproxy_api-0.2.2 → ccproxy_api-0.2.4}/ccproxy/plugins/codex/model_defaults.py

@@ -7,29 +7,30 @@ from ccproxy.models.provider import ModelCard, ModelMappingRule
 
 DEFAULT_CODEX_MODEL_CARDS: list[ModelCard] = [
     ModelCard(
-        id="gpt-5",
+        id="gpt-5.3-codex",
         created=1723075200,
         owned_by="openai",
         permission=[],
-        root="gpt-5",
+        root="gpt-5.3-codex",
         parent=None,
     ),
     ModelCard(
-        id="gpt-5-codex",
+        id="gpt-5.2-codex",
         created=1726444800,
         owned_by="openai",
         permission=[],
-        root="gpt-5-codex",
+        root="gpt-5.2-codex",
         parent=None,
     ),
 ]
 
 
 DEFAULT_CODEX_MODEL_MAPPINGS: list[ModelMappingRule] = [
-    ModelMappingRule(match="gpt-", target="gpt-5", kind="prefix"),
-    ModelMappingRule(match="o3-", target="gpt-5", kind="prefix"),
-    ModelMappingRule(match="o1-", target="gpt-5", kind="prefix"),
-    ModelMappingRule(match="claude-", target="gpt-5", kind="prefix"),
+    ModelMappingRule(match="gpt-5-codex", target="gpt-5.3-codex", kind="prefix"),
+    ModelMappingRule(match="gpt-", target="gpt-5.3-codex", kind="prefix"),
+    ModelMappingRule(match="o3-", target="gpt-5.3-codex", kind="prefix"),
+    ModelMappingRule(match="o1-", target="gpt-5.3-codex", kind="prefix"),
+    ModelMappingRule(match="claude-", target="gpt-5.3-codex", kind="prefix"),
 ]
 
 

{ccproxy_api-0.2.2 → ccproxy_api-0.2.4}/ccproxy/plugins/oauth_claude/storage.py

@@ -15,6 +15,77 @@ from .models import ClaudeCredentials, ClaudeProfileInfo
 logger = get_plugin_logger()
 
 
+# Keychain service name used by Claude Code
+KEYCHAIN_SERVICE = "Claude Code"
+KEYCHAIN_ACCOUNT = "credentials"
+
+
+def _is_keyring_available() -> bool:
+    """Check if keyring library is available."""
+    try:
+        import keyring  # noqa: F401
+
+        return True
+    except ImportError:
+        return False
+
+
+async def _read_from_keychain() -> dict[str, Any] | None:
+    """Read Claude credentials from system keychain.
+
+    Claude Code stores OAuth credentials in the system keychain and intentionally
+    deletes the plain text ~/.claude/.credentials.json file for security.
+    See: https://github.com/anthropics/claude-code/issues/1414
+
+    Uses the keyring library which supports:
+    - macOS Keychain
+    - Windows Credential Manager
+    - Linux Secret Service (GNOME Keyring, KDE Wallet)
+
+    Returns:
+        Parsed credentials dict or None if not found or keyring unavailable
+    """
+    if not _is_keyring_available():
+        logger.debug(
+            "keyring_not_available",
+            hint="Install keyring package for system keychain support",
+            category="auth",
+        )
+        return None
+
+    def read_keychain() -> dict[str, Any] | None:
+        try:
+            import keyring
+
+            password = keyring.get_password(KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT)
+            if password:
+                parsed = json.loads(password)
+                if isinstance(parsed, dict):
+                    return parsed
+                logger.debug(
+                    "keychain_invalid_format",
+                    expected="dict",
+                    got=type(parsed).__name__,
+                    category="auth",
+                )
+        except json.JSONDecodeError as e:
+            logger.debug(
+                "keychain_json_decode_error",
+                error=str(e),
+                category="auth",
+            )
+        except Exception as e:
+            logger.debug(
+                "keychain_read_error",
+                error=str(e),
+                error_type=type(e).__name__,
+                category="auth",
+            )
+        return None
+
+    return await asyncio.to_thread(read_keychain)
+
+
 class ClaudeOAuthStorage(BaseJsonStorage[ClaudeCredentials]):
     """Claude OAuth-specific token storage implementation."""
 
@@ -61,24 +132,48 @@ class ClaudeOAuthStorage(BaseJsonStorage[ClaudeCredentials]):
             return False
 
     async def load(self) -> ClaudeCredentials | None:
-        """Load Claude credentials.
+        """Load Claude credentials from file or system keychain.
+
+        Claude Code stores credentials in the system keychain and intentionally
+        deletes the plain text file for security. This method tries file first,
+        then falls back to the system keychain (macOS Keychain, Windows Credential
+        Manager, or Linux Secret Service).
 
         Returns:
             Stored credentials or None
         """
         try:
-            # Use parent class's read method
+            # Try file first (works on all platforms, manual setups)
             data = await self._read_json()
-            if not data:
-                return None
+            if data:
+                credentials = ClaudeCredentials.model_validate(data)
+                logger.debug(
+                    "claude_oauth_credentials_loaded",
+                    has_oauth=bool(credentials.claude_ai_oauth),
+                    source="file",
+                    category="auth",
+                )
+                return credentials
+
+            # Fallback to system keychain (where Claude Code stores credentials)
+            keychain_data = await _read_from_keychain()
+            if keychain_data:
+                credentials = ClaudeCredentials.model_validate(keychain_data)
+                logger.debug(
+                    "claude_oauth_credentials_loaded",
+                    has_oauth=bool(credentials.claude_ai_oauth),
+                    source="keychain",
+                    category="auth",
+                )
+                return credentials
 
-            credentials = ClaudeCredentials.model_validate(data)
             logger.debug(
-                "claude_oauth_credentials_loaded",
-                has_oauth=bool(credentials.claude_ai_oauth),
+                "claude_oauth_credentials_not_found",
+                checked_file=str(self.file_path),
+                checked_keychain=_is_keyring_available(),
                 category="auth",
             )
-            return credentials
+            return None
         except Exception as e:
             logger.error(
                 "claude_oauth_credentials_load_error",

{ccproxy_api-0.2.2 → ccproxy_api-0.2.4}/pyproject.toml

@@ -92,10 +92,11 @@ dev = [
   "bandit",
   "types-aiofiles>=24.0.0",
   "types-PyYAML>=6.0.12.12",
+  "keyring>=25.0.0",
 ]
 
 [project.optional-dependencies]
-plugins-claude = ["claude-agent-sdk>=0.1.0", "qrcode>=8.2"]
+plugins-claude = ["claude-agent-sdk>=0.1.0", "qrcode>=8.2", "keyring>=25.0.0"]
 plugins-codex = ["qrcode>=8.2", "pyjwt>=2.10.1"]
 plugins-storage = [
   "sqlmodel>=0.0.24",