chore: account-manager — runtime_env sibling root, wait-login and browser fixes
All checks were successful
技能自动化发布 / release (push) Successful in 43s
All checks were successful
技能自动化发布 / release (push) Successful in 43s
This commit is contained in:
@@ -9,9 +9,7 @@ from service.account_service import (
|
||||
cmd_get,
|
||||
cmd_list,
|
||||
cmd_list_json,
|
||||
cmd_pick_logged_in,
|
||||
cmd_pick_web,
|
||||
cmd_set_login_status,
|
||||
)
|
||||
from service.browser_service import cmd_login, cmd_open, cmd_wait_login
|
||||
from util.constants import LOG_LOGGER_NAME, SKILL_SLUG
|
||||
@@ -25,14 +23,12 @@ def _cli_print_full_usage() -> None:
|
||||
print("用法概览(将 main.py 换为你的路径):")
|
||||
print(" python main.py add <平台中文名> <手机号>")
|
||||
print(" python main.py list [平台|all|全部]")
|
||||
print(" python main.py pick-logged-in <平台> # 跨技能用:仅已登录账号,一行 JSON 或 ERROR")
|
||||
print(" python main.py pick-web <平台> # 跨技能用:优先已登录,否则最新一条账号")
|
||||
print(" python main.py pick-web <平台> # 跨技能用:按最近更新选一条账号,一行 JSON")
|
||||
print(" python main.py list-json <平台|all> [--limit N] # 跨技能用:一行 JSON 数组,元素同 get")
|
||||
print(" python main.py get <id>")
|
||||
print(" python main.py set-login-status <id> <0|1> # 跨技能回写登录态")
|
||||
print(" python main.py open <id>")
|
||||
print(" python main.py login <id>")
|
||||
print(" python main.py wait-login <id> [--force] # 跨技能:限时内等待网页登录(默认 180s);--force 忽略库内已登录标记")
|
||||
print(" python main.py wait-login <id> # 跨技能:限时内 DOM 检测登录(默认 180s)")
|
||||
print(" python main.py delete id <id>")
|
||||
print(" python main.py delete platform <平台>")
|
||||
print(" python main.py delete platform <平台> <手机号>")
|
||||
@@ -109,13 +105,6 @@ def main() -> None:
|
||||
_cli_fail_need_account_id("get")
|
||||
sys.exit(1)
|
||||
cmd_get(sys.argv[2])
|
||||
elif cmd == "set-login-status":
|
||||
if len(sys.argv) < 4:
|
||||
print("ERROR:CLI_SET_LOGIN_STATUS_MISSING_ARGS")
|
||||
print("用法:python main.py set-login-status <account_id> <0|1>")
|
||||
print("说明:供 llm-manager 等脚本回写登录态;成功时 stdout 首行以 OK: 开头。")
|
||||
sys.exit(1)
|
||||
cmd_set_login_status(sys.argv[2], sys.argv[3])
|
||||
elif cmd == "list-json":
|
||||
if len(sys.argv) < 3:
|
||||
print("ERROR:CLI_LIST_JSON_MISSING_PLATFORM")
|
||||
@@ -133,18 +122,11 @@ def main() -> None:
|
||||
except ValueError:
|
||||
pass
|
||||
cmd_list_json(platform_arg, limit=lim)
|
||||
elif cmd == "pick-logged-in":
|
||||
if len(sys.argv) < 3:
|
||||
print("ERROR:CLI_PICK_LOGGED_IN_MISSING_ARGS")
|
||||
print("用法:python main.py pick-logged-in <平台中文名或英文键>")
|
||||
print("说明:供 llm-manager 等技能查询该平台已登录账号;成功时 stdout 仅一行 JSON。")
|
||||
sys.exit(1)
|
||||
cmd_pick_logged_in(sys.argv[2])
|
||||
elif cmd == "pick-web":
|
||||
if len(sys.argv) < 3:
|
||||
print("ERROR:CLI_PICK_WEB_MISSING_ARGS")
|
||||
print("用法:python main.py pick-web <平台中文名或英文键>")
|
||||
print("说明:供 llm-manager 等;优先已登录账号,否则返回该平台最新一条账号(未登录也可用于打开浏览器登录)。")
|
||||
print("说明:按 updated_at 选一条账号;是否已登录由 wait-login / 页面检测决定。")
|
||||
sys.exit(1)
|
||||
cmd_pick_web(sys.argv[2])
|
||||
elif cmd == "open":
|
||||
@@ -154,15 +136,12 @@ def main() -> None:
|
||||
cmd_open(sys.argv[2])
|
||||
elif cmd == "wait-login":
|
||||
av = [a for a in sys.argv[2:] if a]
|
||||
force = "--force" in av or "-f" in av
|
||||
av = [a for a in av if a not in ("--force", "-f")]
|
||||
if len(av) < 1:
|
||||
print("ERROR:CLI_WAIT_LOGIN_MISSING_ID")
|
||||
print("用法:python main.py wait-login <账号 id> [--force]")
|
||||
print("说明:供 llm-manager / 搜狐发布等编排;未登录时打开浏览器,限时内等待登录或用户关窗即结束。")
|
||||
print("--force:即使库内已标为登录也重新打开浏览器检测(Cookie 失效时用)。")
|
||||
print("用法:python main.py wait-login <账号 id>")
|
||||
print("说明:始终以本次 DOM 检测为准;供 llm-manager / 搜狐发布等编排。")
|
||||
sys.exit(1)
|
||||
sys.exit(cmd_wait_login(av[0], force=force))
|
||||
sys.exit(cmd_wait_login(av[0]))
|
||||
elif cmd == "login":
|
||||
if len(sys.argv) < 3:
|
||||
_cli_fail_need_account_id("login")
|
||||
|
||||
Reference in New Issue
Block a user