Commit Graph

4830 Commits

Author SHA1 Message Date
k88936 bcac5a7c12 三个提交入口的生成选项映射收敛为单一字段清单
- common::validation 用 tripo_generation_options_from! 由一份字段清单派生三个 From 实现
- multiview 手写的 TripoGenerationOptions 映射改为复用该 From 实现
- 新增共享字段时三条路径一起跟上,缺字段会在编译期报错
2026-09-22 16:15:38 +08:00
k88936 c8b4160fcd 3D 查价错误并入统一的定价错误枚举
- EditorGenerationPricingError 新增 Model3d 变体并实现 From<Model3dPricingError>
- model3d_price 改为返回 EditorGenerationPricingError,内层文案直通保持响应不变
- 提交路由对 3D 定价错误与定价快照错误分别映射,未配置用例改断言 Model3d(NotConfigured)
2026-09-22 16:11:17 +08:00
k88936 9800477c7c 模型版本清单从声明表派生避免漏加新版本
- Model3dModelVersion 的变体、线上值与 ALL 改为由 model3d_model_versions! 单一声明表生成
- ALL 类型改为 &'static [Self],新增版本只需在声明表加一行
- 定价校验与测试的遍历改用 iter().copied()
2026-09-22 16:03:55 +08:00
k88936 2e9aed3750 三个提交入口统一校验 provider 返回的 task id
- 新增 submitted_task_handle:空白 id 在提交调用附近以 OutputSchema 失败
- text / image / multiview 提交路径共用它,任务不再以孤儿状态等到下游查询才报错
2026-09-22 15:53:37 +08:00
k88936 09f0c51b81 空白视图规则收敛到单一助手
- 新增 view_input 同时服务提交前计数校验与 SDK 参数转换
- 空白 / 纯空白视图的判定不再有两份实现,避免校验与转换漂移
2026-09-22 15:49:34 +08:00
k88936 be07eb79c6 未知任务状态错误带上 task id
- map_status 接收 task_id,Unknown 分支改用与其它映射失败一致的 OutputSchema
- provider 异常可与具体任务对上,不再是一条无主错误
2026-09-22 15:47:01 +08:00
k88936 1749f427c1 任务快照只在失败终态保留 failure
- failure 改由终态判定驱动,不再只看 provider 是否留下错误字段
- 已完成的任务即使带过期错误字段也不再挂 failure,保持快照内部自洽
2026-09-22 15:45:45 +08:00
k88936 d9aa686e9a Merge remote-tracking branch 'origin/master' into feat/tribo3d-integeration
Project CI / AI game creator shell Rust smoke (pull_request) Successful in 1m36s
Project CI / Backend tests (pull_request) Failing after 11s
Project CI / AI game creator shell Rust crates (pull_request) Successful in 1m11s
Project CI / Frontend tests (pull_request) Successful in 4m15s
Project CI / Repository checks (pull_request) Failing after 11s
Project CI / AI game creator shell Rust lane 2/2 (pull_request) Successful in 6m36s
Project CI / AI game creator shell Rust lane 1/2 (pull_request) Successful in 8m33s
Project CI / Native shell tests (pull_request) Successful in 9m19s
Project CI / AI game creator shell web tests (pull_request) Successful in 4m29s
# Conflicts:
#	docs/project-memory/shared-memory/pitfalls.md
2026-09-22 15:35:47 +08:00
k88936 050909a0b7 后台定价保存不再清空 3D 段
- payload 的 model3d 缺席或为 null 统一表示沿用当前 3D 定价,显式给出时才覆盖
- 保存路径先取当前快照合并,避免改图 / 视频价格让 3D 提交一直失败关闭
- 补用例覆盖「省略保持」与「显式覆盖」两种语义
2026-09-22 15:27:19 +08:00
k88936 ee2d505eb3 3D 提交在扣费前预检落点归属
- 新增 target 预检模块:画布项目按 (project_id, owner) 定点确认,素材库文件夹按 owner 的库匹配
- 两个提交路由都在查价与入队之前调用;跨 owner / 不存在的落点回 400 model3d-target-unavailable
- 只剩基础设施故障保留原状态码,并补了收敛口径的单测
2026-09-22 15:21:25 +08:00
k88936 8473877bc3 5xx 错误响应不再回带 provider task id
- TaskFailure / OutputSchema / 上游兜底分支只回固定文案,完整错误写入服务端日志
- 补一条断言 502 details 不含 task id 与 provider 原文的用例
2026-09-22 15:17:50 +08:00
k88936 cda7724cae 上游瞬时状态不再回落成 400
- 408 / 425 / 429 与 platform-tripo 的 is_retryable 口径对齐,分别回 504 / 502 / 429
- 补上这三档与客户端 4xx 的分支测试
2026-09-22 15:15:27 +08:00
k88936 e18c6ee502 产物下载客户端不再跟随跳转
- 产物地址来自 provider 响应,禁止 reqwest 自动跳转以防 SSRF
- 需要跳转的地址会以非成功状态显式暴露,不再由服务端静默代发
2026-09-22 15:12:06 +08:00
lhk229 292e42cf5e 为全部 Rust 测试组启用隔离编译缓存
Project CI / Backend tests (pull_request) Has been cancelled
Project CI / Native shell tests (pull_request) Has been cancelled
Project CI / Frontend tests (pull_request) Has been cancelled
Project CI / Repository checks (pull_request) Has been cancelled
Project CI / AI game creator shell web tests (pull_request) Has been cancelled
Project CI / AI game creator shell Rust lane 2/2 (pull_request) Has been cancelled
Project CI / AI game creator shell Rust crates (pull_request) Has been cancelled
Project CI / AI game creator shell Rust smoke (pull_request) Has been cancelled
Project CI / AI game creator shell Rust lane 1/2 (pull_request) Has been cancelled
Project CI / AI game creator shell Rust crates (push) Successful in 1m22s
Project CI / AI game creator shell Rust smoke (push) Successful in 1m51s
Project CI / Backend tests (push) Successful in 5m35s
Project CI / AI game creator shell Rust lane 2/2 (push) Successful in 7m8s
Project CI / AI game creator shell Rust lane 1/2 (push) Successful in 8m11s
Project CI / Native shell tests (push) Successful in 7m6s
Project CI / Frontend tests (push) Successful in 3m30s
Project CI / Repository checks (push) Successful in 3m28s
Project CI / AI game creator shell web tests (push) Successful in 3m7s
扩展缓存消费到 AGC 双 lane、crates、smoke、后端及桌面壳测试
补齐各组实际编译目标和工作目录的可信快照预热
保留 SpacetimeDB 独立编译边界并排除发布构建缓存
根据完整快照体积将对象缓存上限调整为 4 GiB
更新工作流契约测试、运维文档及项目共享记忆
2026-09-22 05:52:16 +00:00
k88936 669a08c7c2 产物下载失败信息补上可诊断上下文
- 传输失败带上脱敏 URL 与底层错误 source 链
- 非成功状态补上状态码文案与脱敏 URL
2026-09-22 13:51:29 +08:00
k88936 01a9941cbc 任务快照映射不再多余克隆字符串
- task_id 与 error_message 直接移交所有权,只保留错误路径上的必要克隆
2026-09-22 13:51:23 +08:00
k88936 fd0a37969e 3D 产物落盘文件名补上安全处理
- URL 无可用扩展名时按 content type 兜底,预览图不再写成 .glb
- 文件名主干中性化路径分隔符与遍历片段,避免逃出目标目录
2026-09-22 13:50:29 +08:00
k88936 7dd7bdd3c7 provider checkpoint 存在性校验补上 provider_kind
- at-most-once submit 的两字段不变量在数据层一起判定
2026-09-22 13:50:24 +08:00
k88936 5049c27f3d 3D 定价表加载时拦截加总溢出
- 底价与加价项累加改用 checked_add 校验,配置阶段即失败
- 避免结算路径 saturating_add 在异常配置下静默少收
2026-09-22 13:49:01 +08:00
k88936 129e2234f3 删掉 3D 引用解析里两个无人调用的宽查函数
- 两个 pub(crate) resolver 全仓无调用方,且会整表列举项目与素材
- 定点解析仍走既有按 ID 的窄查函数
2026-09-22 13:48:53 +08:00
k88936 2916e112df 3D provider 重试次数按上限 10 封顶
- TRIPO_RETRIES 配置异常时不再让产物下载近乎无限重试
2026-09-22 13:48:13 +08:00
k88936 c5e0c6a14d 去掉被丢弃的 remove 返回值告警
- 幂等指纹字段摘除改为显式丢弃返回值,表明这是 best-effort 行为
2026-09-22 13:48:10 +08:00
k88936 e2809b83c0 3D 冒烟示例单端点失败不再中断其余端点
- wait_for_task / get_task / download_model 失败时记录该端点错误并继续
- 保留 throw_on_failure: false 的原有语义,仅补齐传输与超时类错误
2026-09-22 13:45:50 +08:00
k88936 058d851a69 去掉 model3d_price 上已过期的 dead_code 豁免
- server-rs/crates/api-server/src/editor_generation_config.rs:model3d_price 现在由 tripo3d 提交路由真实消费,删掉「里程碑二的路由接上之前只有测试消费」这句已过期注释与配套的 #[allow(dead_code)]

