Upload sdwui-start-util.dev.ipynb

sdwui-start-util.dev.ipynb

@@ -140,72 +140,6 @@
     "_config_args:dict[str, str] =  locals().get('config_args') or globals().get('config_args') or {}"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def _init_conf():\n",
-    "    global _useFrpc\n",
-    "    global _useNgrok\n",
-    "    global _reLoad\n",
-    "    global _before_downloading\n",
-    "    global _async_downloading\n",
-    "    global _before_start_sync_downloading\n",
-    "    global _server_port\n",
-    "    global _sd_git_repo\n",
-    "    global _sd_config_git_repu\n",
-    "    global _huggingface_token\n",
-    "    global _huggingface_repo\n",
-    "    global _link_instead_of_copy\n",
-    "    global show_shell_info\n",
-    "    global _multi_case\n",
-    "    global _skip_start\n",
-    "    global _on_before_start\n",
-    "    global _skip_webui\n",
-    "    global _proxy_path\n",
-    "    global _sub_path\n",
-    "    global _config_args\n",
-    "    \n",
-    "    _useFrpc = locals().get('useFrpc') or globals().get('useFrpc') or True\n",
-    "    _useNgrok = locals().get('useNgrok') or globals().get('useNgrok') or True\n",
-    "    _reLoad = locals().get('reLoad') or globals().get('reLoad') or False\n",
-    "    _before_downloading = locals().get('before_downloading') or globals().get('before_downloading') or ''\n",
-    "    _async_downloading = locals().get('async_downloading') or globals().get('async_downloading') or ''\n",
-    "    _before_start_sync_downloading = locals().get('before_start_sync_downloading') or globals().get('before_start_sync_downloading') or  ''\n",
-    "    _server_port = locals().get('server_port') or globals().get('server_port') or 7860\n",
-    "    _sd_git_repo = locals().get('sd_git_repo') or globals().get('sd_git_repo') or 'https://github.com/viyiviyi/stable-diffusion-webui.git -b local' \n",
-    "    _sd_git_repo = _sd_git_repo\\\n",
-    "        .replace('{sdwui}','stable-diffusion-webui')\\\n",
-    "        .replace('{wui}',\"webui\")  \n",
-    "    _sd_config_git_repu = locals().get('sd_config_git_repu') or globals().get('sd_config_git_repu') or 'https://github.com/viyiviyi/sd-configs.git'\n",
-    "    _sd_config_git_repu = _sd_config_git_repu\\\n",
-    "        .replace('{sdwui}','stable-diffusion-webui')\\\n",
-    "        .replace('{wui}',\"webui\")\n",
-    "    _huggingface_token = locals().get('huggingface_token') or globals().get('huggingface_token') or '{input_path}/configs/huggingface_token.txt'\n",
-    "    _huggingface_token = _huggingface_token\\\n",
-    "        .replace('{sdwui}','stable-diffusion-webui')\\\n",
-    "        .replace('{wui}',\"webui\")\n",
-    "    _huggingface_repo = locals().get('huggingface_repo') or globals().get('huggingface_repo') or ''\n",
-    "    _huggingface_repo = _huggingface_repo\\\n",
-    "        .replace('{sdwui}','stable-diffusion-webui')\\\n",
-    "        .replace('{wui}',\"webui\")\n",
-    "    _link_instead_of_copy = locals().get('link_instead_of_copy') or globals().get('link_instead_of_copy') or True\n",
-    "    show_shell_info = locals().get('hidden_console_info') or globals().get('hidden_console_info')\n",
-    "    if show_shell_info is None: show_shell_info = False\n",
-    "    _multi_case = locals().get('multi_case') or globals().get('multi_case') or False\n",
-    "    _skip_start = locals().get('skip_start') or globals().get('skip_start') or True\n",
-    "    _on_before_start = locals().get('on_before_start') or globals().get('on_before_start') or before_start \n",
-    "    _skip_webui = locals().get('skip_webui') or globals().get('skip_webui') or False\n",
-    "    _proxy_path = locals().get('proxy_path') or globals().get('proxy_path') or {}\n",
-    "    _sub_path =  locals().get('sub_path') or globals().get('sub_path') or ['/','/1/']\n",
-    "    if len(_sub_path) != 2:\n",
-    "        _sub_path = ['/','/1/']\n",
-    "        \n",
-    "    _config_args =  locals().get('config_args') or globals().get('config_args') or {}"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -370,6 +304,7 @@
     "space_string = ' \\n\\r\\t\\'\\\",'\n",
     "\n",
     "def config_reader(conf:str):\n",
+    "    conf = conf or \"\"\n",
     "    args = [replace_path(item.split('#')[0].strip(space_string)) for item in conf.split('\\n') if item.strip(space_string)]\n",
     "    return [item.strip() for item in args if item.strip()]\n"
    ]
