From 76c368340384df9dccbeda76f8e31774c5626337 Mon Sep 17 00:00:00 2001
From: H Lohaus <hlohaus@users.noreply.github.com>
Date: Sun, 8 Dec 2024 20:39:40 +0100
Subject: =?UTF-8?q?Remove=20webview=20js=20api,=20Add=20unittest=20for=20p?=
 =?UTF-8?q?rovider=20has=20model,=20Use=20cooki=E2=80=A6=20(#2470)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove webview js api, Add unittest for provider has model, Use cookies dir for cache
---
 g4f/Provider/Airforce.py                         |  2 +-
 g4f/Provider/Blackbox.py                         | 21 ++----
 g4f/Provider/Flux.py                             |  2 +-
 g4f/Provider/RobocodersAPI.py                    |  3 +-
 g4f/Provider/needs_auth/CopilotAccount.py        |  5 +-
 g4f/Provider/needs_auth/MetaAI.py                |  2 +-
 g4f/gui/client/index.html                        | 26 ++-----
 g4f/gui/client/static/js/chat.v1.js              | 49 ++----------
 g4f/gui/client/static/js/highlightjs-copy.min.js |  4 -
 g4f/gui/server/android_gallery.py                | 67 -----------------
 g4f/gui/server/js_api.py                         | 94 ------------------------
 g4f/gui/webview.py                               |  2 -
 g4f/image.py                                     |  3 +-
 g4f/models.py                                    | 42 ++---------
 14 files changed, 34 insertions(+), 288 deletions(-)
 delete mode 100644 g4f/gui/server/android_gallery.py
 delete mode 100644 g4f/gui/server/js_api.py

(limited to 'g4f')

diff --git a/g4f/Provider/Airforce.py b/g4f/Provider/Airforce.py
index 5e5d5194..474c9f88 100644
--- a/g4f/Provider/Airforce.py
+++ b/g4f/Provider/Airforce.py
@@ -60,6 +60,7 @@ class Airforce(AsyncGeneratorProvider, ProviderModelMixin):
         "evil": "any-uncensored",
         "sdxl": "stable-diffusion-xl-base",
         "flux-pro": "flux-1.1-pro",
+        "llama-3.1-8b": "llama-3.1-8b-chat"
     }
 
     @classmethod
@@ -85,7 +86,6 @@ class Airforce(AsyncGeneratorProvider, ProviderModelMixin):
                 cls.models = [model for model in cls.models if model not in cls.hidden_models]
             except Exception as e:
                 debug.log(f"Error fetching text models: {e}")
-                cls.models = [cls.default_model]
 
         return cls.models
         
diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py
index 9c02f3d7..537a3ea8 100644
--- a/g4f/Provider/Blackbox.py
+++ b/g4f/Provider/Blackbox.py
@@ -7,21 +7,20 @@ import json
 import re
 import aiohttp
 
-import os
 import json
 from pathlib import Path
 
 from ..typing import AsyncResult, Messages, ImageType
 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
 from ..image import ImageResponse, to_data_uri
-
+from ..cookies import get_cookies_dir
 from .helper import format_prompt
 
 class Blackbox(AsyncGeneratorProvider, ProviderModelMixin):
     label = "Blackbox AI"
     url = "https://www.blackbox.ai"
     api_endpoint = "https://www.blackbox.ai/api/chat"
-    
+
     working = True
     supports_stream = True
     supports_system_message = True
@@ -38,7 +37,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin):
     agentMode = {
         'ImageGeneration': {'mode': True, 'id': "ImageGenerationLV45LJp", 'name': "Image Generation"}
     }
-    
+
     trendingAgentMode = {
         "gemini-1.5-flash": {'mode': True, 'id': 'Gemini'},
         "llama-3.1-8b": {'mode': True, 'id': "llama-3.1-8b"},
@@ -108,19 +107,11 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin):
         "flux": "ImageGeneration",
     }
 