验证:cargo check -p api-server(--locked)无该函数相关告警
2026-09-22 13:43:45 +08:00
k88936 444520b464 修正 storage.rs 注释错别字
- server-rs/crates/api-server/src/tripo3d/storage.rs:sniff_model_content_type 文档注释「说慌」改为「说谎」

验证:npm run check:encoding、git diff --check
2026-09-22 13:42:37 +08:00
k88936 326729a5ac Idempotency-Key 校验错误保留请求上下文
- server-rs/crates/api-server/src/tripo3d/routes.rs:require_idempotency_key 增加 request_context 参数,缺失 / 格式非法的两个 400 改用 into_response_with_context(Some(..)),与同处理器其它校验、定价错误一致;此前传 None,客户端拿不到请求 ID / 关联标识

验证:cargo test -p api-server --locked idempotency_key(相关 6 个用例全绿)
2026-09-22 13:42:34 +08:00
k88936 14740e0ef6 3D 任务参数用例改为断言真实主张
- server-rs/crates/api-server/src/tripo3d/job.rs:把 job_request_rejects_payload_without_fingerprint_stripping_support 改名为 job_request_stays_strict_after_stripping_platform_fingerprint 并补断言——带指纹 + 其它未知字段的合法 payload 仍必须被拒(摘下平台字段不等于放宽严格解析);原用例名声称验证指纹摘除,实际只断言了「缺字段的 payload 被拒」和「未知 job kind 被拒」

