diff --git a/sn0w.py b/sn0w.py index b8457db..40d6741 100644 --- a/sn0w.py +++ b/sn0w.py @@ -125,6 +125,7 @@ class Logger: else: color = self.PURPLE_TEXT # Default color + self.reload_config() # Check if the message's level is in the enabled log levels if level.upper() in self.enabled_levels or level.upper() in ["EMERGENCY", "ALERT", "CRITICAL", "ERROR"]: self.print_sn0w(message, color) @@ -330,20 +331,3 @@ class MessageHolder: except ValueError: cls.logger.log(f"failed to parse '${message}' as ${'comma separated list of ints' if asList else 'int'}", "ERROR") return [1] if asList else 1 - - -routes = MessageHolder.routes -API_PREFIX = MessageHolder.API_PREFIX - - -@routes.post(f"{API_PREFIX}/textbox_string") -async def handle_textbox_string(request): - data = await request.json() - MessageHolder.addMessage(data.get("node_id"), data.get("outputs")) - return web.json_response({"status": "ok"}) - - -@routes.post(f"{API_PREFIX}/update_sorting") -async def handle_update_sorting(request): - Logger.reload_config() - return web.json_response({"status": "ok"}) diff --git a/src/character_select.py b/src/character_select.py index aee568a..b7ee0be 100644 --- a/src/character_select.py +++ b/src/character_select.py @@ -4,14 +4,14 @@ import random from aiohttp import web -from sn0w import ConfigReader, Logger, Utility, MessageHolder +from ..sn0w import ConfigReader, Logger, Utility, MessageHolder routes = MessageHolder.routes API_PREFIX = MessageHolder.API_PREFIX @routes.post(f"{API_PREFIX}/update_characters") -async def handle_update_characters(): +async def handle_update_characters(request): CharacterSelectNode.initialize() return web.json_response({"status": "ok"}) diff --git a/src/check_folder_paths.py b/src/check_folder_paths.py index 29c300e..da4d6b6 100644 --- a/src/check_folder_paths.py +++ b/src/check_folder_paths.py @@ -2,7 +2,7 @@ import json import os import folder_paths -from sn0w import Logger +from ..sn0w import Logger def check_lora_folders(): diff --git a/src/dynamic_lora_loader.py b/src/dynamic_lora_loader.py index 5665b55..99b702a 100644 --- a/src/dynamic_lora_loader.py +++ b/src/dynamic_lora_loader.py @@ -3,7 +3,7 @@ from nodes import LoraLoader import folder_paths -from sn0w import Logger, Utility +from ..sn0w import Logger, Utility def generate_lora_node_class(lora_type, required_folders=None, combos=1): diff --git a/src/dynamic_scheduler_loader.py b/src/dynamic_scheduler_loader.py index f121b83..56f79d9 100644 --- a/src/dynamic_scheduler_loader.py +++ b/src/dynamic_scheduler_loader.py @@ -1,4 +1,4 @@ -from sn0w import Utility +from ..sn0w import Utility from .custom_schedulers.custom_schedulers import CustomSchedulers diff --git a/src/load_lora_from_folder.py b/src/load_lora_from_folder.py index 37ebbec..617acb2 100644 --- a/src/load_lora_from_folder.py +++ b/src/load_lora_from_folder.py @@ -3,7 +3,7 @@ import re import folder_paths from nodes import LoraLoader -from sn0w import Logger, Utility, ConfigReader +from ..sn0w import Logger, Utility, ConfigReader class LoadLoraFolderNode: diff --git a/src/lora_tester.py b/src/lora_tester.py index 2944e73..64010ef 100644 --- a/src/lora_tester.py +++ b/src/lora_tester.py @@ -1,7 +1,7 @@ import comfy.samplers import folder_paths -from sn0w import Utility +from ..sn0w import Utility from nodes import KSampler, KSamplerAdvanced, VAEDecode, VAEEncode, EmptyLatentImage, LoraLoader, CLIPTextEncode from .upscale_with_model_by import UpscaleImageBy diff --git a/src/prompt_combine.py b/src/prompt_combine.py index 81d1107..2119e22 100644 --- a/src/prompt_combine.py +++ b/src/prompt_combine.py @@ -1,5 +1,5 @@ import re -from sn0w import ConfigReader, Logger +from ..sn0w import ConfigReader, Logger class CombineStringNode: diff --git a/src/show_sigmas.py b/src/show_sigmas.py index c4e6f77..ee266bd 100644 --- a/src/show_sigmas.py +++ b/src/show_sigmas.py @@ -5,7 +5,7 @@ import numpy as np import torch from server import PromptServer -from sn0w import MessageHolder +from ..sn0w import MessageHolder class ShowSigmasNode: diff --git a/src/simple_ksampler.py b/src/simple_ksampler.py index 8a28354..3f9f783 100644 --- a/src/simple_ksampler.py +++ b/src/simple_ksampler.py @@ -3,7 +3,7 @@ from comfy_extras.nodes_custom_sampler import SamplerCustom, BasicScheduler, Pol import comfy.samplers from comfy_extras.nodes_align_your_steps import AlignYourStepsScheduler -from sn0w import Logger, Utility +from ..sn0w import Logger, Utility from .custom_schedulers.custom_schedulers import CustomSchedulers @@ -79,6 +79,7 @@ class SimpleSamplerCustom: # Get sampler and sigmas sampler = self.get_sampler(sampler_name)[0] sigmas = self.get_custom_sigmas(model, model_type, scheduler_name, steps, denoise) + self.logger.print_sigmas_differences(scheduler_name, sigmas) samples = custom_sampler.sample(model, add_noise, noise_seed, cfg, positive_prompt, negative_prompt, sampler, sigmas, latent_image) if image_output["links"] != []: