Mirrors
/
stable-diffusion-webui
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

safer Imports

This commit is contained in:
w-e-w 2024-07-09 01:30:55 +09:00
parent 4debd4d3ef
commit 72cfa2829d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/sysinfo.py
View File

@ -7,7 +7,7 @@ import hashlib
import re import re
from pathlib import Path from pathlib import Path
from modules import paths_internal, timer, shared, extensions, errors, launch_utils from modules import paths_internal, timer, shared_cmd_options, errors, launch_utils
checksum_token = "DontStealMyGamePlz__WINNERS_DONT_USE_DRUGS__DONT_COPY_THAT_FLOPPY" checksum_token = "DontStealMyGamePlz__WINNERS_DONT_USE_DRUGS__DONT_COPY_THAT_FLOPPY"
environment_whitelist = { environment_whitelist = {
@ -135,11 +135,11 @@ def get_argv():
res = [] res = []
for v in sys.argv: for v in sys.argv:
if shared.cmd_opts.gradio_auth and shared.cmd_opts.gradio_auth == v: if shared_cmd_options.cmd_opts.gradio_auth and shared_cmd_options.cmd_opts.gradio_auth == v:
res.append("<hidden>") res.append("<hidden>")
continue continue
if shared.cmd_opts.api_auth and shared.cmd_opts.api_auth == v: if shared_cmd_options.cmd_opts.api_auth and shared_cmd_options.cmd_opts.api_auth == v:
res.append("<hidden>") res.append("<hidden>")
continue continue
@ -181,6 +181,7 @@ def get_info_from_repo_path(path: Path):
def get_extensions(*, enabled, fallback_disabled_extensions=None): def get_extensions(*, enabled, fallback_disabled_extensions=None):
try: try:
from modules import extensions
if extensions.extensions: if extensions.extensions:
def to_json(x: extensions.Extension): def to_json(x: extensions.Extension):
return { return {
@ -199,10 +200,11 @@ def get_extensions(*, enabled, fallback_disabled_extensions=None):
def get_config(): def get_config():
try: try:
from modules import shared
return shared.opts.data return shared.opts.data
except Exception as _: except Exception as _:
try: try:
with open(shared.cmd_opts.ui_settings_file, 'r') as f: with open(shared_cmd_options.cmd_opts.ui_settings_file, 'r') as f:
return json.load(f) return json.load(f)
except Exception as e: except Exception as e:
return str(e) return str(e)