Enhance recipe search functionality with improved state management and search options

- Introduced new search options for recipes, allowing users to filter by title, tags, LoRA filename, and LoRA model name.
- Updated the RecipeRoutes and RecipeScanner to accommodate the new search options, enhancing the filtering capabilities.
- Refactored RecipeManager and RecipeSearchManager to utilize the hierarchical state structure for managing search parameters and pagination state.
- Improved the user interface by dynamically displaying relevant search options based on the current page context.
This commit is contained in:
Will Miao
2025-03-20 08:27:38 +08:00
parent 90f74018ae
commit caf5b1528c
7 changed files with 145 additions and 61 deletions

View File

@@ -76,6 +76,12 @@ class RecipeRoutes:
sort_by = request.query.get('sort_by', 'date')
search = request.query.get('search', None)
# Get search options (renamed for better clarity)
search_title = request.query.get('search_title', 'true').lower() == 'true'
search_tags = request.query.get('search_tags', 'true').lower() == 'true'
search_lora_name = request.query.get('search_lora_name', 'true').lower() == 'true'
search_lora_model = request.query.get('search_lora_model', 'true').lower() == 'true'
# Get filter parameters
base_models = request.query.get('base_models', None)
tags = request.query.get('tags', None)
@@ -87,13 +93,22 @@ class RecipeRoutes:
if tags:
filters['tags'] = tags.split(',')
# Add search options to filters
search_options = {
'title': search_title,
'tags': search_tags,
'lora_name': search_lora_name,
'lora_model': search_lora_model
}
# Get paginated data
result = await self.recipe_scanner.get_paginated_data(
page=page,
page_size=page_size,
sort_by=sort_by,
search=search,
filters=filters
filters=filters,
search_options=search_options
)
# Format the response data with static URLs for file paths

View File

@@ -348,7 +348,7 @@ class RecipeScanner:
logger.error(f"Error getting base model for lora: {e}")
return None
async def get_paginated_data(self, page: int, page_size: int, sort_by: str = 'date', search: str = None, filters: dict = None):
async def get_paginated_data(self, page: int, page_size: int, sort_by: str = 'date', search: str = None, filters: dict = None, search_options: dict = None):
"""Get paginated and filtered recipe data
Args:
@@ -357,6 +357,7 @@ class RecipeScanner:
sort_by: Sort method ('name' or 'date')
search: Search term
filters: Dictionary of filters to apply
search_options: Dictionary of search options to apply
"""
cache = await self.get_cached_data()
@@ -365,11 +366,44 @@ class RecipeScanner:
# Apply search filter
if search:
filtered_data = [
item for item in filtered_data
if search.lower() in str(item.get('title', '')).lower() or
search.lower() in str(item.get('prompt', '')).lower()
]
# Default search options if none provided
if not search_options:
search_options = {
'title': True,
'tags': True,
'lora_name': True,
'lora_model': True
}
# Build the search predicate based on search options
def matches_search(item):
# Search in title if enabled
if search_options.get('title', True) and search.lower() in str(item.get('title', '')).lower():
return True
# Search in tags if enabled
if search_options.get('tags', True) and 'tags' in item:
for tag in item['tags']:
if search.lower() in tag.lower():
return True
# Search in lora file names if enabled
if search_options.get('lora_name', True) and 'loras' in item:
for lora in item['loras']:
if search.lower() in str(lora.get('file_name', '')).lower():
return True
# Search in lora model names if enabled
if search_options.get('lora_model', True) and 'loras' in item:
for lora in item['loras']:
if search.lower() in str(lora.get('modelName', '')).lower():
return True
# No match found
return False
# Filter the data using the search predicate
filtered_data = [item for item in filtered_data if matches_search(item)]
# Apply additional filters
if filters: