.

app.py

@@ -66,9 +66,22 @@ class LocalModelManager:
         self.models = {}
         self.tokenizers = {}
         self.pipelines = {}
+        
+    def preload_models(self):
+        """起動時にすべてのローカルモデルを事前にロード"""
+        logger.info("Preloading all local models...")
+        for model in TEXT_GENERATION_MODELS:
+            if model.type == ModelType.LOCAL and model.model_path:
+                self.load_model_sync(model.model_path, "text-generation")
+                
+        for model in CLASSIFICATION_MODELS:
+            if model.type == ModelType.LOCAL and model.model_path:
+                self.load_model_sync(model.model_path, "text-classification")
+        
+        logger.info("All local models preloaded successfully")
 
-    async def load_model(self, model_path: str, task: str = "text-generation"):
-        """モデルの遅延ロード"""
+    def load_model_sync(self, model_path: str, task: str = "text-generation"):
+        """モデルの同期ロード"""
         if model_path not in self.models:
             logger.info(f"Loading model: {model_path}")
             try:
@@ -102,6 +115,11 @@ class LocalModelManager:
                 logger.error(f"Error loading model {model_path}: {str(e)}")
                 raise
 
+    async def load_model(self, model_path: str, task: str = "text-generation"):
+        """モデルの遅延ロード（バックワードコンパティビリティのために維持）"""
+        if model_path not in self.models:
+            self.load_model_sync(model_path, task)
+
     @spaces.GPU()
     def _generate_text_sync(self, pipeline, text: str) -> str:
         """同期的なテキスト生成の実行"""
@@ -157,6 +175,12 @@ class ModelManager:
                     model.model_id,
                     token=True  # これによりHFトークンを使用
                 )
+    
+    def preload_models(self):
+        """起動時にすべてのモデルを事前にロード"""
+        logger.info("Preloading models...")
+        self.local_manager.preload_models()
+        logger.info("Model preloading complete")
 
     async def run_text_generation(self, text: str, selected_types: List[str]) -> List[str]:
         """テキスト生成モデルの実行"""
@@ -288,6 +312,7 @@ class ToxicityApp:
     def __init__(self):
         self.ui = UIComponents()
         self.model_manager = ModelManager()
+        self.models_loaded = False
 
     def update_model_visibility(self, selected_types: List[str]) -> List[gr.update]:
         """モデルの表示状態を更新"""
@@ -311,40 +336,74 @@ class ToxicityApp:
         class_results.extend([""] * (len(CLASSIFICATION_MODELS) - len(class_results)))
         
         return gen_results + class_results
+    
+    def load_models_and_update_ui(self):
+        """モデルをロードしUIを更新する"""
+        try:
+            # モデルのロード
+            self.model_manager.preload_models()
+            self.models_loaded = True
+            logger.info("Models loaded successfully")
+            # ロード完了メッセージを返して、UIのロード中表示を非表示にする
+            return gr.update(visible=False), gr.update(visible=True)
+        except Exception as e:
+            logger.error(f"Error loading models: {e}")
+            return gr.update(value=f"Error loading models: {e}"), gr.update(visible=False)
 
     def create_ui(self):
         """UIの作成"""
         with gr.Blocks() as demo:
-            self.ui.create_header()
-            self.ui.create_input_section()
-            self.ui.create_filter_section()
-            self.ui.create_invoke_button()
-            self.ui.create_model_tabs()
-
-            # イベントハンドラの設定
-            self.ui.filter_checkboxes.change(
-                fn=self.update_model_visibility,
-                inputs=[self.ui.filter_checkboxes],
-                outputs=[
-                    output["group"]
-                    for outputs in [self.ui.gen_model_outputs, self.ui.class_model_outputs]
-                    for output in outputs
-                ]
-            )
+            # ロード中コンポーネント
+            with gr.Group(visible=True) as loading_group:
+                gr.Markdown("""
+                # Toxic Eye
+                
+                ### Loading models... This may take a few minutes.
+                
+                The application is initializing and preloading all models.
+                Please wait while the models are being loaded...
+                """)
+            
+            # メインUIコンポーネント（初期状態では非表示）
+            with gr.Group(visible=False) as main_ui_group:
+                self.ui.create_header()
+                self.ui.create_input_section()
+                self.ui.create_filter_section()
+                self.ui.create_invoke_button()
+                self.ui.create_model_tabs()
+
+                # イベントハンドラの設定
+                self.ui.filter_checkboxes.change(
+                    fn=self.update_model_visibility,
+                    inputs=[self.ui.filter_checkboxes],
+                    outputs=[
+                        output["group"]
+                        for outputs in [self.ui.gen_model_outputs, self.ui.class_model_outputs]
+                        for output in outputs
+                    ]
+                )
 
-            self.ui.invoke_button.click(
-                fn=self.handle_invoke,
-                inputs=[self.ui.input_text, self.ui.filter_checkboxes],
-                outputs=[
-                    output["output"]
-                    for outputs in [self.ui.gen_model_outputs, self.ui.class_model_outputs]
-                    for output in outputs
-                ]
+                self.ui.invoke_button.click(
+                    fn=self.handle_invoke,
+                    inputs=[self.ui.input_text, self.ui.filter_checkboxes],
+                    outputs=[
+                        output["output"]
+                        for outputs in [self.ui.gen_model_outputs, self.ui.class_model_outputs]
+                        for output in outputs
+                    ]
+                )
+            
+            # 起動時にモデルロード処理を実行
+            demo.load(
+                fn=self.load_models_and_update_ui,
+                inputs=None,
+                outputs=[loading_group, main_ui_group]
             )
 
         return demo
 
 def main():
+    logger.info("Starting Toxic Eye application")
     app = ToxicityApp()
     demo = app.create_ui()
     demo.launch()