Allow g4f user to select provider, show models in each provider, add manuals in g4f and using api tabs

Author: yjg30737

pyqt_openai/__init__.py

@@ -336,9 +336,6 @@ def move_updater():
 
 STT_MODEL = 'whisper-1'
 
-# G4F Models
-G4F_MODELS = ['gpt-4o', 'gpt-4o-mini', 'gemini-flash', 'claude-3-5-sonnet', 'llama-3.1-70b']
-
 # Endpoint
 # https://platform.openai.com/docs/models/model-endpoint-compatibility
 OPENAI_ENDPOINT_DICT = {
@@ -391,6 +388,10 @@ def move_updater():
 # This has to be managed separately since some of the arguments are different with usual models
 O1_MODELS = ['o1-preview', 'o1-mini']
 
+DEFAULT_LLM = 'gpt-4o'
+
+G4F_PROVIDER_DEFAULT = 'Auto'
+
 # Dictionary that stores the platform and model pairs
 PROVIDER_MODEL_DICT = {
     'OpenAI': ['gpt-4o', 'gpt-4o-mini']+O1_MODELS,
@@ -493,7 +494,7 @@ def move_updater():
         'show_chat_list': True,
         'stream': True,
         'db': 'conv',
-        'model': 'gpt-4o',
+        'model': DEFAULT_LLM,
         'show_setting': True,
         'use_llama_index': False,
         'do_not_ask_again': False,

pyqt_openai/chat_widget/right_sidebar/usingAPIPage.py

@@ -1,15 +1,15 @@
 from PySide6.QtCore import Qt, Signal
 from PySide6.QtWidgets import QWidget, QDoubleSpinBox, QSpinBox, QFormLayout, QSizePolicy, QComboBox, QTextEdit, \
-    QLabel, QVBoxLayout, QCheckBox, QPushButton, QScrollArea, QGroupBox, QHBoxLayout
+    QLabel, QVBoxLayout, QCheckBox, QPushButton, QScrollArea, QGroupBox, QHBoxLayout, QTextBrowser
 
 from pyqt_openai import DEFAULT_SHORTCUT_JSON_MODE, OPENAI_TEMPERATURE_RANGE, OPENAI_TEMPERATURE_STEP, \
     MAX_TOKENS_RANGE, TOP_P_RANGE, TOP_P_STEP, FREQUENCY_PENALTY_RANGE, PRESENCE_PENALTY_STEP, PRESENCE_PENALTY_RANGE, \
     FREQUENCY_PENALTY_STEP, LLAMAINDEX_URL
 from pyqt_openai.chat_widget.right_sidebar.apiWidget import ApiWidget
 from pyqt_openai.config_loader import CONFIG_MANAGER
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.globals import get_chat_model, init_llama, get_openai_chat_model
-from pyqt_openai.util.script import getSeparator
+from pyqt_openai.globals import init_llama, get_openai_chat_model
+from pyqt_openai.util.script import getSeparator, get_chat_model
 from pyqt_openai.widgets.linkLabel import LinkLabel
 
 
@@ -37,6 +37,26 @@ def __initVal(self):
         self.__use_llama_index = CONFIG_MANAGER.get_general_property('use_llama_index')
 
     def __initUi(self):
+        manualBrowser = QTextBrowser()
+        manualBrowser.setOpenExternalLinks(True)
+        manualBrowser.setOpenLinks(True)
+
+        # TODO LANGUAGE
+        manualBrowser.setHtml('''
+        <h2>Using API</h2>
+        <h3>Description</h3>
+        <p>- Fast responses.</p>
+        <p>- Stable response server.</p>
+        <p>- Ability to save your AI usage history and statistics.</p>
+        <p>- Option to add custom LLMs you have created.</p>
+        <p>- Ability to save conversation history on the server.</p>
+        <p>- JSON response functionality available (limited to specific LLMs).</p>
+        <p>- LlamaIndex can be used.</p>
+        <p>- Various hyperparameters can be assigned.</p>
+        ''')
+
+        manualBrowser.setSizePolicy(QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.MinimumExpanding)
+
         systemlbl = QLabel(LangClass.TRANSLATIONS['System'])
         systemlbl.setToolTip(LangClass.TRANSLATIONS['Basically system means instructions or rules that the model should follow.'] + '\n' + LangClass.TRANSLATIONS['You can write your own system instructions here.'])
 
@@ -170,6 +190,8 @@ def __initUi(self):
         self.__llamaChkBox.setText(LangClass.TRANSLATIONS['Use LlamaIndex'])
 
         lay = QVBoxLayout()
+        lay.addWidget(manualBrowser)
+        lay.addWidget(getSeparator('horizontal'))
         lay.addWidget(systemlbl)
         lay.addWidget(self.__systemTextEdit)
         lay.addWidget(saveSystemBtn)

pyqt_openai/chat_widget/right_sidebar/usingG4FPage.py

@@ -1,9 +1,11 @@
 from PySide6.QtCore import Qt, Signal
-from PySide6.QtWidgets import QWidget, QComboBox, QVBoxLayout, QCheckBox, QHBoxLayout, QLabel
+from PySide6.QtWidgets import QWidget, QComboBox, QCheckBox, QFormLayout, QTextBrowser, QSizePolicy
 
+from pyqt_openai import G4F_PROVIDER_DEFAULT
 from pyqt_openai.config_loader import CONFIG_MANAGER
-from pyqt_openai.globals import get_chat_model
 from pyqt_openai.lang.translations import LangClass
+from pyqt_openai.util.script import get_g4f_providers, get_g4f_models_by_provider, get_chat_model, get_g4f_models, \
+    getSeparator
 
 
 class UsingG4FPage(QWidget):
@@ -20,27 +22,39 @@ def __initVal(self):
         self.__model = CONFIG_MANAGER.get_general_property('model')
 
     def __initUi(self):
-        modelCmbBox = QComboBox()
-        modelCmbBox.addItems(get_chat_model(is_g4f=True))
-        modelCmbBox.setCurrentText(self.__model)
-        modelCmbBox.currentTextChanged.connect(self.__modelChanged)
+        manualBrowser = QTextBrowser()
+        manualBrowser.setOpenExternalLinks(True)
+        manualBrowser.setOpenLinks(True)
 
-        lay = QHBoxLayout()
-        lay.addWidget(QLabel(LangClass.TRANSLATIONS['Model']))
-        lay.addWidget(modelCmbBox)
-        lay.setContentsMargins(0, 0, 0, 0)
+        # TODO LANGUAGE
+        manualBrowser.setHtml('''
+        <h2>Using GPT4Free (Free)</h2>
+        <h3>Description</h3>
+        <p>- Responses may often be slow or incomplete.</p>
+        <p>- The response server may be unstable.</p>
+        ''')
+        manualBrowser.setSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
 
-        selectModelWidget = QWidget()
-        selectModelWidget.setLayout(lay)
+        self.__modelCmbBox = QComboBox()
+        self.__modelCmbBox.addItems(get_chat_model(is_g4f=True))
+        self.__modelCmbBox.setCurrentText(self.__model)
+        self.__modelCmbBox.currentTextChanged.connect(self.__modelChanged)
 
         streamChkBox = QCheckBox()
         streamChkBox.setChecked(self.__stream)
         streamChkBox.toggled.connect(self.__streamChecked)
         streamChkBox.setText(LangClass.TRANSLATIONS['Stream'])
 
-        lay = QVBoxLayout()
-        lay.addWidget(selectModelWidget)
-        lay.addWidget(streamChkBox)
+        providerCmbBox = QComboBox()
+        providerCmbBox.addItems(get_g4f_providers(including_auto=True))
+        providerCmbBox.currentTextChanged.connect(self.__providerChanged)
+
+        lay = QFormLayout()
+        lay.addRow(manualBrowser)
+        lay.addRow(getSeparator('horizontal'))
+        lay.addRow('Model', self.__modelCmbBox)
+        lay.addRow('Provider', providerCmbBox)
+        lay.addRow(streamChkBox)
         lay.setAlignment(Qt.AlignmentFlag.AlignTop)
 
         self.setLayout(lay)
@@ -51,4 +65,11 @@ def __modelChanged(self, v):
 
     def __streamChecked(self, f):
         self.__stream = f
-        CONFIG_MANAGER.set_general_property('stream', f)
+        CONFIG_MANAGER.set_general_property('stream', f)
+
+    def __providerChanged(self, v):    
+        self.__modelCmbBox.clear()
+        if v == G4F_PROVIDER_DEFAULT:
+            self.__modelCmbBox.addItems(get_g4f_models())
+        else:
+            self.__modelCmbBox.addItems(get_g4f_models_by_provider(v))

pyqt_openai/globals.py

@@ -18,7 +18,7 @@
 from g4f.client import Client
 
 from pyqt_openai import STT_MODEL, OPENAI_ENDPOINT_DICT, PROVIDER_MODEL_DICT, DEFAULT_GEMINI_MODEL, LLAMA_REQUEST_URL, \
-    OPENAI_CHAT_ENDPOINT, O1_MODELS, G4F_MODELS
+    OPENAI_CHAT_ENDPOINT, O1_MODELS
 from pyqt_openai.config_loader import CONFIG_MANAGER
 from pyqt_openai.lang.translations import LangClass
 from pyqt_openai.models import ChatMessageContainer
@@ -49,7 +49,7 @@ def set_api_key(env_var_name, api_key):
     if env_var_name == 'LLAMA_API_KEY':
         LLAMA_CLIENT.api_key = api_key
 
-def get_model_endpoint(model):
+def get_openai_model_endpoint(model):
     for k, v in OPENAI_ENDPOINT_DICT.items():
         endpoint_group = list(v)
         if model in endpoint_group:
@@ -58,13 +58,6 @@ def get_model_endpoint(model):
 def get_openai_chat_model():
     return OPENAI_ENDPOINT_DICT[OPENAI_CHAT_ENDPOINT]
 
-def get_chat_model(is_g4f=False):
-    if is_g4f:
-        return G4F_MODELS
-    else:
-        all_models = [model for models in PROVIDER_MODEL_DICT.values() for model in models]
-        return all_models
-
 def get_image_url_from_local(image):
     """
     Image is bytes, this function converts it to base64 and returns the image url
@@ -260,8 +253,6 @@ def get_api_response(args, get_content_only=True):
             else:
                 return response
     elif provider == 'Gemini':
-        # Change 'content' to 'parts'
-        # Change role's value from 'assistant' to 'model'
         for message in args['messages']:
             message['parts'] = message.pop('content')
             if message['role'] == 'assistant':
@@ -364,7 +355,9 @@ def run(self):
 
                 print(f"Done in {int((time.time() - start_time) * 1000)}ms.")
         except Exception as e:
-            self.errorGenerated.emit(f'<p style="color:red">{e}</p>')
+            # TODO LANGUAGE
+            self.errorGenerated.emit(f'<p style="color:red">{e}</p>\n\n'
+                                     f'(Are you registered valid OpenAI API Key? This feature requires OpenAI API Key.)\n')
 
     def stop(self):
         self.__stop = True
@@ -458,7 +451,9 @@ def run(self):
             )
             self.stt_finished.emit(transcript.text)
         except Exception as e:
-            self.errorGenerated.emit(f'<p style="color:red">{e}</p>')
+            # TODO LANGUAGE
+            self.errorGenerated.emit(f'<p style="color:red">{e}\n\n'
+                                     f'(Are you registered valid OpenAI API Key? This feature requires OpenAI API Key.)</p>')
         finally:
             os.remove(self.filename)
 

pyqt_openai/util/script.py

@@ -22,12 +22,14 @@
 from PySide6.QtCore import Qt, QUrl
 from PySide6.QtGui import QDesktopServices
 from PySide6.QtWidgets import QMessageBox, QFrame
+from g4f.Provider import ProviderUtils
+from g4f.models import ModelUtils
 from jinja2 import Template
 
 from pyqt_openai import MAIN_INDEX, \
     PROMPT_NAME_REGEX, PROMPT_MAIN_KEY_NAME, PROMPT_BEGINNING_KEY_NAME, \
     PROMPT_END_KEY_NAME, PROMPT_JSON_KEY_NAME, CONTEXT_DELIMITER, THREAD_ORDERBY, DEFAULT_APP_NAME, \
-    AUTOSTART_REGISTRY_KEY, is_frozen
+    AUTOSTART_REGISTRY_KEY, is_frozen, G4F_PROVIDER_DEFAULT, PROVIDER_MODEL_DICT
 from pyqt_openai.lang.translations import LangClass
 from pyqt_openai.models import ImagePromptContainer
 from pyqt_openai.globals import DB
@@ -414,3 +416,44 @@ def generate_random_prompt(arr):
     else:
         random_prompt = ''
     return random_prompt
+
+def get_g4f_models():
+    models = list(ModelUtils.convert.keys())
+    return models
+
+def get_g4f_providers(including_auto=False):
+    providers = list(ProviderUtils.convert.keys())
+    if including_auto:
+        providers = [G4F_PROVIDER_DEFAULT] + providers
+    return providers
+
+def get_g4f_models_by_provider(provider):
+    provider = ProviderUtils.convert[provider]
+    models = []
+    if hasattr(provider, 'models'):
+        models = provider.models if provider.models else []
+    return models
+
+def get_g4f_providers_by_model(model):
+    providers = get_g4f_providers()
+    supported_providers = []
+
+    for provider in providers:
+        provider = ProviderUtils.convert[provider]
+
+        if hasattr(provider, 'models'):
+            models = provider.models if provider.models else models
+            if model in models:
+                supported_providers.append(provider)
+
+    supported_providers = [provider.get_dict()['name'] for provider in supported_providers]
+
+    return supported_providers
+
+
+def get_chat_model(is_g4f=False):
+    if is_g4f:
+        return get_g4f_models()
+    else:
+        all_models = [model for models in PROVIDER_MODEL_DICT.values() for model in models]
+        return all_models