fix: wire mail provider into standalone registration
This commit is contained in:
10
main.py
10
main.py
@@ -15,6 +15,7 @@ if str(PROJECT_ROOT) not in sys.path:
|
||||
sys.path.insert(0, str(PROJECT_ROOT))
|
||||
|
||||
from openai_pool_orchestrator import TOKENS_DIR, __version__
|
||||
from openai_pool_orchestrator.mail_providers import MultiMailRouter
|
||||
from openai_pool_orchestrator.register import _write_text_atomic, run as register_run
|
||||
|
||||
try:
|
||||
@@ -185,6 +186,7 @@ def handle_register(args: argparse.Namespace) -> dict[str, Any]:
|
||||
sleep_min = max(1, args.sleep_min)
|
||||
sleep_max = max(sleep_min, args.sleep_max)
|
||||
proxy = args.proxy if args.proxy is not None else str(cfg.get("proxy") or "").strip() or None
|
||||
mail_router = MultiMailRouter(cfg)
|
||||
|
||||
count = 0
|
||||
runs: List[dict[str, Any]] = []
|
||||
@@ -192,8 +194,11 @@ def handle_register(args: argparse.Namespace) -> dict[str, Any]:
|
||||
count += 1
|
||||
print(f"\n[{time.strftime('%H:%M:%S')}] >>> 开始第 {count} 次注册流程 <<<")
|
||||
try:
|
||||
provider_name, provider = mail_router.next_provider()
|
||||
print(f"[*] 本次使用邮箱提供商: {provider_name}")
|
||||
token_json = register_run(
|
||||
proxy,
|
||||
mail_provider=provider,
|
||||
proxy_pool_config={
|
||||
"enabled": bool(cfg.get("proxy_pool_enabled", False)),
|
||||
"api_url": cfg.get("proxy_pool_api_url", ""),
|
||||
@@ -203,8 +208,13 @@ def handle_register(args: argparse.Namespace) -> dict[str, Any]:
|
||||
"country": cfg.get("proxy_pool_country", "US"),
|
||||
},
|
||||
)
|
||||
mail_router.report_success(provider_name)
|
||||
except Exception as exc:
|
||||
token_json = None
|
||||
try:
|
||||
mail_router.report_failure(provider_name)
|
||||
except Exception:
|
||||
pass
|
||||
runs.append({"ok": False, "error": str(exc)})
|
||||
print(f"[Error] 发生未捕获异常: {exc}")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user