@@ -470,6 +405,159 @@
     "huggingface_headers:dict = None  "
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def _init_conf():\n",
+    "    global _useFrpc\n",
+    "    global _useNgrok\n",
+    "    global _reLoad\n",
+    "    global _before_downloading\n",
+    "    global _async_downloading\n",
+    "    global _before_start_sync_downloading\n",
+    "    global _server_port\n",
+    "    global _sd_git_repo\n",
+    "    global _sd_config_git_repu\n",
+    "    global _huggingface_token\n",
+    "    global _huggingface_repo\n",
+    "    global _link_instead_of_copy\n",
+    "    global show_shell_info\n",
+    "    global _multi_case\n",
+    "    global _skip_start\n",
+    "    global _on_before_start\n",
+    "    global _skip_webui\n",
+    "    global _proxy_path\n",
+    "    global _sub_path\n",
+    "    global _config_args\n",
+    "    global _install_path\n",
+    "    global _output_path\n",
+    "    global _input_path\n",
+    "    global _ui_dir_name\n",
+    "    \n",
+    "    global ngrokTokenFile\n",
+    "    global frpcConfigFile\n",
+    "    global frpcSSLFFlies\n",
+    "    global frpcExePath\n",
+    "    global otherArgs\n",
+    "    global _setting_file\n",
+    "    global _ui_config_file\n",
+    "    global _frp_temp_config_file\n",
+    "    global _frp_config_or_file\n",
+    "    global ngrokToken\n",
+    "    global venvPath\n",
+    "    \n",
+    "    _useFrpc = locals().get('useFrpc') or globals().get('useFrpc') or True\n",
+    "    _useNgrok = locals().get('useNgrok') or globals().get('useNgrok') or True\n",
+    "    _reLoad = locals().get('reLoad') or globals().get('reLoad') or False\n",
+    "    _before_downloading = locals().get('before_downloading') or globals().get('before_downloading') or ''\n",
+    "    _async_downloading = locals().get('async_downloading') or globals().get('async_downloading') or ''\n",
+    "    _before_start_sync_downloading = locals().get('before_start_sync_downloading') or globals().get('before_start_sync_downloading') or  ''\n",
+    "    _server_port = locals().get('server_port') or globals().get('server_port') or 7860\n",
+    "    _sd_git_repo = locals().get('sd_git_repo') or globals().get('sd_git_repo') or 'https://github.com/viyiviyi/stable-diffusion-webui.git -b local' \n",
+    "    _sd_git_repo = _sd_git_repo\\\n",
+    "        .replace('{sdwui}','stable-diffusion-webui')\\\n",
+    "        .replace('{wui}',\"webui\")  \n",
+    "    _sd_config_git_repu = locals().get('sd_config_git_repu') or globals().get('sd_config_git_repu') or 'https://github.com/viyiviyi/sd-configs.git'\n",
+    "    _sd_config_git_repu = _sd_config_git_repu\\\n",
+    "        .replace('{sdwui}','stable-diffusion-webui')\\\n",
+    "        .replace('{wui}',\"webui\")\n",
+    "    _huggingface_token = locals().get('huggingface_token') or globals().get('huggingface_token') or '{input_path}/configs/huggingface_token.txt'\n",
+    "    _huggingface_token = _huggingface_token\\\n",
+    "        .replace('{sdwui}','stable-diffusion-webui')\\\n",
+    "        .replace('{wui}',\"webui\")\n",
+    "    _huggingface_repo = locals().get('huggingface_repo') or globals().get('huggingface_repo') or ''\n",
+    "    _huggingface_repo = _huggingface_repo\\\n",
+    "        .replace('{sdwui}','stable-diffusion-webui')\\\n",
+    "        .replace('{wui}',\"webui\")\n",
+    "    _link_instead_of_copy = locals().get('link_instead_of_copy') or globals().get('link_instead_of_copy') or True\n",
+    "    show_shell_info = locals().get('hidden_console_info') or globals().get('hidden_console_info')\n",
+    "    if show_shell_info is None: show_shell_info = False\n",
+    "    _multi_case = locals().get('multi_case') or globals().get('multi_case') or False\n",
+    "    _skip_start = locals().get('skip_start') or globals().get('skip_start') or True\n",
+    "    _on_before_start = locals().get('on_before_start') or globals().get('on_before_start') or before_start \n",
+    "    _skip_webui = locals().get('skip_webui') or globals().get('skip_webui') or False\n",
+    "    _proxy_path = locals().get('proxy_path') or globals().get('proxy_path') or {}\n",
+    "    _sub_path =  locals().get('sub_path') or globals().get('sub_path') or ['/','/1/']\n",
+    "    if len(_sub_path) != 2:\n",
+    "        _sub_path = ['/','/1/']\n",
+    "        \n",
+    "    _config_args =  locals().get('config_args') or globals().get('config_args') or {}\n",
+    "    \n",
+    "    _install_path = locals().get('install_path') or globals().get('install_path') or _install_path\n",
+    "    _output_path = locals().get('output_path') or globals().get('output_path') or _output_path\n",
+    "    _input_path = locals().get('input_path') or globals().get('input_path') or _input_path\n",
+    "    _ui_dir_name = locals().get('ui_dir_name') or globals().get('ui_dir_name') or _ui_dir_name\n",
+    "    \n",
+    "    ngrokTokenFile = os.path.join(_input_path,'configs/ngrok_token.txt') # 非必填 存放ngrokToken的文件的路径\n",
+    "    frpcConfigFile = os.path.join(_input_path,'configs/frpc_koishi.ini') # 非必填 frp 配置文件\n",
+    "    # ss证书目录 下载nginx的版本，把pem格式改成crt格式\n",
+    "    frpcSSLFFlies = [os.path.join(_input_path,'configs/koishi_ssl')]\n",
+    "    if 'frp_ssl_dir' in locals() or 'frp_ssl_dir' in globals():\n",
+    "        frpcSSLFFlies = frpcSSLFFlies + config_reader(locals().get('frp_ssl_dir') or globals().get('frp_ssl_dir'))\n",
+    "    # frpc 文件目录 如果目录不存在，会自动下载，也可以在数据集搜索 viyiviyi/utils 添加\n",
+    "    frpcExePath = os.path.join(_input_path,'utils-tools/frpc')\n",
+    "    # 其他需要加载的webui启动参数 写到【参数列表】这个配置去\n",
+    "    otherArgs = '--xformers'\n",
+    "    if 'sd_start_args' in locals() or 'sd_start_args' in globals():\n",
+    "        otherArgs = ' '.join([item for item in config_reader(locals().get('sd_start_args') or globals().get('sd_start_args')) if item != '--no-gradio-queue'])\n",
+    "\n",
+    "    # 这下面的是用于初始化一些值或者环境变量的，轻易别改\n",
+    "    _setting_file = replace_path(locals().get('setting_file') or globals().get('setting_file') or 'config.json')\n",
+    "\n",
+    "    _ui_config_file = replace_path(locals().get('ui_config_file') or globals().get('ui_config_file') or 'ui-config.json')\n",
+    "\n",
+    "    # 设置文件路径\n",
+    "    if Path(f\"{os.environ['HOME']}/google_drive/MyDrive\").exists():\n",
+    "        if _setting_file == '/kaggle/working/configs/config.json':\n",
+    "            _setting_file = os.path.join(_output_path,'configs/config.json')\n",
+    "        if _ui_config_file == '/kaggle/working/configs/ui-config.json':\n",
+    "            _ui_config_file = os.path.join(_output_path,'configs/ui-config.json')\n",
+    "        \n",
+    "    frpcStartArg = ''\n",
+    "    freefrp_url = ''\n",
+    "    _frp_temp_config_file = ''\n",
+    "    _frp_config_or_file = replace_path(locals().get('frp_config_or_file') or globals().get('frp_config_or_file')) or frpcConfigFile\n",
+    "    run(f'''mkdir -p {_install_path}/configFiles''')\n",
+    "    if _frp_config_or_file:\n",
+    "        if '[common]' in _frp_config_or_file:\n",
+    "            echoToFile(_frp_config_or_file,f'{_install_path}/configFiles/temp_frpc_webui.ini')\n",
+    "            _frp_temp_config_file = f'{_install_path}/configFiles/temp_frpc_webui.ini'\n",
+    "        elif '.ini' in _frp_config_or_file:\n",
+    "            _frp_temp_config_file = _frp_config_or_file.strip()\n",
+    "            \n",
+    "        if _frp_temp_config_file:\n",
+    "            if Path(_frp_temp_config_file).exists():\n",
+    "                run(f'''cp -f {_frp_temp_config_file} {_install_path}/configFiles/frpc_webui.ini''')\n",
+    "                run(f'''sed -i \"s/local_port = .*/local_port = {_server_port}/g\" {_install_path}/configFiles/frpc_webui.ini''')\n",
+    "                frpcStartArg = f' -c {_install_path}/configFiles/frpc_webui.ini'\n",
+    "        elif _frp_config_or_file.strip().startswith('-f'):\n",
+    "            frpcStartArg = _frp_config_or_file.strip()\n",
+    "            \n",
+    "    if not frpcStartArg:\n",
+    "        conf,url = get_freefrp_confog(_server_port)\n",
+    "        echoToFile(conf,f'{_install_path}/configFiles/frpc_webui.ini')\n",
+    "        freefrp_url = url\n",
+    "        frpcStartArg = f' -c {_install_path}/configFiles/frpc_webui.ini'\n",
+    "\n",
+    "    ngrokToken=''\n",
+    "    _ngrok_config_or_file = replace_path(locals().get('ngrok_config_or_file') or globals().get('ngrok_config_or_file')) or ngrokTokenFile\n",
+    "    if _ngrok_config_or_file:\n",
+    "        if Path(_ngrok_config_or_file.strip()).exists():\n",
+    "            ngrokTokenFile = _ngrok_config_or_file.strip()\n",
+    "        if Path(ngrokTokenFile).exists():\n",
+    "            with open(ngrokTokenFile,encoding = \"utf-8\") as nkfile:\n",
+    "                ngrokToken = nkfile.readline()\n",
+    "        elif not _ngrok_config_or_file.strip().startswith('/'):\n",
+    "            ngrokToken=_ngrok_config_or_file.strip()\n",
+    "        \n",
+    "    if not Path(venvPath).exists():\n",
+    "        venvPath = os.path.join(_input_path,'sd-webui-venv/venv.zip')\n",
+    "        "
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},