Update app.py

app.py

@@ -1,84 +1,314 @@
-import gradio as gr
+cimport gradio as gr
 import numpy as np
 import math
-from PIL import Image
-import requests
-import io
-import tempfile
+from PIL import Image, ImageDraw
 from scipy.ndimage import map_coordinates
+import tempfile, os
 
-# --- 設定：画像生成API ---
-API_URL = "https://api-inference.huggingface.co/models/runwayml/stable-diffusion-v1-5"
+def flatten_to_white(image, bg_color=(255, 255, 255)):
+    if image.mode == 'RGBA':
+        bg = Image.new('RGB', image.size, bg_color)
+        bg.paste(image, mask=image.split()[3])
+        return bg
+    else:
+        bg = Image.new('RGB', image.size, bg_color)
+        bg.paste(image.convert('RGB'))
+        return bg
 
-# --- 選択肢データ（ここを書き換えれば種類が増えます） ---
-MASTER_DATA = {
-    "動物": ["柴犬", "三毛猫", "皇帝ペンギン", "レッサーパンダ", "ウーパールーパー", "メンダコ"],
-    "食べ物": ["ぷるぷるプリン", "クリームソーダ", "ショートケーキ", "エビフライ", "目玉焼き"],
-    "ファンタジー": ["小さな妖精", "魔法の杖", "ミミック（宝箱）", "マンドラゴラ", "光るクリスタル"],
-    "乗り物": ["空飛ぶクジラ", "ミニ潜水艦", "レトロなプロペラ機", "おもちゃのロケット"]
+def auto_suggest(image):
+    if image is None:
+        return gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), "画像をアップロードしてください"
+
+    arr = np.array(image.convert('RGBA'))
+    h, w = arr.shape[:2]
+    has_alpha = image.mode == 'RGBA' and arr[:,:,3].min() < 255
+
+    if has_alpha:
+        mask = arr[:,:,3] > 10
+    else:
+        gray = np.array(image.convert('L'))
+        mask = gray < 240
+
+    if mask.any():
+        ys, xs = np.where(mask)
+        cy = ys.mean() / h
+        cx = xs.mean() / w
+        width_ratio = (xs.max() - xs.min()) / w
+        height_ratio = (ys.max() - ys.min()) / h
+    else:
+        cy, cx, width_ratio, height_ratio = 0.5, 0.5, 0.8, 0.8
+
+    do_breath = True
+    do_sway   = width_ratio > 0.4
+    do_tail   = cx > 0.55
+    do_fin    = width_ratio > 0.6
+    do_bulge  = height_ratio > 0.6 and width_ratio > 0.5
+    do_blink  = True
+    do_bounce = height_ratio < 0.6
+    do_doze   = cy < 0.45
+    do_swim   = width_ratio > 0.65
+    do_float  = True
+    do_nod    = cy < 0.5
+    do_startle = False
+
+    suggestions = []
+    if do_breath: suggestions.append("呼吸")
+    if do_sway:   suggestions.append("ゆらゆら")
+    if do_blink:  suggestions.append("まばたき")
+    if do_bounce: suggestions.append("ぽよん")
+    if do_swim:   suggestions.append("泳ぐ")
+    if do_float:  suggestions.append("浮き沈み")
+
+    msg = f"提案: {', '.join(suggestions)}"
+    return (
+        gr.update(value=do_breath),
+        gr.update(value=do_sway),
+        gr.update(value=do_tail),
+        gr.update(value=do_fin),
+        gr.update(value=do_bulge),
+        gr.update(value=do_blink),
+        gr.update(value=do_bounce),
+        gr.update(value=do_doze),
+        gr.update(value=do_swim),
+        gr.update(value=do_float),
+        gr.update(value=do_nod),
+        gr.update(value=do_startle),
+        msg
+    )
+
+def warp_frame(arr, W, H, tail_deg, fin_deg, breath_scale,
+               tail_root_x, tail_root_y, fin_root_x, body_cx, body_cy,
+               swim_phase, nod_deg):
+    ys, xs = np.mgrid[0:H, 0:W].astype(np.float64)
+    src_y = ys.copy(); src_x = xs.copy()
+
+    # 呼吸膨らみ
+    dx_b = xs - body_cx; dy_b = ys - body_cy
+    body_inf = np.clip(1.0 - np.sqrt(dx_b**2+dy_b**2)/( W*0.38), 0, 1)**1.2
+    sf = (breath_scale - 1.0) * body_inf
+    src_x -= dx_b * sf; src_y -= dy_b * sf
+
+    # しっぽ
+    if tail_deg != 0:
+        tail_rad = math.radians(tail_deg)
+        dx_t = xs - tail_root_x
+        inf_t = np.where(dx_t>0, (1-np.exp(-dx_t/( W*0.09)))*np.clip(dx_t/(W*0.20),0,1), 0)
+        src_y -= inf_t * math.sin(tail_rad) * W * 0.037
+
+    # ひれ
+    if fin_deg != 0:
+        fin_rad = math.radians(fin_deg)
+        dx_f = fin_root_x - xs
+        inf_f = np.where(dx_f>0, (1-np.exp(-dx_f/(W*0.058)))*np.clip(dx_f/(W*0.13),0,1), 0)
+        src_y -= inf_f * math.sin(fin_rad) * W * 0.023
+
+    # 泳ぐ（体全体が波打つ）
+    if swim_phase != 0:
+        wave = np.sin(xs / W * math.pi * 2 + swim_phase) * H * 0.015
+        src_y -= wave
+
+    # 頭ふり
+    if nod_deg != 0:
+        nod_rad = math.radians(nod_deg)
+        upper = np.clip((body_cy - ys) / (body_cy * 0.8), 0, 1)
+        src_x -= upper * math.sin(nod_rad) * W * 0.04
+
+    coords = [src_y.ravel(), src_x.ravel()]
+    result = np.full_like(arr, 255)
+    for c in range(arr.shape[2]):
+        warped = map_coordinates(arr[:,:,c].astype(np.float64), coords, order=2, mode='constant', cval=255)
+        result[:,:,c] = np.clip(warped.reshape(H,W), 0, 255)
+    return result.astype(np.uint8)
+
+BG_COLORS = {
+    "白": (255, 255, 255),
+    "クリーム": (255, 248, 220),
+    "水色": (200, 230, 255),
+    "ピンク": (255, 220, 230),
+    "黒": (30, 30, 30),
+}
+
+SIZE_MAP = {
+    "小 (240px)": 240,
+    "中 (480px)": 480,
+    "大 (720px)": 720,
 }
 
