Deploy Karate Wiener (kimodo kata maker)

.gitattributes

@@ -99,3 +99,4 @@ stance_library_verify.png filter=lfs diff=lfs merge=lfs -text
 assets/default_scene.webp filter=lfs diff=lfs merge=lfs -text
 assets/citizen_skin_color.png filter=lfs diff=lfs merge=lfs -text
 comic_sheet_v0.png filter=lfs diff=lfs merge=lfs -text
+comic_koma_sample.png filter=lfs diff=lfs merge=lfs -text

app.py

@@ -3591,12 +3591,17 @@ def improve_dojo_prompt(payload_json: str | dict | None) -> str:
     )
     user = (f"Turn these ideas into a dojo scene prompt: {words}" if words
             else "Invent a creative, unexpected dojo scene prompt.")
+    # A fresh nonce + high temperature make every suggestion / reroll different even
+    # for identical input. The model is told not to echo it.
+    import random
+    nonce = random.randint(1, 1_000_000)
+    user += f"\n\nGive a fresh, different idea than before (random key {nonce}; never mention this key)."
     if not TINY_AYA_SPACE:
         return json.dumps({"ok": False, "error": "tiny-aya space not configured"})
     try:
         from gradio_client import Client
         client = Client(TINY_AYA_SPACE, token=_hf_token())
-        out = client.predict(system, user, 220, 0.9, api_name="/generate")
+        out = client.predict(system, user, 220, 1.05, api_name="/generate")
         text = (out or "").strip()
         # Prefer the first substantial line (drops any stray preamble the model adds).
         best = ""

comic_compose.py

@@ -48,20 +48,20 @@ def render_panel(Pf, shot, W=PANEL_W, H=PANEL_H, speed_lines=False):
     center = (Pf.min(axis=0) + Pf.max(axis=0)) / 2.0
     for a, b in ground_grid(center):
         (p2, z) = project(np.array([a, b]), cam, W, H)
-        alpha = float(np.clip(0.30 - 0.035 * z.mean(), 0.05, 0.30))
-        ax.plot(p2[:, 0], p2[:, 1], color=GRID_COL, lw=1.0, alpha=alpha, zorder=1)
+        alpha = float(np.clip(0.55 - 0.05 * z.mean(), 0.12, 0.55))
+        ax.plot(p2[:, 0], p2[:, 1], color=GRID_COL, lw=1.2, alpha=alpha, zorder=1)
 
     # speed lines (gag/action): radial strokes from the panel edge toward the figure
     if speed_lines:
         j2, _ = project(Pf, cam, W, H)
         cx, cy = j2.mean(axis=0)
         rng = np.random.default_rng(7)  # fixed seed: deterministic art
-        for ang in np.linspace(0, 2 * np.pi, 26, endpoint=False):
-            r0 = max(W, H) * 0.75
-            r1 = r0 * rng.uniform(0.55, 0.72)
+        for ang in np.linspace(0, 2 * np.pi, 30, endpoint=False):
+            r0 = max(W, H) * 0.80
+            r1 = r0 * rng.uniform(0.50, 0.66)
             x0, y0 = cx + r0 * np.cos(ang), cy + r0 * np.sin(ang)
             x1, y1 = cx + r1 * np.cos(ang), cy + r1 * np.sin(ang)
-            ax.plot([x0, x1], [y0, y1], color=INK, lw=1.4, alpha=0.22, zorder=2)
+            ax.plot([x0, x1], [y0, y1], color=INK, lw=2.0, alpha=0.40, zorder=2)
 
     j2, jz = project(Pf, cam, W, H)
     # px-per-meter near the head, for sizing the head circle and end caps
@@ -171,8 +171,11 @@ def _sticker_slot(draw, panel_box, expression):
     s = 108
     bx, by = x0 + 12, y1 - 12 - s
     draw.rounded_rectangle([bx, by, bx + s, by + s], radius=12, outline="#bba76f", width=2)
-    f = _font(40)
-    draw.text((bx + s / 2, by + s / 2 - 12), "🌭", font=f, anchor="mm")
+    try:
+        emoji = ImageFont.truetype("C:/Windows/Fonts/seguiemj.ttf", 44)
+        draw.text((bx + s / 2, by + s / 2 - 12), "🌭", font=emoji, anchor="mm", embedded_color=True)
+    except OSError:
+        draw.text((bx + s / 2, by + s / 2 - 12), "KW", font=_font(34, bold=True), fill="#bba76f", anchor="mm")
     draw.text((bx + s / 2, by + s - 16), expression, font=_font(15), fill="#bba76f", anchor="mm")
 
 

