checkpoint

py/routes/lora_routes.py

@@ -107,11 +107,29 @@ class LoraRoutes:
                     settings=settings
                 )
             else:
-                # Normal flow
+                # Normal flow - get recipes with the same formatting as the API endpoint
                 cache = await self.recipe_scanner.get_cached_data()
+                recipes_data = cache.sorted_by_name[:20]  # Show first 20 recipes by name
+                
+                # Format the response data with static URLs for file paths - same as in recipe_routes
+                for item in recipes_data:
+                    # Always ensure file_url is set
+                    if 'file_path' in item:
+                        item['file_url'] = self._format_recipe_file_url(item['file_path'])
+                    else:
+                        item['file_url'] = '/loras_static/images/no-preview.png'
+                    
+                    # Ensure loras array exists
+                    if 'loras' not in item:
+                        item['loras'] = []
+                        
+                    # Ensure base_model field exists
+                    if 'base_model' not in item:
+                        item['base_model'] = ""
+                
                 template = self.template_env.get_template('recipes.html')
                 rendered = template.render(
-                    recipes=cache.sorted_by_date[:20],  # Show first 20 recipes by date
+                    recipes=recipes_data,
                     is_initializing=False,
                     settings=settings
                 )
@@ -128,6 +146,22 @@ class LoraRoutes:
                 status=500
             )
 
+    def _format_recipe_file_url(self, file_path: str) -> str:
+        """Format file path for recipe image as a URL - same as in recipe_routes"""
+        try:
+            # Return the file URL directly for the first lora root's preview
+            recipes_dir = os.path.join(config.loras_roots[0], "recipes").replace(os.sep, '/')
+            if file_path.replace(os.sep, '/').startswith(recipes_dir):
+                relative_path = os.path.relpath(file_path, config.loras_roots[0]).replace(os.sep, '/')
+                return f"/loras_static/root1/preview/{relative_path}" 
+            
+            # If not in recipes dir, try to create a valid URL from the file path
+            file_name = os.path.basename(file_path)
+            return f"/loras_static/root1/preview/recipes/{file_name}"
+        except Exception as e:
+            logger.error(f"Error formatting recipe file URL: {e}", exc_info=True)
+            return '/loras_static/images/no-preview.png'  # Return default image on error
+
     def setup_routes(self, app: web.Application):
         """Register routes with the application"""
         app.router.add_get('/loras', self.handle_loras_page)

py/routes/recipe_routes.py

@@ -67,9 +67,19 @@ class RecipeRoutes:
             
             # Format the response data with static URLs for file paths
             for item in result['items']:
-                item['preview_url'] = item['file_path']
-                # Convert file path to URL
-                item['file_url'] = self._format_recipe_file_url(item['file_path'])
+                # Always ensure file_url is set
+                if 'file_path' in item:
+                    item['file_url'] = self._format_recipe_file_url(item['file_path'])
+                else:
+                    item['file_url'] = '/loras_static/images/no-preview.png'
+                
+                # 确保 loras 数组存在
+                if 'loras' not in item:
+                    item['loras'] = []
+                    
+                # 确保有 base_model 字段
+                if 'base_model' not in item:
+                    item['base_model'] = ""
             
             return web.json_response(result)
         except Exception as e:
@@ -101,17 +111,19 @@ class RecipeRoutes:
     
     def _format_recipe_file_url(self, file_path: str) -> str:
         """Format file path for recipe image as a URL"""
-        # This is a simplified example - in real implementation, 
-        # you would map this to a static route that can serve the file
-        
-        # For recipes folder in the first lora root
-        for idx, root in enumerate(config.loras_roots, start=1):
-            recipes_dir = os.path.join(root, "recipes")
-            if file_path.startswith(recipes_dir):
-                relative_path = os.path.relpath(file_path, root)
-                return f"/loras_static/root{idx}/{relative_path}"
-        
-        return file_path  # Return original path if no mapping found
+        try:
+            # Return the file URL directly for the first lora root's preview
+            recipes_dir = os.path.join(config.loras_roots[0], "recipes").replace(os.sep, '/')
+            if file_path.replace(os.sep, '/').startswith(recipes_dir):
+                relative_path = os.path.relpath(file_path, config.loras_roots[0]).replace(os.sep, '/')
+                return f"/loras_static/root1/preview/{relative_path}" 
+            
+            # If not in recipes dir, try to create a valid URL from the file path
+            file_name = os.path.basename(file_path)
+            return f"/loras_static/root1/preview/recipes/{file_name}"
+        except Exception as e:
+            logger.error(f"Error formatting recipe file URL: {e}", exc_info=True)
+            return '/loras_static/images/no-preview.png'  # Return default image on error
     
     def _format_recipe_data(self, recipe: Dict) -> Dict:
         """Format recipe data for API response"""