api整備

app.py

@@ -64,6 +64,16 @@ def _set_status(message: str) -> None:
         status_message = message
 
 
+def _get_dummy_results() -> List[WordTreeResponse]:
+    """モデルが未準備・異常時に返すダミー候補"""
+    dummy_payload = [
+        {"text": "[eos]", "probability": 0.8},
+        {"text": "#dummy#候補2", "probability": 0.6},
+        {"text": "#dummy#候補3", "probability": 0.4},
+    ]
+    return [WordTreeResponse(**item) for item in dummy_payload]
+
+
 def initialize_model() -> None:
     """モデルを初期化"""
     global adapter
@@ -237,9 +247,9 @@ fastapi_app = FastAPI(
 )
 
 
-@fastapi_app.get("/")
-def root() -> Dict[str, str]:
-    """簡易案内"""
+@fastapi_app.get("/api")
+def api_root() -> Dict[str, str]:
+    """API簡易案内"""
     return {
         "message": "LLMView Multi-Model API",
         "status_endpoint": "/health",
@@ -250,7 +260,7 @@ def root() -> Dict[str, str]:
 
 @fastapi_app.get("/health")
 def health() -> Dict[str, Any]:
-    """状態確認"""
+    """状態確認（元のLLMViewと同じ形式）"""
     with status_lock:
         current_status = status_message
     
@@ -262,14 +272,26 @@ def health() -> Dict[str, Any]:
     }
 
 
-@spaces.GPU  # ZeroGPU対応
+@fastapi_app.on_event("startup")
+async def startup_event():
+    """アプリ起動時の処理（GPU要求を確実に検出させる）"""
+    if SPACES_AVAILABLE:
+        try:
+            _gpu_init_function()
+            print("[SPACE] GPU要求をstartup eventで送信しました")
+        except Exception as e:
+            print(f"[SPACE] GPU要求エラー: {e}")
+
+
+@spaces.GPU  # ZeroGPU対応: デコレータを先に適用（Space起動時に検出される）
 @fastapi_app.post("/build_word_tree", response_model=List[WordTreeResponse])
-def api_build_word_tree(payload: WordTreeRequest) -> List[WordTreeResponse]:
-    """単語ツリーを構築（FastAPIエンドポイント）"""
+def build_word_tree(payload: WordTreeRequest) -> List[WordTreeResponse]:
+    """単語ツリーを構築（元のLLMViewと同じAPI）"""
     if not payload.prompt_text.strip():
         raise HTTPException(status_code=400, detail="prompt_text を入力してください。")
 
     if adapter is None:
+        print("[API] build_word_tree: モデル未準備（adapter is None）")
         with status_lock:
             current_status = status_message
         raise HTTPException(
@@ -277,6 +299,11 @@ def api_build_word_tree(payload: WordTreeRequest) -> List[WordTreeResponse]:
         )
 
     try:
+        print(
+            f"[API] build_word_tree called: prompt=\n##########################\n{payload.prompt_text}\n##########################\n', "
+            f"root=\n%%%%%%%%%%%%%%%%%%%\n{payload.root_text}\n%%%%%%%%%%%%%%%%%%%\n', top_k={payload.top_k}, max_depth={payload.max_depth}"
+        )
+
         results = adapter.build_word_tree(
             prompt_text=payload.prompt_text,
             root_text=payload.root_text,
@@ -285,18 +312,15 @@ def api_build_word_tree(payload: WordTreeRequest) -> List[WordTreeResponse]:
         )
 
         if not results:
-            # ダミー結果を返す
-            results = [
-                {"text": "候補が生成されませんでした", "probability": 0.0}
-            ]
+            print("[API] No candidates generated, returning dummy candidates")
+            results = _get_dummy_results()
 
         return [WordTreeResponse(**item) for item in results]
     except Exception as exc:
         import traceback
         traceback.print_exc()
-        raise HTTPException(
-            status_code=500, detail=f"エラーが発生しました: {exc}"
-        )
+        print(f"[API] build_word_tree error: {exc}, fallback to dummy results")
+        return _get_dummy_results()
 
 
 # ZeroGPU対応: 起動時に検出されるように、デコレータ付き関数を定義