From 9858acee7b8d0a0a302477919bd530f34655b81d Mon Sep 17 00:00:00 2001
From: Lu Guanghua <102669562+Touch-Night@users.noreply.github.com>
Date: Mon, 18 Sep 2023 04:35:43 +0800
Subject: [PATCH 1/3] Fix unexpected extensions load after gradio restart
 (#3965)

---
 modules/extensions.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/extensions.py b/modules/extensions.py
index 796ff072..6c072504 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -27,6 +27,7 @@ def apply_settings(extension, name):
 
 def load_extensions():
     global state, setup_called
+    state = {}
     for i, name in enumerate(shared.args.extensions):
         if name in available_extensions:
             if name != 'api':

From 45335fa8f4dc2e13687afcab336928ee92cdaea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thireus=20=E2=98=A0?= <Thireus@users.noreply.github.com>
Date: Sun, 17 Sep 2023 23:24:40 +0100
Subject: [PATCH 2/3] Bump ExLlamav2 to v0.0.2 (#3970)

---
 requirements.txt        | 2 +-
 requirements_nocuda.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index afacade4..8818cc5d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ accelerate==0.22.*
 colorama
 datasets
 einops
-exllamav2==0.0.1
+exllamav2==0.0.2
 markdown
 numpy==1.24
 optimum==1.13.1
diff --git a/requirements_nocuda.txt b/requirements_nocuda.txt
index fefc0346..de02295f 100644
--- a/requirements_nocuda.txt
+++ b/requirements_nocuda.txt
@@ -8,7 +8,7 @@ accelerate==0.22.*
 colorama
 datasets
 einops
-exllamav2==0.0.1
+exllamav2==0.0.2
 markdown
 numpy==1.24
 optimum==1.13.1

From fee38e0601f1ae35084a622e2a9af79ce2a48452 Mon Sep 17 00:00:00 2001
From: James Braza <jamesbraza@gmail.com>
Date: Sun, 17 Sep 2023 15:26:05 -0700
Subject: [PATCH 3/3] Simplified ExLlama cloning instructions and failure
 message (#3972)

---
 README.md          | 4 +---
 modules/exllama.py | 7 +++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0a1530f2..c3bfe137 100644
--- a/README.md
+++ b/README.md
@@ -101,9 +101,7 @@ pip install -r requirements_nocuda.txt
 
 ```
 cd text-generation-webui
-mkdir repositories
-cd repositories
-git clone https://github.com/turboderp/exllama
+git clone https://github.com/turboderp/exllama repositories/exllama
 ```
 
 #### bitsandbytes on older NVIDIA GPUs
diff --git a/modules/exllama.py b/modules/exllama.py
index 7f32c746..4253e6ca 100644
--- a/modules/exllama.py
+++ b/modules/exllama.py
@@ -14,7 +14,7 @@ try:
     from exllama.model import ExLlama, ExLlamaCache, ExLlamaConfig
     from exllama.tokenizer import ExLlamaTokenizer
 except:
-    logger.warning('Exllama module failed to load. Will attempt to load from repositories.')
+    logger.warning('exllama module failed to import. Will attempt to import from repositories/.')
     try:
         from modules.relative_imports import RelativeImport
 
@@ -23,7 +23,10 @@ except:
             from model import ExLlama, ExLlamaCache, ExLlamaConfig
             from tokenizer import ExLlamaTokenizer
     except:
-        logger.error("Could not find repositories/exllama/. Make sure that exllama is cloned inside repositories/ and is up to date.")
+        logger.error(
+            "Could not find repositories/exllama. Please ensure that exllama"
+            " (https://github.com/turboderp/exllama) is cloned inside repositories/ and is up to date."
+        )
         raise