diff --git a/installer.py b/installer.py index 4e2288cec..4d544f930 100644 --- a/installer.py +++ b/installer.py @@ -1140,7 +1140,7 @@ def list_extensions_folder(folder, quiet=False): disabled_extensions = opts.get('disabled_extensions', []) enabled_extensions = [x for x in os.listdir(folder) if os.path.isdir(os.path.join(folder, x)) and x not in disabled_extensions and not x.startswith('.')] if not quiet: - log.info(f'Extensions: path="{folder}" enabled={enabled_extensions}') + log.info(f'Extensions: path="{folder}" available={enabled_extensions}') return enabled_extensions @@ -1363,7 +1363,6 @@ def install_requirements(): log.info('Install requirements: this may take a while...') pip('install -r requirements.txt') if args.optional: - quick_allowed = False install_optional() log.info('Install: verifying requirements') if args.new: diff --git a/launch.py b/launch.py index 06ba83b29..b90d01be5 100755 --- a/launch.py +++ b/launch.py @@ -238,7 +238,7 @@ def main(): init_args() # setup argparser and default folders installer.args = args installer.setup_logging(debug=args.debug, trace=args.trace, filename=args.log) - log.info('[bold cyan]SD.Next[/]: starting') + log.info('Starting: [bold cyan]SD.Next[/]') installer.get_logfile() try: sys.excepthook = installer.custom_excepthook diff --git a/modules/extensions.py b/modules/extensions.py index b93fe7f81..7b9c9541d 100644 --- a/modules/extensions.py +++ b/modules/extensions.py @@ -271,4 +271,6 @@ def list_extensions(): enabled = dirname.lower() not in disabled_extensions extension = Extension(name=dirname, path=path, enabled=enabled, is_builtin=is_builtin) extensions.append(extension) - log.debug(f'Extensions: disabled={[e.name for e in extensions if not e.enabled]}') + enabled = [e.name for e in extensions if e.enabled] + disabled = [e.name for e in extensions if not e.enabled] + log.debug(f'Extensions: enabled={enabled} disabled={disabled}') diff --git a/modules/logger.py b/modules/logger.py index b9ec471f7..4aac7dac3 100644 --- a/modules/logger.py +++ b/modules/logger.py @@ -182,21 +182,14 @@ def setup_logging(debug=None, trace=None, filename=None): render_options = render_options.update_height(height=render_options.height - self.top - self.bottom) lines = console.render_lines(self.renderable, render_options, style=style, pad=False) _Segment = Segment - left = _Segment(" " * self.left, style) if self.left else None right = [_Segment.line()] blank_line: list[Segment] | None = None if self.top: blank_line = [_Segment(f'{" " * width}\\n', style)] yield from blank_line * self.top - if left: - for line in lines: - yield left - yield from line - yield from right - else: - for line in lines: - yield from line - yield from right + for line in lines: # self.left is forced to 0 above, so no left-padding segment is ever emitted + yield from line + yield from right if self.bottom: blank_line = blank_line or [_Segment(f'{" " * width}\\n', style)] yield from blank_line * self.bottom diff --git a/modules/lora/networks.py b/modules/lora/networks.py index 2a3a4ee43..4595bbb00 100644 --- a/modules/lora/networks.py +++ b/modules/lora/networks.py @@ -72,10 +72,10 @@ class ActivationPass: self.sd_model = getattr(shared.sd_model, "pipe", shared.sd_model) self.fuse = fuse self.elimit = None # the error limiter, bound for the duration of the walk - self.wanted_names = tuple((x.name, x.te_multiplier, x.unet_multiplier, x.dyn_dim) for x in l.loaded_networks) if len(l.loaded_networks) > 0 else () + self.wanted_names: tuple[tuple[str, float, list, int | None], ...] = tuple((x.name, x.te_multiplier, x.unet_multiplier, x.dyn_dim) for x in l.loaded_networks) if len(l.loaded_networks) > 0 else () self.stack_sig = lora_stack.signature() + lora_blocks.signature() + lora_sdnq.signature() # tracked beside network_current_names so stack-setting, block-weight and mechanism changes re-apply self.select_active = len(l.loaded_networks) > 0 and lora_stack.active_select(len(l.loaded_networks)) # restore-only walks have nothing to stack; the count warning would fire on every network-free generation - self.component_wanted = () + self.component_wanted: tuple[tuple[str, float, list, int | None], ...] = () self.device = None self.group_offload = shared.opts.diffusers_offload_mode == "group" self.group_stripped = {} diff --git a/pyproject.toml b/pyproject.toml index 9e53dc46c..bd050c124 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -384,9 +384,10 @@ python-version = "3.10" [tool.ty.src] include = [ "*.py", + "modules/*.py", + "pipelines/*.py", + "scripts/*.py", "modules/**/*.py", - "pipelines/**/*.py", - "scripts/**/*.py", "extensions-builtin/**/*.py" ] exclude = [ @@ -412,8 +413,8 @@ exclude = [ "modules/teacache", "modules/face/*.py", "modules/sub_quadratic_attention.py", - "pipelines/**/*.py", - "scripts/**/*.py", + "pipelines/*/**/*.py", + "scripts/*/**/*.py", ] [tool.ty.rules]