-def update_subs(main_cat):
-    return gr.update(choices=MASTER_DATA[main_cat], value=MASTER_DATA[main_cat][0])
-
-def generate_static(main_cat, sub_cat):
-    # 背景を白に固定し、キャラを中央に寄せる「ガチガチの呪文」
-    prompt = f"a cute {sub_cat}, {main_cat} theme, masterpiece, high quality, simple anime style, white background, solo, center composition"
-    try:
-        # タイムラインを長めに設定してエラーを防ぐ
-        response = requests.post(API_URL, json={"inputs": prompt}, timeout=60)
-        if response.status_code == 200:
-            img = Image.open(io.BytesIO(response.content)).convert("RGBA")
-            return img, "✅ 静止画ができました！SUZURI用にはこの画像を保存してください。"
-        else:
-            return None, "❌ 混み合っています。もう一度「生成」を押してください。"
-    except:
-        return None, "❌ 通信エラーです。再度お試しください。"
-
-def make_gif(static_img, face_protection):
-    if static_img is None: return None, "先に画像を生成してください"
-    
-    # X投稿用に少しサイズを調整
-    img_arr = np.array(static_img.resize((400, 400), Image.LANCZOS))
+def generate(image,
+             do_breath, do_sway, do_tail, do_fin, do_bulge,
+             do_blink, do_bounce, do_doze, do_swim, do_float, do_nod, do_startle,
+             intensity, speed, fmt,
+             breath_amp, sway_amp, tail_amp, fin_amp, bulge_amp,
+             bg_color_name, out_size_name):
+    if image is None:
+        return None, None, "画像をアップロードしてください"
+
+    OUT = SIZE_MAP.get(out_size_name, 480)
+    bg_color = BG_COLORS.get(bg_color_name, (255, 255, 255))
+
+    flat = flatten_to_white(image, bg_color).resize((OUT, OUT), Image.LANCZOS)
+    base_arr = np.array(flat).astype(np.float64)
+    H, W = base_arr.shape[:2]
+
+    tail_root_x = int(W * 0.63)
+    tail_root_y = int(H * 0.50)
+    fin_root_x  = int(W * 0.26)
+    body_cx     = int(W * 0.50)
+    body_cy     = int(H * 0.50)
+
+    speed_map = {"遅い": 3.0, "普通": 2.0, "速い": 1.3}
+    total_sec = speed_map.get(speed, 2.0)
+    N_FRAMES  = 48
+    DURATION  = int(total_sec * 1000 / N_FRAMES)
+    scale     = intensity / 5.0
+
+    # びくっのタイミング
+    startle_frame = N_FRAMES // 4 if do_startle else -1
+
     frames = []
