diff --git a/CHANGELOG.md b/CHANGELOG.md index edab95f..c2d5e54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v2.2.3 - 2024 Aug.27 +- Lib *(`internal`)* + ### v2.2.2 - 2024 Aug.27 - Fix **Color Picker** for Gradio **4** diff --git a/lib_cc/__init__.py b/lib_cc/__init__.py new file mode 100644 index 0000000..09d0517 --- /dev/null +++ b/lib_cc/__init__.py @@ -0,0 +1,2 @@ +from .callback import * +from .settings import * diff --git a/scripts/cc_callback.py b/lib_cc/callback.py similarity index 98% rename from scripts/cc_callback.py rename to lib_cc/callback.py index b232c37..17709ae 100644 --- a/scripts/cc_callback.py +++ b/lib_cc/callback.py @@ -1,11 +1,14 @@ from modules.sd_samplers_kdiffusion import KDiffusionSampler from modules import script_callbacks, devices -from scripts.cc_scaling import apply_scaling +from functools import wraps from random import random import torch +from .scaling import apply_scaling + class NoiseMethods: + @staticmethod def get_delta(latent: torch.Tensor) -> torch.Tensor: mean = torch.mean(latent) @@ -76,6 +79,7 @@ original_callback = KDiffusionSampler.callback_state @torch.inference_mode() +@wraps(original_callback) def cc_callback(self, d): if not self.vec_cc["enable"]: return original_callback(self, d) diff --git a/scripts/cc_colorpicker.py b/lib_cc/colorpicker.py similarity index 93% rename from scripts/cc_colorpicker.py rename to lib_cc/colorpicker.py index fb49d76..1a0cccb 100644 --- a/scripts/cc_colorpicker.py +++ b/lib_cc/colorpicker.py @@ -1,4 +1,4 @@ -import modules.scripts as scripts +from modules import scripts import gradio as gr import os diff --git a/scripts/cc_const.py b/lib_cc/const.py similarity index 100% rename from scripts/cc_const.py rename to lib_cc/const.py diff --git a/scripts/cc_scaling.py b/lib_cc/scaling.py similarity index 100% rename from scripts/cc_scaling.py rename to lib_cc/scaling.py diff --git a/scripts/cc_settings.py b/lib_cc/settings.py similarity index 50% rename from scripts/cc_settings.py rename to lib_cc/settings.py index 852c106..e100168 100644 --- a/scripts/cc_settings.py +++ b/lib_cc/settings.py @@ -1,10 +1,11 @@ -from modules import script_callbacks, shared +from modules.script_callbacks import on_ui_settings +from modules.shared import OptionInfo, opts -def on_ui_settings(): - shared.opts.add_option( +def settings(): + opts.add_option( "cc_metadata", - shared.OptionInfo( + OptionInfo( True, "Append Vectorscope CC parameters to generation information", section=("infotext", "Infotext"), @@ -12,4 +13,4 @@ def on_ui_settings(): ) -script_callbacks.on_ui_settings(on_ui_settings) +on_ui_settings(settings) diff --git a/scripts/cc_style.py b/lib_cc/style.py similarity index 98% rename from scripts/cc_style.py rename to lib_cc/style.py index 91700ae..8666b8d 100644 --- a/scripts/cc_style.py +++ b/lib_cc/style.py @@ -1,4 +1,4 @@ -import modules.scripts as scripts +from modules import scripts import gradio as gr import json import os diff --git a/scripts/cc_xyz.py b/lib_cc/xyz.py similarity index 98% rename from scripts/cc_xyz.py rename to lib_cc/xyz.py index 2376b24..2a05269 100644 --- a/scripts/cc_xyz.py +++ b/lib_cc/xyz.py @@ -1,4 +1,4 @@ -import modules.scripts as scripts +from modules import scripts def grid_reference(): diff --git a/scripts/cc.py b/scripts/cc.py index fc3f58e..94b1c5b 100644 --- a/scripts/cc.py +++ b/scripts/cc.py @@ -1,16 +1,17 @@ from modules.sd_samplers_kdiffusion import KDiffusionSampler from modules import shared, scripts -from scripts.cc_colorpicker import create_colorpicker -from scripts.cc_style import StyleManager -from scripts.cc_xyz import xyz_support -import scripts.cc_const as const +from lib_cc.colorpicker import create_colorpicker +from lib_cc.style import StyleManager +from lib_cc.xyz import xyz_support +from lib_cc import const from random import seed import gradio as gr +import lib_cc -VERSION = "v2.2.2" +VERSION = "v2.2.3" style_manager = StyleManager() diff --git a/scripts/cc_hdr.py b/scripts/cc_hdr.py index 384ba87..3156a91 100644 --- a/scripts/cc_hdr.py +++ b/scripts/cc_hdr.py @@ -1,11 +1,10 @@ -import modules.scripts as scripts +from modules.processing import process_images, get_fixed_seed +from modules import scripts +from copy import copy import gradio as gr import numpy as np import cv2 as cv -from modules.processing import process_images, get_fixed_seed -from copy import copy - # https://docs.opencv.org/4.8.0/d2/df0/tutorial_py_hdr.html def merge_HDR(imgs: list, path: str, depth: str, fmt: str, gamma: float):