From 01b9c4ddf050515d8c0a3eacbff0e99473fb4bf4 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sun, 7 Apr 2024 15:30:11 -0400 Subject: [PATCH] reorder imports and update requirements --- installer.py | 1 + modules/errors.py | 11 ++++++----- requirements.txt | 10 +++++----- wiki | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/installer.py b/installer.py index 43f552549..88fb08402 100644 --- a/installer.py +++ b/installer.py @@ -82,6 +82,7 @@ def setup_logging(): def get(self): return self.buffer + install('rich', 'rich') from functools import partial, partialmethod from logging.handlers import RotatingFileHandler from rich.theme import Theme diff --git a/modules/errors.py b/modules/errors.py index 0a47f3fab..ef650f52c 100644 --- a/modules/errors.py +++ b/modules/errors.py @@ -1,14 +1,15 @@ import logging import warnings -from rich.console import Console -from rich.theme import Theme -from rich.pretty import install as pretty_install -from rich.traceback import install as traceback_install from installer import log as installer_log, setup_logging - setup_logging() log = installer_log + +from rich.console import Console # pylint: disable=wrong-import-order +from rich.theme import Theme # pylint: disable=wrong-import-order +from rich.pretty import install as pretty_install # pylint: disable=wrong-import-order +from rich.traceback import install as traceback_install # pylint: disable=wrong-import-order + console = Console(log_time=True, tab_size=4, log_time_format='%H:%M:%S-%f', soft_wrap=True, safe_box=True, theme=Theme({ "traceback.border": "black", "traceback.border.syntax_error": "black", diff --git a/requirements.txt b/requirements.txt index 84087e8c9..4a11d0fc3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,8 +41,8 @@ torchsde==0.2.6 clip-interrogator==0.6.0 antlr4-python3-runtime==4.9.3 requests==2.31.0 -tqdm==4.66.1 -accelerate==0.28.0 +tqdm==4.66.2 +accelerate==0.29.1 opencv-contrib-python-headless==4.9.0.80 diffusers==0.27.2 einops==0.4.1 @@ -50,7 +50,7 @@ gradio==3.43.2 huggingface_hub==0.22.2 numexpr==2.8.8 numpy==1.26.4 -numba==0.59.0 +numba==0.59.1 pandas protobuf==3.20.3 pytorch_lightning==1.9.4 @@ -59,6 +59,6 @@ transformers==4.39.3 tomesd==0.1.3 urllib3==1.26.18 Pillow==10.3.0 -timm==0.9.12 +timm==0.9.16 pydantic==1.10.13 -typing-extensions==4.9.0 \ No newline at end of file +typing-extensions==4.11.0 \ No newline at end of file diff --git a/wiki b/wiki index 6dd679960..67f0f43e3 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 6dd679960269d519c3eac9e770e54fe0efaf66bc +Subproject commit 67f0f43e3d5ba87425bce6aa4eb1f129a12d8f65