Release v1.0.2

Author: AuuCoder

.env.example

@@ -13,6 +13,8 @@ CHATGPT2API_THREAD_TOKENS=80
 
 # iCloud Privacy Mail 内部服务（启用 Compose 的 local-icloud profile；不会单独暴露端口）
 ICLOUD_PRIVACY_MAIL_BASE_URL=http://icloud-privacy-mail:8787
+# Apple 登录对共享代理出口较敏感，默认让 Apple/iCloud 官方域名直连。
+ICLOUD_PRIVACY_MAIL_NO_PROXY=127.0.0.1,localhost,icloud-privacy-mail,.apple.com,.icloud.com,.apple.com.cn,.icloud.com.cn
 # 仅供注册中心的外部自动领取 API 使用；控制台管理不需要单独密钥。
 ICLOUD_PRIVACY_MAIL_API_KEY=change-me
 
@@ -95,6 +97,7 @@ STORAGE_BACKEND=json
 # CHATGPT2API_PROXY_RUNTIME_RESOURCE_PROXY_URL=
 # 宿主机直接运行 Uvicorn 时，Compose 默认 privoxy 地址会自动映射到此 URL。
 # CHATGPT2API_HOST_PRIVOXY_URL=http://127.0.0.1:40080
+# CHATGPT2API_HOST_FLARESOLVERR_URL=http://127.0.0.1:8191
 # CHATGPT2API_PROXY_RUNTIME_SKIP_SSL_VERIFY=false
 # CHATGPT2API_PROXY_RUNTIME_RESET_STATUS_CODES=403
 

.gitignore

@@ -39,6 +39,7 @@ git_cache/
 *.log
 /runtime/
 services/checkout_protocol/proxy_state.json
+services/checkout_protocol/dumps/
 loginwithpassword_*/
 logwithemailverifycode_*/
 test_batch_output/
