Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace print with logger #1104

Merged
merged 8 commits into from
Feb 12, 2024
Merged

replace print with logger #1104

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5f6bf29
Replace print with logger if they are logs (#905)
shirayu Feb 4, 2024
6279b33
fallback to basic logging if rich is not installed
kohya-ss Feb 4, 2024
efd3b58
Add logging arguments and update logging setup
kohya-ss Feb 4, 2024
9b8ea12
update log initialization without rich
kohya-ss Feb 8, 2024
055f02e
add logging args for training scripts
kohya-ss Feb 8, 2024
5d9e287
make rich to output to stderr instead of stdout
kohya-ss Feb 8, 2024
7202596
log to print tag frequencies
kohya-ss Feb 10, 2024
672851e
Merge branch 'dev' into dev_improve_log
kohya-ss Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update log initialization without rich
  • Loading branch information
@kohya-ss
kohya-ss committed Feb 8, 2024
commit 9b8ea12d34ecb2db7d4bbdad52569d1455df042b
9 changes: 8 additions & 1 deletion library/utils.py
View file
Original file line number Diff line number Diff line change
@@ -34,12 +34,14 @@ def setup_logging(args=None, log_level=None, reset=False):
else:
return

# log_level can be set by the caller or by the args, the caller has priority. If not set, use INFO
if log_level is None and args is not None:
log_level = args.console_log_level
if log_level is None:
log_level = "INFO"
log_level = getattr(logging, log_level)

msg_init = None
if args is not None and args.console_log_file:
handler = logging.FileHandler(args.console_log_file, mode="w")
else:
@@ -50,7 +52,8 @@ def setup_logging(args=None, log_level=None, reset=False):

handler = RichHandler()
Copy link
Contributor

@shirayu shirayu Feb 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to add one more thing.
By default, rich logs to standard output (stdout), but I think it is better to change it as follows.

Textualize/rich#2022

Proposal

from rich.console import Console    
from rich.logging import RichHandler
handler = RichHandler(console=Console(stderr=True))

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! That certainly seems to be consistent.

If someone wants the output to be on stdout as before, there is an option for it.

except ImportError:
print("rich is not installed, using basic logging")
# print("rich is not installed, using basic logging")
msg_init = "rich is not installed, using basic logging"

if handler is None:
handler = logging.StreamHandler(sys.stdout) # same as print
@@ -63,3 +66,7 @@ def setup_logging(args=None, log_level=None, reset=False):
handler.setFormatter(formatter)
logging.root.setLevel(log_level)
logging.root.addHandler(handler)

if msg_init is not None:
logger = logging.getLogger(__name__)
logger.info(msg_init)