From 00bf5819b34fc2d3c52355d20745f0ec5f029d5f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 12:45:41 +0000 Subject: [PATCH] fix(auth): wire GUI CPA export hook --- .github/workflows/temp-gui-cpa-hook-v2.yml | 34 ---------------------- grok_register_ttk.py | 7 +++++ tools/apply_gui_cpa_hook_v2.py | 25 ---------------- 3 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 .github/workflows/temp-gui-cpa-hook-v2.yml delete mode 100644 tools/apply_gui_cpa_hook_v2.py diff --git a/.github/workflows/temp-gui-cpa-hook-v2.yml b/.github/workflows/temp-gui-cpa-hook-v2.yml deleted file mode 100644 index b4c4845..0000000 --- a/.github/workflows/temp-gui-cpa-hook-v2.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Temporary GUI CPA hook patch v2 - -on: - issues: - types: - - edited - -permissions: - contents: write - -jobs: - apply-upgrade: - if: github.event.issue.number == 7 - runs-on: ubuntu-latest - steps: - - name: Checkout main - uses: actions/checkout@v4 - with: - ref: main - fetch-depth: 0 - - - name: Apply GUI CPA hook v2 - run: python tools/apply_gui_cpa_hook_v2.py - - - name: Commit patch and clean temporary files - shell: bash - run: | - rm -f tools/apply_gui_cpa_hook_v2.py - rm -f .github/workflows/temp-gui-cpa-hook-v2.yml - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git add grok_register_ttk.py tools/apply_gui_cpa_hook_v2.py .github/workflows/temp-gui-cpa-hook-v2.yml - git commit -m "fix(auth): wire GUI CPA export hook" - git push origin HEAD:main diff --git a/grok_register_ttk.py b/grok_register_ttk.py index cc61d69..85fc3df 100755 --- a/grok_register_ttk.py +++ b/grok_register_ttk.py @@ -3406,6 +3406,13 @@ class GrokRegisterGUI: except Exception as file_exc: self.log(f"[Debug] 保存账号文件失败: {file_exc}") add_token_to_grok2api_pools(sso, email=email, log_callback=self.log) + maybe_export_cpa_xai_after_success( + email=email, + password=profile.get("password", ""), + sso=sso, + log_callback=self.log, + cancel_callback=self.should_stop, + ) self.success_count += 1 retry_count_for_slot = 0 i += 1 diff --git a/tools/apply_gui_cpa_hook_v2.py b/tools/apply_gui_cpa_hook_v2.py deleted file mode 100644 index 4005bb5..0000000 --- a/tools/apply_gui_cpa_hook_v2.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python3 -import ast -from pathlib import Path - -ROOT = Path(__file__).resolve().parents[1] -APP_PATH = ROOT / "grok_register_ttk.py" - -app = APP_PATH.read_text(encoding="utf-8-sig") -old = ' add_token_to_grok2api_pools(sso, email=email, log_callback=self.log)\n self.success_count += 1' -new = ''' add_token_to_grok2api_pools(sso, email=email, log_callback=self.log) - maybe_export_cpa_xai_after_success( - email=email, - password=profile.get("password", ""), - sso=sso, - log_callback=self.log, - cancel_callback=self.should_stop, - ) - self.success_count += 1''' -if old in app: - app = app.replace(old, new, 1) -elif new not in app: - raise RuntimeError("GUI CPA hook anchor not found") -ast.parse(app) -APP_PATH.write_text(app, encoding="utf-8-sig") -print("GUI CPA hook applied.")