1 files changed, 16 insertions, 20 deletions
diff --git a/modules/sysinfo.py b/modules/sysinfo.py
index 5f15ac4f..5abf616b 100644
--- a/modules/sysinfo.py
+++ b/modules/sysinfo.py
@@ -1,7 +1,6 @@
 import json
 import os
 import sys
-import traceback
 
 import platform
 import hashlib
@@ -10,7 +9,7 @@ import psutil
 import re
 
 import launch
-from modules import paths_internal, timer
+from modules import paths_internal, timer, shared, extensions, errors
 
 checksum_token = "DontStealMyGamePlz__WINNERS_DONT_USE_DRUGS__DONT_COPY_THAT_FLOPPY"
 environment_whitelist = {
@@ -23,16 +22,13 @@ environment_whitelist = {
     "TORCH_COMMAND",
     "REQS_FILE",
     "XFORMERS_PACKAGE",
-    "GFPGAN_PACKAGE",
     "CLIP_PACKAGE",
     "OPENCLIP_PACKAGE",
     "STABLE_DIFFUSION_REPO",
     "K_DIFFUSION_REPO",
-    "CODEFORMER_REPO",
     "BLIP_REPO",
     "STABLE_DIFFUSION_COMMIT_HASH",
     "K_DIFFUSION_COMMIT_HASH",
-    "CODEFORMER_COMMIT_HASH",
     "BLIP_COMMIT_HASH",
     "COMMANDLINE_ARGS",
     "IGNORE_CMD_ARGS_ERRORS",
@@ -83,9 +79,9 @@ def get_dict():
         "Data path": paths_internal.data_path,
         "Extensions dir": paths_internal.extensions_dir,
         "Checksum": checksum_token,
-        "Commandline": sys.argv,
+        "Commandline": get_argv(),
         "Torch env info": get_torch_sysinfo(),
-        "Exceptions": get_exceptions(),
+        "Exceptions": errors.get_exceptions(),
         "CPU": {
             "model": platform.processor(),
             "count logical": psutil.cpu_count(logical=True),
@@ -105,22 +101,25 @@ def get_dict():
     return res
 
 
-def format_traceback(tb):
-    return [[f"{x.filename}, line {x.lineno}, {x.name}", x.line] for x in traceback.extract_tb(tb)]
+def get_environment():
+    return {k: os.environ[k] for k in sorted(os.environ) if k in environment_whitelist}
 
 
-def get_exceptions():
-    try:
-        from modules import errors
+def get_argv():
+    res = []
 
-        return [{"exception": str(e), "traceback": format_traceback(tb)} for e, tb in reversed(errors.exception_records)]
-    except Exception as e:
-        return str(e)
+    for v in sys.argv:
+        if shared.cmd_opts.gradio_auth and shared.cmd_opts.gradio_auth == v:
+            res.append("<hidden>")
+            continue
 
+        if shared.cmd_opts.api_auth and shared.cmd_opts.api_auth == v:
+            res.append("<hidden>")
+            continue
 
-def get_environment():
-    return {k: os.environ[k] for k in sorted(os.environ) if k in environment_whitelist}
+        res.append(v)
 
+    return res
 
 re_newline = re.compile(r"\r*\n")
 
@@ -138,8 +137,6 @@ def get_torch_sysinfo():
 def get_extensions(*, enabled):
 
     try:
-        from modules import extensions
-
         def to_json(x: extensions.Extension):
             return {
                 "name": x.name,
@@ -156,7 +153,6 @@ def get_extensions(*, enabled):
 
 def get_config():
     try:
-        from modules import shared
         return shared.opts.data
     except Exception as e:
         return str(e)