pull/4663/head
Vladimir Mandic 2026-02-19 11:36:20 +01:00
parent d65a2d1ebc
commit 4006b3e093
24 changed files with 32 additions and 40 deletions

View File

@ -2,7 +2,6 @@ import re
import inspect import inspect
from typing import Any, Optional, Union from typing import Any, Optional, Union
from collections.abc import Callable from collections.abc import Callable
import pydantic
from pydantic import BaseModel, Field, create_model from pydantic import BaseModel, Field, create_model
try: try:
from pydantic import ConfigDict from pydantic import ConfigDict

View File

@ -15,7 +15,6 @@ original_Blocks_get_config_file = None
def process_kanvas(self, x): # only used when kanvas overrides gr.Image object def process_kanvas(self, x): # only used when kanvas overrides gr.Image object
import numpy as np import numpy as np
from modules import errors
t0 = time.time() t0 = time.time()
image_data = list(x.get('image', {}).values()) image_data = list(x.get('image', {}).values())
image = None image = None

View File

@ -3,7 +3,7 @@ import tempfile
from collections import namedtuple from collections import namedtuple
from pathlib import Path from pathlib import Path
from PIL import Image, PngImagePlugin from PIL import Image, PngImagePlugin
from modules import shared, errors, paths from modules import shared, paths
from modules.logger import log from modules.logger import log

View File

@ -1,8 +1,8 @@
from modules.logger import log
import hashlib import hashlib
import os.path import os.path
from rich import progress, errors from rich import progress, errors
from installer import console from installer import console
from modules.logger import log
from modules.json_helpers import readfile, writefile from modules.json_helpers import readfile, writefile
from modules.paths import data_path from modules.paths import data_path

View File

@ -3,7 +3,7 @@ import re
import json import json
import piexif import piexif
from PIL import Image, ExifTags from PIL import Image, ExifTags
from modules import shared, errors, sd_samplers from modules import sd_samplers
from modules.logger import log from modules.logger import log
from modules.image.watermark import get_watermark from modules.image.watermark import get_watermark

View File

@ -2,7 +2,6 @@ import os
import sys import sys
import logging import logging
import socket import socket
import time
from functools import partial, partialmethod from functools import partial, partialmethod
from logging.handlers import RotatingFileHandler from logging.handlers import RotatingFileHandler
@ -66,7 +65,7 @@ def install_traceback(suppress: list = None):
_log_config = {'debug': False, 'trace': False, 'log_filename': None} _log_config = {'debug': False, 'trace': False, 'log_filename': None}
def setup_logging(debug=None, trace=None, filename=None): def setup_logging(debug=None, trace=None, filename=None):
global log_file, console, log_rolled, _log_config # pylint: disable=global-statement global log_file, console, log_rolled # pylint: disable=global-statement
if debug is not None: if debug is not None:
_log_config['debug'] = debug _log_config['debug'] = debug

View File

@ -1,6 +1,6 @@
import os import os
import gradio as gr import gradio as gr
from modules import shared, ui_sections from modules import ui_sections
from modules.logger import log from modules.logger import log
from modules.video_models.models_def import models from modules.video_models.models_def import models
from modules.ltx import ltx_process from modules.ltx import ltx_process

View File

@ -1,4 +1,3 @@
from modules.logger import log
import os import os
import re import re
import sys import sys
@ -8,6 +7,7 @@ import time
import diffusers import diffusers
import transformers import transformers
from installer import installed, install, setup_logging from installer import installed, install, setup_logging
from modules.logger import log
ao = None ao = None

View File

@ -5,7 +5,7 @@ https://huggingface.co/blog/TimothyAlexisVass/explaining-the-sdxl-latent-space
import os import os
import torch import torch
from modules import shared, devices from modules import devices
from modules.logger import log from modules.logger import log
from modules.vae import sd_vae_taesd from modules.vae import sd_vae_taesd

View File