-    @classmethod
-    def _get_cache_dir(cls) -> Path:
-        # Get the path to the current file
-        current_file = Path(__file__)
-        # Create the path to the .cache directory
-        cache_dir = current_file.parent / '.cache'
-        # Create a directory if it does not exist
-        cache_dir.mkdir(exist_ok=True)
-        return cache_dir
-
     @classmethod
     def _get_cache_file(cls) -> Path:
-        return cls._get_cache_dir() / 'blackbox.json'
+        dir = Path(get_cookies_dir())
+        dir.mkdir(exist_ok=True)
+        return dir / 'blackbox.json'
 
     @classmethod
     def _load_cached_value(cls) -> str | None:
diff --git a/g4f/Provider/Flux.py b/g4f/Provider/Flux.py
index 05983678..7a00e75a 100644
--- a/g4f/Provider/Flux.py
+++ b/g4f/Provider/Flux.py
@@ -12,7 +12,7 @@ class Flux(AsyncGeneratorProvider, ProviderModelMixin):
     url = "https://black-forest-labs-flux-1-dev.hf.space"
     api_endpoint = "/gradio_api/call/infer"
     working = True
-    default_model = 'flux-1-dev'
+    default_model = 'flux-dev'
     models = [default_model]
     image_models = [default_model]
 
diff --git a/g4f/Provider/RobocodersAPI.py b/g4f/Provider/RobocodersAPI.py
index d8330024..3a94e271 100755
--- a/g4f/Provider/RobocodersAPI.py
+++ b/g4f/Provider/RobocodersAPI.py
@@ -14,6 +14,7 @@ except ImportError:
 from aiohttp import ClientTimeout
 from ..errors import MissingRequirementsError
 from ..typing import AsyncResult, Messages
+from ..cookies import get_cookies_dir
 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
 from .helper import format_prompt
 
@@ -30,7 +31,7 @@ class RobocodersAPI(AsyncGeneratorProvider, ProviderModelMixin):
     agent = [default_model, "RepoAgent", "FrontEndAgent"]
     models = [*agent]
 
-    CACHE_DIR = Path(__file__).parent / ".cache"
+    CACHE_DIR = Path(get_cookies_dir())
     CACHE_FILE = CACHE_DIR / "robocoders.json"
 
     @classmethod
diff --git a/g4f/Provider/needs_auth/CopilotAccount.py b/g4f/Provider/needs_auth/CopilotAccount.py
index 497aab98..0dfb9bd4 100644
--- a/g4f/Provider/needs_auth/CopilotAccount.py
+++ b/g4f/Provider/needs_auth/CopilotAccount.py
@@ -9,4 +9,7 @@ class CopilotAccount(Copilot, ProviderModelMixin):
     default_model = "Copilot"
     default_vision_model = default_model
     models = [default_model]
-    image_models = models
\ No newline at end of file
+    image_models = models
+    model_aliases = {
+        "dall-e-3": default_model
+    }
\ No newline at end of file
diff --git a/g4f/Provider/needs_auth/MetaAI.py b/g4f/Provider/needs_auth/MetaAI.py
index 568de701..a8b6708e 100644
--- a/g4f/Provider/needs_auth/MetaAI.py
+++ b/g4f/Provider/needs_auth/MetaAI.py
@@ -29,7 +29,7 @@ class MetaAI(AsyncGeneratorProvider, ProviderModelMixin):
     label = "Meta AI"
     url = "https://www.meta.ai"
     working = True
-    default_model = ''
+    default_model = 'meta-ai'
 
     def __init__(self, proxy: str = None, connector: BaseConnector = None):
         self.session = ClientSession(connector=get_connector(connector, proxy), headers=DEFAULT_HEADERS)
diff --git a/g4f/gui/client/index.html b/g4f/gui/client/index.html
index cd1f72a6..5410b46e 100644
--- a/g4f/gui/client/index.html
+++ b/g4f/gui/client/index.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html lang="en" data-framework="javascript">
-
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -62,9 +61,8 @@
                 onInit: (el, pswp) => {
                     lightbox.pswp.on('change', () => {
                         const currSlideElement = lightbox.pswp.currSlide.data.element;
-                        let captionHTML = '';
                         if (currSlideElement) {
-                            el.innerHTML = currSlideElement.querySelector('img').getAttribute('alt');
+                            el.innerText = currSlideElement.querySelector('img').getAttribute('alt');
                         }
                     });
                 }
