formate_xy.py 40 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977
  1. import requests
  2. import json
  3. import copy
  4. import hashlib
  5. from enum import Enum
  6. from time import perf_counter
  7. from fastapi import APIRouter, Depends, HTTPException, Query, Body
  8. from fastapi.concurrency import run_in_threadpool
  9. from mysql.connector.pooling import PooledMySQLConnection
  10. from app.core.config import settings
  11. from app.core.logger import get_logger
  12. from app.core.database_loader import get_db_connection
  13. from app.api.users import check_card_permission, get_current_user
  14. from app.utils.scheme import (
  15. CardDetailResponse, ImageType
  16. )
  17. from app.crud import crud_card
  18. from app.utils.xy_process import convert_internal_to_xy_format, convert_xy_to_internal_format
  19. from app.core.minio_client import minio_client
  20. from app.utils.rating_report_utils import crop_defect_image
  21. logger = get_logger(__name__)
  22. router = APIRouter()
  23. db_dependency = Depends(get_db_connection)
  24. class QueryMode(str, Enum):
  25. current = "current"
  26. next = "next"
  27. prev = "prev"
  28. def _resolve_recalc_score_type(image_type: str):
  29. """
  30. 将 14 类新版 image_type 归一到 score_recalculate 接口接受的 score_type。
  31. 新版 stitch 导入后,同一面的 fusion/ring/stripe 共用该面 JSON;
  32. 编辑重算时按正反面统一归到 front_ring / back_ring。
  33. """
  34. image_type_to_recalc_score_type = {
  35. ImageType.front_fusion.value: ImageType.front_ring.value,
  36. ImageType.front_ring.value: ImageType.front_ring.value,
  37. ImageType.front_gray.value: ImageType.front_ring.value,
  38. ImageType.front_stripe1.value: ImageType.front_ring.value,
  39. ImageType.front_stripe2.value: ImageType.front_ring.value,
  40. ImageType.front_stripe3.value: ImageType.front_ring.value,
  41. ImageType.front_stripe4.value: ImageType.front_ring.value,
  42. ImageType.back_fusion.value: ImageType.back_ring.value,
  43. ImageType.back_ring.value: ImageType.back_ring.value,
  44. ImageType.back_gray.value: ImageType.back_ring.value,
  45. ImageType.back_stripe1.value: ImageType.back_ring.value,
  46. ImageType.back_stripe2.value: ImageType.back_ring.value,
  47. ImageType.back_stripe3.value: ImageType.back_ring.value,
  48. ImageType.back_stripe4.value: ImageType.back_ring.value,
  49. # 兼容历史同轴光数据
  50. ImageType.front_coaxial.value: ImageType.front_coaxial.value,
  51. ImageType.back_coaxial.value: ImageType.back_coaxial.value,
  52. }
  53. return image_type_to_recalc_score_type.get(image_type)
  54. def _is_center_box_shapes_empty(center_result: dict) -> bool:
  55. """
  56. 判断 center_result 中 inner/outer box 的 shapes 是否都为空。
  57. 前端某些场景会传空 shapes,直接下发给算分服务可能触发其内部越界。
  58. """
  59. if not isinstance(center_result, dict):
  60. return True
  61. box_result = center_result.get("box_result", {})
  62. if not isinstance(box_result, dict):
  63. return True
  64. inner_shapes = box_result.get("inner_box", {}).get("shapes", [])
  65. outer_shapes = box_result.get("outer_box", {}).get("shapes", [])
  66. return not inner_shapes and not outer_shapes
  67. def _normalize_center_result(center_result: dict) -> dict:
  68. """
  69. 兜底补齐算分服务依赖的 center_result 结构,避免 KeyError: 'box_result'。
  70. """
  71. normalized = center_result if isinstance(center_result, dict) else {}
  72. box_result = normalized.get("box_result")
  73. if not isinstance(box_result, dict):
  74. box_result = {}
  75. normalized["box_result"] = box_result
  76. inner_box = box_result.get("inner_box")
  77. if not isinstance(inner_box, dict):
  78. inner_box = {}
  79. box_result["inner_box"] = inner_box
  80. if not isinstance(inner_box.get("shapes"), list):
  81. inner_box["shapes"] = []
  82. outer_box = box_result.get("outer_box")
  83. if not isinstance(outer_box, dict):
  84. outer_box = {}
  85. box_result["outer_box"] = outer_box
  86. if not isinstance(outer_box.get("shapes"), list):
  87. outer_box["shapes"] = []
  88. return normalized
  89. def _prepare_recalculate_payload(edited_json: dict, source_json: dict) -> dict:
  90. """
  91. 以数据库里的原始 JSON 为底稿,合并前端编辑结果,得到更稳定的重算入参。
  92. 当前仅明确覆盖 defects;center_result 只有在前端传了非空 shapes 时才覆盖。
  93. 对前端标记为删除(edit_type=del)的缺陷,在这里直接过滤,避免重算后再次写回 modified_json。
  94. """
  95. base = copy.deepcopy(source_json) if isinstance(source_json, dict) else {}
  96. incoming = edited_json if isinstance(edited_json, dict) else {}
  97. if "id" in incoming:
  98. base["id"] = incoming["id"]
  99. if "imageWidth" in incoming:
  100. base["imageWidth"] = incoming["imageWidth"]
  101. if "imageHeight" in incoming:
  102. base["imageHeight"] = incoming["imageHeight"]
  103. base.setdefault("result", {})
  104. incoming_result = incoming.get("result", {})
  105. if not isinstance(incoming_result, dict):
  106. incoming_result = {}
  107. # defects 使用前端编辑结果覆盖;前端标记删除的项不参与重算,也不写回 modified_json
  108. incoming_defects = (
  109. incoming_result.get("defect_result", {}).get("defects", [])
  110. if isinstance(incoming_result.get("defect_result", {}), dict)
  111. else []
  112. )
  113. base["result"].setdefault("defect_result", {})
  114. filtered_defects = []
  115. if isinstance(incoming_defects, list):
  116. filtered_defects = [
  117. defect for defect in incoming_defects
  118. if not (isinstance(defect, dict) and defect.get("edit_type") == "del")
  119. ]
  120. base["result"]["defect_result"]["defects"] = filtered_defects
  121. # center_result 仅在前端有有效 shapes 时覆盖;否则沿用底稿
  122. incoming_center = incoming_result.get("center_result")
  123. if isinstance(incoming_center, dict) and not _is_center_box_shapes_empty(incoming_center):
  124. base["result"]["center_result"] = incoming_center
  125. elif "center_result" not in base["result"]:
  126. base["result"]["center_result"] = incoming_center if isinstance(incoming_center, dict) else {}
  127. base["result"]["center_result"] = _normalize_center_result(base["result"].get("center_result"))
  128. return base
  129. _GRAY_IMAGE_TYPES = frozenset({
  130. ImageType.front_gray.value,
  131. ImageType.back_gray.value,
  132. })
  133. # 以融合图 JSON 中的缺陷为准,在同面下列类型原图上裁图(不含灰度图)
  134. _FRONT_DEFECT_URL_TARGET_TYPES = [
  135. ImageType.front_fusion.value,
  136. ImageType.front_ring.value,
  137. ImageType.front_stripe1.value,
  138. ImageType.front_stripe2.value,
  139. ImageType.front_stripe3.value,
  140. ImageType.front_stripe4.value,
  141. ImageType.front_coaxial.value, # 兼容历史同轴光
  142. ]
  143. _BACK_DEFECT_URL_TARGET_TYPES = [
  144. ImageType.back_fusion.value,
  145. ImageType.back_ring.value,
  146. ImageType.back_stripe1.value,
  147. ImageType.back_stripe2.value,
  148. ImageType.back_stripe3.value,
  149. ImageType.back_stripe4.value,
  150. ImageType.back_coaxial.value,
  151. ]
  152. _DEFECT_URL_TARGET_TYPES_BY_SIDE = {
  153. "front": _FRONT_DEFECT_URL_TARGET_TYPES,
  154. "back": _BACK_DEFECT_URL_TARGET_TYPES,
  155. }
  156. # ring / stripe 等可能落在 card_gray_images,裁图时需与主表合并
  157. _ALL_DEFECT_URL_TARGET_TYPES = frozenset(
  158. _FRONT_DEFECT_URL_TARGET_TYPES + _BACK_DEFECT_URL_TARGET_TYPES
  159. )
  160. def _is_gray_image_type(image_type: str) -> bool:
  161. return image_type in _GRAY_IMAGE_TYPES
  162. def _side_key_from_image_type(image_type: str) -> str:
  163. if image_type.startswith("front_"):
  164. return "front"
  165. if image_type.startswith("back_"):
  166. return "back"
  167. return ""
  168. def _defect_rect_hash(min_rect) -> str:
  169. if not min_rect or len(min_rect) != 3:
  170. return ""
  171. rect_str = str(min_rect)
  172. return hashlib.md5(rect_str.encode("utf-8")).hexdigest()[:8]
  173. def _resolve_fusion_images_by_side(all_images: list) -> dict:
  174. """每面仅以融合图 JSON 作为缺陷与裁图坐标来源。"""
  175. type_to_img = {getattr(img, "image_type", ""): img for img in all_images}
  176. return {
  177. "front": type_to_img.get(ImageType.front_fusion.value),
  178. "back": type_to_img.get(ImageType.back_fusion.value),
  179. }
  180. class _DefectCropImageRef:
  181. """裁图用的轻量图片引用(主表 Pydantic 或灰度辅助表行均可)。"""
  182. __slots__ = ("id", "image_type", "image_path")
  183. def __init__(self, image_id: int, image_type: str, image_path: str):
  184. self.id = image_id
  185. self.image_type = image_type
  186. self.image_path = image_path
  187. def _build_defect_crop_pool_by_type(
  188. card_id: int,
  189. all_images: list,
  190. db_conn: PooledMySQLConnection = None,
  191. ) -> dict:
  192. """
  193. 合并主表 card_images 与辅助表 card_gray_images 中的裁图目标。
  194. 同类型主表优先;ring/stripe 导入在灰度表时也能被 defectImgUrls 用到。
  195. """
  196. pool: dict = {}
  197. for img in all_images or []:
  198. image_type = getattr(img, "image_type", "")
  199. if image_type not in _ALL_DEFECT_URL_TARGET_TYPES:
  200. continue
  201. pool[image_type] = img
  202. if db_conn is not None:
  203. cursor = None
  204. try:
  205. cursor = db_conn.cursor(dictionary=True)
  206. cursor.execute(
  207. f"SELECT id, image_type, image_path FROM {settings.DB_GRAY_IMAGE_TABLE_NAME} "
  208. f"WHERE card_id = %s",
  209. (card_id,),
  210. )
  211. for row in cursor.fetchall():
  212. image_type = row.get("image_type") or ""
  213. if image_type not in _ALL_DEFECT_URL_TARGET_TYPES:
  214. continue
  215. if image_type in pool:
  216. continue
  217. pool[image_type] = _DefectCropImageRef(
  218. row["id"],
  219. image_type,
  220. settings.get_full_url(row.get("image_path")),
  221. )
  222. finally:
  223. if cursor:
  224. cursor.close()
  225. return pool
  226. def _defect_url_target_type_list(crop_pool_by_type: dict, side_key: str) -> list:
  227. """同面裁图类型列表;若已有 stripe 则不再使用历史 coaxial。"""
  228. target_types = list(_DEFECT_URL_TARGET_TYPES_BY_SIDE.get(side_key, []))
  229. has_stripe = any(
  230. t.startswith(f"{side_key}_stripe") and t in crop_pool_by_type
  231. for t in target_types
  232. )
  233. if has_stripe:
  234. coaxial = ImageType.front_coaxial.value if side_key == "front" else ImageType.back_coaxial.value
  235. target_types = [t for t in target_types if t != coaxial]
  236. return target_types
  237. def _defect_url_target_images(crop_pool_by_type: dict, side_key: str) -> list:
  238. """按固定类型顺序返回同面需生成 defectImgUrls 的图片(灰度图除外)。"""
  239. targets = []
  240. for image_type in _defect_url_target_type_list(crop_pool_by_type, side_key):
  241. img = crop_pool_by_type.get(image_type)
  242. if img is not None:
  243. targets.append(img)
  244. return targets
  245. def _sanitize_defects_for_recalculate(defects: list):
  246. """
  247. 清理前端展示/编辑辅助字段,减少算分服务解析失败概率。
  248. """
  249. if not isinstance(defects, list):
  250. return
  251. for d in defects:
  252. if not isinstance(d, dict):
  253. continue
  254. if d.get("label") == "slight_scratch":
  255. d["label"] = "scratch"
  256. d.pop("defectImgUrl", None)
  257. d.pop("defectImgUrls", None)
  258. d.pop("gray_id", None)
  259. d.pop("fusion_id", None)
  260. d.pop("edit_type", None)
  261. d.pop("severity_level", None)
  262. d.pop("new_score", None)
  263. def _generate_defect_img_urls_for_json(
  264. card_id: int,
  265. fusion_img_id: int,
  266. json_data: dict,
  267. side_key: str,
  268. crop_pool_by_type: dict,
  269. generate_related_images: bool = True,
  270. ) -> dict:
  271. """
  272. 以融合图 JSON 中的缺陷 min_rect 为准,在同面各目标类型原图上裁图,
  273. 生成 defectImgUrls 并返回 rect_hash -> urls 缓存,供同面其它图复用。
  274. """
  275. start_time = perf_counter()
  276. url_cache_by_rect = {}
  277. if not json_data or "result" not in json_data:
  278. logger.info(
  279. "耗时埋点 _generate_defect_img_urls: card_id=%s fusion_image_id=%s side=%s defects=0 elapsed_ms=%.2f",
  280. card_id, fusion_img_id, side_key, (perf_counter() - start_time) * 1000,
  281. )
  282. return url_cache_by_rect
  283. defect_result = json_data["result"].get("defect_result", {})
  284. defects = defect_result.get("defects", [])
  285. crop_target_images = _defect_url_target_images(crop_pool_by_type, side_key)
  286. target_types = _defect_url_target_type_list(crop_pool_by_type, side_key)
  287. missing_types = [t for t in target_types if t not in crop_pool_by_type]
  288. if missing_types:
  289. logger.info(
  290. "defectImgUrls 裁图目标缺失: card_id=%s side=%s missing=%s",
  291. card_id, side_key, ",".join(missing_types),
  292. )
  293. for idx, defect in enumerate(defects, start=1):
  294. min_rect = defect.get("min_rect")
  295. defect_img_url_list = []
  296. rect_hash = _defect_rect_hash(min_rect)
  297. if min_rect and len(min_rect) == 3 and generate_related_images and crop_target_images:
  298. for s_img in crop_target_images:
  299. s_img_type = getattr(s_img, "image_type", "")
  300. s_img_path = getattr(s_img, "image_path", "")
  301. s_img_id = getattr(s_img, "id", 0)
  302. s_filename = f"xy_{card_id}_{s_img_id}_{idx}_{rect_hash}.jpg"
  303. s_out_rel_path = f"/DefectImage/{s_filename}"
  304. s_out_object_name = f"{settings.MINIO_BASE_PREFIX}{s_out_rel_path}"
  305. s_url = ""
  306. try:
  307. minio_client.stat_object(settings.MINIO_BUCKET, s_out_object_name)
  308. s_url = settings.get_full_url(s_out_rel_path)
  309. except Exception:
  310. if s_img_path:
  311. s_url = crop_defect_image(s_img_path, min_rect, s_filename)
  312. if s_url:
  313. defect_img_url_list.append({
  314. "image_type": s_img_type,
  315. "url": s_url,
  316. })
  317. defect["defectImgUrls"] = defect_img_url_list
  318. if rect_hash:
  319. url_cache_by_rect[rect_hash] = copy.deepcopy(defect_img_url_list)
  320. logger.info(
  321. "耗时埋点 _generate_defect_img_urls: card_id=%s fusion_image_id=%s side=%s "
  322. "defects=%s target_types=%s elapsed_ms=%.2f",
  323. card_id,
  324. fusion_img_id,
  325. side_key,
  326. len(defects),
  327. len(crop_target_images),
  328. (perf_counter() - start_time) * 1000,
  329. )
  330. return url_cache_by_rect
  331. def _apply_defect_img_urls_from_cache(json_data: dict, url_cache_by_rect: dict):
  332. """同面非 canonical 图:按 min_rect 哈希复用已生成的 defectImgUrls,不再访问 MinIO。"""
  333. if not json_data or "result" not in json_data or not url_cache_by_rect:
  334. return
  335. defects = json_data["result"].get("defect_result", {}).get("defects", [])
  336. for defect in defects:
  337. if not isinstance(defect, dict):
  338. continue
  339. rect_hash = _defect_rect_hash(defect.get("min_rect"))
  340. defect["defectImgUrls"] = copy.deepcopy(url_cache_by_rect.get(rect_hash, []))
  341. def _clear_defect_img_urls(json_data: dict):
  342. """灰度图不生成关联缺陷图,清空展示用字段。"""
  343. if not json_data or "result" not in json_data:
  344. return
  345. defects = json_data["result"].get("defect_result", {}).get("defects", [])
  346. for defect in defects:
  347. if isinstance(defect, dict):
  348. defect["defectImgUrls"] = []
  349. def _process_images_to_xy_format(
  350. card_data: dict,
  351. generate_related_images: bool = True,
  352. db_conn: PooledMySQLConnection = None,
  353. ):
  354. """
  355. 内部辅助函数:遍历卡牌数据中的图片,将 JSON 格式转换为前端需要的 XY 格式。
  356. 每面仅以融合图 JSON 生成一次 defectImgUrls(按固定 14 类中的同面非灰类型裁图),
  357. 再拷贝到同面 ring / stripe 等;灰度图不生成 defectImgUrls。
  358. 直接修改传入的 card_data 字典。
  359. """
  360. start_time = perf_counter()
  361. card_id = card_data.get("id")
  362. all_images = card_data.get("images", [])
  363. fusion_by_side = _resolve_fusion_images_by_side(all_images) if all_images else {}
  364. crop_pool_by_type = _build_defect_crop_pool_by_type(
  365. card_id, all_images, db_conn=db_conn,
  366. )
  367. detection_url_cache_by_side = {}
  368. modified_url_cache_by_side = {}
  369. if all_images:
  370. parsed_json_by_img_id = {}
  371. for img in all_images:
  372. d_internal = img.detection_json
  373. if isinstance(d_internal, str):
  374. d_internal = json.loads(d_internal) if d_internal else None
  375. m_internal = img.modified_json
  376. if isinstance(m_internal, str):
  377. m_internal = json.loads(m_internal) if m_internal else None
  378. parsed_json_by_img_id[img.id] = {
  379. "detection": d_internal,
  380. "modified": m_internal,
  381. }
  382. if generate_related_images:
  383. for side_key, fusion_img in fusion_by_side.items():
  384. if not fusion_img:
  385. continue
  386. parsed = parsed_json_by_img_id.get(fusion_img.id, {})
  387. d_internal = parsed.get("detection")
  388. if d_internal:
  389. detection_url_cache_by_side[side_key] = _generate_defect_img_urls_for_json(
  390. card_id,
  391. fusion_img.id,
  392. d_internal,
  393. side_key,
  394. crop_pool_by_type,
  395. generate_related_images=True,
  396. )
  397. m_internal = parsed.get("modified")
  398. if m_internal:
  399. modified_url_cache_by_side[side_key] = _generate_defect_img_urls_for_json(
  400. card_id,
  401. fusion_img.id,
  402. m_internal,
  403. side_key,
  404. crop_pool_by_type,
  405. generate_related_images=True,
  406. )
  407. for img in all_images:
  408. image_type = img.image_type
  409. is_gray = _is_gray_image_type(image_type)
  410. side_key = _side_key_from_image_type(image_type)
  411. parsed = parsed_json_by_img_id.get(img.id, {})
  412. d_internal = parsed.get("detection")
  413. m_internal = parsed.get("modified")
  414. if d_internal:
  415. if is_gray:
  416. _clear_defect_img_urls(d_internal)
  417. elif side_key and detection_url_cache_by_side.get(side_key):
  418. _apply_defect_img_urls_from_cache(
  419. d_internal, detection_url_cache_by_side[side_key],
  420. )
  421. img.detection_json = convert_internal_to_xy_format(d_internal)
  422. else:
  423. img.detection_json = convert_internal_to_xy_format({})
  424. if m_internal:
  425. if is_gray:
  426. _clear_defect_img_urls(m_internal)
  427. elif side_key and modified_url_cache_by_side.get(side_key):
  428. _apply_defect_img_urls_from_cache(
  429. m_internal, modified_url_cache_by_side[side_key],
  430. )
  431. img.modified_json = convert_internal_to_xy_format(m_internal)
  432. else:
  433. m_fallback = copy.deepcopy(d_internal) if d_internal else {}
  434. img.modified_json = convert_internal_to_xy_format(m_fallback)
  435. logger.info(
  436. "耗时埋点 _process_images_to_xy_format: card_id=%s image_count=%s elapsed_ms=%.2f",
  437. card_id, len(all_images), (perf_counter() - start_time) * 1000
  438. )
  439. return card_data
  440. @router.get("/query", response_model=CardDetailResponse, summary="获取卡牌详细信息(格式化xy), 支持前后翻页 [用户调用]")
  441. def get_card_details(
  442. card_id: int = Query(..., description="基准卡牌ID"),
  443. mode: QueryMode = Query(QueryMode.current, description="查询模式: current(当前), next(下一个), prev(上一个)"),
  444. db_conn: PooledMySQLConnection = db_dependency
  445. ):
  446. """
  447. 获取卡牌元数据以及所有与之关联的图片信息,并将坐标转换为 xy 格式。
  448. 同时返回上一张和下一张卡牌的ID。
  449. - **current**: 查询 card_id 对应的卡牌。
  450. - **next**: 查询 ID 比 card_id 大的第一张卡牌。
  451. - **prev**: 查询 ID 比 card_id 小的第一张卡牌。
  452. """
  453. target_id = card_id
  454. cursor = None
  455. start_time = perf_counter()
  456. try:
  457. cursor = db_conn.cursor(dictionary=True)
  458. # 1. 如果是查询上一个或下一个,先计算目标ID
  459. if mode != QueryMode.current:
  460. if mode == QueryMode.next:
  461. query_target = (f"SELECT id FROM {settings.DB_CARD_TABLE_NAME} "
  462. f"WHERE id > %s ORDER BY id ASC LIMIT 1")
  463. else: # mode == QueryMode.prev
  464. query_target = (f"SELECT id FROM {settings.DB_CARD_TABLE_NAME} "
  465. f"WHERE id < %s ORDER BY id DESC LIMIT 1")
  466. cursor.execute(query_target, (card_id,))
  467. row = cursor.fetchone()
  468. if not row:
  469. msg = "没有下一张" if mode == QueryMode.next else "没有上一张"
  470. # 边界场景返回 404,避免与 response_model=CardDetailResponse 冲突
  471. raise HTTPException(status_code=404, detail=msg)
  472. target_id = row['id']
  473. # 2. 获取目标卡牌的详细数据 (Dict 格式)
  474. card_data = crud_card.get_card_with_details(db_conn, target_id)
  475. if not card_data:
  476. raise HTTPException(status_code=404, detail=f"ID为 {target_id} 的卡牌未找到。")
  477. # 3. 补充当前目标卡牌的 id_prev 和 id_next
  478. # 注意:这里需要重新获取 cursor,或者使用 cursor (非 dict 模式可能更方便取值,但 dict 模式也行)
  479. # 这里为了简单直接用 raw SQL
  480. # 查询上一个ID
  481. sql_prev = f"SELECT id FROM {settings.DB_CARD_TABLE_NAME} WHERE id < %s ORDER BY id DESC LIMIT 1"
  482. cursor.execute(sql_prev, (target_id,))
  483. row_prev = cursor.fetchone()
  484. card_data['id_prev'] = row_prev['id'] if row_prev else None
  485. # 查询下一个ID
  486. sql_next = f"SELECT id FROM {settings.DB_CARD_TABLE_NAME} WHERE id > %s ORDER BY id ASC LIMIT 1"
  487. cursor.execute(sql_next, (target_id,))
  488. row_next = cursor.fetchone()
  489. card_data['id_next'] = row_next['id'] if row_next else None
  490. # 4. 遍历图片,转换格式 (使用抽取出的辅助函数)
  491. _process_images_to_xy_format(
  492. card_data,
  493. generate_related_images=True,
  494. db_conn=db_conn,
  495. )
  496. # 5. 将 images 从 Pydantic 对象转为 dict,避免 model_validate 重复验证导致类型异常
  497. if "images" in card_data:
  498. card_data["images"] = [
  499. img.model_dump() if hasattr(img, 'model_dump') else img
  500. for img in card_data["images"]
  501. ]
  502. # 6. 验证并返回
  503. return CardDetailResponse.model_validate(card_data)
  504. except HTTPException:
  505. raise
  506. except Exception as e:
  507. logger.error(f"查询卡牌详情失败 (Mode: {mode}, BaseID: {card_id}): {e}")
  508. raise HTTPException(status_code=500, detail="数据库查询失败")
  509. finally:
  510. logger.info(
  511. "耗时埋点 get_card_details: base_card_id=%s target_card_id=%s mode=%s elapsed_ms=%.2f",
  512. card_id, target_id, mode, (perf_counter() - start_time) * 1000
  513. )
  514. if cursor:
  515. cursor.close()
  516. @router.put("/update/json/{id}", status_code=200, summary="接收xy格式, 还原后重计算分数并保存 [用户调用]")
  517. async def update_image_modified_json(
  518. id: int,
  519. new_json_data: dict = Body(..., description="前端传来的包含xy对象格式的JSON"),
  520. current_user: dict = Depends(get_current_user),
  521. db_conn: PooledMySQLConnection = db_dependency
  522. ):
  523. """
  524. 接收前端传来的特殊格式 JSON (points 为对象列表)。
  525. 1. 将格式还原为后端标准格式 (points 为 [[x,y]])。
  526. 2. 根据 id 获取 image_type。
  527. 3. 调用外部接口重新计算分数。
  528. 4. 更新 modified_json。
  529. """
  530. card_id_to_update = None
  531. cursor = None
  532. # *** 1. 格式还原 ***
  533. # 将前端的 xy dict 格式转回 [[x,y]]
  534. internal_json_payload = convert_xy_to_internal_format(new_json_data)
  535. try:
  536. cursor = db_conn.cursor(dictionary=True)
  537. # 2. 获取图片信息
  538. cursor.execute(
  539. f"SELECT image_type, card_id, detection_json, modified_json "
  540. f"FROM {settings.DB_IMAGE_TABLE_NAME} WHERE id = %s",
  541. (id,)
  542. )
  543. row = cursor.fetchone()
  544. if not row:
  545. raise HTTPException(status_code=404, detail=f"ID为 {id} 的图片未找到。")
  546. card_id_to_update = row["card_id"]
  547. check_card_permission(db_conn, current_user, card_id_to_update)
  548. image_type = row["image_type"]
  549. # score_recalculate 接口只接受 coaxial / ring 类型的 score_type,
  550. # 融合图/灰度图/调光图都按正反面归到对应 ring。
  551. score_type = _resolve_recalc_score_type(image_type)
  552. if not score_type:
  553. raise HTTPException(status_code=400, detail=f"未知的 image_type: {image_type}")
  554. # 3. 准备重算 payload:以库内原始 JSON 为底稿,仅覆盖编辑后的 defects
  555. # 对 fusion 图,score_type 会映射到 ring;此时底稿也应优先使用 ring 图 JSON,
  556. # 否则 fusion 图常见的空框结构会导致算分服务在 ring 逻辑下越界。
  557. source_json_str = row["modified_json"] if row["modified_json"] else row["detection_json"]
  558. if image_type in (ImageType.front_fusion.value, ImageType.back_fusion.value):
  559. target_ring_type = (
  560. ImageType.front_ring.value
  561. if image_type == ImageType.front_fusion.value
  562. else ImageType.back_ring.value
  563. )
  564. cursor.execute(
  565. f"SELECT detection_json, modified_json FROM {settings.DB_IMAGE_TABLE_NAME} "
  566. f"WHERE card_id = %s AND image_type = %s LIMIT 1",
  567. (card_id_to_update, target_ring_type)
  568. )
  569. ring_row = cursor.fetchone()
  570. if ring_row:
  571. source_json_str = ring_row["modified_json"] if ring_row["modified_json"] else ring_row["detection_json"]
  572. else:
  573. logger.warning(
  574. "fusion图重算未找到对应ring底稿,回退到当前图: image_id=%s card_id=%s image_type=%s target_ring_type=%s",
  575. id, card_id_to_update, image_type, target_ring_type
  576. )
  577. if isinstance(source_json_str, str):
  578. source_json_data = json.loads(source_json_str)
  579. else:
  580. source_json_data = source_json_str if isinstance(source_json_str, dict) else {}
  581. payload_for_recalculate = _prepare_recalculate_payload(internal_json_payload, source_json_data)
  582. _defects = payload_for_recalculate.get("result", {}).get("defect_result", {}).get("defects", [])
  583. _sanitize_defects_for_recalculate(_defects)
  584. logger.info(f"开始计算分数 (ID: {id}, Type: {score_type})")
  585. # 4. 调用远程计算接口
  586. try:
  587. response = await run_in_threadpool(
  588. lambda: requests.post(
  589. settings.SCORE_RECALCULATE_ENDPOINT,
  590. params={"score_type": score_type},
  591. json=payload_for_recalculate,
  592. timeout=20
  593. )
  594. )
  595. except Exception as e:
  596. logger.error(
  597. "调用分数计算服务失败(update/json): image_id=%s card_id=%s score_type=%s endpoint=%s error=%s",
  598. id, card_id_to_update, score_type, settings.SCORE_RECALCULATE_ENDPOINT, e,
  599. exc_info=True
  600. )
  601. raise HTTPException(status_code=500, detail=f"调用分数计算服务失败: {e}")
  602. if response.status_code != 200:
  603. logger.error(
  604. "分数计算接口返回错误(update/json): image_id=%s card_id=%s score_type=%s endpoint=%s status=%s body=%s",
  605. id, card_id_to_update, score_type, settings.SCORE_RECALCULATE_ENDPOINT, response.status_code, response.text
  606. )
  607. raise HTTPException(status_code=response.status_code,
  608. detail=f"分数计算接口返回错误: {response.text}")
  609. logger.info("分数计算完成")
  610. # 获取计算服务返回的结果(这个结果通常已经是标准的 internal 格式,带有分数和面积)
  611. final_json_data = response.json()
  612. # 5. 保存结果到数据库
  613. recalculated_json_str = json.dumps(final_json_data, ensure_ascii=False)
  614. update_query = (f"UPDATE {settings.DB_IMAGE_TABLE_NAME} "
  615. f"SET modified_json = %s, is_edited = TRUE "
  616. f"WHERE id = %s")
  617. cursor.execute(update_query, (recalculated_json_str, id))
  618. db_conn.commit()
  619. logger.info(f"图片ID {id} 的 modified_json 已更新并重新计算。")
  620. # 更新对应的 cards 的分数状态
  621. try:
  622. crud_card.update_card_scores_and_status(db_conn, card_id_to_update)
  623. logger.info(f"卡牌 {card_id_to_update} 的分数和状态已更新。")
  624. except Exception as score_update_e:
  625. logger.error(f"更新卡牌 {card_id_to_update} 分数失败: {score_update_e}")
  626. # 更新卡牌审核状态
  627. try:
  628. with db_conn.cursor() as cursor:
  629. review_state = 2
  630. # 更新指定 card_id 的 review_state 字段
  631. # 注意:MySQL 在“值未变化”时 rowcount 可能为 0,这不代表记录不存在。
  632. query_update = f"UPDATE {settings.DB_CARD_TABLE_NAME} SET review_state = %s WHERE id = %s"
  633. cursor.execute(query_update, (review_state, card_id_to_update))
  634. if cursor.rowcount == 0:
  635. cursor.execute(f"SELECT 1 FROM {settings.DB_CARD_TABLE_NAME} WHERE id = %s LIMIT 1",
  636. (card_id_to_update,))
  637. if not cursor.fetchone():
  638. raise HTTPException(status_code=404, detail=f"ID为 {card_id_to_update} 的卡牌未找到。")
  639. db_conn.commit()
  640. logger.info(f"卡牌 ID {card_id_to_update} 的审核状态已成功修改为 {review_state}。")
  641. except Exception as e:
  642. db_conn.rollback()
  643. logger.error(f"修改卡牌 {id} 审核状态失败: {e}")
  644. if isinstance(e, HTTPException):
  645. raise e
  646. raise HTTPException(status_code=500, detail="修改审核状态失败,数据库操作错误。")
  647. return {
  648. "detail": f"成功更新图片ID {id} 的JSON数据",
  649. "image_type": image_type,
  650. "score_type": score_type
  651. }
  652. except HTTPException:
  653. db_conn.rollback()
  654. raise
  655. except Exception as e:
  656. db_conn.rollback()
  657. logger.error(f"更新JSON失败 ({id}): {e}")
  658. raise HTTPException(status_code=500, detail=f"更新JSON数据失败: {e}")
  659. finally:
  660. if cursor:
  661. cursor.close()
  662. # 处理灰度如
  663. @router.put("/update/json_gray/{id}", status_code=200, summary="[灰度] 接收xy格式, 合并至Ring图重计算并保存 [用户调用]")
  664. async def update_gray_image_json(
  665. id: int,
  666. new_json_data: dict = Body(..., description="前端传来的灰度图编辑后的JSON(xy格式)"),
  667. current_user: dict = Depends(get_current_user),
  668. db_conn: PooledMySQLConnection = db_dependency
  669. ):
  670. """
  671. 针对灰度图 (front_gray/back_gray) 的保存逻辑。
  672. """
  673. cursor = None
  674. # 1. 格式还原
  675. internal_gray_json = convert_xy_to_internal_format(new_json_data)
  676. gray_defects = internal_gray_json.get("result", {}).get("defect_result", {}).get("defects", [])
  677. # 丢弃前端展示用的辅助字段,防止传给算分服务导致报错
  678. for d in gray_defects:
  679. if d.get("label") == "slight_scratch":
  680. d["label"] = "scratch"
  681. d.pop("defectImgUrl", None)
  682. d.pop("defectImgUrls", None)
  683. try:
  684. cursor = db_conn.cursor(dictionary=True)
  685. # 2. 获取辅助图(灰度图/融合图)信息
  686. # 以前只查 card_gray_images,现在融合图是在 card_images 表里
  687. # 先查 card_gray_images
  688. cursor.execute(f"SELECT card_id, image_type FROM {settings.DB_GRAY_IMAGE_TABLE_NAME} WHERE id = %s", (id,))
  689. gray_row = cursor.fetchone()
  690. if not gray_row:
  691. # 如果灰度表没找到,去主表找找看是不是融合图
  692. cursor.execute(f"SELECT card_id, image_type FROM {settings.DB_IMAGE_TABLE_NAME} WHERE id = %s AND image_type IN ('front_fusion', 'back_fusion')", (id,))
  693. gray_row = cursor.fetchone()
  694. if not gray_row:
  695. raise HTTPException(status_code=404, detail=f"ID为 {id} 的辅助图未找到。")
  696. card_id = gray_row['card_id']
  697. check_card_permission(db_conn, current_user, card_id)
  698. gray_image_type = gray_row['image_type']
  699. # 3. 确定目标 Ring 图类型
  700. target_ring_type = None
  701. if gray_image_type in (ImageType.front_gray.value, ImageType.front_fusion.value):
  702. target_ring_type = ImageType.front_ring.value
  703. elif gray_image_type in (ImageType.back_gray.value, ImageType.back_fusion.value):
  704. target_ring_type = ImageType.back_ring.value
  705. else:
  706. raise HTTPException(status_code=400, detail=f"不支持的辅助图类型: {gray_image_type}")
  707. # 4. 获取目标 Ring 图数据 (Card Images 表)
  708. cursor.execute(
  709. f"SELECT id, detection_json, modified_json FROM {settings.DB_IMAGE_TABLE_NAME} "
  710. f"WHERE card_id = %s AND image_type = %s",
  711. (card_id, target_ring_type)
  712. )
  713. ring_row = cursor.fetchone()
  714. if not ring_row:
  715. raise HTTPException(status_code=404, detail=f"未找到对应的 Ring 图 ({target_ring_type}),无法应用修改。")
  716. ring_image_id = ring_row['id']
  717. # 优先使用 modified_json,如果没有则使用 detection_json
  718. source_json_str = ring_row['modified_json'] if ring_row['modified_json'] else ring_row['detection_json']
  719. if isinstance(source_json_str, str):
  720. ring_json_data = json.loads(source_json_str)
  721. else:
  722. ring_json_data = source_json_str
  723. # 5. 合并逻辑 (Merge Logic)
  724. # 确保路径存在
  725. if "result" not in ring_json_data: ring_json_data["result"] = {}
  726. if "defect_result" not in ring_json_data["result"]: ring_json_data["result"]["defect_result"] = {}
  727. if "defects" not in ring_json_data["result"]["defect_result"]: ring_json_data["result"]["defect_result"][
  728. "defects"] = []
  729. ring_defects = ring_json_data["result"]["defect_result"]["defects"]
  730. # 遍历灰度图传来的新缺陷列表
  731. for new_defect in gray_defects:
  732. is_fusion = gray_image_type in (ImageType.front_fusion.value, ImageType.back_fusion.value)
  733. key_to_check = "fusion_id" if is_fusion else "gray_id"
  734. identifier = new_defect.get(key_to_check)
  735. # 只有带有对应标识的才进行特殊合并处理
  736. # 如果没有,视作普通新缺陷直接添加
  737. if not identifier:
  738. ring_defects.append(new_defect)
  739. continue
  740. # 在 Ring 图现有的缺陷中寻找匹配的标识
  741. match_index = -1
  742. for i, old_defect in enumerate(ring_defects):
  743. if old_defect.get(key_to_check) == identifier:
  744. match_index = i
  745. break
  746. if match_index != -1:
  747. # 存在:替换 (Replace)
  748. ring_defects[match_index] = new_defect
  749. else:
  750. # 不存在:添加 (Append)
  751. ring_defects.append(new_defect)
  752. # 6. 调用计算服务 (对 Ring 图数据进行重算)
  753. # score_recalculate 接口接受 ring 类型,直接用目标 ring 类型即可
  754. score_type = _resolve_recalc_score_type(target_ring_type)
  755. logger.info(f"开始重计算 Ring 图分数 (GrayID: {id} -> RingID: {ring_image_id}, Type: {score_type})")
  756. try:
  757. response = await run_in_threadpool(
  758. lambda: requests.post(
  759. settings.SCORE_RECALCULATE_ENDPOINT,
  760. params={"score_type": score_type},
  761. json=ring_json_data, # 发送合并后的 Ring 数据
  762. timeout=20
  763. )
  764. )
  765. except Exception as e:
  766. logger.error(
  767. "调用分数计算服务失败(update/json_gray): gray_id=%s ring_id=%s card_id=%s score_type=%s endpoint=%s error=%s",
  768. id, ring_image_id, card_id, score_type, settings.SCORE_RECALCULATE_ENDPOINT, e,
  769. exc_info=True
  770. )
  771. raise HTTPException(status_code=500, detail=f"调用分数计算服务失败: {e}")
  772. if response.status_code != 200:
  773. logger.error(
  774. "分数计算接口返回错误(update/json_gray): gray_id=%s ring_id=%s card_id=%s score_type=%s endpoint=%s status=%s body=%s",
  775. id, ring_image_id, card_id, score_type, settings.SCORE_RECALCULATE_ENDPOINT, response.status_code, response.text
  776. )
  777. raise HTTPException(status_code=response.status_code,
  778. detail=f"分数计算接口返回错误: {response.text}")
  779. final_ring_json = response.json()
  780. # 7. 保存结果到数据库 (保存到 Ring 图记录)
  781. final_json_str = json.dumps(final_ring_json, ensure_ascii=False)
  782. update_query = (
  783. f"UPDATE {settings.DB_IMAGE_TABLE_NAME} "
  784. f"SET modified_json = %s, is_edited = TRUE "
  785. f"WHERE id = %s"
  786. )
  787. cursor.execute(update_query, (final_json_str, ring_image_id))
  788. db_conn.commit()
  789. logger.info(f"Ring 图 {ring_image_id} 已根据灰度图 {id} 的修改进行了更新。")
  790. # 8. 更新卡牌总分状态
  791. try:
  792. crud_card.update_card_scores_and_status(db_conn, card_id)
  793. except Exception as e:
  794. logger.error(f"更新卡牌 {card_id} 分数状态失败: {e}")
  795. # 更新卡牌审核状态
  796. try:
  797. with db_conn.cursor() as cursor:
  798. review_state = 2
  799. # 更新指定 card_id 的 review_state 字段
  800. # 注意:MySQL 在 “值未变化” 的情况下 rowcount 可能为 0,但这不代表记录不存在。
  801. query_update = f"UPDATE {settings.DB_CARD_TABLE_NAME} SET review_state = %s WHERE id = %s"
  802. cursor.execute(query_update, (review_state, card_id))
  803. if cursor.rowcount == 0:
  804. cursor.execute(f"SELECT 1 FROM {settings.DB_CARD_TABLE_NAME} WHERE id = %s LIMIT 1", (card_id,))
  805. if not cursor.fetchone():
  806. raise HTTPException(status_code=404, detail=f"ID为 {card_id} 的卡牌未找到。")
  807. db_conn.commit()
  808. logger.info(f"卡牌 ID {card_id} 的审核状态已成功修改为 {review_state}。")
  809. except Exception as e:
  810. db_conn.rollback()
  811. logger.error(f"修改卡牌 {id} 审核状态失败: {e}")
  812. if isinstance(e, HTTPException):
  813. raise e
  814. raise HTTPException(status_code=500, detail="修改审核状态失败,数据库操作错误。")
  815. return {
  816. "detail": f"成功应用灰度图修改到 {target_ring_type}",
  817. "target_ring_id": ring_image_id,
  818. "gray_id": id
  819. }
  820. except HTTPException:
  821. db_conn.rollback()
  822. raise
  823. except Exception as e:
  824. db_conn.rollback()
  825. logger.error(f"灰度图更新失败 ({id}): {e}")
  826. raise HTTPException(status_code=500, detail=f"系统内部错误: {e}")
  827. finally:
  828. if cursor:
  829. cursor.close()