feat(sub2api): 支持按分组同步 OpenAI OAuth 账号

- 连接配置新增 group_id 字段，同步时作为 group 参数传给 sub2api /admin/accounts
- 新增 list_remote_groups + GET /api/sub2api/servers/{id}/groups，按 platform=openai 过滤
- 编辑对话框支持「拉取分组」切换为下拉选择（含全部 / 未分组 / 具体分组选项）
- 连接列表副标题显示当前筛选分组

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

services/api.py

@@ -17,6 +17,7 @@ from services.cpa_service import cpa_config, cpa_import_service, list_remote_fil
 from services.proxy_service import proxy_config, test_proxy
 from services.sub2api_service import (
     list_remote_accounts as sub2api_list_remote_accounts,
+    list_remote_groups as sub2api_list_remote_groups,
     sub2api_config,
     sub2api_import_service,
 )
@@ -98,6 +99,7 @@ class Sub2APIServerCreateRequest(BaseModel):
     email: str = ""
     password: str = ""
     api_key: str = ""
+    group_id: str = ""
 
 
 class Sub2APIServerUpdateRequest(BaseModel):
@@ -106,6 +108,7 @@ class Sub2APIServerUpdateRequest(BaseModel):
     email: str | None = None
     password: str | None = None
     api_key: str | None = None
+    group_id: str | None = None
 
 
 class Sub2APIImportRequest(BaseModel):
@@ -478,6 +481,7 @@ def create_app() -> FastAPI:
             email=body.email,
             password=body.password,
             api_key=body.api_key,