@@ -80,7 +78,6 @@
     <script>window.conversation_id = "{{chat_id}}"</script>
     <title>g4f - gui</title>
 </head>
-
 <body>
     <div class="gradient"></div>
     <div class="row">
@@ -92,12 +89,6 @@
                 </button>
             </div>
             <div class="bottom_buttons">
-                <!--
-                <button onclick="open_album();">
-                    <i class="fa-solid fa-toolbox"></i>
-                    <span>Images Album</span>
-                </button>
-                -->
                 <button onclick="open_settings();">
                     <i class="fa-solid fa-toolbox"></i>
                     <span>Open Settings</span>
@@ -118,8 +109,6 @@
                 </div>
             </div>
         </div>
-        <div class="images hidden">
-        </div>
         <div class="settings hidden">
             <div class="paper">
             <h3>Settings</h3>
@@ -151,14 +140,14 @@
             <div class="field">
                 <span class="label">Auto continue in ChatGPT</span>
                 <input id="auto_continue" type="checkbox" name="auto_continue" checked/>
-                <label for="auto_continue" class="toogle" title="Continue large responses in OpenaiChat"></label>
+                <label for="auto_continue" class="toogle" title="Continue large responses in OpenAI ChatGPT"></label>
             </div>
             <div class="field box">
                 <label for="message-input-height" class="label" title="">Input max. height</label>
                 <input type="number" id="message-input-height" value="200"/>
             </div>
             <div class="field box">
-                <label for="recognition-language" class="label" title="">Speech recognition lang</label>
+                <label for="recognition-language" class="label" title="">Speech recognition language</label>
                 <input type="text" id="recognition-language" value="" placeholder="navigator.language"/>
             </div>
             <div class="field box">
@@ -250,7 +239,7 @@
                 <div class="box input-box">
                     <textarea id="message-input" placeholder="Ask a question" cols="30" rows="10"
                         style="white-space: pre-wrap;resize: none;"></textarea>
-                    <label class="file-label image-label" for="image" title="Works with Bing, Gemini, OpenaiChat and You">
+                    <label class="file-label image-label" for="image" title="">
                         <input type="file" id="image" name="image" accept="image/*" required/>
                         <i class="fa-regular fa-image"></i>
                     </label>
@@ -278,12 +267,13 @@
                      <option value="gpt-4o">gpt-4o</option>
                      <option value="gpt-4o-mini">gpt-4o-mini</option>
                      <option value="llama-3.1-70b">llama-3.1-70b</option>
-                     <option value="llama-3.1-70b">llama-3.1-405b</option>
-                     <option value="llama-3.1-70b">mixtral-8x7b</option>
+                     <option value="llama-3.1-405b">llama-3.1-405b</option>
+                     <option value="mixtral-8x7b">mixtral-8x7b</option>
                      <option value="gemini-pro">gemini-pro</option>
                      <option value="gemini-flash">gemini-flash</option>
-                     <option value="claude-3-haiku">claude-3-haiku</option>
                      <option value="claude-3.5-sonnet">claude-3.5-sonnet</option>
+                     <option value="flux">flux (Image Generation)</option>
+                     <option value="dall-e-3">dall-e-3 (Image Generation)</option>
                      <option disabled="disabled">----</option>
                   </select>
                   <select name="model2" id="model2" class="hidden"></select>
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js
index cb6cd3a1..0cde4188 100644
--- a/g4f/gui/client/static/js/chat.v1.js
+++ b/g4f/gui/client/static/js/chat.v1.js
@@ -333,7 +333,7 @@ const handle_ask = async () => {
     }
     messageInput.value = "";
     await count_input()
-    await add_conversation(window.conversation_id, message);
+    await add_conversation(window.conversation_id);
 
     if ("text" in fileInput.dataset) {
         message += '\n```' + fileInput.dataset.type + '\n'; 
@@ -544,20 +544,6 @@ async function add_message_chunk(message, message_id) {
     }
 }
 