验证:cargo test -p api-server --locked job_request(2 个用例全绿)、npm run check:rustfmt
2026-09-22 13:40:13 +08:00
k88936 48a5bf06d0 3D 产物读取不再克隆 content type
- server-rs/crates/api-server/src/tripo3d/artifacts.rs:content_type 只在本函数取一次、之后不再读句柄字段,改用 take() 转移所有权而不是 clone()

验证:cargo check -p api-server(--locked)
2026-09-22 13:36:28 +08:00
k88936 9263d79d42 3D 产物读取按声明长度预分配缓冲
- server-rs/crates/api-server/src/tripo3d/artifacts.rs:read_artifact 用 Vec::with_capacity 按 provider 声明的 content_length 预分配(并封顶到 512 MiB 上限,防止谎报长度撑爆内存),避免几百 MB 产物逐块 extend 反复搬移

验证:cargo check -p api-server(--locked)
2026-09-22 13:36:25 +08:00
k88936 6d8164d37a OSS 不可用错误补上机器可读的 reason
- server-rs/crates/api-server/src/tripo3d/errors.rs:oss_unavailable 增加 reason=oss-unavailable,与同文件其它 5xx 映射及 editor_agent 的 OSS 错误口径一致,客户端可按 reason 分类这个 503

验证:cargo check -p api-server(--locked)
2026-09-22 13:35:23 +08:00
k88936 66b8c2bed0 3D 定价快照读取失败补上机器可读的 reason
- server-rs/crates/api-server/src/tripo3d/errors.rs:map_pricing_store_error 增加 reason=model3d-pricing-store-error,与同文件其它映射一致,客户端可按 reason 分类这个 500;provider 保持 editor-generation-pricing(全仓库定价错误都是这个口径),不改写为 TRIPO_PROVIDER

