Upload sdwui_install.py

sdwui_install.py

@@ -18,57 +18,33 @@ def mkdirs(path, exist_ok=True):
         
 # 内置参数默认值，当上下文有参数时可覆盖默认值
 
-_useFrpc = False
-if 'useFrpc' in locals() or 'useFrpc' in globals():
-    _useFrpc = config.useFrpc
+_useFrpc = config.useFrpc
     
-_useNgrok = False
-if 'useNgrok' in locals() or 'useNgrok' in globals():
-    _useNgrok = config.useNgrok
-    
-_reLoad = False
-if 'reLoad' in locals() or 'reLoad' in globals():
-    _reLoad = config.reLoad
-    
-_before_downloading = ''
-if 'before_downloading' in locals() or 'before_downloading' in globals():
-    _before_downloading = config.before_downloading
+_useNgrok = config.useNgrok
 
-_async_downloading = ''
-if 'async_downloading' in locals() or 'async_downloading' in globals():
-    _async_downloading = config.async_downloading
+_reLoad = config.reLoad
 
-_before_start_sync_downloading = ''
-if 'before_start_sync_downloading' in locals() or 'before_start_sync_downloading' in globals():
-    _before_start_sync_downloading = config.before_start_sync_downloading
-    
-_server_port = 7860
-if 'server_port' in locals() or 'server_port' in globals():
-    _server_port = config.server_port
-    
-_sd_git_repo ='https://github.com/viyiviyi/stable-diffusion-webui.git -b local' 
-if 'sd_git_repo' in locals() or 'sd_git_repo' in globals():
-    _sd_git_repo = config.sd_git_repo\
+_before_downloading = config.before_downloading
+
+_async_downloading = config.async_downloading
+
+_before_start_sync_downloading = config.before_start_sync_downloading
+
+_server_port = config.server_port or 7860
+
+_sd_git_repo = config.sd_git_repo\
     .replace('{sdwui}','stable-diffusion-webui')\
-    .replace('{wui}',"webui")
+    .replace('{wui}',"webui") or 'https://github.com/viyiviyi/stable-diffusion-webui.git -b local' 
     
-_sd_config_git_repu = 'https://github.com/viyiviyi/sd-configs.git'
-if 'sd_config_git_repu' in locals() or 'sd_config_git_repu' in globals():
-    _sd_config_git_repu = config.sd_config_git_repu\
+_sd_config_git_repu = config.sd_config_git_repu\
     .replace('{sdwui}','stable-diffusion-webui')\
-    .replace('{wui}',"webui")
+    .replace('{wui}',"webui") or 'https://github.com/viyiviyi/sd-configs.git'
 
-_link_instead_of_copy = True
-if 'link_instead_of_copy' in locals() or 'link_instead_of_copy' in globals():
-    _link_instead_of_copy = config.link_instead_of_copy
-    
-show_shell_info = False
-if 'hidden_console_info' in locals() or 'hidden_console_info' in globals():
-    show_shell_info = not config.hidden_console_info
-    
-_skip_start = False
-if 'skip_start' in locals() or 'skip_start' in globals():
-    _skip_start = config.skip_start
+_link_instead_of_copy = config.link_instead_of_copy
+
+show_shell_info = not config.hidden_console_info
+
+_skip_start = config.skip_start
     
 run_by_none_device = False
 
@@ -143,15 +119,13 @@ def config_reader(conf:str):
 ngrokTokenFile = os.path.join(input_path,'configs/ngrok_token.txt') # 非必填 存放ngrokToken的文件的路径
 frpcConfigFile = os.path.join(input_path,'configs/frpc_koishi.ini') # 非必填 frp 配置文件
 # ss证书目录 下载nginx的版本，把pem格式改成crt格式
-frpcSSLFFlies =[os.path.join(input_path,'configs/koishi_ssl')]
-if 'frp_ssl_dir' in locals() or 'frp_ssl_dir' in globals():
-    frpcSSLFFlies = frpcSSLFFlies + config_reader(config.frp_ssl_dir)
+frpcSSLFFlies = [os.path.join(input_path,'configs/koishi_ssl')] + config_reader(config.frp_ssl_dir)
+
 # frpc 文件目录 如果目录不存在，会自动下载，也可以在数据集搜索 viyiviyi/utils 添加
 frpcExePath = os.path.join(input_path,'utils-tools/frpc')
 # 其他需要加载的webui启动参数 写到【参数列表】这个配置去