comic_shots.py

@@ -15,10 +15,10 @@ RIGHTJ = {2, 5, 8, 11, 14, 17, 19, 21}
 SHOTS = {
     # aim_up biases the look-at above the bbox center so the figure sits LOW in
     # the frame — the upper strip belongs to the speech bubble.
-    "establishing": dict(az=38.0, el=10.0, margin=1.16, roll=0.0, fov=40.0, aim_up=0.22),
-    "action":       dict(az=55.0, el=4.0,  margin=1.02, roll=-4.0, fov=46.0, aim_up=0.16),
+    "establishing": dict(az=38.0, el=10.0, margin=1.06, roll=0.0, fov=40.0, aim_up=0.18),
+    "action":       dict(az=55.0, el=4.0,  margin=1.08, roll=-4.0, fov=46.0, aim_up=0.18),
     "gag":          dict(az=22.0, el=16.0, margin=0.98, roll=13.0, fov=50.0, aim_up=0.10),
-    "hero":         dict(az=32.0, el=-16.0, margin=1.04, roll=0.0, fov=38.0, aim_up=0.14),
+    "hero":         dict(az=32.0, el=-16.0, margin=1.08, roll=0.0, fov=38.0, aim_up=0.16),
 }
 
 
@@ -43,7 +43,9 @@ def make_camera(shot_name, Pf):
     eye = target + direction * dist
     # Don't let the camera dip below the floor (hero shots on grounded poses).
     eye[1] = max(eye[1], 0.12)
-    return dict(eye=eye, target=target, fov=fov, roll=np.radians(s["roll"]))
+    aim = target.copy()
+    aim[1] += s.get("aim_up", 0.0) * radius
+    return dict(eye=eye, target=aim, fov=fov, roll=np.radians(s["roll"]))
 
 
 def project(points, cam, W, H):

tabs/dojo.drawer.html

@@ -1,9 +1,8 @@
 <aside id="kimodo-dojo-drawer" class="kimodo-drawer" aria-label="Dojo drawer">
-  <h2>Dojo</h2>
 
   <!-- ============ LIBRARY VIEW: list of dojos (Mine / Community) ============ -->
   <div id="kimodo-dojo-library" class="kimodo-dojo-view">
-    <div class="kimodo-cz-seg kimodo-cz-seg--sub" id="kimodo-dojo-scope" aria-label="Dojo scope">
+    <div class="kimodo-cz-seg kimodo-cz-seg--sub kimodo-dojo-seg" id="kimodo-dojo-scope" aria-label="Dojo scope">
       <button type="button" class="kimodo-cz-segbtn active" data-scope="mine">Mine</button>
       <button type="button" class="kimodo-cz-segbtn" data-scope="community">Community</button>
     </div>
@@ -14,14 +13,34 @@
 
   <!-- ============ CREATE VIEW: prompt + suggest + generate + progress ======= -->
   <div id="kimodo-dojo-create" class="kimodo-dojo-view" hidden>
-    <button id="kimodo-dojo-back" class="kimodo-dojo-back" type="button" title="Back to dojos">‹ Dojos</button>
-    <div class="kimodo-drawer-sub">Describe a room scene for the viewer.</div>
+    <button id="kimodo-dojo-back" class="kimodo-dojo-back" type="button" title="Back to dojos">‹</button>
 
-    <label class="kimodo-dojo-label" for="kimodo-dojo-prompt">Scene prompt</label>
+    <div class="kimodo-dojo-promptrow">
+      <label class="kimodo-dojo-label" for="kimodo-dojo-prompt">Describe the dojo</label>
+      <button id="kimodo-dojo-erase" class="kimodo-dojo-erase" type="button" title="Clear the prompt" aria-label="Clear the prompt">⌫</button>
+    </div>
     <textarea id="kimodo-dojo-prompt" class="kimodo-dojo-prompt" rows="5"
-      spellcheck="true" placeholder="A few words, or leave blank and tap Suggest…">A traditional martial arts dojo room, polished wooden floor, training mats, wooden wall panels, warm lantern light, full room visible, high detail, no people, no text.</textarea>
+      spellcheck="true" placeholder="a random dojo"></textarea>
     <button id="kimodo-dojo-improve" class="kimodo-dojo-improve" type="button"