验证:cargo check -p api-server(--locked)
2026-09-22 13:35:20 +08:00
k88936 cb136fb445 画布图层的媒体渲染分派抽成独立函数
- src/components/image-editor/ImageCanvasWorldView.tsx:音频 / 视频 / 序列帧 / model3d / 默认图片这条五层三元链提成 renderCanvasLayerMedia(早返回写成一列判断),渲染分支与传参不变,新增媒体类型不再加深三元

验证:npx vitest run src/components/image-editor/ImageCanvasWorldView.test.tsx(57 用例全绿)、npm run typecheck
2026-09-22 13:33:14 +08:00
k88936 d1478e3859 文生 / 图生 3D 面板入口合并到同一个 opener
- src/components/image-editor/useImageCanvasGenerationWorkflow.ts:新增 openModel3dGenerationDialog(mode),openModel3dTextToModelDialog / openModel3dImageToModelDialog 退化成两个只传 mode 的薄包装;两条入口此前是除 mode 外逐字相同的复制,改逻辑时容易只改一处

验证:npm run typecheck
2026-09-22 13:31:48 +08:00
k88936 b41d156edd 底部工具栏的子选项锚点 ref 改用查表
- src/components/image-editor/ImageCanvasBottomToolbarView.tsx:把 spec / music / model3d / publication 的三层三元 ref 选择链提成 toolWrapRefs 映射表,新增子选项时不再延长三元链

验证:npx vitest run src/components/image-editor/ImageCanvasBottomToolbarView.test.tsx(3 用例全绿)、npm run typecheck
2026-09-22 13:31:46 +08:00
k88936 4363a6219a 修正查看器失败文案穷尽检查的写法(上一提交未通过类型检查)
- src/components/image-editor/model3d-preview/Model3dViewerModel.ts:上一提交把 never 断言写在 switch (detail?.reason) 上,default 分支里可选链未被收窄,npm run typecheck 报 TS2322(undefined 不能赋给 never)。改为先取局部常量并早返回「原因缺失 / load-failed」,switch 只处理其余三种原因,default 保留 never 断言
- 文案与判定结果不变

验证:npm run typecheck(tsconfig.typecheck-guardrails,exit 0);临时给 Model3dViewerFailureReason 增加一个成员,确认该 default 分支会编译报错(TS2322),随后已还原;npx vitest run src/components/image-editor/model3d-preview(18 用例全绿)
2026-09-22 13:31:24 +08:00
k88936 0ec0a13cbc 关闭 3D 预览面板时清掉查看器状态
- src/components/image-editor/model3d-preview/Model3dViewerModal.tsx:layer 变 null(面板关闭)时把 viewerStatus 复位,下一次打开从禁用的「重置视角」开始,不再继承上一轮实例的 ready;只处理关闭不处理换模型,避免 effect 晚于查看器上报而盖掉 loading
- src/components/image-editor/model3d-preview/Model3dViewerModal.test.tsx:新增「关闭后重开不沿用 ready」的回归用例

