xiaoxia/xiaoxia-saas

fix(#2187): outfit提取正则优化，保留颜色形容词 #2187

Merged

auto-approve-bot merged 4 commits from fix/outfit-extract-regex-tweak into develop

2026-10-05 02:04:08 +08:00

Author	SHA1	Message	Date
业务服务器运维	377a5acf9d	merge develop into #2187 : resolve outfit regex conflict, keep new regex CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 2s Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 2s Details CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 1m1s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 1m9s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m30s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 2m7s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m2s Details CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 3m0s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m2s Details CI/CD Pipeline / Validate - Style (pull_request) Successful in 5m37s Details AI Code Review / AI Code Review (pull_request) Successful in 6m53s Details CI/CD Pipeline / Validate - Security (pull_request) Successful in 9m50s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / CI Gate (pull_request) Successful in 1s Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 7m35s Details ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 29s Details Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 4m0s Details	2026-10-05 01:53:30 +08:00
CI Bot	bd1050a23f	style: auto-format with black + isort + ruff + prettier [skip ci-format-check] CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s Details CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 47s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m16s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 2m22s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 2m44s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m0s Details CI/CD Pipeline / Validate - Style (pull_request) Successful in 3m13s Details CI/CD Pipeline / Validate - Security (pull_request) Successful in 6m7s Details AI Code Review / AI Code Review (pull_request) Successful in 6m31s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 7m29s Details CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 7m34s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / CI Gate (pull_request) Successful in 1s Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 7m34s Details	2026-10-04 17:34:11 +00:00
xiaoxia	27f29cc31e	fix(#2187 ): outfit提取正则优化,保留颜色形容词+清理尾部型号杂字 CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped Details CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 2s Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 2s Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m11s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m17s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m9s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 3m5s Details CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 3m16s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m29s Details CI/CD Pipeline / Validate - Style (pull_request) Has been cancelled Details CI/CD Pipeline / Validate - Security (pull_request) Has been cancelled Details CI/CD Pipeline / PR Build Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details AI Code Review / AI Code Review (pull_request) Has been cancelled Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Has been cancelled Details - 前缀清理只移除品牌/产品类前缀(牌/品牌/款/产品/商品/的)，保留颜色/款式/尺寸形容词 - 尾部清理扩展：标/数字+单位(ml/g/L/斤/件/瓶/盒)/尾部纯数字 - 提取窗口从前后6/2扩到8/4，多保留颜色词（米白色/米白色翻领） - 修复"米白色翻领衬衫"被清成"白色"、尾部残留"标"字的问题	2026-10-05 01:30:05 +08:00
xiaoxia	5482efa045	fix(#2186 ): 智能回填portrait_prompt+few-shot示例,服装发型还原增强 CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped Details CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 0s Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 2m44s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m55s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m52s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m0s Details CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 3m4s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 3m38s Details CI/CD Pipeline / Validate - Security (pull_request) Successful in 6m2s Details AI Code Review / AI Code Review (pull_request) Successful in 6m36s Details CI/CD Pipeline / Validate - Style (pull_request) Has been cancelled Details CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Has been cancelled Details #2185后VLM仍省略hair/outfit四属性（只输出6个旧属性，连"无法判断"都不写）， worker兜底用通用值导致服装还原失败（翻领衬衫→浅米色针织上衣）。双层增强： 1. 智能回填（worker）： - outfit兜底不再固定"日常服装"，从product.name+features中匹配服装关键词（衬衫/T恤/毛衣/针织/外套/西装/连衣裙/牛仔裤等30+类），提取前后短语作为具体服装描述 - hair兜底不再固定"自然发型"，从color标签中识别小面积发色（占比<0.3的黑/棕/金/栗等颜色）自动填充发色+"头发" - 回填后重新拼装_parts，保证portrait_prompt信息密度 - 回填不覆盖VLM正确输出的值，只补全缺失/通用值 2. few-shot示例（prompt）： - image_analysis system prompt新增有人物场景的<people>完整10属性输出示例 - 明确"必须写全10个属性，禁止省略" 预期：原米色翻领衬衫人像→outfit回填为"米色翻领衬衫"、hair从颜色提取"黑色头发" →Seedream t2i还原服装款式→整体人物相似度稳超85%且服装更准	2026-10-05 00:46:24 +08:00