-otherArgs = '--xformers'
-if 'sd_start_args' in locals() or 'sd_start_args' in globals():
-    otherArgs = ' '.join([item for item in config_reader(config.sd_start_args) if item != '--no-gradio-queue'])
+otherArgs = ' '.join([item for item in config_reader(config.sd_start_args) if item != '--no-gradio-queue']) or '--xformers'
+
 venvPath = os.path.join(input_path,'sd-webui-venv/venv.tar.bak') # 安装好的python环境 sd-webui-venv是一个公开是数据集 可以搜索添加
 
 # 用于使用kaggle api的token文件 参考 https://www.kaggle.com/docs/api
@@ -162,45 +136,41 @@ requirements = []
     
 frpcStartArg = ''
 
-_setting_file = ''
-if 'setting_file' in locals() or 'setting_file' in globals():
-    _setting_file = replace_path(config.setting_file)
-_ui_config_file = ''
-if 'ui_config_file' in locals() or 'ui_config_file' in globals():
-    _ui_config_file = replace_path(config.ui_config_file)
+_setting_file = replace_path(config.setting_file)
+
+_ui_config_file = replace_path(config.ui_config_file)
 
 mkdirs(f'{install_path}/configFiles',True)
-if 'frp_config_or_file' in locals() or 'frp_config_or_file' in globals():
-    _frp_config_or_file = replace_path(config.frp_config_or_file)
-    if Path(_frp_config_or_file.strip()).exists():
-        frpcConfigFile = _frp_config_or_file.strip()
-    if not Path(frpcConfigFile).exists(): 
-        if _frp_config_or_file.strip().startswith('-f'):
-            frpcStartArg = _frp_config_or_file.strip()
-        else:
-            print('没有frpcp配置')
-            _useFrpc = False
+
+_frp_config_or_file = replace_path(config.frp_config_or_file)
+if Path(_frp_config_or_file.strip()).exists():
+    frpcConfigFile = _frp_config_or_file.strip()
+if not Path(frpcConfigFile).exists(): 
+    if _frp_config_or_file.strip().startswith('-f'):
+        frpcStartArg = _frp_config_or_file.strip()
     else:
-        run(f'''cp -f {frpcConfigFile} {install_path}/configFiles/frpc_webui.ini''')
-        frpcConfigFile = f'{install_path}/configFiles/frpc_webui.ini'
-        run(f'''sed -i "s/local_port = .*/local_port = {_server_port}/g" {frpcConfigFile}''')
-        frpcStartArg = f' -c {frpcConfigFile}'
+        print('没有frpcp配置')
+        _useFrpc = False
+else:
+    run(f'''cp -f {frpcConfigFile} {install_path}/configFiles/frpc_webui.ini''')
+    frpcConfigFile = f'{install_path}/configFiles/frpc_webui.ini'
+    run(f'''sed -i "s/local_port = .*/local_port = {_server_port}/g" {frpcConfigFile}''')
+    frpcStartArg = f' -c {frpcConfigFile}'
+
 
 ngrokToken=''
-if 'ngrok_config_or_file' in locals() or 'ngrok_config_or_file' in globals():
-    _ngrok_config_or_file = replace_path(config.ngrok_config_or_file)
-    if Path(_ngrok_config_or_file.strip()).exists():
-        ngrokTokenFile = _ngrok_config_or_file.strip()
-    if Path(ngrokTokenFile).exists():
-        with open(ngrokTokenFile,encoding = "utf-8") as nkfile:
-            ngrokToken = nkfile.readline()
-    elif not _ngrok_config_or_file.strip().startswith('/'):
-        ngrokToken=_ngrok_config_or_file.strip()
+_ngrok_config_or_file = replace_path(config.ngrok_config_or_file)
+if Path(_ngrok_config_or_file.strip()).exists():
+    ngrokTokenFile = _ngrok_config_or_file.strip()
+if Path(ngrokTokenFile).exists():
+    with open(ngrokTokenFile,encoding = "utf-8") as nkfile:
+        ngrokToken = nkfile.readline()
+elif not _ngrok_config_or_file.strip().startswith('/'):
+    ngrokToken=_ngrok_config_or_file.strip()
     
 if not Path(venvPath).exists():
     venvPath = os.path.join(input_path,'sd-webui-venv/venv.zip')
 
-
 import concurrent.futures
 import importlib
 import os