Merge pull request #11593 from akx/better-status-reporting-1

Better status reporting, part 1

1 files changed, 11 insertions, 2 deletions

diff --git a/modules/shared.py b/modules/shared.py
index 203ee1b9..9ab9d98b 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -4,6 +4,7 @@ import os
 import sys

 import threading

 import time

+import logging

 

 import gradio as gr

 import torch

@@ -18,6 +19,8 @@ from modules.paths_internal import models_path, script_path, data_path, sd_confi
 from ldm.models.diffusion.ddpm import LatentDiffusion

 from typing import Optional

 

+log = logging.getLogger(__name__)

+

 demo = None

 

 parser = cmd_args.parser

@@ -144,12 +147,15 @@ class State:
     def request_restart(self) -> None:

         self.interrupt()

         self.server_command = "restart"

+        log.info("Received restart request")

 

     def skip(self):

         self.skipped = True

+        log.info("Received skip request")

 

     def interrupt(self):

         self.interrupted = True

+        log.info("Received interrupt request")

 

     def nextjob(self):

         if opts.live_previews_enable and opts.show_progress_every_n_steps == -1:

@@ -173,7 +179,7 @@ class State:
 

         return obj

 

-    def begin(self):

+    def begin(self, job: str = "(unknown)"):

         self.sampling_step = 0

         self.job_count = -1

         self.processing_has_refined_job_count = False

@@ -187,10 +193,13 @@ class State:
         self.interrupted = False

         self.textinfo = None

         self.time_start = time.time()

-

+        self.job = job

         devices.torch_gc()

+        log.info("Starting job %s", job)

 

     def end(self):

+        duration = time.time() - self.time_start

+        log.info("Ending job %s (%.2f seconds)", self.job, duration)

         self.job = ""

         self.job_count = 0