kingkont 0.7.20 → 0.7.21

package/index.html

@@ -1343,6 +1343,17 @@
         <button class="seg" data-img-model="sdxl-lightning" type="button" title="Очень быстрая (3-5с)">⚡ SDXL Lightning</button>
       </div>
     </label>
+    <label id="imageOptionsRow">Соотношение сторон
+      <div class="seg-control" id="imageAspectCtl">
+        <button class="seg active" data-img-asp="1:1" type="button">1:1</button>
+        <button class="seg" data-img-asp="16:9" type="button">16:9</button>
+        <button class="seg" data-img-asp="9:16" type="button">9:16</button>
+        <button class="seg" data-img-asp="3:2" type="button">3:2</button>
+        <button class="seg" data-img-asp="2:3" type="button">2:3</button>
+        <button class="seg" data-img-asp="4:3" type="button" title="Не поддерживается Grok">4:3</button>
+        <button class="seg" data-img-asp="3:4" type="button" title="Не поддерживается Grok">3:4</button>
+      </div>
+    </label>
     <label id="videoModelRow" style="display: none;">Модель для видео
       <div class="seg-control">
         <button class="seg active" data-vid-model="seedance-2" type="button" title="ByteDance Seedance 2 — основная">Seedance 2</button>
@@ -1778,6 +1789,7 @@ const state = {
   currentBoard: null,   // { kind, name, key, handle, metadata, urls }
   genKind: 'image',
   imageModel: 'nano-banana-2',  // 'nano-banana-2' | 'grok' | ...
+  imageAspect: localStorage.getItem('imageAspect') || '1:1',  // 1:1 / 16:9 / 9:16 / 3:2 / 2:3 / 4:3 / 3:4
   videoModel: localStorage.getItem('videoModel') || 'seedance-2',  // 'seedance-2' | 'kling-o1' | 'kling-3.0' | ...
   ttsModel: localStorage.getItem('ttsModel') || 'qwen/qwen3-tts',  // qwen/elevenlabs/v3/minimax/speech-02-hd/gemini
   videoDuration: +(localStorage.getItem('videoDuration') || 5),
@@ -3866,6 +3878,8 @@ async function openGenerateForRef(fromNode, clientX, clientY, forceKind) {
     document.querySelectorAll('#genModal [data-kind]').forEach(b =>
       b.classList.toggle('active', b.dataset.kind === forceKind));
     $('imageModelRow').style.display = forceKind === 'image' ? '' : 'none';
+
+    $('imageOptionsRow').style.display = forceKind === 'image' ? '' : 'none';
     $('videoOptionsRow').style.display = forceKind === 'video' ? '' : 'none';
 
     $('videoModelRow').style.display = forceKind === 'video' ? '' : 'none';
@@ -5120,6 +5134,8 @@ async function regenerateNode(node) {
   document.querySelectorAll('#genModal [data-kind]').forEach(b =>
     b.classList.toggle('active', b.dataset.kind === state.genKind));
   $('imageModelRow').style.display = state.genKind === 'image' ? '' : 'none';
+
+  $('imageOptionsRow').style.display = state.genKind === 'image' ? '' : 'none';
   $('videoOptionsRow').style.display = state.genKind === 'video' ? '' : 'none';
 
   $('videoModelRow').style.display = state.genKind === 'video' ? '' : 'none';
@@ -5132,6 +5148,10 @@ async function regenerateNode(node) {
     document.querySelectorAll('#genModal [data-img-model]').forEach(b =>
       b.classList.toggle('active', b.dataset.imgModel === g.modelKey));
   }
+  if (state.genKind === 'image') {
+    if (g.aspectRatio) state.imageAspect = g.aspectRatio;
+    syncImageAspectActive();
+  }
   // Видео: подставляем сохранённые duration/resolution/aspect для regenerate
   if (state.genKind === 'video') {
     if (g.duration) state.videoDuration = g.duration;
@@ -6074,6 +6094,8 @@ function openPhraseFor(charInfo) {
   document.querySelectorAll('#genModal [data-kind]').forEach(b =>
     b.classList.toggle('active', b.dataset.kind === 'audio'));
   $('imageModelRow').style.display = 'none';
+
+  $('imageOptionsRow').style.display = 'none';
   $('videoOptionsRow').style.display = 'none';
 
   $('videoModelRow').style.display = 'none';
@@ -6257,6 +6279,8 @@ async function openGenModal(kind) {
     b.classList.toggle('active', b.dataset.kind === kind));
   // Видимость рядов под текущий kind
   $('imageModelRow').style.display = kind === 'image' ? '' : 'none';
+
+  $('imageOptionsRow').style.display = kind === 'image' ? '' : 'none';
   $('videoOptionsRow').style.display = kind === 'video' ? '' : 'none';
 
   $('videoModelRow').style.display = kind === 'video' ? '' : 'none';
@@ -6679,6 +6703,8 @@ document.querySelectorAll('#genModal [data-kind]').forEach(b => {
     b.classList.add('active');
     state.genKind = b.dataset.kind;
     $('imageModelRow').style.display = state.genKind === 'image' ? '' : 'none';
+
+    $('imageOptionsRow').style.display = state.genKind === 'image' ? '' : 'none';
     $('videoOptionsRow').style.display = state.genKind === 'video' ? '' : 'none';
 
     $('videoModelRow').style.display = state.genKind === 'video' ? '' : 'none';
@@ -6953,6 +6979,21 @@ document.querySelectorAll('#genModal [data-vid-model]').forEach(b => {
     localStorage.setItem('videoModel', state.videoModel);
   });
 });
+// Переключатель aspect ratio для image
+document.querySelectorAll('#genModal [data-img-asp]').forEach(b => {
+  b.addEventListener('click', () => {
+    document.querySelectorAll('#genModal [data-img-asp]').forEach(x => x.classList.remove('active'));
+    b.classList.add('active');
+    state.imageAspect = b.dataset.imgAsp;
+    localStorage.setItem('imageAspect', state.imageAspect);
+  });
+});
+function syncImageAspectActive() {
+  document.querySelectorAll('#genModal [data-img-asp]').forEach(b =>
+    b.classList.toggle('active', b.dataset.imgAsp === state.imageAspect));
+}
+syncImageAspectActive();
+
 // Переключатель модели TTS
 document.querySelectorAll('#genModal [data-tts-model]').forEach(b => {
   b.addEventListener('click', () => {
@@ -7229,12 +7270,15 @@ $('genSubmit').addEventListener('click', async () => {
       // Связь с родительской нодой (выведена через "вытягивание"). Хранится
       // даже если sourceRef.use=false в state — сохраняем структурную связь.
       ...(savedSourceRef ? { sourceRef: savedSourceRef } : {}),
-      // Параметры видео сохраняем — при regenerate используем те же (предсказуемость).
+      // Параметры видео/картинки сохраняем — при regenerate используем те же.
       ...(kind === 'video' ? {
         duration: state.videoDuration,
         resolution: state.videoResolution,
         aspectRatio: state.videoAspect,
       } : {}),
+      ...(kind === 'image' ? {
+        aspectRatio: state.imageAspect,
+      } : {}),
     },
   };
   if (saveOnly) node.status = 'draft';
@@ -7384,6 +7428,10 @@ async function startGenerationJob(node, kind, prompt, mediaRefs, boardHandle, bK
       submitBody.duration = node.generated?.duration ?? state.videoDuration;
       submitBody.resolution = node.generated?.resolution ?? state.videoResolution;
       submitBody.aspectRatio = node.generated?.aspectRatio ?? state.videoAspect;
+    } else if (kind === 'image') {
+      // Grok-imagine требует aspect_ratio из {2:3, 3:2, 1:1, 9:16, 16:9}.
+      // Остальные модели (nano-banana-2, seedream и др.) тоже принимают.
+      submitBody.aspectRatio = node.generated?.aspectRatio ?? state.imageAspect;
     }
     logJob(node.id, `POST /api/generate body: ${logSafe(submitBody)}`);
     logJob(node.id, `POST /api/generate (image_input=${imageInputs.length}, video_input=${videoInputs.length}, model=${modelKey})`);
@@ -7945,6 +7993,8 @@ async function openGenAudioForTimeline(charInfo, track, time) {
   document.querySelectorAll('#genModal [data-kind]').forEach(b =>
     b.classList.toggle('active', b.dataset.kind === 'audio'));
   $('imageModelRow').style.display = 'none';
+
+  $('imageOptionsRow').style.display = 'none';
   $('videoOptionsRow').style.display = 'none';
 
   $('videoModelRow').style.display = 'none';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kingkont",
-  "version": "0.7.20",
+  "version": "0.7.21",
   "description": "KingKont \u00b7 Chatium \u2014 \u043d\u043e\u0434-\u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u0441\u0446\u0435\u043d \u0441 AI-\u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0435\u0439 (\u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438/\u0432\u0438\u0434\u0435\u043e/\u0433\u043e\u043b\u043e\u0441/SFX/\u043c\u0443\u0437\u044b\u043a\u0430/\u0442\u0435\u043a\u0441\u0442)",
   "main": "main.js",
   "bin": {