Update app.py

app.py

@@ -1,26 +1,16 @@
 #!/usr/bin/env python3
 """
-SillyTavern Character‑Card Generator — version 2.0.1 (Apr 2025)
+SillyTavern Character‑Card Generator — version 2.0.2 (Apr 2025)
 ──────────────────────────────────────────────────────────────
-Patch notes 2.0.1
-•   Fixes Gradio 4.43.x OpenAPI‑schema crash (TypeError: … 'bool' is not iterable)
-•   Adds `share=True` fallback so app still launches in sandboxed / cloud
-    environments where localhost is not publicly reachable.
-•   Bumps the minimum Gradio to 4.44.1 (where the schema bug is fixed).
-•   Minor: logs version on start‑up.
-
-No functional behaviour changed — only the launch wrapper.
+• 2.0.1 accidentally stubbed‑out the UI; 2.0.2 restores the full layout.
+• Keeps the Gradio‑schema crash fix & `share=True` launch params.
 """
 
 from __future__ import annotations
 
-import json
-import os
-import sys
-import uuid
+import json, sys, uuid
 from dataclasses import dataclass
 from functools import cached_property
-from io import BytesIO
 from pathlib import Path
 from typing import Any, Dict, List, Tuple, Union
 
@@ -28,164 +18,147 @@ import gradio as gr
 from PIL import Image
 from PIL.PngImagePlugin import PngInfo
 
-# ─── Version & deps ─────────────────────────────────────────────────────────
-__version__ = "2.0.1"
+__version__ = "2.0.2"
 