验证:npx vitest run src/components/image-editor/model3d-preview(18 用例全绿)
2026-09-22 13:29:10 +08:00
k88936 c96d7fe847 查看器失败文案改用穷尽 switch
- src/components/image-editor/model3d-preview/Model3dViewerModel.ts:resolveModel3dViewerFailureText 从早返回改成 switch,并给 default 加 never 穷尽检查;查看器今后新增失败原因会在此处编译报错,而不是静默落到通用兜底文案。文案与判定结果不变

验证:npx vitest run src/components/image-editor/model3d-preview、npx tsc -p tsconfig.typecheck-guardrails.json --noEmit
2026-09-22 13:28:14 +08:00
k88936 8131a70a2f 失败态的重试按钮也按 canSubmit 门禁渲染
- src/components/image-editor/model3d-generation/Model3dGenerationModal.tsx:重试按钮改为 dialog.status === 'failed' && canSubmit 才渲染;此前定价失效或参考图未上传完时它仍可点,提交管线再挡回来,交互上表现为「点了没反应」

验证:npx vitest run src/components/image-editor/model3d-generation/Model3dGenerationModal.test.tsx(8 用例全绿)
2026-09-22 13:27:39 +08:00
k88936 73f34ecbc9 前端补上「分件 + 方形布线 / 智能低多边形」的互斥校验
- src/components/image-editor/model3d-generation/Model3dGenerationFormModel.ts:resolveModel3dGenerationParams 增加 generateParts 与 quad / smartLowPoly 的互斥判定,与 provider 的 validate_generation_options 对齐;此前纯几何档位下这两个开关仍可同开,前端能出价、提交后才被后端拒
- src/components/image-editor/model3d-generation/Model3dGenerationFormModel.test.ts:新增该组合被拒的用例

验证:npx vitest run src/components/image-editor/model3d-generation(40 用例全绿)
2026-09-22 13:26:49 +08:00
k88936 25fe98836f 幂等键指纹的键排序改成具名比较函数
- src/components/image-editor/model3d-generation/Model3dGenerationSubmission.ts:canonicalizeModel3dRequestValue 里的嵌套三元比较器提成模块级 compareModel3dRequestEntryKeys,排序结果不变,只是不再嵌三元且不必每次递归重建比较器

验证:npx vitest run src/components/image-editor/model3d-generation(39 用例全绿)
2026-09-22 13:26:28 +08:00
k88936 b48c34d6b4 删掉重复且无人使用的 3D 提交超时常量
- src/components/image-editor/model3d-generation/Model3dGenerationSubmission.ts:删除 MODEL3D_SUBMISSION_TIMEOUT_MS;实际生效的是 editorProjectClient 的 EDITOR_MODEL3D_SUBMISSION_TIMEOUT_MS(submitModel3dGenerationRequest 用它),保留两份 60_000 只会各自漂移

验证:全仓库检索该常量只剩定义处(已删);npx tsc -p tsconfig.typecheck-guardrails.json --noEmit
2026-09-22 13:26:00 +08:00
k88936 5bdabdc7f7 3D 提交计划在非 3D 模式改用专门的原因文案
- src/components/image-editor/model3d-generation/Model3dGenerationSubmission.ts:buildModel3dSubmissionPlan 的 mode 兜底改用 MODEL3D_MODE_UNSUPPORTED_REASON,不再把非 3D 面板说成「3D 模型定价尚未配置」

验证:npx vitest run src/components/image-editor/model3d-generation
2026-09-22 13:25:38 +08:00
k88936 9b1c99f37b 非 3D 面板不再复用「定价未配置」这句原因
- src/components/image-editor/model3d-generation/Model3dGenerationFormModel.ts:新增 MODEL3D_MODE_UNSUPPORTED_REASON,resolveModel3dGenerationQuote 在 mode 不是 3D 生成模式时返回它;原文案会把「模式不支持」误报成定价配置问题

