Add DoRA type support. move VALID_LORA_TYPES to utils.constants and update imports in recipe parsers and API routes.

This commit is contained in:
Will Miao
2025-06-12 09:25:00 +08:00
parent 26d105c439
commit 78cac2edc2
4 changed files with 11 additions and 8 deletions

View File

@@ -7,7 +7,7 @@ import re
from typing import Dict, List, Any, Optional, Tuple
from abc import ABC, abstractmethod
from ..config import config
from .constants import VALID_LORA_TYPES
from ..utils.constants import VALID_LORA_TYPES
logger = logging.getLogger(__name__)

View File

@@ -1,5 +1,8 @@
"""Constants used across recipe parsers."""
# Import VALID_LORA_TYPES from utils.constants
from ..utils.constants import VALID_LORA_TYPES
# Constants for generation parameters
GEN_PARAM_KEYS = [
'prompt',
@@ -11,6 +14,3 @@ GEN_PARAM_KEYS = [
'size',
'clip_skip',
]
# Valid Lora types
VALID_LORA_TYPES = ['lora', 'locon']

View File

@@ -13,7 +13,7 @@ from ..services.websocket_manager import ws_manager
from ..services.settings_manager import settings
import asyncio
from .update_routes import UpdateRoutes
from ..utils.constants import PREVIEW_EXTENSIONS, CARD_PREVIEW_WIDTH
from ..utils.constants import PREVIEW_EXTENSIONS, CARD_PREVIEW_WIDTH, VALID_LORA_TYPES
from ..utils.exif_utils import ExifUtils
from ..services.service_registry import ServiceRegistry
@@ -401,8 +401,8 @@ class ApiRoutes:
versions = response.get('modelVersions', [])
model_type = response.get('type', '')
# Check model type - should be LORA or LoCon
if model_type.lower() not in ['lora', 'locon']:
# Check model type - should be LORA, LoCon, or DORA
if model_type.lower() not in VALID_LORA_TYPES:
return web.json_response({
'error': f"Model type mismatch. Expected LORA or LoCon, got {model_type}"
}, status=400)

View File

@@ -31,4 +31,7 @@ EXAMPLE_IMAGE_WIDTH = 832
SUPPORTED_MEDIA_EXTENSIONS = {
'images': ['.jpg', '.jpeg', '.png', '.webp', '.gif'],
'videos': ['.mp4', '.webm']
}
}
# Valid Lora types
VALID_LORA_TYPES = ['lora', 'locon', 'dora']