Merge branch 'dev' into img2img-batch-png-info

1 files changed, 2 insertions, 5 deletions

diff --git a/modules/interrogate.py b/modules/interrogate.py
index 111b1322..a3ae1dd5 100644
--- a/modules/interrogate.py
+++ b/modules/interrogate.py
@@ -1,6 +1,5 @@
 import os

 import sys

-import traceback

 from collections import namedtuple

 from pathlib import Path

 import re

@@ -185,8 +184,7 @@ class InterrogateModels:
 

     def interrogate(self, pil_image):

         res = ""

-        shared.state.begin()

-        shared.state.job = 'interrogate'

+        shared.state.begin(job="interrogate")

         try:

             if shared.cmd_opts.lowvram or shared.cmd_opts.medvram:

                 lowvram.send_everything_to_cpu()

@@ -216,8 +214,7 @@ class InterrogateModels:
                             res += f", {match}"

 

         except Exception:

-            print("Error interrogating", file=sys.stderr)

-            print(traceback.format_exc(), file=sys.stderr)

+            errors.report("Error interrogating", exc_info=True)

             res += "<error>"

 

         self.unload()