-    
-    # アニメーション計算
-    for i in range(20):
-        h, w = img_arr.shape[:2]
-        y, x = np.indices((h, w))
-        dist = np.sqrt((x/w - 0.5)**2 + (y/h - 0.5)**2)
-        weight = np.clip(dist * 2, 0, 1) if face_protection else 1.0
-        sx = 10 * math.sin(i * 0.3) * (y / h) * weight
-        sy = 5 * math.sin(i * 0.4) * (1 - y / h) * weight
-        map_x, map_y = (x + sx).astype(np.float32), (y + sy).astype(np.float32)
-        warped = np.zeros_like(img_arr)
-        for c in range(4):
-            warped[:,:,c] = map_coordinates(img_arr[:,:,c], [map_y, map_x], order=1)
-        frames.append(Image.fromarray(warped).convert("RGB")) # GIFはRGB
-    
-    tmp = tempfile.NamedTemporaryFile(delete=False, suffix=".gif")
-    frames[0].save(tmp.name, save_all=True, append_images=frames[1:], duration=80, loop=0)
-    return tmp.name, "✅ X宣伝用のGIFが完成しました！"
-
-with gr.Blocks() as demo:
-    gr.Markdown("# 🎨 SUZURI入稿 ＆ X宣伝用メーカー")
-    
+    for i in range(N_FRAMES):
+        t = i / N_FRAMES
+        sin_t  = math.sin(2*math.pi*t)
+        sin_t2 = math.sin(2*math.pi*t*0.5 + 0.5)
+
+        # 基本動き
+        breath_y     = int(sin_t * breath_amp * scale) if do_breath else 0
+        sway_x       = int(sin_t2 * sway_amp * scale) if do_sway else 0
+        breath_scale = (1.0 + sin_t * (bulge_amp/100) * scale) if do_bulge else 1.0
+        tail_a       = math.sin(2*math.pi*t*1.4) * tail_amp * scale if do_tail else 0
+        fin_a        = math.sin(2*math.pi*t*1.4 + math.pi*0.8) * fin_amp * scale if do_fin else 0
+
+        # 泳ぐ
+        swim_phase = (2*math.pi*t*2) if do_swim else 0
+
+        # 頭ふり
+        nod_deg = math.sin(2*math.pi*t*0.7) * 8 * scale if do_nod else 0
+
+        # ぽよん（バウンド）
+        if do_bounce:
+            bounce = abs(math.sin(2*math.pi*t)) * 6 * scale
+            breath_y += int(bounce)
+
+        # 浮き沈み（ゆっくり上下）
+        if do_float:
+            breath_y += int(math.sin(2*math.pi*t*0.5) * 5 * scale)
+
+        # うとうと（頭が下がる）
+        if do_doze:
+            doze = max(0, math.sin(2*math.pi*t*0.3)) * 10 * scale
+            breath_y += int(doze)
+
+        # びくっ
+        if do_startle and i == startle_frame:
+            breath_y -= int(15 * scale)
+            sway_x += int(5 * scale)
+
+        warped = warp_frame(
+            base_arr, W, H,
+            tail_a, fin_a, breath_scale,
+            tail_root_x, tail_root_y, fin_root_x,
+            body_cx, body_cy,
+            swim_phase, nod_deg
+        )
+
+        frame = Image.new('RGB', (OUT, OUT), bg_color)
+        wimg = Image.fromarray(warped)
+        frame.paste(wimg, (sway_x, breath_y))
+
+        # まばたき（目の部分を横線で潰す）
+        if do_blink:
+            blink_t = (math.sin(2*math.pi*t*0.4 - math.pi/2) + 1) / 2
+            if blink_t > 0.85:
+                draw = ImageDraw.Draw(frame)
+                eye_y = int(H * 0.38)
+                eye_h = int(H * 0.06 * (1 - blink_t) * 8)
+                if eye_h > 0:
+                    draw.rectangle([int(W*0.25), eye_y, int(W*0.75), eye_y + eye_h],
+                                   fill=bg_color)
+
+        frames.append(frame)
+
+    suffix = ".webp" if fmt == "WebP（推奨）" else ".gif"
+    tmp = tempfile.NamedTemporaryFile(suffix=suffix, delete=False)
+
+    if fmt == "WebP（推奨）":
+        frames[0].save(tmp.name, save_all=True, append_images=frames[1:],
+                       loop=0, duration=DURATION, lossless=True, quality=100, format='WEBP')
+    else:
+        frames[0].save(tmp.name, save_all=True, append_images=frames[1:],
+                       loop=0, duration=DURATION, optimize=True)
+
+    size_kb = os.path.getsize(tmp.name) // 1024
+    msg = f"完成！ {N_FRAMES}フレーム × {DURATION}ms = {total_sec:.1f}秒ループ　({size_kb}KB)"
+    return tmp.name, tmp.name, msg
+
+
+with gr.Blocks(title="キャラアニメーター") as demo:
+    gr.Markdown("## キャラクターアニメーター")
+    gr.Markdown("画像をアップロードして、しぐさを選んでアニメーションを生成します。")
+
     with gr.Row():