+            group_id=body.group_id,
         )
         return {
             "server": sanitize_sub2api_server(server),
@@ -509,6 +513,21 @@ def create_app() -> FastAPI:
             raise HTTPException(status_code=404, detail={"error": "server not found"})
         return {"servers": sanitize_sub2api_servers(sub2api_config.list_servers())}
 
+    @router.get("/api/sub2api/servers/{server_id}/groups")
+    async def sub2api_server_groups(
+            server_id: str,
+            authorization: str | None = Header(default=None),
+    ):
+        require_auth_key(authorization)
+        server = sub2api_config.get_server(server_id)
+        if server is None:
+            raise HTTPException(status_code=404, detail={"error": "server not found"})
+        try:
+            groups = await run_in_threadpool(sub2api_list_remote_groups, server)
+        except Exception as exc:
+            raise HTTPException(status_code=502, detail={"error": str(exc)}) from exc
+        return {"server_id": server_id, "groups": groups}
+
     @router.get("/api/sub2api/servers/{server_id}/accounts")
     async def sub2api_server_accounts(
             server_id: str,

services/sub2api_service.py

@@ -65,6 +65,7 @@ def _normalize_server(raw: dict) -> dict:
         "email": _clean(raw.get("email")),
         "password": _clean(raw.get("password")),
         "api_key": _clean(raw.get("api_key")),
+        "group_id": _clean(raw.get("group_id")),
         "import_job": _normalize_import_job(raw.get("import_job"), fail_unfinished=True),
     }
 
@@ -104,7 +105,16 @@ class Sub2APIConfig:
                     return dict(server)
         return None
 
-    def add_server(self, *, name: str, base_url: str, email: str, password: str, api_key: str) -> dict:
+    def add_server(
+        self,
+        *,
+        name: str,
+        base_url: str,
+        email: str,
+        password: str,
+        api_key: str,
+        group_id: str = "",
+    ) -> dict:
         server = _normalize_server({
             "id": _new_id(),
             "name": name,
@@ -112,6 +122,7 @@ class Sub2APIConfig:
             "email": email,
             "password": password,
             "api_key": api_key,
+            "group_id": group_id,
         })
         with self._lock:
             self._servers.append(server)
@@ -240,21 +251,25 @@ def list_remote_accounts(server: dict) -> list[dict]:
         return []
 
     headers = _auth_headers(server)
+    group_id = _clean(server.get("group_id"))
 
     session = Session(verify=True)
     items: list[dict] = []
     try:
         page = 1
         while True:
+            params: dict[str, object] = {
+                "platform": "openai",
+                "type": "oauth",
+                "page": page,
+                "page_size": 200,
+            }
+            if group_id:
+                params["group"] = group_id
             response = session.get(
                 f"{base_url.rstrip('/')}/api/v1/admin/accounts",
                 headers=headers,
-                params={
-                    "platform": "openai",
-                    "type": "oauth",
-                    "page": page,
-                    "page_size": 200,
-                },
+                params=params,
                 timeout=30,
             )
             if not response.ok:
@@ -293,6 +308,62 @@ def list_remote_accounts(server: dict) -> list[dict]:
     return items
 
 
+def list_remote_groups(server: dict) -> list[dict]:
+    """Return OpenAI account groups from a sub2api server."""
+    base_url = _clean(server.get("base_url"))
+    if not base_url:
+        return []
+
+    headers = _auth_headers(server)
+
+    session = Session(verify=True)
+    items: list[dict] = []
+    try:
+        page = 1
+        while True:
+            response = session.get(
+                f"{base_url.rstrip('/')}/api/v1/admin/groups",
+                headers=headers,
+                params={
+                    "platform": "openai",
+                    "page": page,
+                    "page_size": 200,
+                },
+                timeout=30,
+            )
+            if not response.ok:
+                raise RuntimeError(f"sub2api groups failed: HTTP {response.status_code} {response.text[:200]}")
+            payload = response.json()
+
+            data = payload.get("data") if isinstance(payload, dict) else None
+            if not isinstance(data, list) or not data:
+                break
+
+            for group in data:
+                if not isinstance(group, dict):
+                    continue
+                group_id = group.get("id")
+                if group_id is None:
+                    continue
+                items.append({
+                    "id": str(group_id),
+                    "name": _clean(group.get("name")),
+                    "description": _clean(group.get("description")),
+                    "status": _clean(group.get("status")),
+                    "account_count": int(group.get("account_count") or 0),
+                    "active_account_count": int(group.get("active_account_count") or 0),
+                })
+
+            total = int(payload.get("total") or 0) if isinstance(payload, dict) else 0
+            if page * 200 >= total or len(data) < 200:
+                break
+            page += 1
+    finally:
+        session.close()
+
+    return items
+
+
 def _fetch_access_token_for_account(server: dict, account_id: str) -> tuple[str, dict]:
     """Return (access_token, account_meta) for a single sub2api account id."""
     base_url = _clean(server.get("base_url"))

web/src/app/settings/components/sub2api-connections.tsx

@@ -5,11 +5,13 @@ import {
   Eye,
   EyeOff,
   Import,
+  Layers,
   Link2,
   LoaderCircle,
   Mail,
   Pencil,
   Plus,
+  RefreshCcw,
   Save,
   Search,
   ServerCog,
@@ -42,10 +44,12 @@ import {
   createSub2APIServer,
   deleteSub2APIServer,
   fetchSub2APIServerAccounts,
+  fetchSub2APIServerGroups,
   fetchSub2APIServers,
   startSub2APIImport,
   updateSub2APIServer,
   type Sub2APIRemoteAccount,
+  type Sub2APIRemoteGroup,
   type Sub2APIServer,
 } from "@/lib/api";
 
@@ -89,10 +93,14 @@ export function Sub2APIConnections() {
   const [formEmail, setFormEmail] = useState("");
   const [formPassword, setFormPassword] = useState("");
   const [formApiKey, setFormApiKey] = useState("");
+  const [formGroupId, setFormGroupId] = useState("");
   const [authMode, setAuthMode] = useState<AuthMode>("password");
   const [showSecret, setShowSecret] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
 
+  const [remoteGroups, setRemoteGroups] = useState<Sub2APIRemoteGroup[] | null>(null);
+  const [isLoadingGroups, setIsLoadingGroups] = useState(false);
+
   const [deletingId, setDeletingId] = useState<string | null>(null);
   const [loadingAccountsId, setLoadingAccountsId] = useState<string | null>(null);
 
@@ -166,8 +174,10 @@ export function Sub2APIConnections() {
     setFormEmail("");
     setFormPassword("");
     setFormApiKey("");
+    setFormGroupId("");
     setAuthMode("password");
     setShowSecret(false);
+    setRemoteGroups(null);
     setDialogOpen(true);
   };
 
@@ -178,11 +188,34 @@ export function Sub2APIConnections() {
     setFormEmail(server.email);
     setFormPassword("");
     setFormApiKey("");
+    setFormGroupId(server.group_id || "");
     setAuthMode(server.has_api_key ? "api_key" : "password");
     setShowSecret(false);
+    setRemoteGroups(null);
     setDialogOpen(true);
   };
 
+  const handleFetchGroups = async () => {
+    if (!editingServer) {
+      toast.error("请先保存连接后再拉取分组");
+      return;
+    }
+    setIsLoadingGroups(true);
+    try {
+      const data = await fetchSub2APIServerGroups(editingServer.id);
+      setRemoteGroups(data.groups);
+      if (data.groups.length === 0) {
+        toast.message("远端没有 platform=openai 的分组");
+      } else {
+        toast.success(`读取到 ${data.groups.length} 个分组`);
+      }
+    } catch (error) {
+      toast.error(error instanceof Error ? error.message : "拉取分组失败");
+    } finally {
+      setIsLoadingGroups(false);
+    }
+  };
+
   const handleSave = async () => {
     if (!formBaseUrl.trim()) {
       toast.error("请输入 Sub2API 地址");
@@ -208,6 +241,7 @@ export function Sub2APIConnections() {
         const updates: Parameters<typeof updateSub2APIServer>[1] = {
           name: formName.trim(),
           base_url: formBaseUrl.trim(),
+          group_id: formGroupId.trim(),
         };
         if (authMode === "password") {
           updates.email = formEmail.trim();
@@ -232,6 +266,7 @@ export function Sub2APIConnections() {
           email: authMode === "password" ? formEmail.trim() : "",
           password: authMode === "password" ? formPassword.trim() : "",
           api_key: authMode === "api_key" ? formApiKey.trim() : "",
+          group_id: formGroupId.trim(),
         });
         setServers(data.servers);
         toast.success("连接已添加");
@@ -401,6 +436,7 @@ export function Sub2APIConnections() {
                         <div className="truncate text-xs text-stone-400">
                           {server.base_url}
                           {server.email ? ` · ${server.email}` : server.has_api_key ? " · API Key" : ""}
+                          {server.group_id ? ` · 分组 ${server.group_id}` : " · 全部分组"}
                         </div>
                       </div>
                       <div className="flex items-center gap-1">
@@ -615,6 +651,60 @@ export function Sub2APIConnections() {
                 </div>
               </div>
             )}
+            <div className="space-y-2">
+              <label className="flex items-center gap-1.5 text-sm font-medium text-stone-700">
+                <Layers className="size-3.5" />
+                分组（可选）
+              </label>
+              {remoteGroups && remoteGroups.length > 0 ? (
+                <Select value={formGroupId || "__all__"} onValueChange={(value) => setFormGroupId(value === "__all__" ? "" : value)}>
+                  <SelectTrigger className="h-11 rounded-xl border-stone-200 bg-white">
+                    <SelectValue placeholder="选择分组" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value="__all__">全部分组（不限制）</SelectItem>
+                    <SelectItem value="ungrouped">未分组</SelectItem>
+                    {remoteGroups.map((group) => (
+                      <SelectItem key={group.id} value={group.id}>
+                        {group.name || `Group ${group.id}`}
+                        {group.account_count
+                          ? `��${group.active_account_count}/${group.account_count}）`
+                          : ""}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              ) : (
+                <Input
+                  value={formGroupId}
+                  onChange={(event) => setFormGroupId(event.target.value)}
+                  placeholder="留空则同步所有分组；或填写分组 ID / ungrouped"
+                  className="h-11 rounded-xl border-stone-200 bg-white"
+                />
+              )}
+              {editingServer ? (
+                <div className="flex items-center justify-between gap-2 text-xs text-stone-500">
+                  <span>同步时会用分组 ID 过滤，留空 = 同步所有 OpenAI OAuth 账号。</span>
+                  <Button
+                    variant="outline"
+                    className="h-8 rounded-lg border-stone-200 bg-white px-2 text-xs text-stone-600"
+                    onClick={() => void handleFetchGroups()}
+                    disabled={isLoadingGroups}
+                  >
+                    {isLoadingGroups ? (
+                      <LoaderCircle className="size-3.5 animate-spin" />
+                    ) : (
+                      <RefreshCcw className="size-3.5" />
+                    )}
+                    {remoteGroups ? "重新拉取" : "拉取分组"}
+                  </Button>
+                </div>
+              ) : (
+                <div className="text-xs text-stone-500">
+                  添加完连接后可在编辑对话框里点「拉取分组」选择具体分组。
+                </div>
+              )}
+            </div>
           </div>
           <DialogFooter className="pt-2">
             <Button

web/src/lib/api.ts

@@ -215,6 +215,7 @@ export type Sub2APIServer = {
   base_url: string;
   email: string;
   has_api_key: boolean;
+  group_id: string;
   import_job?: CPAImportJob | null;
 };
 
@@ -228,6 +229,15 @@ export type Sub2APIRemoteAccount = {
   has_refresh_token: boolean;
 };
 
+export type Sub2APIRemoteGroup = {
+  id: string;
+  name: string;
+  description: string;
+  status: string;
+  account_count: number;
+  active_account_count: number;
+};
+
 export async function fetchSub2APIServers() {
   return httpRequest<{ servers: Sub2APIServer[] }>("/api/sub2api/servers");
 }
@@ -238,6 +248,7 @@ export async function createSub2APIServer(server: {
   email: string;
   password: string;
   api_key: string;
+  group_id: string;
 }) {
   return httpRequest<{ server: Sub2APIServer; servers: Sub2APIServer[] }>("/api/sub2api/servers", {
     method: "POST",
@@ -247,7 +258,14 @@ export async function createSub2APIServer(server: {
 
 export async function updateSub2APIServer(
   serverId: string,
-  updates: { name?: string; base_url?: string; email?: string; password?: string; api_key?: string },
+  updates: {
+    name?: string;
+    base_url?: string;
+    email?: string;
+    password?: string;
+    api_key?: string;
+    group_id?: string;
+  },
 ) {
   return httpRequest<{ server: Sub2APIServer; servers: Sub2APIServer[] }>(`/api/sub2api/servers/${serverId}`, {
     method: "POST",
@@ -255,6 +273,12 @@ export async function updateSub2APIServer(
   });
 }
 
+export async function fetchSub2APIServerGroups(serverId: string) {
+  return httpRequest<{ server_id: string; groups: Sub2APIRemoteGroup[] }>(
+    `/api/sub2api/servers/${serverId}/groups`,
+  );
+}
+
 export async function deleteSub2APIServer(serverId: string) {
   return httpRequest<{ servers: Sub2APIServer[] }>(`/api/sub2api/servers/${serverId}`, {
     method: "DELETE",