-cameraInput?.addEventListener("click", (e) => {
-    if (window?.pywebview) {
-        e.preventDefault();
-        pywebview.api.take_picture();
-    }
-});
-
-imageInput?.addEventListener("click", (e) => {
-    if (window?.pywebview) {
-        e.preventDefault();
-        pywebview.api.choose_image();
-    }
-});
-
 const ask_gpt = async (message_id, message_index = -1, regenerate = false, provider = null, model = null) => {
     if (!model && !provider) {
         model = get_selected_model()?.value || null;
@@ -861,7 +847,7 @@ const load_conversation = async (conversation_id, scroll=true) => {
     if (window.GPTTokenizer_cl100k_base) {
         const filtered = prepare_messages(messages, null);
         if (filtered.length > 0) {
-            last_model = last_model?.startsWith("gpt-4") ? "gpt-4" : "gpt-3.5-turbo"
+            last_model = last_model?.startsWith("gpt-3") ? "gpt-3.5-turbo" : "gpt-4"
             let count_total = GPTTokenizer_cl100k_base?.encodeChat(filtered, last_model).length
             if (count_total > 0) {
                 elements += `<div class="count_total">(${count_total} tokens used)</div>`;
@@ -916,7 +902,7 @@ async function get_messages(conversation_id) {
     return conversation?.items || [];
 }
 
-async function add_conversation(conversation_id, content) {
+async function add_conversation(conversation_id) {
     if (appStorage.getItem(`conversation:${conversation_id}`) == null) {
         await save_conversation(conversation_id, {
             id: conversation_id,
@@ -1134,17 +1120,6 @@ function open_settings() {
     log_storage.classList.add("hidden");
 }
 
-function open_album() {
-    if (album.classList.contains("hidden")) {
-        sidebar.classList.remove("shown");
-        settings.classList.add("hidden");
-        album.classList.remove("hidden");
-        history.pushState({}, null, "/images/");
-    } else {
-        album.classList.add("hidden");
-    }
-}
-
 const register_settings_storage = async () => {
     const optionElements = document.querySelectorAll(optionElementsSelector);
     optionElements.forEach((element) => {
@@ -1277,18 +1252,12 @@ window.addEventListener('load', async function() {
     await on_load();
     if (window.conversation_id == "{{chat_id}}") {
         window.conversation_id = uuid();
-    } else {
-        await on_api();
     }
-});
-
-window.addEventListener('pywebviewready', async function() {
     await on_api();
 });
 
 async function on_load() {
     count_input();
-
     if (/\/chat\/.+/.test(window.location.href)) {
         load_conversation(window.conversation_id);
     } else {
@@ -1334,7 +1303,7 @@ async function on_api() {
     messageInput.addEventListener("keydown", async (evt) => {
         if (prompt_lock) return;
 
-        // If not mobile
+        // If not mobile and not shift enter
         if (!window.matchMedia("(pointer:coarse)").matches && evt.keyCode === 13 && !evt.shiftKey) {
             evt.preventDefault();
             console.log("pressed enter");
@@ -1396,6 +1365,7 @@ async function on_api() {
         await load_provider_models(appStorage.getItem("provider"));
     } catch (e) {
         console.error(e)
+        // Redirect to show basic authenfication
         if (document.location.pathname == "/chat/") {
             document.location.href = `/chat/error`;
         }
@@ -1552,15 +1522,6 @@ function get_selected_model() {
 }
 
 async function api(ressource, args=null, file=null, message_id=null) {
-    if (window?.pywebview) {
-        if (args !== null) {
-            if (ressource == "models") {
-                ressource = "provider_models";
-            }
-            return pywebview.api[`get_${ressource}`](args);
-        }
-        return pywebview.api[`get_${ressource}`]();
-    }
     let api_key;
     if (ressource == "models" && args) {
         api_key = get_api_key_by_provider(args);
diff --git a/g4f/gui/client/static/js/highlightjs-copy.min.js b/g4f/gui/client/static/js/highlightjs-copy.min.js
index 87d09026..0dca7a29 100644
--- a/g4f/gui/client/static/js/highlightjs-copy.min.js
+++ b/g4f/gui/client/static/js/highlightjs-copy.min.js
@@ -48,10 +48,6 @@ class CopyButtonPlugin {
                     alert = null
                 }, 2e3)
             }
-
-            
             if (typeof callback === "function") return callback(newText, el);
-            
         }
-    
 }
diff --git a/g4f/gui/server/android_gallery.py b/g4f/gui/server/android_gallery.py
deleted file mode 100644
index 9101bc02..00000000
--- a/g4f/gui/server/android_gallery.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from kivy.logger import Logger
-from kivy.clock import Clock
-
-from jnius import autoclass
-from jnius import cast
-from android import activity
-
-PythonActivity = autoclass('org.kivy.android.PythonActivity')
-Intent = autoclass('android.content.Intent')
-Uri = autoclass('android.net.Uri')
-
-MEDIA_DATA = "_data"
-RESULT_LOAD_IMAGE = 1
-
-Activity = autoclass('android.app.Activity')
-
-def user_select_image(on_selection):
-    """Open Gallery Activity and call callback with absolute image filepath of image user selected.
-    None if user canceled.
-    """
-
-    currentActivity = cast('android.app.Activity', PythonActivity.mActivity)
-
-    # Forum discussion: https://groups.google.com/forum/#!msg/kivy-users/bjsG2j9bptI/-Oe_aGo0newJ
-    def on_activity_result(request_code, result_code, intent):
-        if request_code != RESULT_LOAD_IMAGE:
-            Logger.warning('user_select_image: ignoring activity result that was not RESULT_LOAD_IMAGE')
-            return
-
-        if result_code == Activity.RESULT_CANCELED:
-            Clock.schedule_once(lambda dt: on_selection(None), 0)
-            return
-
-        if result_code != Activity.RESULT_OK:
-            # This may just go into the void...
-            raise NotImplementedError('Unknown result_code "{}"'.format(result_code))
-
-        selectedImage = intent.getData();  # Uri
-        filePathColumn = [MEDIA_DATA]; # String[]
-        # Cursor
-        cursor = currentActivity.getContentResolver().query(selectedImage,
-                filePathColumn, None, None, None);
-        cursor.moveToFirst();
-
-        # int
-        columnIndex = cursor.getColumnIndex(filePathColumn[0]);
-        # String
-        picturePath = cursor.getString(columnIndex);
-        cursor.close();
-        Logger.info('android_ui: user_select_image() selected %s', picturePath)
-
-        # This is possibly in a different thread?
-        Clock.schedule_once(lambda dt: on_selection(picturePath), 0)
-
-    # See: http://pyjnius.readthedocs.org/en/latest/android.html
-    activity.bind(on_activity_result=on_activity_result)
-
-    intent = Intent()
-
-    # http://programmerguru.com/android-tutorial/how-to-pick-image-from-gallery/
-    # http://stackoverflow.com/questions/18416122/open-gallery-app-in-android
-    intent.setAction(Intent.ACTION_PICK)
-    # TODO internal vs external?
-    intent.setData(Uri.parse('content://media/internal/images/media'))
-    # TODO setType(Image)?
-
-    currentActivity.startActivityForResult(intent, RESULT_LOAD_IMAGE)
\ No newline at end of file
diff --git a/g4f/gui/server/js_api.py b/g4f/gui/server/js_api.py
deleted file mode 100644
index 08eed947..00000000
--- a/g4f/gui/server/js_api.py
+++ /dev/null
@@ -1,94 +0,0 @@
-from __future__ import annotations
-
-import json
-import os.path
-from typing import Iterator
-from uuid import uuid4
-from functools import partial
-
-import webview
-import platformdirs
-from plyer import camera
-from plyer import filechooser
-app_storage_path = platformdirs.user_pictures_dir
-user_select_image = partial(
-    filechooser.open_file,
-    path=platformdirs.user_pictures_dir(),
-    filters=[["Image", "*.jpg", "*.jpeg", "*.png", "*.webp", "*.svg"]],
-)
-
-try:
-    from android.runnable import run_on_ui_thread
-    import android.permissions
-    from android.permissions import Permission
-    from android.permissions import _RequestPermissionsManager
-    _RequestPermissionsManager.register_callback()
-    from .android_gallery import user_select_image
-    has_android = True
-except:
-    run_on_ui_thread = lambda a : a
-    has_android = False
-
-from .api import Api
-
-class JsApi(Api):
-    def get_conversation(self, options: dict, **kwargs) -> Iterator:
-        window = webview.windows[0]
-        if hasattr(self, "image") and self.image is not None:
-            kwargs["image"] = open(self.image, "rb")
-        for message in self._create_response_stream(
-            self._prepare_conversation_kwargs(options, kwargs),
-            options.get("conversation_id"),
-            options.get('provider')
-        ):
-            if not window.evaluate_js(f"if (!this.abort) this.add_message_chunk({json.dumps(message)}); !this.abort && !this.error;"):
-                break
-        self.image = None
-        self.set_selected(None)
-
-    @run_on_ui_thread
-    def choose_image(self):
-        self.request_permissions()
-        user_select_image(
-            on_selection=self.on_image_selection
-        )
-
-    @run_on_ui_thread
-    def take_picture(self):
-        self.request_permissions()
-        filename = os.path.join(app_storage_path(), f"chat-{uuid4()}.png")
-        camera.take_picture(filename=filename, on_complete=self.on_camera)
-
-    def on_image_selection(self, filename):
-        filename = filename[0] if isinstance(filename, list) and filename else filename
-        if filename and os.path.exists(filename):
-            self.image = filename
-        else:
-            self.image = None
-        self.set_selected(None if self.image is None else "image")
-
-    def on_camera(self, filename):
-        if filename and os.path.exists(filename):
-            self.image = filename
-        else:
-            self.image = None
-        self.set_selected(None if self.image is None else "camera")
-
-    def set_selected(self, input_id: str = None):
-        window = webview.windows[0]
-        if window is not None:
-            window.evaluate_js(
-                f"document.querySelector(`.image-label.selected`)?.classList.remove(`selected`);"
-            )
-            if input_id is not None and input_id in ("image", "camera"):
-                window.evaluate_js(
-                    f'document.querySelector(`label[for="{input_id}"]`)?.classList.add(`selected`);'
-                )
-
-    def request_permissions(self):
-        if has_android:
-            android.permissions.request_permissions([
-                Permission.CAMERA,
-                Permission.READ_EXTERNAL_STORAGE,
-                Permission.WRITE_EXTERNAL_STORAGE
-            ])
\ No newline at end of file
diff --git a/g4f/gui/webview.py b/g4f/gui/webview.py
index dce47ecc..4f6927c8 100644
--- a/g4f/gui/webview.py
+++ b/g4f/gui/webview.py
@@ -10,7 +10,6 @@ except ImportError:
     has_platformdirs = False
 
 from g4f.gui.gui_parser import gui_parser
-from g4f.gui.server.js_api import JsApi
 import g4f.version
 import g4f.debug
 
@@ -31,7 +30,6 @@ def run_webview(
         f"g4f - {g4f.version.utils.current_version}",
         os.path.join(dirname, "client/index.html"),
         text_select=True,
-        js_api=JsApi(),
     )
     if has_platformdirs and storage_path is None:
         storage_path = user_config_dir("g4f-webview")
diff --git a/g4f/image.py b/g4f/image.py
index fb5cfb1f..97dfdea3 100644
--- a/g4f/image.py
+++ b/g4f/image.py
@@ -277,8 +277,7 @@ def to_data_uri(image: ImageType) -> str:
 
 # Function to ensure the images directory exists
 def ensure_images_dir():
-    if not os.path.exists(images_dir):
-        os.makedirs(images_dir)
+    os.makedirs(images_dir, exist_ok=True)
 
 async def copy_images(
     images: list[str],
diff --git a/g4f/models.py b/g4f/models.py
index a4bde1c9..79b2ad5a 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -114,13 +114,13 @@ gpt_4o_mini = Model(
 gpt_4_turbo = Model(
     name          = 'gpt-4-turbo',
     base_provider = 'OpenAI',
-    best_provider = IterListProvider([Liaobots, Airforce])
+    best_provider = Airforce
 )
 
 gpt_4 = Model(
     name          = 'gpt-4',
     base_provider = 'OpenAI',
-    best_provider = IterListProvider([DDG, Blackbox, PollinationsAI, Copilot, OpenaiChat, Liaobots, Airforce])
+    best_provider = IterListProvider([DDG, Blackbox, PollinationsAI, Copilot, OpenaiChat, Liaobots])
 )
 
 # o1
@@ -258,12 +258,6 @@ hermes_3 = Model(
     best_provider = IterListProvider([HuggingChat, HuggingFace])
 )
 
-mixtral_8x7b_dpo = Model(
-    name          = "mixtral-8x7b-dpo",
-    base_provider = "NousResearch",
-    best_provider = IterListProvider([AmigoChat, Airforce])
-)
-
 ### Microsoft ###
 phi_2 = Model(
     name          = "phi-2",
@@ -321,7 +315,7 @@ claude_3_sonnet = Model(
 claude_3_haiku = Model(
     name          = 'claude-3-haiku',
     base_provider = 'Anthropic',
-    best_provider = IterListProvider([DDG, Liaobots])
+    best_provider = DDG
 )
 
 # claude 3.5
@@ -361,7 +355,7 @@ blackboxai_pro = Model(
 command_r_plus = Model(
     name = 'command-r-plus',
     base_provider = 'CohereForAI',
-    best_provider = IterListProvider([PollinationsAI, HuggingChat, AmigoChat])
+    best_provider = IterListProvider([HuggingChat, AmigoChat])
 )
 
 ### Qwen ###
@@ -376,7 +370,7 @@ qwen_1_5_7b = Model(
 qwen_2_72b = Model(
     name = 'qwen-2-72b',
     base_provider = 'Qwen',
-    best_provider = IterListProvider([DeepInfraChat, HuggingChat, HuggingFace])
+    best_provider = DeepInfraChat
 )
 
 # qwen 2.5
@@ -448,18 +442,6 @@ openchat_3_5 = Model(
 
 
 ### x.ai ###
-grok_2 = Model(
-    name = 'grok-2',
-    base_provider = 'x.ai',
-    best_provider = Liaobots
-)
-
-grok_2_mini = Model(
-    name = 'grok-2-mini',
-    base_provider = 'x.ai',
-    best_provider = Liaobots
-)
-
 grok_beta = Model(
     name = 'grok-beta',
     base_provider = 'x.ai',
@@ -502,14 +484,6 @@ lfm_40b = Model(
     best_provider = IterListProvider([Airforce, PerplexityLabs])
 )
 
-
-### DiscoResearch ### 
-german_7b = Model(
-    name = 'german-7b',
-    base_provider = 'DiscoResearch',
-    best_provider = Airforce
-)
-
 ### HuggingFaceH4 ### 
 zephyr_7b = Model(
     name = 'zephyr-7b',
@@ -758,7 +732,6 @@ class ModelUtils:
         'mistral-large': mistral_large,
 
         ### NousResearch ###
-        'mixtral-8x7b-dpo': mixtral_8x7b_dpo,
         'hermes-2-dpo': hermes_2_dpo,
         'hermes-2-pro': hermes_2_pro,
         'hermes-3': hermes_3,
@@ -825,8 +798,6 @@ class ModelUtils:
         'openchat-3.5': openchat_3_5,
 
         ### x.ai ###
-        'grok-2': grok_2,
-        'grok-2-mini': grok_2_mini,
         'grok-beta': grok_beta,
 
         ### Perplexity AI ###
@@ -837,9 +808,6 @@ class ModelUtils:
         'deepseek-chat': deepseek_chat,
         'deepseek-coder': deepseek_coder,
 
-        ### TheBloke ###   
-        'german-7b': german_7b,
-
         ### Nvidia ###   
         'nemotron-70b': nemotron_70b,
         
-- 
cgit v1.2.3