From ad99a7ba65c68f0347b1dd3c14d1f465e523a094 Mon Sep 17 00:00:00 2001 From: SillyLossy Date: Thu, 6 Apr 2023 23:00:49 +0300 Subject: [PATCH 1/6] Colab again --- colab/GPU.ipynb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/colab/GPU.ipynb b/colab/GPU.ipynb index 08cb7eadb..5d31267ec 100644 --- a/colab/GPU.ipynb +++ b/colab/GPU.ipynb @@ -288,6 +288,7 @@ "\n", "\n", "# TavernAI extras\n", + "extras_url = '(disabled)'\n", "params = []\n", "params.append('--cpu')\n", "ExtrasModules = []\n", @@ -304,7 +305,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", @@ -355,17 +355,19 @@ " break\n", " ii.addTask('extract extras URL', extractUrl)\n", "\n", - "def cloneTavern():\n", - " !git clone https://github.com/Cohee1207/SillyTavern\n", - "ii.addTask(\"Clone SillyTavern\", cloneTavern)\n", - "\n", "ii.run()\n", - "%cd /SillyTavern\n", + "\n", + "def cloneTavern():\n", + " %cd /\n", + " !git clone https://github.com/Cohee1207/SillyTavern\n", + " %cd /SillyTavern\n", + "ii.addTask(\"Clone SillyTavern\", cloneTavern)\n", "\n", "if UseGoogleDrive:\n", " %env googledrive=2\n", "\n", " def setupTavernPaths():\n", + " %cd /SillyTavern\n", " tdrive = \"/content/drive/MyDrive/SillyTavern\"\n", " create_paths([\n", " tdrive,\n", @@ -386,6 +388,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", From 194a19a338242a917fcbc15140d9e0a143d13f01 Mon Sep 17 00:00:00 2001 From: SillyLossy Date: Thu, 6 Apr 2023 23:35:52 +0300 Subject: [PATCH 2/6] Fix extras url --- colab/GPU.ipynb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colab/GPU.ipynb b/colab/GPU.ipynb index 5d31267ec..a4accca54 100644 --- a/colab/GPU.ipynb +++ b/colab/GPU.ipynb @@ -261,6 +261,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", @@ -269,7 +270,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", @@ -335,6 +335,7 @@ " ii.addTask('run server', runServer)\n", "\n", " def extractUrl():\n", + " global extras_url\n", " subprocess.call('nohup lt --port 5100 > ./extras.out 2> ./extras.err &', shell=True)\n", " print('Waiting for lt init...')\n", " time.sleep(5)\n", From 12c47a939748f5fb92b73c96de154ec65d98303e Mon Sep 17 00:00:00 2001 From: Cohee Date: Fri, 7 Apr 2023 00:10:21 +0300 Subject: [PATCH 3/6] New colab link --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 7c686bbb1..ec7e4ca8e 100644 --- a/readme.md +++ b/readme.md @@ -19,11 +19,11 @@ Since Tavern is only a user interface, it has tiny hardware requirements, it wil ### I want to try self-hosted easily. Got a Google Colab? -Try on Colab (runs KoboldAI backend and TavernAI Extras server alongside): +Try on Colab (runs KoboldAI backend and TavernAI Extras server alongside): Open In Colab -https://colab.research.google.com/github/Cohee1207/TavernAI-extras/blob/main/colab/GPU.ipynb +https://colab.research.google.com/github/Cohee1207/SillyTavern/blob/main/colab/GPU.ipynb ## Mobile support From ac48ed0e4050ca7d7e744d053045bec33c18f523 Mon Sep 17 00:00:00 2001 From: Cohee Date: Fri, 7 Apr 2023 00:12:27 +0300 Subject: [PATCH 4/6] Update readme.md --- readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/readme.md b/readme.md index ec7e4ca8e..4a21c28a6 100644 --- a/readme.md +++ b/readme.md @@ -25,6 +25,10 @@ Try on Colab (runs KoboldAI backend and TavernAI Extras server alongside): **This fork can be ran natively on Android phones using Termux. Please refer to this guide by ArroganceComplex#2659:** From 86720a71fda574f72cd60835d50223fd90a2655b Mon Sep 17 00:00:00 2001 From: Cohee Date: Fri, 7 Apr 2023 00:13:23 +0300 Subject: [PATCH 5/6] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 4a21c28a6..857f07a3c 100644 --- a/readme.md +++ b/readme.md @@ -27,7 +27,7 @@ https://colab.research.google.com/github/Cohee1207/SillyTavern/blob/main/colab/G If that didn't work, try the legacy link: -[https://github.com/Cohee1207/TavernAI-extras/blob/main/colab/GPU.ipynb](https://colab.research.google.com/github/SillyLossy/TavernAI-extras/blob/main/colab/GPU.ipynb) +https://colab.research.google.com/github/SillyLossy/TavernAI-extras/blob/main/colab/GPU.ipynb ## Mobile support From 471b36a6d928eb7c49248bf8715f15723e8407c2 Mon Sep 17 00:00:00 2001 From: Cohee Date: Fri, 7 Apr 2023 00:15:45 +0300 Subject: [PATCH 6/6] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 857f07a3c..7c05f346b 100644 --- a/readme.md +++ b/readme.md @@ -27,7 +27,7 @@ https://colab.research.google.com/github/Cohee1207/SillyTavern/blob/main/colab/G If that didn't work, try the legacy link: -https://colab.research.google.com/github/SillyLossy/TavernAI-extras/blob/main/colab/GPU.ipynb +https://colab.research.google.com/github/Cohee1207/TavernAI-extras/blob/main/colab/GPU.ipynb ## Mobile support