From 0a822d2497fbd744348d6d82eb70b5d7b24fe58e Mon Sep 17 00:00:00 2001 From: Will Miao <13051207myq@gmail.com> Date: Thu, 30 Jan 2025 19:02:47 +0800 Subject: [PATCH] Remove custom websocket event type and related progress sending logic from LorasEndpoint --- __init__.py | 3 --- nodes.py | 17 +---------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/__init__.py b/__init__.py index 9381872f..499b5c20 100644 --- a/__init__.py +++ b/__init__.py @@ -6,9 +6,6 @@ NODE_CLASS_MAPPINGS = { WEB_DIRECTORY = "./js" -# Add custom websocket event type -EXTENSION_WEB_SOCKET_MESSAGE_TYPES = ["lora-scan-progress"] - # Add this init function to properly register routes def init(): LorasEndpoint.add_routes() diff --git a/nodes.py b/nodes.py index f2ebcdcf..efc23c4c 100644 --- a/nodes.py +++ b/nodes.py @@ -49,28 +49,14 @@ class LorasEndpoint: web.post('/api/replace_preview', instance.replace_preview), ]) - def send_progress(self, current, total, status="Scanning"): - """Send progress through websocket""" - try: - if hasattr(self.server, 'send_sync'): - self.server.send_sync("lora-scan-progress", { - "value": current, - "max": total, - "status": status - }) - except Exception as e: - print(f"Error sending progress: {str(e)}") async def scan_loras(self): loras = [] for loras_root in self.loras_roots: for root, _, files in os.walk(loras_root): safetensors_files = [f for f in files if f.endswith('.safetensors')] - total_files = len(safetensors_files) - for idx, filename in enumerate(safetensors_files, 1): - self.send_progress(idx, total_files, f"Scanning: {filename}") - + for filename in safetensors_files: file_path = os.path.join(root, filename).replace(os.sep, "/") # Try to load existing metadata first @@ -93,7 +79,6 @@ class LorasEndpoint: loras.append(lora_data) - self.send_progress(total_files, total_files, "Scan completed") return loras