-# Third‑party SDKs — optional -------------------------------------------------
-try:
-    from anthropic import Anthropic, APITimeoutError as AnthropicTimeout
-except ImportError:
-    Anthropic = None  # type: ignore
-
-try:
-    from openai import OpenAI, APITimeoutError as OpenAITimeout
-except ImportError:
-    OpenAI = None  # type: ignore
-
-###############################################################################
-#  Model catalog (unchanged)
-###############################################################################
-
-CLAUDE_MODELS: List[str] = [
-    "claude-3-opus-20240229",
-    "claude-3-sonnet-20240229",
-    "claude-3-haiku-20240307",
-    "claude-3-5-sonnet-20240620",
-    "claude-3-5-sonnet-20241022",
-    "claude-3-5-haiku-20241022",
+# ─── Model lists ───────────────────────────────────────────────────────────
+CLAUDE_MODELS = [
+    "claude-3-opus-20240229","claude-3-sonnet-20240229","claude-3-haiku-20240307",
+    "claude-3-5-sonnet-20240620","claude-3-5-sonnet-20241022","claude-3-5-haiku-20241022",
     "claude-3-7-sonnet-20250219",
 ]
-
-OPENAI_MODELS: List[str] = [
-    "o3", "o3-mini", "o4-mini",
-    "gpt-4.1", "gpt-4.1-mini", "gpt-4.1-nano",
-    "gpt-4o", "gpt-4o-mini", "gpt-4", "gpt-4-32k",
-    "gpt-4-0125-preview", "gpt-4-turbo-preview", "gpt-4-1106-preview",
-    "gpt-3.5-turbo",
+OPENAI_MODELS = [
+    "o3","o3-mini","o4-mini","gpt-4.1","gpt-4.1-mini","gpt-4.1-nano",
+    "gpt-4o","gpt-4o-mini","gpt-4","gpt-4-32k","gpt-4-0125-preview",
+    "gpt-4-turbo-preview","gpt-4-1106-preview","gpt-3.5-turbo",
 ]
-
 ALL_MODELS = CLAUDE_MODELS + OPENAI_MODELS
-DEFAULT_ANTHROPIC_ENDPOINT = "https://api.anthropic.com"
-DEFAULT_OPENAI_ENDPOINT = "https://api.openai.com/v1"
-
-###############################################################################
-#  Helper classes (unchanged logic)
-###############################################################################
-
-JsonDict = Dict[str, Any]
+DEFAULT_ANTHROPIC_ENDPOINT="https://api.anthropic.com"
+DEFAULT_OPENAI_ENDPOINT="https://api.openai.com/v1"
 
+# ─── API wrapper ───────────────────────────────────────────────────────────
+JsonDict = Dict[str,Any]
+try:
+    from anthropic import Anthropic,APITimeoutError as AnthropicTimeout
+except ImportError:
+    Anthropic=None
+try:
+    from openai import OpenAI,APITimeoutError as OpenAITimeout
+except ImportError:
+    OpenAI=None
 
 @dataclass
 class APIConfig:
-    endpoint: str
-    api_key: str
-    model: str
-    temperature: float = 0.7
-    top_p: float = 0.9
-    thinking: bool = False
-
+    endpoint:str; api_key:str; model:str
+    temperature:float=0.7; top_p:float=0.9; thinking:bool=False
     @cached_property
-    def provider(self) -> str:
-        if self.model in CLAUDE_MODELS:
-            return "anthropic"
-        if self.model in OPENAI_MODELS:
-            return "openai"
-        raise ValueError(self.model)
-
+    def provider(self):
+        return "anthropic" if self.model in CLAUDE_MODELS else "openai"
     @cached_property
     def sdk(self):
-        if self.provider == "anthropic":
-            if Anthropic is None:
-                raise RuntimeError("Install anthropic‑python for Claude models.")
-            return Anthropic(api_key=self.api_key, base_url=self.endpoint)
-        if self.provider == "openai":
-            if OpenAI is None:
-                raise RuntimeError("Install openai‑python for GPT/o‑series models.")
-            return OpenAI(api_key=self.api_key, base_url=self.endpoint)
-        raise AssertionError
-
-    # ------------------------------------------------------------------
-    def chat(self, user_prompt: str, system_prompt: str = "", max_tokens: int = 4096) -> str:
-        if self.provider == "anthropic":
-            opts = {
-                "model": self.model,
-                "system": system_prompt,
-                "messages": [{"role": "user", "content": user_prompt}],
-                "max_tokens": max_tokens,
-                "temperature": self.temperature,
-                "top_p": self.top_p,
-            }
-            if self.thinking:
-                opts["vision"] = "detailed"
-            resp = self.sdk.messages.create(**opts)
-            return resp.content[0].text
-
-        opts = {
-            "model": self.model,
-            "messages": [
-                {"role": "system", "content": system_prompt},
-                {"role": "user", "content": user_prompt},
-            ],
-            "max_tokens": max_tokens,
-            "temperature": self.temperature,
-            "top_p": self.top_p,
-        }
-        if self.thinking:
-            opts["reasoning_mode"] = "enhanced"
-        resp = self.sdk.chat.completions.create(**opts)
-        return resp.choices[0].message.content
-
-###############################################################################
-#  Card helpers & PNG (unchanged)
-###############################################################################
-
-CARD_REQUIRED_KEYS = {"char_name", "char_persona", "world_scenario", "char_greeting", "example_dialogue", "description"}
-
-
-def extract_card_json(text: str) -> Tuple[str | None, JsonDict | None]:
+        if self.provider=="anthropic":
+            if not Anthropic: raise RuntimeError("install anthropic-python")
+            return Anthropic(api_key=self.api_key,base_url=self.endpoint)
+        if not OpenAI: raise RuntimeError("install openai-python")
+        return OpenAI(api_key=self.api_key,base_url=self.endpoint)
+    def chat(self,user:str,system:str="",max_tokens:int=4096)->str:
+        if self.provider=="anthropic":
+            args=dict(model=self.model,system=system,messages=[{"role":"user","content":user}],max_tokens=max_tokens,temperature=self.temperature,top_p=self.top_p)
+            if self.thinking: args["vision"]="detailed"
+            return self.sdk.messages.create(**args).content[0].text
+        args=dict(model=self.model,messages=[["system",system],["user",user]],max_tokens=max_tokens,temperature=self.temperature,top_p=self.top_p)
+        if self.thinking: args["reasoning_mode"]="enhanced"
+        return self.sdk.chat.completions.create(**args).choices[0].message.content
+
+# ─── card helpers ──────────────────────────────────────────────────────────
+CARD_REQUIRED={"char_name","char_persona","world_scenario","char_greeting","example_dialogue","description"}
+
+def extract_card_json(txt:str)->Tuple[str|None,JsonDict|None]:
     try:
-        body = text.replace("```json", "").replace("```", "").strip()
-        raw = body[body.find("{") : body.rfind("}") + 1]
-        data: JsonDict = json.loads(raw)
-        data.update({
-            "name": data["char_name"],
-            "personality": data["char_persona"],
-            "scenario": data["world_scenario"],
-            "first_mes": data["char_greeting"],
-        })
-        return (json.dumps(data, ensure_ascii=False, indent=2), data) if CARD_REQUIRED_KEYS.issubset(data) else (None, None)
+        body=txt.replace("```json","",1).replace("```","",1).strip()
+        raw=body[body.find("{"):body.rfind("}")+1]
+        data=json.loads(raw)
+        data.update(name=data["char_name"],personality=data["char_persona"],scenario=data["world_scenario"],first_mes=data["char_greeting"])
+        return (json.dumps(data,indent=2),data) if CARD_REQUIRED<=data.keys() else (None,None)
     except Exception:
-        return None, None
-
-
-def inject_card_into_png(img_path: str | Path, card: Union[str, JsonDict]) -> Path:
-    card_json: JsonDict = json.loads(card) if isinstance(card, str) else card
-    img = Image.open(img_path)
-    w, h = img.size
-    target_ratio = 400 / 600
-    if w / h > target_ratio:
-        new_w = int(h * target_ratio); left = (w - new_w) // 2; img = img.crop((left, 0, left + new_w, h))
-    else:
-        new_h = int(w / target_ratio); top = (h - new_h) // 2; img = img.crop((0, top, w, top + new_h))
-    img = img.resize((400, 600), Image.LANCZOS)
-    meta = PngInfo(); meta.add_text("chara", json.dumps(card_json).encode().hex())
-    out = Path(__file__).with_name("outputs"); out.mkdir(exist_ok=True)
-    result = out / f"{card_json['name']}_{uuid.uuid4()}.png"
-    img.save(result, "PNG", pnginfo=meta)
-    return result
-
-###############################################################################
-#  Gradio UI (only change: launch params, show_api=False)
-###############################################################################
-
-def build_ui() -> gr.Blocks:
+        return None,None
+
+def inject_card_into_png(img_path:str,card:Union[str,JsonDict]):
+    card=json.loads(card) if isinstance(card,str) else card
+    img=Image.open(img_path)
+    w,h=img.size; ratio=400/600
+    img=img.crop(((w-int(h*ratio))//2,0,(w+int(h*ratio))//2,h)) if w/h>ratio else img.crop((0,(h-int(w/ratio))//2,w,(h+int(w/ratio))//2))
+    img=img.resize((400,600),Image.LANCZOS)
+    meta=PngInfo(); meta.add_text("chara",json.dumps(card).encode().hex())
+    out=Path(__file__).with_name("outputs"); out.mkdir(exist_ok=True)
+    dest=out/f"{card['name']}_{uuid.uuid4()}.png"
+    img.save(dest,"PNG",pnginfo=meta); return dest
+
+# ─── Gradio UI ─────────────────────────────────────────────────────────────
+
+def build_ui():
     with gr.Blocks(title=f"SillyTavern Card Gen {__version__}") as demo:
         gr.Markdown(f"### 🃏 SillyTavern Character Generator v{__version__}")
-        # … UI body unchanged … (see previous version for full layout)
+
+        with gr.Tab("JSON Generate"):
+            with gr.Row():
+                with gr.Column():
+                    endpoint=gr.Textbox(label="Endpoint",value=DEFAULT_ANTHROPIC_ENDPOINT)
+                    api_key=gr.Textbox(label="API Key",type="password")
+                    model_dd=gr.Dropdown(ALL_MODELS,label="Model")
+                    thinking=gr.Checkbox(label="Thinking mode")
+                    temp=gr.Slider(0,1,0.7,label="Temperature")
+                    topp=gr.Slider(0,1,0.9,label="Top‑P")
+                    prompt=gr.Textbox(lines=5,label="Prompt")
+                    gen=gr.Button("Generate JSON")
+                with gr.Column():
+                    raw_out=gr.Textbox(label="Raw output")
+                    json_out=gr.Textbox(label="Card JSON")
+                    json_file=gr.File(label="Download .json")
+            with gr.Row():
+                img_model=gr.Dropdown(["SDXL","midjourney"],label="Image model",value="SDXL")
+                gen_img_prompt=gr.Button("Generate image prompt")
+                img_prompt_out=gr.Textbox(label="Image prompt")
+
+        with gr.Tab("PNG Inject"):
+            gr.Markdown("Upload an image and JSON to embed")
+            with gr.Row():
+                img_up=gr.Image(type="filepath")
+                json_text=gr.Textbox(label="JSON")
+                json_up=gr.File(label="Or upload .json",file_types=[".json"])
+                inject_btn=gr.Button("Inject")
+                png_out=gr.File(label="PNG with card")
+
+        # ── callbacks ───────────────────────────────────────────────────
+        def choose_endpoint(k):
+            return DEFAULT_ANTHROPIC_ENDPOINT if k.startswith("sk-ant-") else DEFAULT_OPENAI_ENDPOINT if k.startswith("sk-") else DEFAULT_ANTHROPIC_ENDPOINT
+        api_key.change(choose_endpoint,api_key,endpoint)
+
+        def generate_json(ep,k,m,think,t,p,user):
+            cfg=APIConfig(ep.strip(),k.strip(),m,t,p,think)
+            sys_prompt=Path(__file__).with_name("json.txt").read_text() if Path(__file__).with_name("json.txt").exists() else ""
+            out=cfg.chat(user,sys_prompt)
+            raw,parsed=extract_card_json(out)
+            if raw and parsed:
+                outdir=Path(__file__).with_name("outputs"); outdir.mkdir(exist_ok=True)
+                fp=outdir/f"{parsed['name']}_{uuid.uuid4()}.json"; fp.write_text(raw)
+                return out,raw,str(fp)
+            return out,"",None
+        gen.click(generate_json,[endpoint,api_key,model_dd,thinking,temp,topp,prompt],[raw_out,json_out,json_file])
+
+        def gen_img(ep,k,m,raw,image_model):
+            cfg=APIConfig(ep.strip(),k.strip(),m)
+            sys_prompt=Path(__file__).with_name(f"{image_model}.txt").read_text() if Path(__file__).with_name(f"{image_model}.txt").exists() else ""
+            return cfg.chat(raw,sys_prompt)
+        gen_img_prompt.click(gen_img,[endpoint,api_key,model_dd,raw_out,img_model],img_prompt_out)
+
+        def inject(image,json_str,json_path):
+            if json_path: json_str=Path(json_path).read_text()
+            return str(inject_card_into_png(image,json_str)) if image and json_str else None
+        inject_btn.click(inject,[img_up,json_text,json_up],png_out)
 
     return demo
 
-###############################################################################
-if __name__ == "__main__":
+# ─── main ───────────────────────────────────────────────────────────────────
+if __name__=="__main__":
     print(f"== SillyTavern Card Gen {__version__} ==")
-    build_ui().launch(share=True, show_api=False)
+    build_ui().launch(share=True,show_api=False)