Merge branch 'release_candidate'

1 files changed, 18 insertions, 8 deletions

diff --git a/modules/sysinfo.py b/modules/sysinfo.py
index cf24c6dd..2db7551d 100644
--- a/modules/sysinfo.py
+++ b/modules/sysinfo.py
@@ -10,7 +10,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,7 +23,6 @@ environment_whitelist = {
     "TORCH_COMMAND",

     "REQS_FILE",

     "XFORMERS_PACKAGE",

-    "GFPGAN_PACKAGE",

     "CLIP_PACKAGE",

     "OPENCLIP_PACKAGE",

     "STABLE_DIFFUSION_REPO",

@@ -83,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": {

@@ -115,8 +114,6 @@ def format_exception(e, tb):
 

 def get_exceptions():

     try:

-        from modules import errors

-

         return list(reversed(errors.exception_records))

     except Exception as e:

         return str(e)

@@ -126,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")

 

 

@@ -142,8 +155,6 @@ def get_torch_sysinfo():
 def get_extensions(*, enabled):

 

     try:

-        from modules import extensions

-

         def to_json(x: extensions.Extension):

             return {

                 "name": x.name,

@@ -160,7 +171,6 @@ def get_extensions(*, enabled):
 

 def get_config():

     try:

-        from modules import shared

         return shared.opts.data

     except Exception as e:

         return str(e)