From 29304bb046e866fb0b42f4e5168effe42a787e97 Mon Sep 17 00:00:00 2001 From: sn0w12 Date: Thu, 2 May 2024 21:02:46 +0200 Subject: [PATCH] Moved sn0w.py to root --- __init__.py | 2 +- src/sn0w.py => sn0w.py | 26 +++----------------------- src/character_select.py | 2 +- src/dynamic_lora_loader.py | 1 - src/load_lora_15.py | 1 - src/load_lora_from_folder.py | 2 +- src/load_lora_xl.py | 1 - src/lora_tester.py | 2 +- src/perlin_noise.py | 1 - src/prompt_combine.py | 2 +- 10 files changed, 8 insertions(+), 32 deletions(-) rename src/sn0w.py => sn0w.py (78%) diff --git a/__init__.py b/__init__.py index f59427b..d6f3979 100644 --- a/__init__.py +++ b/__init__.py @@ -1,5 +1,5 @@ from .src.dynamic_lora_loader import generate_lora_node_class -from .src.sn0w import ConfigReader, Logger +from .sn0w import ConfigReader, Logger from .src.find_resolution import FindResolutionNode from .src.lora_selector import LoraSelectorNode diff --git a/src/sn0w.py b/sn0w.py similarity index 78% rename from src/sn0w.py rename to sn0w.py index efb1e71..e27494d 100644 --- a/src/sn0w.py +++ b/sn0w.py @@ -3,31 +3,11 @@ import json import torch class ConfigReader: - _config = None - - @classmethod - def load_config(cls): - if cls._config is None: - # Get the directory of the current file - current_file_path = os.path.realpath(__file__) - # Navigate up to the parent directory of the current file - parent_dir = os.path.dirname(os.path.dirname(current_file_path)) - # Construct the path to the 'config.json' file located in the parent directory - config_path = os.path.join(parent_dir, 'config.json') - - try: - with open(config_path, 'r') as file: - cls._config = json.load(file) - except FileNotFoundError: - print(f"Configuration file not found at {config_path}. Using default settings.") - cls._config = {} # Use an empty dict as a fallback - return cls._config - @staticmethod def get_setting(setting_id, default=None): current_dir = os.path.dirname(os.path.abspath(__file__)) # Construct the relative path - relative_path = '../../../user/default/comfy.settings.json' + relative_path = '../../user/default/comfy.settings.json' # Combine paths and normalize it file_path = os.path.abspath(os.path.join(current_dir, relative_path)) try: @@ -35,10 +15,10 @@ class ConfigReader: settings = json.load(file) return settings.get(setting_id, default) except FileNotFoundError: - print(f"Local configuration file not found at {file_path}.") + Logger.print_sn0w(f"Local configuration file not found at {file_path}.", "\033[0;33m") return default except json.JSONDecodeError: - print(f"Error decoding JSON from {file_path}.") + Logger.print_sn0w(f"Error decoding JSON from {file_path}.", "\033[0;31m") return default class Logger: diff --git a/src/character_select.py b/src/character_select.py index 936b99d..0d2c1e4 100644 --- a/src/character_select.py +++ b/src/character_select.py @@ -1,7 +1,7 @@ import os import json import random -from .sn0w import ConfigReader, Logger +from ..sn0w import ConfigReader, Logger class CharacterSelectNode: # Initialize class variables diff --git a/src/dynamic_lora_loader.py b/src/dynamic_lora_loader.py index 1ca0ecb..fe54fe0 100644 --- a/src/dynamic_lora_loader.py +++ b/src/dynamic_lora_loader.py @@ -2,7 +2,6 @@ import os import folder_paths from nodes import LoraLoader from pathlib import Path -from .sn0w import ConfigReader, Logger def generate_lora_node_class(lora_type, required_folders): class DynamicLoraNode: diff --git a/src/load_lora_15.py b/src/load_lora_15.py index ec20ea3..d2461a3 100644 --- a/src/load_lora_15.py +++ b/src/load_lora_15.py @@ -1,7 +1,6 @@ import folder_paths from nodes import LoraLoader from pathlib import Path -from .sn0w import ConfigReader class LoraLora15Node: @classmethod diff --git a/src/load_lora_from_folder.py b/src/load_lora_from_folder.py index e6affc5..04ccc41 100644 --- a/src/load_lora_from_folder.py +++ b/src/load_lora_from_folder.py @@ -3,7 +3,7 @@ import re import time import folder_paths from nodes import LoraLoader -from .sn0w import Logger, Utility, ConfigReader +from ..sn0w import Logger, Utility, ConfigReader class LoadLoraFolderNode: logger = Logger() diff --git a/src/load_lora_xl.py b/src/load_lora_xl.py index 8cbe0ae..6928d84 100644 --- a/src/load_lora_xl.py +++ b/src/load_lora_xl.py @@ -1,7 +1,6 @@ import folder_paths from nodes import LoraLoader from pathlib import Path -from .sn0w import ConfigReader class LoraLoraXLNode: @classmethod diff --git a/src/lora_tester.py b/src/lora_tester.py index 30097cf..df1e409 100644 --- a/src/lora_tester.py +++ b/src/lora_tester.py @@ -1,5 +1,5 @@ from nodes import KSampler, KSamplerAdvanced, VAEDecode, VAEEncode, EmptyLatentImage, LoraLoader, ImageScaleBy, CLIPTextEncode -from .sn0w import Utility +from ..sn0w import Utility from comfy_extras.nodes_upscale_model import ImageUpscaleWithModel import comfy.samplers import folder_paths diff --git a/src/perlin_noise.py b/src/perlin_noise.py index aeb05d7..96e5272 100644 --- a/src/perlin_noise.py +++ b/src/perlin_noise.py @@ -1,7 +1,6 @@ import os import numpy as np import torch -from PIL import Image class FilmGrain: def __init__(self): diff --git a/src/prompt_combine.py b/src/prompt_combine.py index 20da4eb..74ebd17 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: logger = Logger()