diff --git a/modules/api/models.py b/modules/api/models.py index 7305fc7bf..4cbb4ee2e 100644 --- a/modules/api/models.py +++ b/modules/api/models.py @@ -2,7 +2,6 @@ import re import inspect from typing import Any, Optional, Union from collections.abc import Callable -import pydantic from pydantic import BaseModel, Field, create_model try: from pydantic import ConfigDict diff --git a/modules/gr_hijack.py b/modules/gr_hijack.py index 16d8ac9fb..c10b9a75b 100644 --- a/modules/gr_hijack.py +++ b/modules/gr_hijack.py @@ -15,7 +15,6 @@ original_Blocks_get_config_file = None def process_kanvas(self, x): # only used when kanvas overrides gr.Image object import numpy as np - from modules import errors t0 = time.time() image_data = list(x.get('image', {}).values()) image = None diff --git a/modules/gr_tempdir.py b/modules/gr_tempdir.py index 8fcda86e8..691933e87 100644 --- a/modules/gr_tempdir.py +++ b/modules/gr_tempdir.py @@ -3,7 +3,7 @@ import tempfile from collections import namedtuple from pathlib import Path from PIL import Image, PngImagePlugin -from modules import shared, errors, paths +from modules import shared, paths from modules.logger import log diff --git a/modules/hashes.py b/modules/hashes.py index 0924d7ace..3d365907c 100644 --- a/modules/hashes.py +++ b/modules/hashes.py @@ -1,8 +1,8 @@ -from modules.logger import log import hashlib import os.path from rich import progress, errors from installer import console +from modules.logger import log from modules.json_helpers import readfile, writefile from modules.paths import data_path diff --git a/modules/image/metadata.py b/modules/image/metadata.py index 18395f56a..be0dde605 100644 --- a/modules/image/metadata.py +++ b/modules/image/metadata.py @@ -3,7 +3,7 @@ import re import json import piexif from PIL import Image, ExifTags -from modules import shared, errors, sd_samplers +from modules import sd_samplers from modules.logger import log from modules.image.watermark import get_watermark diff --git a/modules/logger.py b/modules/logger.py index fc7505dff..d451df0c5 100644 --- a/modules/logger.py +++ b/modules/logger.py @@ -2,7 +2,6 @@ import os import sys import logging import socket -import time from functools import partial, partialmethod from logging.handlers import RotatingFileHandler @@ -66,7 +65,7 @@ def install_traceback(suppress: list = None): _log_config = {'debug': False, 'trace': False, 'log_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: _log_config['debug'] = debug diff --git a/modules/ltx/ltx_ui.py b/modules/ltx/ltx_ui.py index bfdf4d810..846efcd0b 100644 --- a/modules/ltx/ltx_ui.py +++ b/modules/ltx/ltx_ui.py @@ -1,6 +1,6 @@ import os import gradio as gr -from modules import shared, ui_sections +from modules import ui_sections from modules.logger import log from modules.video_models.models_def import models from modules.ltx import ltx_process diff --git a/modules/model_quant.py b/modules/model_quant.py index 719c3dda2..63ab5cf07 100644 --- a/modules/model_quant.py +++ b/modules/model_quant.py @@ -1,4 +1,3 @@ -from modules.logger import log import os import re import sys @@ -8,6 +7,7 @@ import time import diffusers import transformers from installer import installed, install, setup_logging +from modules.logger import log ao = None diff --git a/modules/processing_correction.py b/modules/processing_correction.py index c0e5aebb6..b0445b73f 100644 --- a/modules/processing_correction.py +++ b/modules/processing_correction.py @@ -5,7 +5,7 @@ https://huggingface.co/blog/TimothyAlexisVass/explaining-the-sdxl-latent-space import os import torch -from modules import shared, devices +from modules import devices from modules.logger import log from modules.vae import sd_vae_taesd diff --git a/modules/sd_hijack_hypertile.py b/modules/sd_hijack_hypertile.py index 11c227308..9ea96a193 100644 --- a/modules/sd_hijack_hypertile.py +++ b/modules/sd_hijack_hypertile.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING -from modules.logger import log from functools import wraps, cache from contextlib import contextmanager, nullcontext import random @@ -11,6 +10,7 @@ import math import torch import torch.nn as nn from einops import rearrange +from modules.logger import log if TYPE_CHECKING: from collections.abc import Callable diff --git a/modules/shared.py b/modules/shared.py index c6dd24620..d25bf76db 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -16,14 +16,14 @@ import modules.memmon import modules.paths as paths from modules.json_helpers import readfile # 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.memstats import memory_stats # pylint: disable=unused-import log.debug('Initializing: pipelines') -from modules import shared_items -from modules.caption.openclip import get_clip_models, refresh_clip_models -from modules.caption.vqa import vlm_models, vlm_prompts, vlm_system, vlm_default +from modules import shared_items # pylint: disable=unused-import +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 # pylint: disable=unused-import if TYPE_CHECKING: @@ -156,7 +156,7 @@ startup_offload_mode, startup_offload_min_gpu, startup_offload_max_gpu, startup_ log.debug('Initializing: settings') 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) from modules.shared_legacy import get_legacy_options options_templates.update(get_legacy_options()) diff --git a/modules/ui_definitions.py b/modules/ui_definitions.py index 012779b9b..e9ae1c015 100644 --- a/modules/ui_definitions.py +++ b/modules/ui_definitions.py @@ -18,34 +18,34 @@ options_templates = {} def list_checkpoint_titles(): - import modules.sd_models + import modules.sd_models # pylint: disable=redefined-outer-name return modules.sd_models.checkpoint_titles() def refresh_checkpoints(): - import modules.sd_models + import modules.sd_models # pylint: disable=redefined-outer-name return modules.sd_models.list_models() def refresh_vaes(): - import modules.sd_vae + import modules.sd_vae # pylint: disable=redefined-outer-name modules.sd_vae.refresh_vae_list() def refresh_upscalers(): - import modules.modelloader + import modules.modelloader # pylint: disable=redefined-outer-name modules.modelloader.load_upscalers() def list_samplers(): - import modules.sd_samplers + import modules.sd_samplers # pylint: disable=redefined-outer-name modules.sd_samplers.set_samplers() return modules.sd_samplers.all_samplers def get_openvino_device_list(): try: - import modules.intel.openvino + import modules.intel.openvino # pylint: disable=redefined-outer-name return modules.intel.openvino.get_device_list() except Exception: return [] diff --git a/modules/ui_docs.py b/modules/ui_docs.py index 2bf4deb93..9bf795e60 100644 --- a/modules/ui_docs.py +++ b/modules/ui_docs.py @@ -1,8 +1,8 @@ import os import time import gradio as gr -from modules import ui_symbols, ui_components from installer import install +from modules import ui_symbols, ui_components from modules.logger import log diff --git a/modules/ui_extra_networks_history.py b/modules/ui_extra_networks_history.py index ac3b2bcd1..3d2d05059 100644 --- a/modules/ui_extra_networks_history.py +++ b/modules/ui_extra_networks_history.py @@ -2,7 +2,6 @@ import time import json import html from modules import shared, ui_extra_networks -from modules.logger import log class ExtraNetworksPageHistory(ui_extra_networks.ExtraNetworksPage): diff --git a/modules/ui_gallery.py b/modules/ui_gallery.py index de00de363..6e49182f1 100644 --- a/modules/ui_gallery.py +++ b/modules/ui_gallery.py @@ -2,7 +2,7 @@ import os from urllib.parse import unquote import gradio as gr 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.ui_components import ToolButton @@ -19,7 +19,7 @@ def read_media(fn): geninfo = '' try: frames, fps, duration, w, h, codec, _frame = video.get_video_params(fn) - log = f''' + info_html = f'''
Video {w} x {h} | Codec {codec} | Frames {frames:,} @@ -30,7 +30,7 @@ def read_media(fn): ''' except Exception as e: # keep preview even if probing fails log.warning(f'Video probe failed: file="{fn}" {e}') - log = f''' + info_html = f'''
Video | Size {stat_size:,} | Modified {stat_mtime}
Image {image.width} x {image.height} | Format {image.format} | Mode {image.mode} | Size {stat_size:,} | Modified {stat_mtime}