Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

oobabooga · Nov 18, 2024 · d012938 · d012938
2 parents 3d19746 + 1c937da
commit d012938
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 17 deletions.
diff --git a/extensions/openai/completions.py b/extensions/openai/completions.py
@@ -143,21 +143,20 @@ def convert_history(history):
         new_history = []
         for entry in history:
             if isinstance(entry['content'], list):
-                image_url = None
-                content = None
                 for item in entry['content']:
                     if not isinstance(item, dict):
                         continue
-
+
+                    image_url = None
+                    content = None
                     if item['type'] == 'image_url' and isinstance(item['image_url'], dict):
                         image_url = item['image_url']['url']
                     elif item['type'] == 'text' and isinstance(item['text'], str):
                         content = item['text']
-
-                if image_url:
-                    new_history.append({"image_url": image_url, "role": "user"})
-                if content:
-                    new_history.append({"content": content, "role": "user"})
+                    if image_url:
+                        new_history.append({"image_url": image_url, "role": "user"})
+                    if content:
+                        new_history.append({"content": content, "role": "user"})
             else:
                 new_history.append(entry)
 

diff --git a/modules/ui_model_menu.py b/modules/ui_model_menu.py
@@ -260,6 +260,8 @@ def download_model_wrapper(repo_id, specific_file, progress=gr.Progress(), retur
             yield ("Please enter a model path")
             return
 
+        repo_id = repo_id.strip()
+        specific_file = specific_file.strip()
         downloader = importlib.import_module("download-model").ModelDownloader()
 
         progress(0.0)

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-accelerate==1.0.*
+accelerate==1.1.*
 bitsandbytes==0.44.*
 colorama
 datasets

diff --git a/requirements_amd.txt b/requirements_amd.txt
@@ -1,4 +1,4 @@
-accelerate==1.0.*
+accelerate==1.1.*
 colorama
 datasets
 einops

diff --git a/requirements_amd_noavx2.txt b/requirements_amd_noavx2.txt
@@ -1,4 +1,4 @@
-accelerate==1.0.*
+accelerate==1.1.*
 colorama
 datasets
 einops

diff --git a/requirements_apple_intel.txt b/requirements_apple_intel.txt
@@ -1,4 +1,4 @@
-accelerate==1.0.*
+accelerate==1.1.*
 colorama
 datasets
 einops

diff --git a/requirements_apple_silicon.txt b/requirements_apple_silicon.txt
@@ -1,4 +1,4 @@
-accelerate==1.0.*
+accelerate==1.1.*
 colorama
 datasets
 einops

diff --git a/requirements_cpu_only.txt b/requirements_cpu_only.txt
@@ -1,4 +1,4 @@
-accelerate==1.0.*
+accelerate==1.1.*
 colorama
 datasets
 einops

diff --git a/requirements_cpu_only_noavx2.txt b/requirements_cpu_only_noavx2.txt
@@ -1,4 +1,4 @@
-accelerate==1.0.*
+accelerate==1.1.*
 colorama
 datasets
 einops

diff --git a/requirements_noavx2.txt b/requirements_noavx2.txt
@@ -1,4 +1,4 @@
-accelerate==1.0.*
+accelerate==1.1.*
 bitsandbytes==0.44.*
 colorama
 datasets

diff --git a/requirements_nowheels.txt b/requirements_nowheels.txt
@@ -1,4 +1,4 @@
-accelerate==1.0.*
+accelerate==1.1.*
 colorama
 datasets
 einops