-      title="Improve the prompt with tiny-aya (or suggest one if empty)">✦ Improve with tiny-aya</button>
+      title="Let tiny-aya write or reroll the prompt">let tiny-aya decide 🎲</button>
+
+    <div class="kimodo-dojo-actions">
+      <button id="kimodo-dojo-generate" class="kimodo-dojo-primary" type="button">Generate Scene</button>
+    </div>
+
+    <div id="kimodo-dojo-progress" class="kimodo-dojo-progress" aria-label="Dojo generation progress">
+      <div class="kimodo-dojo-step" data-step="flux-iso"><span></span>Flux isometric</div>
+      <div class="kimodo-dojo-step" data-step="flux-pano"><span></span>Flux 360</div>
+      <div class="kimodo-dojo-step" data-step="splat"><span></span>TripoSplat</div>
+      <div class="kimodo-dojo-step" data-step="viewer"><span></span>Viewer load</div>
+    </div>
+    <div id="kimodo-dojo-time" class="kimodo-dojo-time" aria-live="polite"></div>
+    <div id="kimodo-dojo-detail" class="kimodo-dojo-detail" aria-live="polite"></div>
+    <div id="kimodo-dojo-preview-wrap" class="kimodo-dojo-preview-wrap">
+      <figure><figcaption>Isometric</figcaption><img id="kimodo-dojo-preview" alt="Flux isometric result" /></figure>
+      <figure><figcaption>360</figcaption><img id="kimodo-dojo-preview-pano" alt="Flux 360 result" /></figure>
+    </div>
+    <div id="kimodo-dojo-status" class="kimodo-drawer-sub kimodo-dojo-status">Ready.</div>
 
     <details class="kimodo-dojo-adv">
       <summary>Advanced settings</summary>
@@ -50,24 +69,5 @@
         </div>
       </div>
     </details>
-
-    <div class="kimodo-dojo-actions">
-      <button id="kimodo-dojo-generate" class="kimodo-dojo-primary" type="button">Generate Scene</button>
-      <button id="kimodo-dojo-clear" type="button">Clear</button>
-    </div>
-
-    <div id="kimodo-dojo-progress" class="kimodo-dojo-progress" aria-label="Dojo generation progress">
-      <div class="kimodo-dojo-step" data-step="flux-iso"><span></span>Flux isometric</div>
-      <div class="kimodo-dojo-step" data-step="flux-pano"><span></span>Flux 360</div>
-      <div class="kimodo-dojo-step" data-step="splat"><span></span>TripoSplat</div>
-      <div class="kimodo-dojo-step" data-step="viewer"><span></span>Viewer load</div>
-    </div>
-    <div id="kimodo-dojo-time" class="kimodo-dojo-time" aria-live="polite"></div>
-    <div id="kimodo-dojo-detail" class="kimodo-dojo-detail" aria-live="polite"></div>
-    <div id="kimodo-dojo-preview-wrap" class="kimodo-dojo-preview-wrap">
-      <figure><figcaption>Isometric</figcaption><img id="kimodo-dojo-preview" alt="Flux isometric result" /></figure>
-      <figure><figcaption>360</figcaption><img id="kimodo-dojo-preview-pano" alt="Flux 360 result" /></figure>
-    </div>
-    <div id="kimodo-dojo-status" class="kimodo-drawer-sub kimodo-dojo-status">Ready.</div>
   </div>
 </aside>

tabs/dojo.tab.css

@@ -229,17 +229,25 @@
 
 /* ============ Library / create restructure ============ */
 .kimodo-dojo-view[hidden] { display: none; }