@ -3,7 +3,6 @@
from __future__ import annotations from __future__ import annotations
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from modules.logger import log
from functools import wraps, cache from functools import wraps, cache
from contextlib import contextmanager, nullcontext from contextlib import contextmanager, nullcontext
import random import random
@ -11,6 +10,7 @@ import math
import torch import torch
import torch.nn as nn import torch.nn as nn
from einops import rearrange from einops import rearrange
from modules.logger import log
if TYPE_CHECKING: if TYPE_CHECKING:
from collections.abc import Callable from collections.abc import Callable

View File

@ -16,14 +16,14 @@ import modules.memmon
import modules.paths as paths import modules.paths as paths
from modules.json_helpers import readfile # pylint: disable=W0611 from modules.json_helpers import readfile # pylint: disable=W0611
from modules.shared_helpers import listdir, req # pylint: disable=W0611 from modules.shared_helpers import listdir, req # pylint: disable=W0611
from modules import errors, devices, shared_state, cmd_args, theme, history, files_cache from modules import errors, devices, shared_state, cmd_args, theme, history, files_cache # pylint: disable=unused-import
from modules.shared_defaults import get_default_modes from modules.shared_defaults import get_default_modes
from modules.memstats import memory_stats # pylint: disable=unused-import from modules.memstats import memory_stats # pylint: disable=unused-import
log.debug('Initializing: pipelines') log.debug('Initializing: pipelines')
from modules import shared_items from modules import shared_items # pylint: disable=unused-import
from modules.caption.openclip import get_clip_models, refresh_clip_models from modules.caption.openclip import get_clip_models, refresh_clip_models # pylint: disable=unused-import
from modules.caption.vqa import vlm_models, vlm_prompts, vlm_system, vlm_default from modules.caption.vqa import vlm_models, vlm_prompts, vlm_system, vlm_default # pylint: disable=unused-import
if TYPE_CHECKING: if TYPE_CHECKING:
@ -156,7 +156,7 @@ startup_offload_mode, startup_offload_min_gpu, startup_offload_max_gpu, startup_
log.debug('Initializing: settings') log.debug('Initializing: settings')
from modules import ui_definitions from modules import ui_definitions
from modules.ui_definitions import OptionInfo, options_section from modules.ui_definitions import OptionInfo, options_section # pylint: disable=unused-import
options_templates = ui_definitions.create_settings(cmd_opts) options_templates = ui_definitions.create_settings(cmd_opts)
from modules.shared_legacy import get_legacy_options from modules.shared_legacy import get_legacy_options
options_templates.update(get_legacy_options()) options_templates.update(get_legacy_options())

View File

@ -18,34 +18,34 @@ options_templates = {}
def list_checkpoint_titles(): def list_checkpoint_titles():
import modules.sd_models import modules.sd_models # pylint: disable=redefined-outer-name
return modules.sd_models.checkpoint_titles() return modules.sd_models.checkpoint_titles()
def refresh_checkpoints(): def refresh_checkpoints():
import modules.sd_models import modules.sd_models # pylint: disable=redefined-outer-name
return modules.sd_models.list_models() return modules.sd_models.list_models()
def refresh_vaes(): def refresh_vaes():
import modules.sd_vae import modules.sd_vae # pylint: disable=redefined-outer-name
modules.sd_vae.refresh_vae_list() modules.sd_vae.refresh_vae_list()
def refresh_upscalers(): def refresh_upscalers():
import modules.modelloader import modules.modelloader # pylint: disable=redefined-outer-name
modules.modelloader.load_upscalers() modules.modelloader.load_upscalers()
def list_samplers(): def list_samplers():
import modules.sd_samplers import modules.sd_samplers # pylint: disable=redefined-outer-name
modules.sd_samplers.set_samplers() modules.sd_samplers.set_samplers()
return modules.sd_samplers.all_samplers return modules.sd_samplers.all_samplers
def get_openvino_device_list(): def get_openvino_device_list():
try: try:
import modules.intel.openvino import modules.intel.openvino # pylint: disable=redefined-outer-name
return modules.intel.openvino.get_device_list() return modules.intel.openvino.get_device_list()
except Exception: except Exception:
return [] return []

