Upload 2 files

easydiffusion/_main.ipynb

@@ -13,7 +13,7 @@
     "from pathlib import Path\n",
     "from typing import Union\n",
     "print(\"\\nEasy Diffusion - v3\\n\")\n",
-    "current_dir = os.getcwd()\n",
+    "current_dir = os.environ['CURRENT_DIR'] = os.getcwd() if 'current_dir' not in os.environ else os.environ['CURRENT_DIR']\n",
     "update_branch = os.path.isfile(f\"{current_dir}/sd-ui-files/scripts/get_config.py\") and subprocess.run(f\"python {current_dir}/sd-ui-files/scripts/get_config.py --default=main update_branch\", shell=True, capture_output=True, text=True).stdout.strip() or \"main\"\n",
     "\n",
     "if os.path.isfile(f\"{current_dir}/install_status.txt\") and \"sd_ui_git_cloned\" in open(f\"{current_dir}/install_status.txt\").read():\n",
@@ -77,6 +77,8 @@
     "  gen_key(ssh_path)\n",
     "\n",
     "os.chdir(\"sd-ui-files\")\n",
+    "main_dir = os.environ['MAIN_DIR'] = os.getcwd() if 'MAIN_DIR' not in os.environ else os.environ['MAIN_DIR']\n",
+    "\n",
     "!python ./scripts/check_modules.py  #安装依赖&环境\n",
     "!pip install --upgrade pytorch-lightning\n",
     "!apt-get install aria2\n",

easydiffusion/_start.ipynb

@@ -11,9 +11,18 @@
     "import time\n",
     "import os\n",
     "#/content/esay\n",
+    "current_dir = os.environ['CURRENT_DIR']\n",
+    "main_dir = os.environ['MAIN_DIR']\n",
+    "%cd {main_dir}\n",
+    "use_remote = True # @param {type:\"boolean\"}\n",
+    "use_cloudflare = True # @param {type:\"boolean\"}\n",
     "\n",
     "def start_tunnle():\n",
-    "  time.sleep(1)\n",
+    "  open(\"/content/output.log\", \"w\").close()\n",
+    "  # 循环检测文件内容，直到存在\"http://127.0.0.1:9090\"。\n",
+    "  while not \"Warning: Could not find TensorRT\" in open(\"/content/output.log\", \"r\").read():\n",
+    "    time.sleep(1)\n",
+    "  clear_output()  \n",
     "  if ngrok_token:\n",
     "    try:\n",
     "        from pyngrok import ngrok\n",
@@ -25,7 +34,7 @@
     "  if use_cloudflare:\n",
     "    try:\n",
     "        from pycloudflared import try_cloudflare\n",
-    "        cloudflare_url = try_cloudflare(9090, verbose=False)\n",
+    "        cloudflare_url = try_cloudflare(9000, verbose=False)\n",
     "        print(\"cloudflare_tunnel:\", cloudflare_url)\n",
     "    except Exception as e:\n",
     "        print(\"cloudflare 连接失败：\", e)\n",
@@ -38,7 +47,7 @@
     "\n",
     "threading.Thread(target=start_tunnle, daemon=True).start()\n",
     "\n",
-    "!python {current_dir}/sd-ui-files/scripts/check_modules.py --launch-uvicorn\n",
+    "!python {current_dir}/sd-ui-files/scripts/check_modules.py --launch-uvicorn 2>&1 | tee /content/output.log\n",
     "#!python ./ui/main.py"
    ]
   }