From 896fde789ee69bd5dd2a829def0878793aa28079 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 20:16:50 +0300
Subject: hide --gradio-auth and --api-auth values from /internal/sysinfo
 report

---
 modules/sysinfo.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'modules/sysinfo.py')

diff --git a/modules/sysinfo.py b/modules/sysinfo.py
index 058e66ce..2db7551d 100644
--- a/modules/sysinfo.py
+++ b/modules/sysinfo.py
@@ -82,7 +82,7 @@ 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(),
         "CPU": {
@@ -123,6 +123,22 @@ def get_environment():
     return {k: os.environ[k] for k in sorted(os.environ) if k in environment_whitelist}
 
 
+def get_argv():
+    res = []
+
+    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
+
+        res.append(v)
+
+    return res
+
 re_newline = re.compile(r"\r*\n")
 
 
-- 
cgit v1.2.3


From 86b99b1e98fcdd6e7e5f6017071944364e01e6ad Mon Sep 17 00:00:00 2001
From: Jabasukuriputo Wang <wfjsw@users.noreply.github.com>
Date: Fri, 24 Nov 2023 11:28:54 -0600
Subject: Move exception_records related methods to errors.py

---
 modules/errors.py  | 18 ++++++++++++++++--
 modules/sysinfo.py | 17 +----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'modules/sysinfo.py')

diff --git a/modules/errors.py b/modules/errors.py
index 192cd8ff..ac9f1ee5 100644
--- a/modules/errors.py
+++ b/modules/errors.py
@@ -6,6 +6,21 @@ import traceback
 exception_records = []
 
 
+def format_traceback(tb):
+    return [[f"{x.filename}, line {x.lineno}, {x.name}", x.line] for x in traceback.extract_tb(tb)]
+
+
+def format_exception(e, tb):
+    return {"exception": str(e), "traceback": format_traceback(tb)}
+
+
+def get_exceptions():
+    try:
+        return list(reversed(exception_records))
+    except Exception as e:
+        return str(e)
+
+
 def record_exception():
     _, e, tb = sys.exc_info()
     if e is None:
@@ -14,8 +29,7 @@ def record_exception():
     if exception_records and exception_records[-1] == e:
         return
 
-    from modules import sysinfo
-    exception_records.append(sysinfo.format_exception(e, tb))
+    exception_records.append(format_exception(e, tb))
 
     if len(exception_records) > 5:
         exception_records.pop(0)
diff --git a/modules/sysinfo.py b/modules/sysinfo.py
index 7d906e1f..226b204d 100644
--- a/modules/sysinfo.py
+++ b/modules/sysinfo.py
@@ -85,7 +85,7 @@ def get_dict():
         "Checksum": checksum_token,
         "Commandline": sys.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,21 +105,6 @@ 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 format_exception(e, tb):
-    return {"exception": str(e), "traceback": format_traceback(tb)}
-
-
-def get_exceptions():
-    try:
-        return list(reversed(errors.exception_records))
-    except Exception as e:
-        return str(e)
-
-
 def get_environment():
     return {k: os.environ[k] for k in sorted(os.environ) if k in environment_whitelist}
 
-- 
cgit v1.2.3


From 5cedc8f9b2b51f392e7c8f5e29286466e3bee8d6 Mon Sep 17 00:00:00 2001
From: Jabasukuriputo Wang <wfjsw@users.noreply.github.com>
Date: Fri, 24 Nov 2023 11:30:30 -0600
Subject: remove traceback in sysinfo

---
 modules/sysinfo.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/sysinfo.py')

diff --git a/modules/sysinfo.py b/modules/sysinfo.py
index 226b204d..1d058950 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
-- 
cgit v1.2.3