Upload 4 files

bootstrap.py

@@ -1,4 +1,5 @@
 import os
+import re
 import importlib
 from pathlib import Path
 
@@ -79,19 +80,26 @@ def _openai_translate(text: str, lang_from: str = "auto", lang_to: str = "zh") -
 
     url = base_url.rstrip("/") + "/chat/completions"
     headers = {"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}
+    # Build a stronger instruction, especially for Japanese output
+    extra_rules = ""
+    if target_lang.lower().startswith("japan"):
+        extra_rules = (
+            " Use natural Japanese. Prefer including hiragana/katakana (kana) where appropriate; "
+            "do not just output Chinese hanzi. If the input is Chinese, do not return the same text."
+        )
+
+    system_prompt = (
+        "You are a professional translation engine." 
+        f" Translate the user text to {target_lang}."
+        " Only output the translated text without any extra words, quotes, or explanations."
+        " Preserve numbers, emoji, and links." + extra_rules
+    )
+
     payload = {
         "model": model,
         "temperature": 0,
         "messages": [
-            {
-                "role": "system",
-                "content": (
-                    "You are a professional translation engine. "
-                    f"Translate the user text to {target_lang}. "
-                    "Only output the translated text without any extra words, quotes, or explanations. "
-                    "Preserve numbers, emoji, and links."
-                ),
-            },
+            {"role": "system", "content": system_prompt},
             {"role": "user", "content": text},
         ],
     }
@@ -109,6 +117,33 @@ def _openai_translate(text: str, lang_from: str = "auto", lang_to: str = "zh") -
         if not content:
             raise MemeFeedback("OpenAI 翻译失败：空结果")
         result = str(content).strip()
+        # If target is Japanese but no kana detected, attempt a single retry with stricter rule
+        def has_kana(s: str) -> bool:
+            return bool(re.search(r"[\u3040-\u30FF]", s))
+
+        if target_lang.lower().startswith("japan") and not has_kana(result):
+            print("[translate/openai] no kana detected, retrying with stricter Japanese rule", flush=True)
+            strict_prompt = (
+                system_prompt
+                + " Ensure the output contains kana (hiragana or katakana) and is not identical to the input."
+            )
+            payload_retry = {
+                "model": model,
+                "temperature": 0,
+                "messages": [
+                    {"role": "system", "content": strict_prompt},
+                    {"role": "user", "content": text},
+                ],
+            }
+            r2 = httpx.post(url, headers=headers, json=payload_retry, timeout=60)
+            print(f"[translate/openai] retry response status={r2.status_code}", flush=True)
+            r2.raise_for_status()
+            data2 = r2.json()
+            choices2 = data2.get("choices") or []
+            result2 = (choices2[0].get("message", {}).get("content") or "").strip() if choices2 else ""
+            if result2:
+                print(f"[translate/openai] retry success result_len={len(result2)}", flush=True)
+                return result2
         print(f"[translate/openai] success result_len={len(result)}", flush=True)
         return result
     except Exception as e:
@@ -165,6 +200,60 @@ def render_list(params: RenderMemeListRequest = RenderMemeListRequest()):
     from fastapi import Response
     return Response(content=content, media_type=media_type)
 
+# Dynamic infos.json and keyMap.json derived from loaded memes (not aggregated assets)
+from collections import OrderedDict
+from meme_generator.app import MemeInfoResponse, MemeParamsResponse
+
+def build_infos_and_keymap():
+    infos = {}
+    pairs = []  # (keyword, meme_key)
+    for meme in sorted(get_memes(), key=lambda m: m.key):
+        args_type_response = None
+        if meme.params_type.args_type:
+            args_model = meme.params_type.args_type.args_model
+            args_type_response = {
+                "args_model": args_model.model_json_schema() if hasattr(args_model, "model_json_schema") else {},
+                "args_examples": [
+                    getattr(x, "model_dump", lambda: x)() if hasattr(x, "model_dump") else x
+                    for x in meme.params_type.args_type.args_examples
+                ],
+                "parser_options": meme.params_type.args_type.parser_options,
+            }
+        infos[meme.key] = {
+            "key": meme.key,
+            "params_type": {
+                "min_images": meme.params_type.min_images,
+                "max_images": meme.params_type.max_images,
+                "min_texts": meme.params_type.min_texts,
+                "max_texts": meme.params_type.max_texts,
+                "default_texts": meme.params_type.default_texts,
+                "args_type": args_type_response,
+            },
+            "keywords": meme.keywords,
+            "shortcuts": meme.shortcuts,
+            "tags": list(meme.tags),
+            "date_created": meme.date_created,
+            "date_modified": meme.date_modified,
+        }
+        for kw in meme.keywords:
+            pairs.append((kw, meme.key))
+
+    keymap = OrderedDict()
+    for kw, key in sorted(pairs, key=lambda x: len(x[0]), reverse=True):
+        if kw not in keymap:
+            keymap[kw] = key
+    return infos, keymap
+
+@app.get("/memes/static/infos.json")
+def infos_json():
+    infos, _ = build_infos_and_keymap()
+    return infos
+
+@app.get("/memes/static/keyMap.json")
+def keymap_json():
+    _, keymap = build_infos_and_keymap()
+    return keymap
+
 # Load contrib + emoji
 load_memes("/app/meme-generator-contrib/memes")
 load_memes("/app/meme_emoji/emoji")