xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 15 Pull Requests 16 Actions 34.2k Packages Projects Releases 7 Wiki Activity

fix(vision): #2211 followup 移除开头匹配，DB prompt直接用+追加JSON schema #2212

Closed
xiaoxia wants to merge 1 commits from fix/vision-v2-db-prompt into develop
pull from: fix/vision-v2-db-prompt
merge into: xiaoxia:develop
Conversation 2 Commits 1 Files Changed 3
+355 -141
xiaoxia commented 2026-10-05 22:37:52 +08:00
Owner
Copy Link
Copy Source
No description provided.
xiaoxia added 1 commit 2026-10-05 22:37:54 +08:00
fix(vision-v2): 恢复后台prompt配置读取，DB system+追加JSON schema约束
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s
Details
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m9s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 5m12s
Details
AI Code Review / AI Code Review (pull_request) Successful in 6m45s
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 / PR Build API Image (pull_request) Successful in 33s
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 1m37s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 39s
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
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 11s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 1m25s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 10m9s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 10m7s
Details
CI/CD Pipeline / Validate - Style (pull_request) Failing after 13m24s
Details
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 13m14s
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 / Validate - Security (pull_request) Successful in 24m27s
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 / CI Gate (pull_request) Failing after 2s
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 / Production Browser E2E (pull_request) Has been skipped
Details
28e201d52f 
根因：#2200重写V2时把 prompt_loader 调用链删了，system/user prompt
全部硬编码在 vlm_fast_json.py / vlm_fallback.py，用户在后台管理端
配置 viral_video_prompt_templates 表 prompt_type='image_analysis' 的
自定义提示词完全没被读取。

修复：
- 新增 vision/_prompt.py，30秒TTL热加载
- 规则简单直接（不做开头字符串匹配）：
  * DB有is_active=true的image_analysis记录（含用户修改后的版本）
    → system = DB.system_prompt + 追加JSON schema字段约束（覆盖XML等其他输出格式要求）
    → user = DB.user_prompt_template渲染后使用（image_count=1/industry=通用）
  * DB无记录/连接异常/返回空 → 纯硬编码JSON schema prompt
- 复用 prompt_loader._load_from_db 直查DB（不用get_template避免fallback到DEFAULT_TEMPLATES混淆判断）
- fast路径(qwen3.8-flash)追加22字段JSON schema，pro路径(qwen3.7-plus)追加13字段精简schema
- 末尾硬约束："不要输出任何其他文字、解释、XML标签或markdown"
- DB异常静默fallback，不阻断流程

本地冒烟：DB不可达时正确fallback到纯硬编码JSON。
gitea-actions bot commented 2026-10-05 22:40:47 +08:00
Copy Link
Copy Source

🚀 预览环境已部署

项目 详情
PR号 #2212
预览链接 https://pr-2212.preview.xiaoxiajianji.com
API环境 staging

💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。

🔄 每次提交新代码后预览环境会自动更新。

🗑️ PR 关闭或合并后，预览环境会自动清理。

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #2212 | | 预览链接 | [https://pr-2212.preview.xiaoxiajianji.com](https://pr-2212.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后，预览环境会自动清理。
xiaoxia closed this pull request 2026-10-05 22:45:40 +08:00
gitea-actions bot commented 2026-10-05 22:51:29 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

PR #2212 已关闭或合并，对应的预览环境已被清理。

如有需要，可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #2212 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
Some checks are pending
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s
Details
CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 1s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m9s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 5m12s
Details
AI Code Review / AI Code Review (pull_request) Successful in 6m45s
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 / PR Build API Image (pull_request) Successful in 33s
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 1m37s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 39s
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
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 11s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 1m25s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 10m9s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 10m7s
Details
CI/CD Pipeline / Validate - Style (pull_request) Failing after 13m24s
Details
CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 13m14s
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 / Validate - Security (pull_request) Successful in 24m27s
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 / CI Gate (pull_request) Failing after 2s
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 / Production Browser E2E (pull_request) Has been skipped
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot frontend-dev xiaoxia
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#2212
Delete Branch "fix/vision-v2-db-prompt"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?