feat(multicloud): 补齐上线前的多云管理缺口(适配器/动作层/DNS/定时同步)
评估发现项目只有台账能力,缺失真正的多云管理链路。本次按缺口逐项补齐: 适配层 - 新增 aws / linode / namesilo 适配器,registry 登记;阿里云、腾讯云补 list_domains 与 get_account 余额 - NormalizedVPS 补 expiry_date + charge_type:此前云端同步进来的 VPS 拿不到 到期日,永远进不了续费提醒——而续费提醒正是这套台账存在的理由 - base.py 统一云端错误可读化(http_error_message / cloud_error_text):各厂商 把原因放的位置都不同(Linode errors[].reason、Cloudflare errors[].message、 腾讯 Response.Error.Message、AWS XML),此前直接 str(e) 会把 httpx 的多行文本 连同 MDN 链接弹给用户 动作层与 DNS - 新增 /api/actions:实例启停/重启/续费,写操作全部二次确认 + 审计 - 新增 Cloudflare DNS 记录的增删改查 定时同步 - scripts/sync_all_assets.py + /api/sync/assets + vps-sync-assets.timer(08:30) - 08:30 而非随机时刻:必须早于 09:00 的续费检查,否则提醒读到上一天的旧到期日 - sync_all_assets 修正计数:每一项子同步都失败时不再计为「成功」,否则凭证过期 会显示「成功 1」,用户以为数据拉到了、实际一条没有 数据一致性 - AssetRead 输出 external_id(只出不进):前端「云操作」「DNS」按钮靠它渲染, 缺了则所有按钮永远出不来 - import_assets 落库 external_id:导出带了去重键而导入丢弃,会让迁移后首次同步 把所有云端资产当新增再建一份 - _align_preset_providers 取代 _backfill_provider_services:库里声明但注册表未 实现的 sdk_type 清空(声明支持却不支持,比明说不支持更糟),services 只增量 补标签不覆盖,用户自建平台不动 前端如实展示 - cost 为 0 统一显示「未填」而非「0 USD」:0 既可能是没填、也可能是云端不返回 价格,而汇总处又把 0 当「无费用」排除,两处口径不一致 - 总览「本年支出」增加 year_cost_missing,把合计的覆盖缺口说出来 - DNS 弹窗补 MX/SRV 优先级与备注;列表请求失败时 provider 用资产自带 slug 兜底, 否则 Cloudflare 代理勾选框永远不出现 测试:257 -> 309 passed
This commit is contained in:
+46
-14
@@ -98,8 +98,8 @@ def _migrate_assets_db() -> None:
|
||||
conn.execute(sa.text("ALTER TABLE providers ADD COLUMN last_synced_at DATETIME"))
|
||||
if "services" not in cols:
|
||||
conn.execute(sa.text("ALTER TABLE providers ADD COLUMN services VARCHAR DEFAULT ''"))
|
||||
# 为已有预设平台补充 services(仅补空值,用户自定义行不动)
|
||||
_backfill_provider_services(conn)
|
||||
# 预设平台的 sdk_type / services 对齐当前代码能力(幂等,用户自建行不动)
|
||||
_align_preset_providers(conn)
|
||||
if insp.has_table("ai_accounts"):
|
||||
cols = {c["name"] for c in insp.get_columns("ai_accounts")}
|
||||
if "api_key_encrypted" not in cols:
|
||||
@@ -182,22 +182,54 @@ def _migrate_plaintext_api_keys(conn) -> None:
|
||||
)
|
||||
|
||||
|
||||
def _backfill_provider_services(conn) -> None:
|
||||
"""为已有预设平台补充 services 服务列表(只更新 services 为空的预设 slug)"""
|
||||
def _align_preset_providers(conn) -> None:
|
||||
"""把预设平台的 sdk_type / services 对齐到当前代码能力(幂等)
|
||||
|
||||
seed_providers 只插入缺失 slug、不更新已有行,所以代码侧的能力变化
|
||||
(新增适配器、废弃从未实现的 sdk_type)必须在这里落地,否则线上会长期
|
||||
停留在旧声明上。
|
||||
|
||||
- sdk_type:库里声明的值不在适配器注册表内就清空。留着会让平台卡片显示
|
||||
「API 对接: xxx」,用户建好账号点同步才撞「暂不支持的 SDK 类型」——
|
||||
声明支持却不支持,比明说不支持更糟。
|
||||
- services:只增量补标签,不删除。用户可能手动加过标签(线上 aliyun-intl
|
||||
就多了 ai_agent/other),按种子值整体覆盖会丢用户配置。
|
||||
|
||||
只处理 slug 命中 PRESET_PROVIDERS 的行,用户自建平台(如 tothost)不动。
|
||||
"""
|
||||
import sqlalchemy as sa
|
||||
from app.adapters import registry
|
||||
from app.core.seed import PRESET_PROVIDERS
|
||||
|
||||
for data in PRESET_PROVIDERS:
|
||||
services = data.get("services")
|
||||
if not services:
|
||||
supported = set(registry.supported_types())
|
||||
preset = {d["slug"]: d for d in PRESET_PROVIDERS}
|
||||
|
||||
rows = conn.execute(
|
||||
sa.text("SELECT id, slug, sdk_type, services FROM providers")
|
||||
).fetchall()
|
||||
|
||||
for row in rows:
|
||||
data = preset.get(row[1])
|
||||
if not data:
|
||||
continue
|
||||
conn.execute(
|
||||
sa.text(
|
||||
"UPDATE providers SET services = :services "
|
||||
"WHERE slug = :slug AND (services IS NULL OR services = '')"
|
||||
),
|
||||
{"services": services, "slug": data["slug"]},
|
||||
)
|
||||
|
||||
declared = row[2]
|
||||
if declared and declared not in supported:
|
||||
conn.execute(
|
||||
sa.text("UPDATE providers SET sdk_type = NULL WHERE id = :id"),
|
||||
{"id": row[0]},
|
||||
)
|
||||
|
||||
seed_services = [s.strip() for s in (data.get("services") or "").split(",") if s.strip()]
|
||||
if not seed_services:
|
||||
continue
|
||||
current = [s.strip() for s in (row[3] or "").split(",") if s.strip()]
|
||||
missing = [s for s in seed_services if s not in current]
|
||||
if missing:
|
||||
conn.execute(
|
||||
sa.text("UPDATE providers SET services = :services WHERE id = :id"),
|
||||
{"services": ",".join(current + missing), "id": row[0]},
|
||||
)
|
||||
|
||||
|
||||
def _dedupe_accounts(conn) -> None:
|
||||
|
||||
Reference in New Issue
Block a user