@deepblend/dsh-blender-ui 0.4.0 → 0.6.0

package/lib/client.js

@@ -355,6 +355,14 @@ window.__ModuleLoader__.load({
       'editor.unknownSettings': '这张预览缺少实测渲染设置，无法比较编辑差异。',
       'editor.missingBaseline': '没有同相机、同帧和同渲染设置的编辑前预览，暂时无法比较差异。',
       'editor.choose': '选择一个对象，调整后应用并查看真实预览。',
+      'assembly.title': '调整整套模型',
+      'assembly.help': '尺寸会联动配方中的部件，保留独立修改的材质、倒角和摄影设置。保存后生成新版本和预览。',
+      'assembly.save': '保存整套尺寸并预览',
+      'assembly.retry': '重试同一次保存',
+      'assembly.conflict': '部分受控几何已被单独修改，请先恢复对应部件；整套尺寸尚未保存。',
+      'assembly.stale': '当前作品已有新版本。草稿已保留，请重新载入后再修改。',
+      'assembly.otherDraft': '请先保存或放弃其他未提交的编辑。',
+      'assembly.photoKept': '已保留自定义摄影，请确认新尺寸下的构图。',
       'editor.position': '位置（mm）',
       'editor.rotation': '旋转（°）',
       'editor.geometry': '形状与轮廓',
@@ -371,6 +379,9 @@ window.__ModuleLoader__.load({
       'editor.animated': '动画控制的通道已禁用。',
       'editor.invalid': '{field} 的值无效。',
       'editor.size': '尺寸（mm）',
+      'editor.boxWidth': '宽（mm）',
+      'editor.boxDepth': '深（mm）',
+      'editor.boxHeight': '高（mm）',
       'editor.radius': '半径（mm）',
       'editor.handledCup': '带把手杯体',
       'editor.wallThickness': '杯壁厚度（mm）',
@@ -943,6 +954,14 @@ window.__ModuleLoader__.load({
       'editor.unknownSettings': 'Measured render settings are missing. This preview cannot establish the edit difference.',
       'editor.missingBaseline': 'No before preview has the same camera, frame and measured render settings. The edit difference is unavailable.',
       'editor.choose': 'Select an object, adjust its settings, then apply and view a real preview.',
+      'assembly.title': 'Resize the assembly',
+      'assembly.help': 'Recipe parts follow the dimensions. Independent materials, bevels and photography are retained. Saving creates a new revision and preview.',
+      'assembly.save': 'Save assembly dimensions and preview',
+      'assembly.retry': 'Retry the same save',
+      'assembly.conflict': 'Controlled geometry was edited separately. Restore those parts before resizing; nothing has been saved.',
+      'assembly.stale': 'The work has a newer revision. Your draft is retained; reload it before editing.',
+      'assembly.otherDraft': 'Save or discard other unsaved edits first.',
+      'assembly.photoKept': 'Custom photography was preserved. Check framing at the new dimensions.',
       'editor.position': 'Position (mm)',
       'editor.rotation': 'Rotation (°)',
       'editor.geometry': 'Shape and profile',
@@ -959,6 +978,9 @@ window.__ModuleLoader__.load({
       'editor.animated': 'Channels driven by animation are disabled.',
       'editor.invalid': 'Invalid value for {field}.',
       'editor.size': 'Size (mm)',
+      'editor.boxWidth': 'Width (mm)',
+      'editor.boxDepth': 'Depth (mm)',
+      'editor.boxHeight': 'Height (mm)',
       'editor.radius': 'Radius (mm)',
       'editor.handledCup': 'Handled cup',
       'editor.wallThickness': 'Wall thickness (mm)',
@@ -1386,7 +1408,7 @@ window.__ModuleLoader__.load({
 
     /** Every DeepBlend wire tool name this package draws a card for. */
     const TOOL_CARD_KEYS = [
-      'blender_capabilities', 'blender_recipe_list', 'blender_project_create', 'blender_project_get',
+      'blender_capabilities', 'blender_recipe_list', 'blender_recipe_parameters', 'blender_project_create', 'blender_project_get',
       'blender_scene_get', 'blender_scene_patch', 'blender_preview_render',
       'blender_scene_validate', 'blender_revision_restore', 'blender_asset_ingest',
       'blender_preview_views', 'blender_visual_review',
@@ -2054,7 +2076,13 @@ window.__ModuleLoader__.load({
       }
       const generator = draft.entity.generator
       if (generator) {
+        if (generator.dimensions !== undefined) {
+          if (!['cube', 'rounded_box'].includes(generator.shape) || generator.size !== undefined
+            || !Array.isArray(generator.dimensions) || generator.dimensions.length !== 3) bad('dimensions')
+          else generator.dimensions.forEach((value, axis) => scalar(value, `dimensions.${EDITOR_AXES[axis]}`, Number.MIN_VALUE))
+        }
         for (const key of GENERATOR_FIELDS[generator.shape] || []) {
+          if (key === 'size' && generator.dimensions !== undefined) continue
           const bounds = generatorIntegerBounds(generator, key)
           if (bounds?.[2] && generator[key] % bounds[2]) bad(key)
           scalar(generator[key], key, key === 'rootTension' ? 1 : bounds ? bounds[0] : Number.MIN_VALUE,
@@ -2478,6 +2506,19 @@ window.__ModuleLoader__.load({
         || photographyDirty(photographyDraftFor(state))
         || Boolean(state.assetDrafts?.[state.activeProjectId])
         || state.forms.patch !== null
+        || assemblyDirty(assemblyDraftFor(state))
+    }
+    const assemblyKey = state => JSON.stringify([state.projectsRoot, state.activeProjectId])
+    const assemblyDraftFor = state => state.assemblyDrafts?.[assemblyKey(state)] || null
+    const assemblyDirty = draft => Boolean(draft && Object.entries(draft.values).some(([id, value]) => value === '' || Number(value) !== draft.original[id]))
+    const assemblyInvalid = draft => !draft || draft.parameters.some(parameter => {
+      const raw = draft.values[parameter.id], value = Number(raw)
+      return raw === '' || !Number.isFinite(value) || value < parameter.minimum || value > parameter.maximum
+    })
+    function createAssemblyDraft(source, projectsRoot) {
+      const values = Object.fromEntries(source.parameters.map(parameter => [parameter.id, parameter.value]))
+      return { projectId: source.projectId, projectsRoot, baseRevision: source.revision,
+        parameters: editorClone(source.parameters), values, original: { ...values }, idempotencyKey: newCreationKey(), attempt: null }
     }
     function briefValid(draft) {
       return Boolean(draft && typeof draft.goal === 'string' && draft.goal.length <= 2000 && draft.referenceImages.length <= 4
@@ -2724,10 +2765,11 @@ window.__ModuleLoader__.load({
         editorDrafts: {},
         editorLastEdits: {},
         editorComparison: null,
+        assemblyDrafts: {},
         patchDrafts: {},
         recipeChoices: [],
         forms: { title: '', goal: '', recipe: null, recipeParameters: {}, patch: null, frameStart: '', frameEnd: '', profile: 'preview' },
-        busy: { create: false, patch: false, editor: false, render: false, restore: false },
+        busy: { create: false, patch: false, editor: false, assembly: false, render: false, restore: false },
         notices: { projects: null, scene: null, preview: null, jobs: null, revisions: null },
       }
     }
@@ -2989,6 +3031,13 @@ window.__ModuleLoader__.load({
         if (sequence !== loadSequence || projectId !== target()) return
         if (active !== data.activeProjectId) patch.forms = { ...data.forms, patch: data.patchDrafts[active] ?? null }
         if (patch.selected?.scene && active) {
+          const source = patch.selected.recipeParameters
+          if (source?.available === true && source.projectId === active && source.revision === patch.selected.scene.revision) {
+            const key = JSON.stringify([patch.projectsRoot, active]), draft = data.assemblyDrafts[key]
+            if ((!draft || !assemblyDirty(draft)) && !data.busy.assembly) {
+              patch.assemblyDrafts = { ...data.assemblyDrafts, [key]: createAssemblyDraft(source, patch.projectsRoot) }
+            }
+          }
           const photography = data.photographyDrafts[active]
           if ((!photography || !photographyDirty(photography)) && !data.photographyWork[active]?.saving) {
             patch.photographyDrafts = { ...data.photographyDrafts, [active]: createPhotographyDraft(patch.selected.scene, active, photography, patch.projectsRoot) }
@@ -3159,6 +3208,48 @@ window.__ModuleLoader__.load({
         }
       }
       const actions = {
+        setAssemblyValue: (id, value) => {
+          const draft = assemblyDraftFor(data)
+          if (!draft || data.busy.assembly || draft.attempt || !draft.parameters.some(parameter => parameter.id === id)) return
+          set({ assemblyDrafts: { ...data.assemblyDrafts, [assemblyKey(data)]: { ...draft, values: { ...draft.values, [id]: value } } } })
+        },
+        resetAssembly: () => {
+          const source = data.selected?.recipeParameters
+          if (!source?.available || data.busy.assembly) return
+          set({ assemblyDrafts: { ...data.assemblyDrafts, [assemblyKey(data)]: createAssemblyDraft(source, data.projectsRoot) } })
+        },
+        saveAssembly: async () => {
+          const draft = assemblyDraftFor(data), source = data.selected?.recipeParameters
+          if (!draft || data.busy.assembly || assemblyInvalid(draft) || !assemblyDirty(draft)) return
+          if (!draft.attempt && (draft.baseRevision !== source?.revision || source?.conflicts?.length
+              || projectHasUnsavedDrafts({ ...data, assemblyDrafts: {} }))) return
+          const key = assemblyKey(data), body = draft.attempt || { baseRevision: draft.baseRevision,
+            projectsRoot: draft.projectsRoot, idempotencyKey: draft.idempotencyKey,
+            parameters: Object.fromEntries(Object.entries(draft.values).map(([id, value]) => [id, Number(value)])) }
+          set({ assemblyDrafts: { ...data.assemblyDrafts, [key]: { ...draft, attempt: body } } })
+          setIn('busy', 'assembly', true)
+          const outcome = await postJson(fetchImpl, projectRoute(draft.projectId, '/recipe-parameters'), body)
+          setIn('busy', 'assembly', false)
+          if (outcome.ok) {
+            const drafts = { ...data.assemblyDrafts }; delete drafts[key]
+            set({ assemblyDrafts: drafts })
+            if (target() === draft.projectId && data.projectsRoot === draft.projectsRoot) {
+              const revision = outcome.payload.revision.revision
+              const notice = { ok: true, kind: 'recipe-parameters', message: t('scene.committed', { revision,
+                digest: shortDigest(outcome.payload.revision.digest) }) + (outcome.payload.revision.preservedCameraIds?.length ? ` ${t('assembly.photoKept')}` : '') }
+              set({ view: 'preview', compareMode: 'revisions', compareLeft: draft.baseRevision, compareRight: revision,
+                notices: { ...data.notices, scene: notice, preview: notice } })
+            }
+            reload()
+          } else {
+            const uncertain = outcome.error.code === 'UI_FETCH_FAILED' || /^HTTP_5/.test(outcome.error.code)
+            set({ assemblyDrafts: { ...data.assemblyDrafts, [key]: { ...draft, attempt: uncertain ? body : null } } })
+            if (target() === draft.projectId && data.projectsRoot === draft.projectsRoot) {
+              setIn('notices', 'scene', { ok: false, message: `${outcome.error.code}: ${outcome.error.message}` })
+              if (outcome.error.code === 'REVISION_CONFLICT') reload()
+            }
+          }
+        },
         acceptsFileChoice,
         setAppearance: value => {
           if (!APPEARANCES.includes(value)) return
@@ -4358,6 +4449,32 @@ window.__ModuleLoader__.load({
       }, result.message)
     }
 
+    function AssemblyEditor(ctx) {
+      const { state, actions } = ctx, source = state.selected?.recipeParameters, draft = assemblyDraftFor(state)
+      if (!source) return null
+      if (source.error) return el('div', { className: 'db-card', 'data-assembly-editor': true },
+        el('h4', null, t('assembly.title')), ErrorBox({ error: source.error }))
+      if (!source.available || !draft) return null
+      const stale = draft.baseRevision !== state.selected.scene.revision
+      const otherDirty = projectHasUnsavedDrafts({ ...state, assemblyDrafts: {} })
+      const blocked = state.busy.assembly || !draft.attempt && (stale || source.conflicts?.length || otherDirty)
+      return el('div', { className: 'db-card', 'data-assembly-editor': true,
+        'data-assembly-base-revision': draft.baseRevision, 'data-assembly-dirty': String(assemblyDirty(draft)) },
+        el('h4', null, t('assembly.title')), el('p', { className: 'db-muted' }, t('assembly.help')),
+        source.conflicts?.length ? el('div', { className: 'db-error' }, t('assembly.conflict'),
+          el('div', { className: 'db-inline' }, [...new Set(source.conflicts.map(conflict => conflict.entityId))].map(entityId =>
+            Button({ key: entityId, action: `assembly-conflict:${entityId}`, onClick: () => actions.selectEditorEntity(entityId), children: entityId })))) : null,
+        stale ? el('div', { className: 'db-error' }, t('assembly.stale')) : null,
+        otherDirty ? el('div', { className: 'db-muted' }, t('assembly.otherDraft')) : null,
+        el('div', { className: 'db-grid' }, draft.parameters.map(parameter => el('label', { key: parameter.id },
+          parameter.title, el('input', { type: 'number', className: 'db-input', 'data-field': `assembly-${parameter.id}`,
+            min: parameter.minimum, max: parameter.maximum, step: 'any', value: draft.values[parameter.id],
+            disabled: state.busy.assembly || Boolean(draft.attempt), onInput: event => actions.setAssemblyValue(parameter.id, event.currentTarget.value) })))),
+        el('div', { className: 'db-inline' }, Button({ action: 'assembly-save', disabled: Boolean(blocked) || assemblyInvalid(draft) || !assemblyDirty(draft),
+          onClick: actions.saveAssembly, children: draft.attempt ? t('assembly.retry') : t('assembly.save') }),
+          Button({ action: 'assembly-reset', disabled: state.busy.assembly, onClick: actions.resetAssembly, children: t('editor.reset') })))
+    }
+
     function SceneEditor(ctx) {
       const { state, actions } = ctx, draft = editorDraftFor(state)
       const lastEdit = state.editorLastEdits?.[state.activeProjectId]
@@ -4455,7 +4572,11 @@ window.__ModuleLoader__.load({
               el('p', { className: 'db-muted', key: 'local-size' }, t('editor.localDimensions', { scale: (draft.entity.transform.scale || [1, 1, 1]).join(' × ') })),
               geometry.shape === 'rounded_box' ? el('p', { className: 'db-muted', key: 'rounded' }, t('editor.roundedRequired')) : null,
               geometry.shape === 'handled_cup' ? el('p', { className: 'db-muted', key: 'cup-help' }, t('editor.cupHelp')) : null,
-              ...(GENERATOR_FIELDS[geometry.shape] || []).filter(key => geometry.shape !== 'handled_cup' || !CUP_ADVANCED_FIELDS.includes(key)).map(geometryField),
+              ...(GENERATOR_FIELDS[geometry.shape] || []).filter(key => !(key === 'size' && geometry.dimensions !== undefined)
+                && (geometry.shape !== 'handled_cup' || !CUP_ADVANCED_FIELDS.includes(key))).map(geometryField),
+              ...(geometry.dimensions !== undefined ? [t('editor.boxWidth'), t('editor.boxDepth'), t('editor.boxHeight')].map((label, index) => numeric(
+                label, `editor-generator-dimensions-${EDITOR_AXES[index]}`, geometry.dimensions[index],
+                value => actions.updateEditor('generator', ['dimensions', index], value), { factor: 1000, min: Number.MIN_VALUE })) : []),
               geometry.shape === 'handled_cup' ? el('details', { key: 'cup-advanced' },
                 el('summary', null, t('editor.cupAdvanced')), ...CUP_ADVANCED_FIELDS.map(geometryField)) : null,
               toggle(t('editor.bevel'), 'editor-generator-bevel', Boolean(geometry.bevel), value => actions.updateEditor('generator', ['bevel'], value ? { width: 0.001, segments: 3 } : undefined), geometry.shape === 'rounded_box'),
@@ -4839,7 +4960,7 @@ window.__ModuleLoader__.load({
             el('span', { className: 'db-muted db-mono' }, String(asset.path || '')))),
         )),
         el('section', { className: 'db-scene-inspector', 'aria-label': t('scene.inspector') },
-        SceneEditor(ctx),
+        AssemblyEditor(ctx), SceneEditor(ctx),
         PhotographyEditor(ctx),
         AssetsView(ctx),
         el('details', { key: advancedDisclosure, 'data-disclosure': advancedDisclosure, open: state.disclosures?.[advancedDisclosure] ?? false,

package/lib/index.js

@@ -426,6 +426,7 @@ export function statusForError(error) {
   if (referenceStatuses[error.code]) return referenceStatuses[error.code]
   if (error.code === 'RECIPE_NOT_FOUND') return 404
   if (error.code === 'RECIPE_CHANGED' || error.code === 'RECIPE_ID_CONFLICT') return 409
+  if (error.code === 'RECIPE_PARAMETER_CONFLICT') return 409
   if (error.code?.startsWith('RECIPE_')) return 400
   switch (error.code) {
     case BlenderErrorCode.PROJECT_NOT_FOUND:
@@ -439,6 +440,7 @@ export function statusForError(error) {
       return 400
     case BlenderErrorCode.RENDER_JOB_CONFLICT:
     case BlenderErrorCode.REVISION_CONFLICT:
+    case BlenderErrorCode.SCENE_FEATURE_UNSUPPORTED:
       return 409
     default:
       return 500
@@ -827,6 +829,16 @@ export function createHandlers(ctx) {
       return { revision: result }
     },
 
+    'project.recipeParameters': async ({ params, query }) => {
+      if (studio().recipeParameterEditingSupported !== true) throw new BlenderError('UI_HOST_API_STALE', 'Update the Host to edit assembly dimensions')
+      return studio().getRecipeParameters(params.projectId, { revision: query.revision })
+    },
+    'project.recipeParameters.update': async ({ params, body }) => {
+      if (studio().recipeParameterEditingSupported !== true) throw new BlenderError('UI_HOST_API_STALE', 'Update the Host to edit assembly dimensions')
+      return { revision: await studio().updateRecipeParameters({ ...body, projectId: params.projectId,
+        saveCheckpoint: true, renderPreview: true }) }
+    },
+
     'project.restore': async ({ params, body }) => {
       const result = await studio().restoreRevision({
         projectId: params.projectId,
@@ -917,7 +929,14 @@ async function buildProjectState(studio, projectId, revision, threshold) {
   const scene = await studio.getScene(projectId, { revision: requested, full: true })
   const jobs = await studio.listJobs({ projectId })
   const qa = await studio.getQaRecord({ projectId, revision: scene.revision })
+  let recipeParameters = null
+  if (studio.recipeParameterEditingSupported === true) {
+    try { recipeParameters = await studio.getRecipeParameters(projectId, { revision: scene.revision }) }
+    catch (error) { recipeParameters = { projectId, revision: scene.revision, available: false,
+      error: { code: error.code ?? 'RECIPE_LOCK_INVALID', message: error.message } } }
+  }
   return {
+    recipeParameters,
     project: buildProjectView({
       projectId,
       title: overview.title,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepblend/dsh-blender-ui",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "type": "module",
   "description": "DeepBlend workbench UI: Host half (typed HTTP API) and Web Client half (sidebar, panels, tool cards).",
   "main": "lib/index.js",
@@ -19,7 +19,7 @@
     }
   },
   "dependencies": {
-    "@deepblend/dsh-blender-contracts": "0.4.0"
+    "@deepblend/dsh-blender-contracts": "0.6.0"
   },
   "license": "MIT",
   "repository": {