+
+/* Mine|Community pill — dojo (amber) palette, NOT the purple My Karate one. */
+.kimodo-dojo-seg { background: #201a16; border-color: #4a3320; }
+.kimodo-dojo-seg .kimodo-cz-segbtn { color: #b9905a !important; }
+.kimodo-dojo-seg .kimodo-cz-segbtn.active { background: #4a3320 !important; color: #ffe0ad !important; }
+
+/* "＋ Add dojo" — same dashed-outline style as "＋ Add a stance", dojo colors. */
 .kimodo-dojo-addbtn {
+  display: block;
   width: 100%;
-  padding: 9px;
+  padding: 11px;
   margin-bottom: 10px;
-  font-size: 12.5px;
+  font-size: 13px;
   font-weight: 600;
   cursor: pointer;
-  border-radius: 8px;
+  border-radius: 9px;
   background: #4a3320 !important;
   color: #ffe0ad !important;
-  border: 1px solid #b97736 !important;
+  border: 1px dashed #b97736 !important;
   box-shadow: none !important;
 }
 .kimodo-dojo-addbtn:hover { background: #5a3f27 !important; }
@@ -315,30 +323,53 @@
   text-align: center;
   color: #87909b;
 }
+/* Back to the dojo list — arrow only, like My Karate's ‹ back. */
 .kimodo-dojo-back {
-  padding: 4px 2px;
-  margin-bottom: 4px;
-  font-size: 13px;
-  cursor: pointer;
+  background: none !important;
+  border: 0 !important;
+  box-shadow: none !important;
   color: #ffd28a !important;
+  font-size: 26px;
+  line-height: 1;
+  cursor: pointer;
+  padding: 0 6px 6px 2px;
+}
+.kimodo-dojo-back:hover { color: #ffe0ad !important; }
+
+/* "Describe the dojo" heading row with a right-anchored erase icon. */
+.kimodo-dojo-promptrow {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 4px 0 5px;
+}
+.kimodo-dojo-promptrow .kimodo-dojo-label { margin: 0; }
+.kimodo-dojo-erase {
+  padding: 2px 6px;
+  font-size: 14px;
+  line-height: 1;
+  cursor: pointer;
+  color: #b9905a !important;
   background: none !important;
   border: 0 !important;
   box-shadow: none !important;
 }
+.kimodo-dojo-erase:hover { color: #ffd28a !important; }
+
 .kimodo-dojo-improve {
   width: 100%;
   margin: 7px 0 4px;
-  padding: 7px;
-  font-size: 11.5px;
+  padding: 8px;
+  font-size: 12px;
   font-weight: 600;
   cursor: pointer;
   border-radius: 7px;
-  background: #2a2440 !important;
-  color: #cbb6ff !important;
-  border: 1px solid #4a3a6a !important;
+  background: #33271a !important;
+  color: #ffd28a !important;
+  border: 1px solid #7a5424 !important;
   box-shadow: none !important;
 }
-.kimodo-dojo-improve:hover:not(:disabled) { background: #342c52 !important; }
+.kimodo-dojo-improve:hover:not(:disabled) { background: #3f3020 !important; }
 .kimodo-dojo-improve:disabled { opacity: .55; cursor: default; }
 .kimodo-dojo-adv {
   margin: 8px 0;

tabs/dojo.tab.js

@@ -3,6 +3,8 @@
   let dojoMode = 'splat';
   let lastScene = null;
   let dojoScope = 'mine';
+  let improvedByAya = false;   // current prompt came from tiny-aya → button reads "reroll"
+  let improving = false;       // a tiny-aya suggestion call is in flight
 
   // Community starters — tapping one opens the create view prefilled, so generating
   // produces a real flux + splat scene (which then lands under "Mine").
@@ -25,6 +27,7 @@
       grid: document.getElementById('kimodo-dojo-grid'),
       emptyMsg: document.getElementById('kimodo-dojo-empty'),
       improve: document.getElementById('kimodo-dojo-improve'),
+      erase: document.getElementById('kimodo-dojo-erase'),
       prompt: document.getElementById('kimodo-dojo-prompt'),
       mode: document.getElementById('kimodo-dojo-mode'),
       roomSize: document.getElementById('kimodo-dojo-room-size'),
@@ -294,6 +297,7 @@
     showView('create');
     resetProgress();
     const els = dojoEls();
+    improvedByAya = false;
     if (seed) {
       if (els.prompt) { els.prompt.value = seed.prompt || ''; els.prompt.dispatchEvent(new Event('input', { bubbles: true })); }
       dojoMode = seed.mode || 'splat';
@@ -301,8 +305,10 @@
       applySettings(seed.settings);
       setStatus('Loaded "' + (seed.name || 'starter') + '". Tweak and Generate.');
     } else {
-      setStatus('Ready.');
+      if (els.prompt) { els.prompt.value = ''; }   // blank by default — placeholder "a random dojo"
+      setStatus('Describe a dojo, or let tiny-aya decide 🎲');
     }
+    updateImproveBtn();
   }
 
   function mineCard(entry) {
@@ -363,14 +369,25 @@
   }
 
   // ---------- tiny-aya prompt suggestion ----------
+  // Improve-button label tracks state: blank prompt → "let tiny-aya decide",
+  // tiny-aya already wrote one → "reroll", otherwise → "improve".
+  function updateImproveBtn() {
+    const els = dojoEls();
+    if (!els.improve || improving) return;
+    const has = !!(els.prompt && els.prompt.value.trim());
+    els.improve.textContent = improvedByAya ? 'reroll 🎲'
+      : (has ? '✦ Improve with tiny-aya' : 'let tiny-aya decide 🎲');
+  }
+
   function improvePrompt() {
     const els = dojoEls();
     const payloadInput = hiddenInput('dojo-suggest-payload');
     const trigger = document.querySelector('#dojo-suggest-btn button, #dojo-suggest-btn');
     if (!payloadInput || !trigger) { setStatus('Suggest backend missing.'); return; }
     const words = (els.prompt && els.prompt.value || '').trim();
-    if (els.improve) { els.improve.disabled = true; els.improve.textContent = '✦ Thinking…'; }
-    setStatus(words ? 'Improving your prompt with tiny-aya…' : 'Suggesting a prompt with tiny-aya…');
+    improving = true;
+    if (els.improve) { els.improve.disabled = true; els.improve.textContent = '🎲 thinking…'; }
+    setStatus(words ? 'Rerolling your prompt with tiny-aya…' : 'Letting tiny-aya invent a dojo…');
     writeHidden('dojo-suggest-result', '');
     writeHidden('dojo-suggest-payload', JSON.stringify({ words: words }));
     const started = Date.now();
@@ -382,16 +399,19 @@
     window.setTimeout(() => trigger.click(), 40);
 
     function finishImprove(val) {
-      if (els.improve) { els.improve.disabled = busy; els.improve.textContent = '✦ Improve with tiny-aya'; }
+      improving = false;
+      if (els.improve) els.improve.disabled = busy;
       try {
         const r = JSON.parse(val);
         if (r.ok && r.prompt) {
           if (els.prompt) { els.prompt.value = r.prompt; els.prompt.dispatchEvent(new Event('input', { bubbles: true })); }
-          setStatus('Prompt suggested ✦');
+          improvedByAya = true;   // set AFTER the input event (which resets it) so the button reads "reroll"
+          setStatus('Prompt ready ✦ — tweak it or tap Generate.');
         } else {
-          setStatus('Suggest failed: ' + (r.error || 'unknown'));
+          setStatus('tiny-aya failed: ' + (r.error || 'unknown'));
         }
-      } catch (e) { setStatus('Suggest failed.'); }
+      } catch (e) { setStatus('tiny-aya failed.'); }
+      updateImproveBtn();
     }
   }
 
@@ -399,7 +419,7 @@
   async function runGenerate() {
     if (busy) return;
     const cfg = currentConfig();
-    if (!cfg.prompt) { setStatus('Add a scene prompt first (or tap Improve).'); return; }
+    if (!cfg.prompt) { setStatus('Describe a dojo first, or tap “let tiny-aya decide 🎲”.'); return; }
     const payloadInput = hiddenInput('dojo-payload');
     const trigger = document.querySelector('#dojo-btn button, #dojo-btn');
     if (!payloadInput || !trigger) { setStatus('Dojo backend controls are missing.'); return; }
@@ -479,7 +499,13 @@
     });
     if (els.add) els.add.addEventListener('click', () => openCreate(null));
     if (els.back) els.back.addEventListener('click', () => showView('library'));
-    if (els.improve) els.improve.addEventListener('click', () => { if (!busy) improvePrompt(); });
+    if (els.improve) els.improve.addEventListener('click', () => { if (!busy && !improving) improvePrompt(); });
+    if (els.erase) els.erase.addEventListener('click', () => {
+      if (els.prompt) { els.prompt.value = ''; els.prompt.dispatchEvent(new Event('input', { bubbles: true })); els.prompt.focus(); }
+      setStatus('Prompt cleared — let tiny-aya decide 🎲');
+    });
+    // Manual edits drop the "reroll" state (a fresh prompt → "improve"/"decide").
+    if (els.prompt) els.prompt.addEventListener('input', () => { if (improving) return; improvedByAya = false; updateImproveBtn(); });
 
     if (els.mode) els.mode.addEventListener('click', (e) => {
       const button = e.target.closest('.kimodo-cz-segbtn[data-mode]');
@@ -498,12 +524,6 @@
     });
 
     if (els.generate) els.generate.addEventListener('click', runGenerate);
-    if (els.clear) els.clear.addEventListener('click', () => {
-      const frame = previewFrame();
-      if (frame && frame.contentWindow) frame.contentWindow.postMessage({ kind: 'dojo-clear' }, '*');
-      resetProgress();
-      setStatus('Scene cleared.');
-    });
   }
 
   window.addEventListener('kimodo-drawer-open', (e) => {