View File

@ -1,8 +1,8 @@
import os import os
import time import time
import gradio as gr import gradio as gr
from modules import ui_symbols, ui_components
from installer import install from installer import install
from modules import ui_symbols, ui_components
from modules.logger import log from modules.logger import log

View File

@ -2,7 +2,6 @@ import time
import json import json
import html import html
from modules import shared, ui_extra_networks from modules import shared, ui_extra_networks
from modules.logger import log
class ExtraNetworksPageHistory(ui_extra_networks.ExtraNetworksPage): class ExtraNetworksPageHistory(ui_extra_networks.ExtraNetworksPage):

View File

@ -2,7 +2,7 @@ import os
from urllib.parse import unquote from urllib.parse import unquote
import gradio as gr import gradio as gr
from PIL import Image from PIL import Image
from modules import shared, ui_symbols, ui_common, images, video, modelstats from modules import ui_symbols, ui_common, images, video, modelstats
from modules.logger import log from modules.logger import log
from modules.ui_components import ToolButton from modules.ui_components import ToolButton
@ -19,7 +19,7 @@ def read_media(fn):
geninfo = '' geninfo = ''
try: try:
frames, fps, duration, w, h, codec, _frame = video.get_video_params(fn) frames, fps, duration, w, h, codec, _frame = video.get_video_params(fn)
log = f''' info_html = f'''
<p>Video <b>{w} x {h}</b> <p>Video <b>{w} x {h}</b>
| Codec <b>{codec}</b> | Codec <b>{codec}</b>
| Frames <b>{frames:,}</b> | Frames <b>{frames:,}</b>
@ -30,7 +30,7 @@ def read_media(fn):
''' '''
except Exception as e: # keep preview even if probing fails except Exception as e: # keep preview even if probing fails
log.warning(f'Video probe failed: file="{fn}" {e}') log.warning(f'Video probe failed: file="{fn}" {e}')
log = f''' info_html = f'''
<p>Video <p>Video
| Size <b>{stat_size:,}</b> | Size <b>{stat_size:,}</b>
| Modified <b>{stat_mtime}</b></p><br> | Modified <b>{stat_mtime}</b></p><br>
@ -38,20 +38,20 @@ def read_media(fn):
return [ return [
gr.update(visible=False, value=[]), # hide image gallery preview gr.update(visible=False, value=[]), # hide image gallery preview
gr.update(visible=True, value=fn), # show video player gr.update(visible=True, value=fn), # show video player
geninfo, geninfo, log geninfo, geninfo, info_html
] ]
else: # image else: # image
image = Image.open(fn) image = Image.open(fn)
image.already_saved_as = fn image.already_saved_as = fn
geninfo, _items = images.read_info_from_image(image) geninfo, _items = images.read_info_from_image(image)
log = f''' info_html = f'''
<p>Image <b>{image.width} x {image.height}</b> <p>Image <b>{image.width} x {image.height}</b>
| Format <b>{image.format}</b> | Format <b>{image.format}</b>
| Mode <b>{image.mode}</b> | Mode <b>{image.mode}</b>
| Size <b>{stat_size:,}</b> | Size <b>{stat_size:,}</b>
| Modified <b>{stat_mtime}</b></p><br> | Modified <b>{stat_mtime}</b></p><br>
''' '''
return [gr.update(visible=True, value=[image]), gr.update(visible=False), geninfo, geninfo, log] return [gr.update(visible=True, value=[image]), gr.update(visible=False), geninfo, geninfo, info_html]
def create_ui(): def create_ui():

View File