-        with gr.Column():
-            m_cat = gr.Dropdown(list(MASTER_DATA.keys()), value="動物", label="1. ジャンル")
-            s_cat = gr.Dropdown(MASTER_DATA["動物"], value="柴犬", label="2. キャラを選択")
-            m_cat.change(update_subs, m_cat, s_cat)
-            
-            gen_btn = gr.Button("🚀 キャラを生成", variant="primary")
-            face_p = gr.Checkbox(value=True, label="顔を歪ませない（自然な動き）")
-            gif_btn = gr.Button("🐦 X投稿用GIFを作る")
-
-        with gr.Column():
-            static_out = gr.Image(label="SUZURI用（静止画）", type="pil")
-            gif_out = gr.Image(label="X宣伝用（GIFアニメ）")
-            status = gr.Textbox(label="状況")
-
-    gen_btn.click(generate_static, [m_cat, s_cat], [static_out, status])
-    gif_btn.click(make_gif, [static_out, face_p], [gif_out, status])
+        with gr.Column(scale=1):
+            image_input = gr.Image(type="pil", image_mode="RGBA", label="画像をアップロード")
+            auto_btn = gr.Button("🔍 しぐさを自動提案", variant="secondary")
+            suggest_msg = gr.Textbox(label="提案結果", interactive=False)
+
+            gr.Markdown("### 汎用しぐさ")
+            do_breath  = gr.Checkbox(label="呼吸（上下）",        value=True)
+            do_sway    = gr.Checkbox(label="ゆらゆら（左右）",     value=True)
+            do_blink   = gr.Checkbox(label="まばたき",            value=False)
+            do_bounce  = gr.Checkbox(label="ぽよん（バウンド）",   value=False)
+            do_nod     = gr.Checkbox(label="頭ふり",              value=False)
+            do_doze    = gr.Checkbox(label="うとうと",             value=False)
+            do_startle = gr.Checkbox(label="びくっ（驚き）",       value=False)
+
+            gr.Markdown("### 海の生き物系しぐさ")
+            do_tail  = gr.Checkbox(label="しっぽふりふり",         value=False)
+            do_fin   = gr.Checkbox(label="ひれパタパタ",           value=False)
+            do_bulge = gr.Checkbox(label="ぷくぷく膨らむ",         value=False)
+            do_swim  = gr.Checkbox(label="泳ぐ（波打つ）",         value=False)
+            do_float = gr.Checkbox(label="浮き沈み",              value=False)
+
+            gr.Markdown("### 基本調整")
+            intensity = gr.Slider(1, 10, value=5, step=1, label="動きの大きさ（全体）")
+            speed     = gr.Radio(["遅い", "普通", "速い"], value="普通", label="速さ")
+
+            gr.Markdown("### 細かい動きの調整")
+            breath_amp = gr.Slider(1, 20, value=8,  step=1, label="呼吸の幅（px）")
+            sway_amp   = gr.Slider(1, 15, value=3,  step=1, label="ゆらゆらの幅（px）")
+            tail_amp   = gr.Slider(1, 30, value=13, step=1, label="しっぽの角度")
+            fin_amp    = gr.Slider(1, 20, value=9,  step=1, label="ひれの角度")
+            bulge_amp  = gr.Slider(1, 10, value=4,  step=1, label="膨らみの強さ（%）")
+
+            gr.Markdown("### 出力設定")
+            bg_color_name = gr.Radio(list(BG_COLORS.keys()), value="白", label="背景色")
+            out_size_name = gr.Radio(list(SIZE_MAP.keys()),  value="中 (480px)", label="出力サイズ")
+            fmt           = gr.Radio(["WebP（推奨）", "GIF"], value="WebP（推奨）", label="出力形式")
+
+            btn = gr.Button("アニメーション生成", variant="primary")
+
+        with gr.Column(scale=1):
+            preview     = gr.Image(label="プレビュー", type="filepath")
+            output_file = gr.File(label="ダウンロード")
+            status_msg  = gr.Textbox(label="ステータス", interactive=False)
+
+    auto_btn.click(
+        fn=auto_suggest,
+        inputs=[image_input],
+        outputs=[do_breath, do_sway, do_tail, do_fin, do_bulge,
+                 do_blink, do_bounce, do_doze, do_swim, do_float, do_nod, do_startle,
+                 suggest_msg]
+    )
+
+    btn.click(
+        fn=generate,
+        inputs=[image_input,
+                do_breath, do_sway, do_tail, do_fin, do_bulge,
+                do_blink, do_bounce, do_doze, do_swim, do_float, do_nod, do_startle,
+                intensity, speed, fmt,
+                breath_amp, sway_amp, tail_amp, fin_amp, bulge_amp,
+                bg_color_name, out_size_name],
+        outputs=[output_file, preview, status_msg]
+    )
 
 demo.launch()