@@ -50,4 +51,6 @@ test/
 tests/
 docs/*.md
 scripts/test_*.py
+scripts/probe_*.py
+scripts/pix_browser_capture.py
 /web/

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.0.2 - 2026-07-17
+
++ [新增] Grok 4.5 OAuth 账号支持按配置独立投递到 Sub2API 和 CPA；凭据始终先保存到本地，远程失败不影响授权结果。
++ [新增] OAuth 账号测试支持“全部账号”和“指定账号”两种模式，逐账号展示成功、失败、耗时和错误原因。
++ [优化] Grok 注册与协议授权日志收敛为关键步骤，并补充 OAuth 投递状态和账号运行状态展示。
++ [文档] README 补充上游项目二开来源声明。
+
 ## 1.0.1 - 2026-07-15
 
 + [新增] Pix 新增方案 3 BR/VN 独立协议，支持 BR Checkout/Provider 与 VN Promotion 双 sticky 出口，并保留方案 1、方案 2 独立选择。

README.md

@@ -320,3 +320,5 @@ uv run --with pytest --with pytest-asyncio python -m pytest -q
 - `GROK2API_LICENSE`
 
 许可证和来源声明必须随分发内容保留。运行时、版本检查、安装地址和容器发布均使用 GPTGrok2API 自有仓库与服务。
+
+本项目基于 [yukkcat/chatgpt2api](https://github.com/yukkcat/chatgpt2api) 二开。

VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

api/grok_oauth.py

@@ -43,6 +43,11 @@ class OAuthAccountDeleteRequest(BaseModel):
     ids: list[str] = Field(default_factory=list)
 
 
+class OAuthAccountTestRequest(BaseModel):
+    model: str = Field(min_length=1, max_length=128)
+    prompt: str = Field(min_length=1, max_length=1_200)
+
+
 async def require_grok_oauth_admin(
     authorization: str | None = Header(default=None),
 ) -> dict[str, object]:
@@ -124,6 +129,14 @@ async def refresh_account(account_id: str) -> dict[str, Any]:
     async def sync_models(account_id: str) -> dict[str, Any]:
         return await xai_cli_oauth_service.sync_models(account_id)
 
+    @router.post("/accounts/{account_id}/test")
+    async def test_account(account_id: str, body: OAuthAccountTestRequest) -> dict[str, Any]:
+        return await xai_cli_oauth_service.test_account(
+            account_id,
+            model=body.model,
+            prompt=body.prompt,
+        )
+
     @router.post("/accounts/status")
     async def set_status(body: OAuthAccountStatusRequest) -> dict[str, Any]:
         result = xai_cli_oauth_store.set_disabled(body.ids, body.disabled)

api/grok_oauth_test.py

@@ -62,6 +62,29 @@ def test_protocol_job_start_and_status_routes(self) -> None:
         self.assertEqual(status.status_code, 200)
         self.assertEqual(status.json()["job"]["status"], "running")
 
+    def test_account_probe_route_targets_requested_oauth_account(self) -> None:
+        result = {
+            "account_id": "oauth-one",
+            "account": {"id": "oauth-one", "email": "oa***e@example.com"},
+            "model": "grok-4.5",
+            "content": "OK",
+            "elapsed_ms": 120,
+        }
+        with patch("api.grok_oauth.require_admin", return_value={"id": "admin", "role": "admin"}), patch.object(
+            grok_oauth.xai_cli_oauth_service,
+            "test_account",
+            new=AsyncMock(return_value=result),
+        ) as test_account:
+            response = self.client.post(
+                "/api/grok/oauth/accounts/oauth-one/test",
+                json={"model": "grok-4.5", "prompt": "只回复 OK"},
+                headers={"Authorization": "Bearer test-admin-key"},
+            )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json()["account_id"], "oauth-one")
+        test_account.assert_awaited_once_with("oauth-one", model="grok-4.5", prompt="只回复 OK")
+
 
 if __name__ == "__main__":
     unittest.main()

api/register_test.py

@@ -257,7 +257,17 @@ def test_grok_account_batch_chat_test_uses_admin_route_and_prompt(self) -> None:
             "current": 1,
             "current_id": "grok-one",
             "cancel_requested": False,
-            "summary": {"total": 2, "success": 0, "limited": 0, "permission": 0, "failed": 0, "skipped": 1, "pending": 1},
+            "summary": {
+                "total": 2,
+                "success": 0,
+                "blocked": 0,
+                "invalid": 0,
+                "limited": 0,
+                "permission": 0,
+                "failed": 0,
+                "skipped": 1,
+                "pending": 1,
+            },
             "results": [
                 {"id": "grok-one", "status": "pending", "error": "", "elapsed_ms": 0},
                 {"id": "grok-two", "status": "skipped", "error": "账号未保存 SSO 登录态", "elapsed_ms": 0},

app/control/account/backends/local.py

@@ -196,10 +196,18 @@ def _row_to_token_payload(cls, row: sqlite3.Row) -> dict[str, Any]:
             remaining = row[f"{mode}_remaining"]
             total = row[f"{mode}_total"]
             if always_include or remaining is not None or total is not None:
-                quota[mode] = {
+                item = {
                     "remaining": cls._payload_int(remaining),
                     "total": cls._payload_int(total),
                 }
+                if mode == "console":
+                    reset_at = cls._payload_int(row["console_reset_at"])
+                    source = cls._payload_int(row["console_source"])
+                    if reset_at > 0:
+                        item["reset_at"] = reset_at
+                    if source in (0, 1, 2):
+                        item["source"] = source
+                quota[mode] = item
 
         return {
             "token": row["token"],
@@ -210,6 +218,9 @@ def _row_to_token_payload(cls, row: sqlite3.Row) -> dict[str, Any]:
             "fail_count": cls._payload_int(row["usage_fail_count"]),
             "last_used_at": row["last_use_at"],
             "tags": cls._parse_tags(row["tags"]),
+            "refresh_status": str(row["refresh_status"] or ""),
+            "refresh_at": row["refresh_at"],
+            "refresh_error": str(row["refresh_error"] or "")[:300],
         }
 
     def _upsert_sync(
@@ -578,6 +589,20 @@ def _token_payload_select_sql(cls) -> str:
             f"THEN json_extract({column}, '$.total') END AS {mode}_total"
             for mode, column, _always_include in _TOKEN_PAYLOAD_QUOTAS
         )
+        console_metadata_select = (
+            "CASE WHEN json_valid(quota_console) "
+            "THEN json_extract(quota_console, '$.reset_at') END AS console_reset_at, "
+            "CASE WHEN json_valid(quota_console) "
+            "THEN json_extract(quota_console, '$.source') END AS console_source"
+        )
+        refresh_metadata_select = (
+            "CASE WHEN json_valid(ext) "
+            "THEN json_extract(ext, '$.refresh_status') END AS refresh_status, "
+            "CASE WHEN json_valid(ext) "
+            "THEN json_extract(ext, '$.refresh_at') END AS refresh_at, "
+            "CASE WHEN json_valid(ext) "
+            "THEN json_extract(ext, '$.refresh_error') END AS refresh_error"
+        )
         return f"""
             SELECT
                 token,
@@ -587,7 +612,9 @@ def _token_payload_select_sql(cls) -> str:
                 usage_use_count,
                 usage_fail_count,
                 last_use_at,
-                {quota_select}
+                {quota_select},
+                {console_metadata_select},
+                {refresh_metadata_select}
             FROM {_TBL}
             WHERE deleted_at IS NULL
             ORDER BY updated_at DESC

app/control/account/backends/local_test.py

@@ -0,0 +1,56 @@
+from __future__ import annotations
+
+import tempfile
+import unittest
+from pathlib import Path
+
+from app.control.account.backends.local import LocalAccountRepository
+from app.control.account.commands import AccountPatch, AccountUpsert
+from app.control.account.enums import QuotaSource
+
+
+class LocalAccountRepositoryTokenPayloadTest(unittest.IsolatedAsyncioTestCase):
+    async def test_console_quota_keeps_source_and_reset_time(self) -> None:
+        with tempfile.TemporaryDirectory() as temp_dir:
+            repo = LocalAccountRepository(Path(temp_dir) / "accounts.db")
+            await repo.initialize()
+            await repo.upsert_accounts([AccountUpsert(token="test-token", pool="basic")])
+            await repo.patch_accounts(
+                [
+                    AccountPatch(
+                        token="test-token",
+                        ext_merge={
+                            "refresh_status": "failed",
+                            "refresh_at": 1_800_000_000_100,
+                            "refresh_error": "上游未返回真实额度数据",
+                        },
+                        quota_console={
+                            "remaining": 0,
+                            "total": 20,
+                            "window_seconds": 3600,
+                            "reset_at": 1_800_000_000_000,
+                            "synced_at": None,
+                            "source": int(QuotaSource.ESTIMATED),
+                        },
+                    )
+                ]
+            )
+
+            payload = (await repo.list_token_payloads())[0]
+
+        self.assertEqual(
+            payload["quota"]["console"],
+            {
+                "remaining": 0,
+                "total": 20,
+                "reset_at": 1_800_000_000_000,
+                "source": int(QuotaSource.ESTIMATED),
+            },
+        )
+        self.assertEqual(payload["refresh_status"], "failed")
+        self.assertEqual(payload["refresh_at"], 1_800_000_000_100)
+        self.assertEqual(payload["refresh_error"], "上游未返回真实额度数据")
+
+
+if __name__ == "__main__":
+    unittest.main()