@ -1,7 +1,6 @@
from typing import TYPE_CHECKING, cast from typing import TYPE_CHECKING, cast
import os import os
import gradio as gr import gradio as gr
from modules import errors
from modules.logger import log from modules.logger import log
from modules.ui_components import ToolButton from modules.ui_components import ToolButton

View File

@ -1,6 +1,5 @@
import gradio as gr import gradio as gr
from PIL import Image from PIL import Image
from modules import shared
from modules.logger import log from modules.logger import log

View File

@ -1,6 +1,6 @@
from modules.logger import log
import time import time
from PIL import Image from PIL import Image
from modules.logger import log
from modules.upscaler import Upscaler, UpscalerData from modules.upscaler import Upscaler, UpscalerData

View File

@ -1,4 +1,3 @@
from modules.logger import log
import io import io
import time import time
import json import json
@ -6,6 +5,7 @@ import torch
import requests import requests
from PIL import Image from PIL import Image
from safetensors.torch import _tobytes from safetensors.torch import _tobytes
from modules.logger import log
hf_decode_endpoints = { hf_decode_endpoints = {

View File

@ -56,7 +56,6 @@ def download_model(model_path):
model_url = 'https://huggingface.co/stabilityai/stable-cascade/resolve/main/previewer.safetensors?download=true' model_url = 'https://huggingface.co/stabilityai/stable-cascade/resolve/main/previewer.safetensors?download=true'
if not os.path.exists(model_path): if not os.path.exists(model_path):
import torch import torch
from modules.logger import log
os.makedirs(os.path.dirname(model_path), exist_ok=True) os.makedirs(os.path.dirname(model_path), exist_ok=True)
log.info(f'Downloading Stable Cascade previewer: {model_path}') log.info(f'Downloading Stable Cascade previewer: {model_path}')
torch.hub.download_url_to_file(model_url, model_path) torch.hub.download_url_to_file(model_url, model_path)
@ -69,7 +68,6 @@ def load_model(model_path):
return checkpoint return checkpoint
def decode(latents): def decode(latents):
from modules import shared
global preview_model # pylint: disable=global-statement global preview_model # pylint: disable=global-statement
if preview_model is None: if preview_model is None:
model_path = os.path.join(paths.models_path, "VAE-approx", "sd_cascade_previewer.safetensors") model_path = os.path.join(paths.models_path, "VAE-approx", "sd_cascade_previewer.safetensors")

View File

@ -175,7 +175,7 @@ def load_veo(model_name): # pylint: disable=unused-argument
if __name__ == "__main__": if __name__ == "__main__":
from installer import setup_logging from installer import setup_logging # pylint: disable=ungrouped-imports
setup_logging() setup_logging()
log.info('test') log.info('test')
model = GoogleVeoVideoPipeline('veo-3.1-generate-preview') model = GoogleVeoVideoPipeline('veo-3.1-generate-preview')

View File

@ -1,6 +1,6 @@
import os import os
import gradio as gr import gradio as gr
from modules import shared, sd_models, ui_common, ui_sections, ui_symbols, ui_video_vlm, call_queue from modules import sd_models, ui_common, ui_sections, ui_symbols, ui_video_vlm, call_queue
from modules.logger import log from modules.logger import log
from modules.ui_components import ToolButton from modules.ui_components import ToolButton
from modules.video_models import models_def, video_utils from modules.video_models import models_def, video_utils

View File

@ -1,7 +1,7 @@
import json import json
from PIL import Image from PIL import Image
import gradio as gr import gradio as gr
from modules import scripts_manager, processing, shared, ipadapter, ui_common from modules import scripts_manager, processing, ipadapter, ui_common
from modules.logger import log from modules.logger import log

View File

@ -5,7 +5,7 @@ lib: https://github.com/homm/pillow-lut-tools
import os import os
import gradio as gr import gradio as gr
from installer import install from installer import install
from modules import scripts_manager, shared, processing from modules import scripts_manager, processing
from modules.logger import log from modules.logger import log