2c9ba9d6b3
新增 experience_feedback 表(32 表迁移,alembic head b7d1f4a92c3e),
老师傅对系统推荐方案给出"采纳 / 调整 / 拒绝"反馈,按"产品指纹 +
工艺参数"为键跨任务匹配,下次同指纹产品分析自动消费。
变更内容:
- src/moldinsight/models/experience_feedback.py(new)ORM:Base 单点来源、
跨模块裸 FK(user_id / processing_task_id / stp_file_id)、不建 ORM
relationship;fingerprint JSON 列存跨任务匹配键
- src/moldinsight/models/__init__.py 导出 ExperienceFeedback
- migrations/versions/b7d1f4a92c3e_add_experience_feedback.py(new)32 表
迁移;fingerprint 列 PG 下加 GIN 索引(jsonb_path_query 支持)
- src/shared/database/init_db.py 加 3 个权限码(view_experience_feedback /
feedback_experience_hint / manage_experience_feedback)+ 新角色
process_engineer;admin 角色 permissions 同步补齐;init_permissions /
init_roles 改为按 code 比对(新增保留已有 id,避免 FK 引用失效)——
修复既有 DB 启动期漏掉新权限的幂等 bug
- src/moldinsight/services/experience_feedback_service.py(new)service:
compute_fingerprint 分桶(bbox_aspect / volume_bucket / face_bucket /
undercut_class / material_family / is_foam)/ record_feedback(D9 边界:
service.flush + 路由 commit;D17 衰减:同 stp_file_id 整体续期 90 天 TTL,
无 celery beat 依赖)/ list_hints_for_task / resolve_for_process_params
- src/moldinsight/api/experience_feedback_router.py(new)路由:Pydantic
模型写在路由文件内(项目硬规则);POST /api/tasks/{task_id}/experience-feedback
+ GET /api/tasks/{task_id}/experience-hints;归属 TaskQueryService.ensure_task_access
+ User.has_permission 全仓首次调用点
- src/moldinsight/api/__init__.py ROUTE_MODULES 注册新路由
- tests/test_model_ownership.py EXPECTED_TABLES 加 experience_feedback
(31→32)
- tests/test_experience_feedback_fingerprint.py(new)分桶参数化覆盖
bbox / volume / face / undercut / material / is_foam 各边界值
- tests/test_experience_feedback_router.py(new)API 契约 9 例
(401/403/422/200 路径 + 衰减续期 + 任务归属校验 + ORM 注册收口)
- docs/STATUS.md 顶部加 2026-09-23 批 1 日志条目
- docs/TECH_DEBT.md D17 加批 1 已完成描述 + 剩余工作清单
- docs/API_CONTRACT.md §3.2 加 D17 端点表格
测试基线:185 passed, 9 skipped(净增 59 测试)。
Co-Authored-By: Claude Code <noreply@anthropic.com>
236 lines
11 KiB
Python
236 lines
11 KiB
Python
import asyncio
|
||
import sys
|
||
from pathlib import Path
|
||
from sqlalchemy import text, select
|
||
from shared.database.database import db_manager
|
||
from shared.models.identity import User, Role, Permission, UserRole, RolePermission
|
||
from shared.services.auth_service import get_password_hash
|
||
from shared.config.settings import settings
|
||
from shared.utils.logger import get_logger
|
||
from alembic.config import Config
|
||
from alembic import command
|
||
|
||
logger = get_logger(__name__)
|
||
|
||
_ALEMBIC_INI = Path(__file__).resolve().parents[3] / "alembic.ini"
|
||
|
||
|
||
def _alembic_stamp_head() -> None:
|
||
"""将当前 DB 标记为已到最新版本(基线既有 DB,不执行 SQL)"""
|
||
cfg = Config(str(_ALEMBIC_INI))
|
||
command.stamp(cfg, "head")
|
||
|
||
|
||
def _alembic_upgrade_head() -> None:
|
||
"""执行 alembic 迁移到最新版本"""
|
||
cfg = Config(str(_ALEMBIC_INI))
|
||
command.upgrade(cfg, "head")
|
||
|
||
|
||
async def _run_alembic_migrations() -> None:
|
||
"""以 alembic 管理 schema:既有未纳入管理的 DB 自动 stamp 基线,再 upgrade head
|
||
|
||
- 全新 DB:upgrade head 执行初始迁移,创建全部表
|
||
- 既有已纳入管理:upgrade head 为 no-op
|
||
- 既有但无 alembic_version(历史 DB):先 stamp head 基线,再 upgrade(no-op)
|
||
"""
|
||
async with db_manager.engine.begin() as conn:
|
||
has_alembic = await conn.execute(text("SELECT to_regclass('public.alembic_version')")).scalar()
|
||
if not has_alembic:
|
||
table_count = await conn.execute(
|
||
text("SELECT count(*) FROM information_schema.tables WHERE table_schema='public' AND table_name <> 'alembic_version'")
|
||
).scalar()
|
||
if table_count and table_count > 0:
|
||
logger.info("检测到既有 DB 未纳入 alembic 管理,自动 stamp head 作为基线")
|
||
await asyncio.to_thread(_alembic_stamp_head)
|
||
await asyncio.to_thread(_alembic_upgrade_head)
|
||
|
||
DEFAULT_PERMISSIONS = [
|
||
{"code": "view_dashboard", "name": "查看仪表盘", "module": "dashboard"},
|
||
{"code": "view_moldinsight", "name": "使用模具分析", "module": "moldinsight"},
|
||
{"code": "upload_file", "name": "上传文件", "module": "moldinsight"},
|
||
{"code": "view_history", "name": "查看历史记录", "module": "moldinsight"},
|
||
{"code": "view_inventory", "name": "查看库存", "module": "inventory"},
|
||
{"code": "manage_inventory", "name": "管理库存", "module": "inventory"},
|
||
{"code": "view_products", "name": "查看产品", "module": "inventory"},
|
||
{"code": "manage_products", "name": "管理产品", "module": "inventory"},
|
||
{"code": "view_suppliers", "name": "查看供应商", "module": "inventory"},
|
||
{"code": "manage_suppliers", "name": "管理供应商", "module": "inventory"},
|
||
{"code": "view_customers", "name": "查看客户", "module": "inventory"},
|
||
{"code": "manage_customers", "name": "管理客户", "module": "inventory"},
|
||
{"code": "view_finance", "name": "查看财务", "module": "finance"},
|
||
{"code": "manage_receipts", "name": "管理收款", "module": "finance"},
|
||
{"code": "manage_payments", "name": "管理付款", "module": "finance"},
|
||
{"code": "void_finance_transaction", "name": "作废财务单据", "module": "finance"},
|
||
{"code": "view_users", "name": "查看用户", "module": "admin"},
|
||
{"code": "manage_users", "name": "管理用户", "module": "admin"},
|
||
{"code": "manage_roles", "name": "管理角色", "module": "admin"},
|
||
# D17 Human-in-Loop:老师傅经验反馈
|
||
{"code": "view_experience_feedback", "name": "查看老师傅反馈", "module": "moldinsight"},
|
||
{"code": "feedback_experience_hint", "name": "提交方案级反馈", "module": "moldinsight"},
|
||
{"code": "manage_experience_feedback", "name": "管理老师傅反馈", "module": "moldinsight"},
|
||
]
|
||
|
||
DEFAULT_ROLES = [
|
||
{"code": "admin", "name": "管理员", "description": "系统管理员,拥有所有权限", "is_system": True, "permissions": ["view_dashboard", "view_moldinsight", "upload_file", "view_history", "view_inventory", "manage_inventory", "view_products", "manage_products", "view_suppliers", "manage_suppliers", "view_customers", "manage_customers", "view_finance", "manage_receipts", "manage_payments", "void_finance_transaction", "view_users", "manage_users", "manage_roles", "view_experience_feedback", "feedback_experience_hint", "manage_experience_feedback"]},
|
||
{"code": "user", "name": "普通用户", "description": "普通用户,可使用模具分析和查看库存", "is_system": False, "permissions": ["view_dashboard", "view_moldinsight", "upload_file", "view_history", "view_inventory", "view_products", "view_suppliers", "view_customers", "view_finance", "manage_receipts", "manage_payments"]},
|
||
{"code": "viewer", "name": "只读用户", "description": "只读用户,只能查看数据", "is_system": False, "permissions": ["view_dashboard", "view_moldinsight", "view_history", "view_inventory", "view_products", "view_suppliers", "view_customers", "view_finance"]},
|
||
# D17 Human-in-Loop:工艺工程师角色——可查看 + 提交老师傅反馈
|
||
{"code": "process_engineer", "name": "工艺工程师", "description": "工艺工程师,可查看 + 提交老师傅经验反馈", "is_system": False, "permissions": ["view_dashboard", "view_moldinsight", "upload_file", "view_history", "view_experience_feedback", "feedback_experience_hint"]},
|
||
]
|
||
|
||
|
||
async def init_permissions(session):
|
||
"""初始化权限(按 code 补登:已存在跳过,缺失新增)
|
||
|
||
设计要点(D17 修复):
|
||
- 旧实现 `if existing_perms: return` 会让既存 DB 启动期漏掉新增权限码
|
||
- 改为按 code 比对:已存在的 permission 保留 id(避免 FK 引用失效),
|
||
缺失的新增;这样后续 DEFAULT_PERMISSIONS 追加的项也能在升级时落到既存 DB
|
||
"""
|
||
result = await session.execute(select(Permission))
|
||
existing_perms = {p.code: p for p in result.scalars().all()}
|
||
|
||
perm_map = {p.code: p.id for p in existing_perms.values()}
|
||
new_count = 0
|
||
for perm_data in DEFAULT_PERMISSIONS:
|
||
if perm_data["code"] in existing_perms:
|
||
continue
|
||
perm = Permission(**perm_data)
|
||
session.add(perm)
|
||
await session.flush()
|
||
perm_map[perm.code] = perm.id
|
||
new_count += 1
|
||
|
||
if not existing_perms:
|
||
logger.info(f"创建了 {len(DEFAULT_PERMISSIONS)} 个权限")
|
||
elif new_count:
|
||
logger.info(f"补登了 {new_count} 个权限(既有 DB 升级)")
|
||
else:
|
||
logger.info("权限已初始化(无新增)")
|
||
return perm_map
|
||
|
||
|
||
async def init_roles(session, perm_map):
|
||
"""初始化角色(按 code 补登:已存在跳过,缺失新建 + 完整绑定 permissions)
|
||
|
||
设计要点(D17 修复):
|
||
- 旧实现 `if existing_roles: return` 会让既存 DB 启动期漏掉新角色
|
||
- 改为按 code 比对:已存在的角色不重置其 RolePermission 绑定
|
||
(避免重建关联破坏 user / role 关系),缺失的角色按 DEFAULT_ROLES 完整创建
|
||
"""
|
||
result = await session.execute(select(Role))
|
||
existing_roles = {r.code: r for r in result.scalars().all()}
|
||
|
||
new_count = 0
|
||
for role_data in DEFAULT_ROLES:
|
||
code = role_data["code"]
|
||
if code in existing_roles:
|
||
continue
|
||
perm_codes = role_data.pop("permissions")
|
||
role = Role(**role_data)
|
||
session.add(role)
|
||
await session.flush()
|
||
for perm_code in perm_codes:
|
||
perm_id = perm_map.get(perm_code)
|
||
if perm_id is None:
|
||
continue
|
||
rp = RolePermission(role_id=role.id, permission_id=perm_id)
|
||
session.add(rp)
|
||
new_count += 1
|
||
|
||
if not existing_roles:
|
||
logger.info(f"创建了 {len(DEFAULT_ROLES)} 个角色")
|
||
elif new_count:
|
||
logger.info(f"补登了 {new_count} 个角色(既有 DB 升级)")
|
||
else:
|
||
logger.info("角色已初始化(无新增)")
|
||
|
||
|
||
async def create_admin_user(session):
|
||
"""创建默认管理员"""
|
||
# compose 不再给 ADMIN_PASSWORD 弱默认(D14):缺失时显式失败,
|
||
# 而不是静默创建空口令管理员
|
||
if not settings.ADMIN_PASSWORD:
|
||
raise RuntimeError(
|
||
"ADMIN_PASSWORD 未配置:请在 .env 中设置管理员初始密码后重启"
|
||
)
|
||
|
||
result = await session.execute(select(User).where(User.username == settings.ADMIN_USERNAME))
|
||
existing_admin = result.scalar_one_or_none()
|
||
|
||
if existing_admin:
|
||
logger.info("管理员账户已存在")
|
||
return
|
||
|
||
admin = User(
|
||
username=settings.ADMIN_USERNAME,
|
||
email=settings.ADMIN_EMAIL,
|
||
hashed_password=get_password_hash(settings.ADMIN_PASSWORD),
|
||
full_name=settings.ADMIN_FULL_NAME,
|
||
is_active=True
|
||
)
|
||
session.add(admin)
|
||
await session.flush()
|
||
|
||
result = await session.execute(select(Role).where(Role.code == "admin"))
|
||
admin_role = result.scalar_one_or_none()
|
||
|
||
if admin_role:
|
||
user_role = UserRole(user_id=admin.id, role_id=admin_role.id)
|
||
session.add(user_role)
|
||
|
||
await session.commit()
|
||
logger.info(f"创建了管理员账户: {settings.ADMIN_USERNAME}")
|
||
|
||
|
||
async def init_database(keep_connected: bool = True):
|
||
"""初始化数据库"""
|
||
try:
|
||
await db_manager.connect()
|
||
if settings.AUTO_MIGRATE:
|
||
await _run_alembic_migrations()
|
||
else:
|
||
logger.info(
|
||
"AUTO_MIGRATE=false:跳过启动期 alembic 迁移,"
|
||
"schema 由部署流程单点执行(alembic CLI 或 python -m shared.database.init_db)"
|
||
)
|
||
|
||
async with db_manager.session() as session:
|
||
perm_map = await init_permissions(session)
|
||
if perm_map is None:
|
||
# Permissions already existed, fetch them from database
|
||
result = await session.execute(select(Permission))
|
||
perms = result.scalars().all()
|
||
perm_map = {perm.code: perm.id for perm in perms}
|
||
await init_roles(session, perm_map)
|
||
await create_admin_user(session)
|
||
|
||
|
||
logger.info("数据库初始化完成")
|
||
print("=" * 60)
|
||
print("数据库初始化成功!")
|
||
print("=" * 60)
|
||
print(f"管理员用户名: {settings.ADMIN_USERNAME}")
|
||
print(f"管理员邮箱: {settings.ADMIN_EMAIL}")
|
||
print("=" * 60)
|
||
print("可以在 .env 文件中修改管理员配置:")
|
||
print(" ADMIN_USERNAME")
|
||
print(" ADMIN_EMAIL")
|
||
print(" ADMIN_FULL_NAME")
|
||
print("=" * 60)
|
||
|
||
return True
|
||
|
||
except Exception as e:
|
||
logger.error(f"数据库初始化失败: {e}")
|
||
print(f"数据库初始化失败: {e}")
|
||
return False
|
||
finally:
|
||
if not keep_connected:
|
||
await db_manager.disconnect()
|
||
|
||
|
||
if __name__ == "__main__":
|
||
asyncio.run(init_database(keep_connected=False))
|