diff --git a/py/routes/api_routes.py b/py/routes/api_routes.py index a9f5e8bb..78aee080 100644 --- a/py/routes/api_routes.py +++ b/py/routes/api_routes.py @@ -246,50 +246,6 @@ class ApiRoutes: "civitai": ModelRouteUtils.filter_civitai_data(lora.get("civitai", {})) } - # Private helper methods - async def _read_preview_file(self, reader) -> tuple[bytes, str]: - """Read preview file and content type from multipart request""" - field = await reader.next() - if field.name != 'preview_file': - raise ValueError("Expected 'preview_file' field") - content_type = field.headers.get('Content-Type', 'image/png') - return await field.read(), content_type - - async def _read_model_path(self, reader) -> str: - """Read model path from multipart request""" - field = await reader.next() - if field.name != 'model_path': - raise ValueError("Expected 'model_path' field") - return (await field.read()).decode() - - async def _save_preview_file(self, model_path: str, preview_data: bytes, content_type: str) -> str: - """Save preview file and return its path""" - base_name = os.path.splitext(os.path.basename(model_path))[0] - folder = os.path.dirname(model_path) - - # Determine if content is video or image - if content_type.startswith('video/'): - # For videos, keep original format and use .mp4 extension - extension = '.mp4' - optimized_data = preview_data - else: - # For images, optimize and convert to WebP - optimized_data, _ = ExifUtils.optimize_image( - image_data=preview_data, - target_width=CARD_PREVIEW_WIDTH, - format='webp', - quality=85, - preserve_metadata=False - ) - extension = '.webp' # Use .webp without .preview part - - preview_path = os.path.join(folder, base_name + extension).replace(os.sep, '/') - - with open(preview_path, 'wb') as f: - f.write(optimized_data) - - return preview_path - async def fetch_all_civitai(self, request: web.Request) -> web.Response: """Fetch CivitAI metadata for all loras in the background""" try: diff --git a/py/utils/metadata_manager.py b/py/utils/metadata_manager.py index 587eea85..fa953180 100644 --- a/py/utils/metadata_manager.py +++ b/py/utils/metadata_manager.py @@ -244,11 +244,11 @@ class MetadataManager: model_info = await extract_lora_metadata(file_path) metadata.base_model = model_info['base_model'] - elif metadata.__class__.__name__ == "CheckpointMetadata": - model_info = await extract_checkpoint_metadata(file_path) - metadata.base_model = model_info['base_model'] - if 'model_type' in model_info: - metadata.model_type = model_info['model_type'] + # elif metadata.__class__.__name__ == "CheckpointMetadata": + # model_info = await extract_checkpoint_metadata(file_path) + # metadata.base_model = model_info['base_model'] + # if 'model_type' in model_info: + # metadata.model_type = model_info['model_type'] except Exception as e: logger.error(f"Error enriching metadata: {str(e)}")