Merge remote-tracking branch 'oldorigin/main'

colab/GPU.ipynb

@@ -215,6 +215,7 @@
         "  ui1prefix = f\"{prefix} for UI 1: \"\n",
         "  while True:\n",
         "      line = p.stdout.readline().decode().strip()\n",
+        "      print(line)\n",
         "      if urlprefix in line:\n",
         "          url = line.split(urlprefix)[1]\n",
         "          break\n",
@@ -223,7 +224,6 @@
         "          break\n",
         "      elif not line:\n",
         "          break\n",
-        "      print(line)\n",
         "      if \"INIT\" in line and \"Transformers\" in line:\n",
         "        print(\"Model loading... (It will take 2 - 5 minutes)\")\n",
         "\n",
@@ -245,6 +245,7 @@
         "\n",
         "# ---\n",
         "# TavernAI extras\n",
+        "extras_url = '(disabled)'\n",
         "params = []\n",
         "params.append('--cpu')\n",
         "ExtrasModules = []\n",
@@ -261,7 +262,6 @@
         "params.append(f'--captioning-model={Captions_Model}')\n",
         "params.append(f'--enable-modules={\",\".join(ExtrasModules)}')\n",
         "\n",
-        "extras_url = '(disabled)'\n",
         "\n",
         "if UseExtrasExtensions:\n",
         "    def cloneExtras():\n",
@@ -286,6 +286,7 @@
         "  %env googledrive=2\n",
         "\n",
         "  def setupTavernPaths():\n",
+        "    %cd /SillyTavern\n",
         "    tdrive = \"/content/drive/MyDrive/SillyTavern\"\n",
         "    create_paths([\n",
         "        tdrive,\n",
@@ -306,6 +307,7 @@
         "  ii.addTask(\"Setup Tavern Paths\", setupTavernPaths)\n",
         "\n",
         "def installTavernDependencies():\n",
+        "  %cd /SillyTavern\n",
         "  !npm install\n",
         "  !npm install -g localtunnel\n",
         "ii.addTask(\"Install Tavern Dependencies\", installTavernDependencies)\n",