验证:npx vitest run src/components/image-editor/model3d-generation
2026-09-22 13:25:37 +08:00
k88936 9a62941779 贴图质量映射抽成单一函数,去掉嵌套三元
- src/components/image-editor/model3d-generation/Model3dGenerationFormModel.ts:resolveModel3dGenerationParams 里的贴图质量嵌套三元提成 resolveModel3dTextureQuality(tier),取值与判定条件不变

验证:npx vitest run src/components/image-editor/model3d-generation
2026-09-22 13:25:22 +08:00
k88936 7987fed204 删掉无人引用的 MODEL3D_IMAGE_PROMPT_MAX_LENGTH
- src/components/image-editor/model3d-generation/Model3dGenerationFormModel.ts:删除只导出、全仓库无引用的图生 3D 提示词长度常量;文生上限与画布尺寸常量仍在使用

验证:全仓库检索该常量只剩定义处;npx tsc -p tsconfig.typecheck-guardrails.json --noEmit
2026-09-22 13:25:18 +08:00
k88936 02df355281 3D 提交地址改成按 endpoint 穷尽映射
- src/services/image-editor/editorProjectClient.ts:新增 EDITOR_MODEL3D_ENDPOINT_API(Record<Model3dPricingEndpoint, string>)取代三元判断;原写法对非 image-to-model 的值一律回落 text-to-model,endpoint 联合扩容时会静默走错接口

验证:npx tsc -p tsconfig.typecheck-guardrails.json --noEmit
2026-09-22 13:24:43 +08:00
k88936 5d47ef9347 3D 提交的「不自动重试」选项改回 retry 字段
- src/services/image-editor/editorProjectClient.ts:submitModel3dGenerationRequest 把 EDITOR_GENERATION_REQUEST_RETRY_OPTIONS 从顶层展开改成 retry 字段;requestJson 只认 options.retry,顶层展开的 maxRetries / retryUnsafeMethods 会被静默忽略,计费 POST 的「不自动重试」意图丢失(当前只是靠 POST 默认 maxRetries=0 侥幸不重试)

验证:文件内 9 处生成入口现在统一使用 retry 字段
2026-09-22 13:24:22 +08:00
k88936 fc8a674e91 3D 模型角标改用 Tailwind v4 可用的类与专用 CSS 规则
- src/index.css:新增 .image-canvas-editor__kind-badge--model3d 规则,背景与阴影沿用原取值,与其它 asset kind 的写法一致
- src/components/image-editor/ImageCanvasWorldView.tsx:model3d 角标改成引用该规则;原写法用 Tailwind v3 的 `!` 前缀(v4 改后缀),实际不会生成工具类,角标退化成白字无底色的白药丸

验证:npx prettier --check src/index.css src/components/image-editor/ImageCanvasWorldView.tsx
2026-09-22 13:23:24 +08:00
k88936 f1d0aed7dd 3D 生成面板补上浮动菜单的 portal 与定位参数
- src/components/image-editor/ImageCanvasGenerationComposerView.tsx:Model3dGenerationModal 传入 renderEditorPortal / buildPortalMenuStyle,与同文件其余生成面板一致;此前走默认的恒等实现,「参考图来源」菜单内联在文档流里且没有定位样式

验证:npx tsc -p tsconfig.typecheck-guardrails.json --noEmit
2026-09-22 13:22:44 +08:00
k88936 9f4f7341c9 修复 AGC 资源工具条缺 onPreviewModel3d 导致的类型检查失败
- apps/ai-game-creator-shell/src/view/project-development/index.tsx:给 ImageCanvasSelectedLayerToolbarView 补上 onPreviewModel3d 空实现,并写明资源画布不登记 preview-model3d、按钮不会渲染;此前该必填属性缺失,AGC 严格模式报 TS2741

验证:npm run ai-game-creator-shell:typecheck(修复前 error TS2741,修复后 exit 0、error TS 计数 0)
2026-09-22 13:21:10 +08:00