Commit aeba3cad authored by AUTOMATIC's avatar AUTOMATIC
Browse files

add whitelist for environment in the report

add extra link to view the report instead of downloading it
parent cd7ec5f7
Loading
Loading
Loading
Loading
+29 −1
Original line number Original line Diff line number Diff line
@@ -13,6 +13,30 @@ import launch
from modules import paths_internal, timer
from modules import paths_internal, timer


checksum_token = "DontStealMyGamePlz__WINNERS_DONT_USE_DRUGS__DONT_COPY_THAT_FLOPPY"
checksum_token = "DontStealMyGamePlz__WINNERS_DONT_USE_DRUGS__DONT_COPY_THAT_FLOPPY"
environment_whitelist = {
    "GIT",
    "INDEX_URL",
    "WEBUI_LAUNCH_LIVE_OUTPUT",
    "GRADIO_ANALYTICS_ENABLED",
    "PYTHONPATH",
    "TORCH_INDEX_URL",
    "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",
}




def pretty_bytes(num, suffix="B"):
def pretty_bytes(num, suffix="B"):
@@ -72,7 +96,7 @@ def get_dict():
        },
        },
        "Extensions": get_extensions(enabled=True),
        "Extensions": get_extensions(enabled=True),
        "Inactive extensions": get_extensions(enabled=False),
        "Inactive extensions": get_extensions(enabled=False),
        "Environment": {k: os.environ[k] for k in sorted(os.environ)},
        "Environment": get_environment(),
        "Config": get_config(),
        "Config": get_config(),
        "Startup": timer.startup_record,
        "Startup": timer.startup_record,
        "Packages": sorted([f"{pkg.key}=={pkg.version}" for pkg in pkg_resources.working_set]),
        "Packages": sorted([f"{pkg.key}=={pkg.version}" for pkg in pkg_resources.working_set]),
@@ -94,6 +118,10 @@ def get_exceptions():
        return str(e)
        return str(e)




def get_environment():
    return {k: os.environ[k] for k in sorted(os.environ) if k in environment_whitelist}


re_newline = re.compile(r"\r*\n")
re_newline = re.compile(r"\r*\n")




+1 −1
Original line number Original line Diff line number Diff line
@@ -158,7 +158,7 @@ class UiSettings:
                    loadsave.create_ui()
                    loadsave.create_ui()


                with gr.TabItem("Sysinfo", id="sysinfo", elem_id="settings_tab_sysinfo"):
                with gr.TabItem("Sysinfo", id="sysinfo", elem_id="settings_tab_sysinfo"):
                    gr.HTML('<a href="./internal/sysinfo-download" download>Download system info</a>', elem_id="sysinfo_download")
                    gr.HTML('<a href="./internal/sysinfo-download" class="sysinfo_big_link" download>Download system info</a><br /><a href="./internal/sysinfo">(or open as text in a new page)</a>', elem_id="sysinfo_download")


                    with gr.Row():
                    with gr.Row():
                        with gr.Column(scale=1):
                        with gr.Column(scale=1):
+4 −1
Original line number Original line Diff line number Diff line
@@ -450,8 +450,11 @@ table.popup-table .link{
    opacity: 0.75;
    opacity: 0.75;
}
}


#sysinfo_download a{
#sysinfo_download a.sysinfo_big_link{
    font-size: 24pt;
    font-size: 24pt;
}

#sysinfo_download a{
    text-decoration: underline;
    text-decoration: underline;
}
}