diff --git a/TODO.md b/TODO.md index 9da98999b..0b0ee692c 100644 --- a/TODO.md +++ b/TODO.md @@ -4,15 +4,14 @@ Stuff to be fixed... -- Fix integration with - Fix integration with -- Create new GitHub hooks/actions for CI/CD -- Clean-up server state after on-the-fly restart (e.g., impacts read gen data) ## Features Stuff to be added... +- Create new GitHub hooks/actions for CI/CD +- Move Restart Server from WebUI to Launch and reload modules - Redo Extensions tab: see - Stream-load models as option for slow storage - Replace **PngInfo** / **EXIF** metadata handler @@ -30,43 +29,7 @@ Stuff to be investigated... Pick & merge PRs from main repo... -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -Complete: - -- +- Merge backlog: ## Models diff --git a/extensions-builtin/seed_travel b/extensions-builtin/seed_travel index 972cc4392..1a97ebb43 160000 --- a/extensions-builtin/seed_travel +++ b/extensions-builtin/seed_travel @@ -1 +1 @@ -Subproject commit 972cc439225ae6993b8c43bf4b677c9f16e3ead1 +Subproject commit 1a97ebb43428b43c41001cfe79e50b468126d99f diff --git a/modules/lycoris b/modules/lycoris index ded70eedd..8b47a5349 160000 --- a/modules/lycoris +++ b/modules/lycoris @@ -1 +1 @@ -Subproject commit ded70eeddc2b26bf3efd25c2b29b6746294bb731 +Subproject commit 8b47a5349b59efac812664c5732c6e3947a6fec7 diff --git a/modules/middleware.py b/modules/middleware.py index 2301d1e60..6520a0ed6 100644 --- a/modules/middleware.py +++ b/modules/middleware.py @@ -12,13 +12,12 @@ from fastapi.exceptions import HTTPException from fastapi.encoders import jsonable_encoder import modules.errors as errors -logging.disable(logging.CRITICAL) errors.install() def setup_middleware(app: FastAPI, cmd_opts): print('Initializing middleware') - # uvicorn_logger=logging.getLogger("uvicorn.error") - # uvicorn_logger.disabled = True + uvicorn_logger=logging.getLogger("uvicorn.error") + uvicorn_logger.disabled = True from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.gzip import GZipMiddleware app.user_middleware = [x for x in app.user_middleware if x.cls.__name__ != 'CORSMiddleware'] diff --git a/modules/shared.py b/modules/shared.py index cc5237556..05653b664 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -14,12 +14,11 @@ import modules.devices as devices from modules import script_loading, errors, ui_components, shared_items, cmd_args from modules.paths_internal import models_path, script_path, data_path, sd_configs_path, sd_default_config, sd_model_file, default_sd_model_file, extensions_dir, extensions_builtin_dir # pylint: disable=W0611 import modules.paths_internal as paths - from setup import log as setup_log # pylint: disable=E0611 + errors.install(gr) demo: gr.Blocks = None log = setup_log - parser = cmd_args.parser script_loading.preload_extensions(paths.extensions_dir, parser) @@ -683,6 +682,8 @@ def restart_server(): if demo is None: return try: + import logging + logging.disable(logging.CRITICAL) demo.server.should_exit = True demo.server.force_exit = True demo.close(verbose=False) diff --git a/setup.py b/setup.py index 252f514d5..ef7928870 100644 --- a/setup.py +++ b/setup.py @@ -48,6 +48,7 @@ def setup_logging(clean=False): pretty_install(console=console) traceback_install(console=console, extra_lines=1, width=console.width, word_wrap=False, indent_guides=False, suppress=[]) rh = RichHandler(show_time=True, omit_repeated_times=False, show_level=True, show_path=False, markup=False, rich_tracebacks=True, log_time_format='%H:%M:%S-%f', level=logging.DEBUG if args.debug else logging.INFO, console=console) + rh.set_name(logging.DEBUG if args.debug else logging.INFO) log.addHandler(rh) except: sh = logging.StreamHandler() diff --git a/webui.py b/webui.py index bd1b776ea..58228d0e8 100644 --- a/webui.py +++ b/webui.py @@ -9,7 +9,6 @@ from modules import timer, errors startup_timer = timer.Timer() -logging.basicConfig(level=logging.WARNING, format='%(asctime)s | %(levelname)s | %(pathname)s | %(message)s', force=True) # reset logging import torch # pylint: disable=C0411 import torchvision # pylint: disable=W0611,C0411 import pytorch_lightning # pytorch_lightning should be imported after torch, but it re-enables warnings on import so import once to disable them # pylint: disable=W0611,C0411 @@ -152,6 +151,7 @@ def create_api(app): def start_ui(): + logging.disable(logging.INFO) initialize() ui_tempdir.on_tmpdir_changed() if shared.opts.clean_temp_dir_at_start: @@ -201,6 +201,7 @@ def start_ui(): def webui(): start_ui() + load_model() print(f"Startup time: {startup_timer.summary()}") @@ -216,6 +217,14 @@ def webui(): print(f"Startup time: {startup_timer.summary()}") time.sleep(1) + """ + import sys + import types + from modules.paths_internal import script_path + libs = [name for name, m in sys.modules.items() if isinstance(m, types.ModuleType) and (getattr(m, '__file__', '') or '').startswith(script_path)] + print(libs) + """ + if __name__ == "__main__": webui()