Sync develop → main (v0.1.101) #121

Merged

xiaoxia merged 10 commits from develop into main 2026-06-30 11:10:59 +08:00

Conversation 0 Commits 10 Files Changed 13

+240 -37

xiaoxia commented 2026-06-30 11:10:53 +08:00

Owner

Copy Link

Copy Source

同步 develop 到 main，包含 PR#117~#120 全部修复

同步 develop 到 main，包含 PR#117~#120 全部修复

xiaoxia added 10 commits 2026-06-30 11:10:53 +08:00

fix: 上传文件大小限制从 800MB 提升至 2000MB ... b98c83582b

P0 修复:
- config.py: OSS_DIRECT_UPLOAD_MAX_MB 默认值从 800 改为 2000
- config.py: 添加 AliasChoices 支持 MAX_UPLOAD_SIZE_MB 环境变量
  （.env.production 中 MAX_UPLOAD_SIZE_MB=2000 现在可被正确读取）

P1 修复:
- infra/nginx/xiaoxia-saas.conf: client_max_body_size 800m → 2g（3处）
- infra/docker/nginx-production.conf: client_max_body_size 800m → 2g

feat(assets): add 2GB file size validation and OSS direct upload for large files ... b5e27a5e9e

- Add MAX_FILE_SIZE (2GB) validation in handleUpload with friendly error message
- Route files >100MB through OSS presigned direct upload (uploadAssetDirect)
- Keep small file form upload (uploadAsset) for files <=100MB
- Update upload hint text to show '单文件不超过 2GB' limit
- Add directUploadMutation with proper loading state tracking

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

fix(assets): add project_id to OSS direct upload and align size limit to 2048MB ... 304354208a

P1: prepareDirectUpload and completeDirectUpload now require project_id,
uploadAssetDirect calls getOrCreateDefaultProject() to obtain it automatically.
P2: MAX_FILE_SIZE changed from 2*1024^3 to 2048*1024*1024 to align with
backend OSS_DIRECT_UPLOAD_MAX_MB=2000.

chore(ci): add automatic Docker image cleanup after builds ... d934e0e322

- Add scripts/cleanup_old_images.sh: keeps only last 2 versions
  per service (api/worker/web), removes old local tags and registry
  blobs via Registry API, prunes dangling images
- Add cleanup step to deploy.yml build-production-runtime-images job
  with if:always() to ensure cleanup runs even on build failure
- Prevents disk space exhaustion from accumulated Docker images
  and Registry blobs on the build server

Merge pull request 'fix: 上传文件大小限制从 800MB 提升至 2000MB' (#117) from fix/upload-size-limit-2000mb into develop 6dbb281acf

fix: rename OSS_DIRECT_UPLOAD_EXPRESS_SECRET to OSS_DIRECT_UPLOAD_EXPIRE_SECONDS ... e6ecce79ee

Root cause of upload endpoint 500 errors:
- config.py defined OSS_DIRECT_UPLOAD_EXPRESS_SECRET (wrong name)
- upload.py accessed settings.OSS_DIRECT_UPLOAD_EXPIRE_SECONDS (correct name)
- AttributeError on every call to prepare_direct_upload → 500

This fixes both /api/v1/upload/prepare-direct-upload and any other
upload endpoints that reference the expire seconds config.

Merge pull request 'fix: 修复上传端点 500 错误 — 配置字段名拼写错误' (#119) from fix/upload-size-limit-2000mb into develop bae9b509de

fix: 上传端点异常处理 + OSS 诊断能力 ... 05c9137ece

问题：PR#119 修复变量名后上传端点仍然 500，说明根因不仅是变量名错误

修复：
1. upload.py — 所有 3 个上传端点添加完整异常捕获和日志
   - prepare_direct_upload: 捕获 RuntimeError→503 + 其他异常→500+日志
   - complete_direct_upload: file_exists() 异常捕获→503（之前未捕获→500）
   - upload_asset: upload_file() 异常捕获→503/500+日志（之前未捕获→500）

2. storage.py — OSSStorageService.__init__ 添加启动诊断日志
   - 凭证缺失时记录 missing env vars
   - oss2 SDK 未安装时记录错误
   - bucket 初始化成功/失败时记录

3. health.py — /ready 端点增加 OSS 检查
   - 检查凭证是否配置
   - 检查 oss2 SDK 是否可用
   - 调用 get_bucket_info() 验证连通性

部署后请调用 GET /api/v1/ready 查看 OSS 状态

fix: list_by_project → find_by_project (修复上传/诊断端点 500) ... 37152a0729

根因：upload.py、chunked_upload.py、asset_diagnosis.py 调用了
asset_library_repository.list_by_project()，但 SQLAlchemy 实现
只有 find_by_project()，导致 AttributeError → 500。

同步修复 InMemory 实现的方法名以保持一致。

Merge pull request 'fix: 上传端点 500 根因修复 (list_by_project → find_by_project) + OSS 诊断能力' (#120) from fix/upload-size-limit-2000mb into develop ... b6ead113cf

PR#120: fix list_by_project → find_by_project (3 files)

xiaoxia merged commit 51e3cf5454 into main 2026-06-30 11:10:59 +08:00

xiaoxia referenced this issue from a commit 2026-06-30 11:10:59 +08:00

Merge pull request 'Sync develop → main (v0.1.101)' (#121) from develop into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

P0

阻塞性，必须立即处理

P1

高优先级

P2

中优先级

P3

低优先级/后考虑

architecture

架构设计

backend

后端相关

blocked

阻塞中

bug

Bug修复

ci-bug

CI本身的bug

ci-optimization

CI优化类任务

ci-pipeline

CI流水线/workflow相关

cleanup

代码清理

devops

运维/部署/CI

documentation

文档相关

feature

新功能

frontend

前端相关

question

需要讨论确认

ready

PR CI通过，可合并

refactor

代码重构

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

auto-approve-bot xiaoxia

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#121