Replace QComboBox with QLineEdit in order to get model input directly by user

Author: yjg30737

pyqt_openai/chat_widget/llamaOpenAIThread.py

@@ -4,8 +4,6 @@
 from pyqt_openai.models import ChatMessageContainer
 
 
-
-# TODO
 # Should combine with ChatThread
 class LlamaOpenAIThread(QThread):
     replyGenerated = Signal(str, bool, ChatMessageContainer)

pyqt_openai/chat_widget/right_sidebar/modelSearchBar.py

@@ -0,0 +1,16 @@
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QLineEdit, QCompleter
+
+from pyqt_openai.util.script import get_chat_model
+
+
+class ModelSearchBar(QLineEdit):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        all_models = get_chat_model()
+        # TODO LANGAUGE
+        self.setPlaceholderText("Start typing a model name...")
+
+        completer = QCompleter(all_models)
+        completer.setCaseSensitivity(Qt.CaseSensitivity.CaseInsensitive)
+        self.setCompleter(completer)

pyqt_openai/chat_widget/right_sidebar/usingAPIPage.py

@@ -33,11 +33,11 @@
     O1_MODELS,
     SMALL_LABEL_PARAM,
 )
+from pyqt_openai.chat_widget.right_sidebar.modelSearchBar import ModelSearchBar
 from pyqt_openai.config_loader import CONFIG_MANAGER
 from pyqt_openai.lang.translations import LangClass
 from pyqt_openai.util.script import (
     getSeparator,
-    get_chat_model,
     get_openai_chat_model,
     init_llama,
 )
@@ -114,14 +114,13 @@ def __initUi(self):
         saveSystemBtn = QPushButton(LangClass.TRANSLATIONS["Save System"])
         saveSystemBtn.clicked.connect(self.__saveSystem)
 
-        modelCmbBox = QComboBox()
-        modelCmbBox.addItems(get_chat_model())
-        modelCmbBox.setCurrentText(self.__model)
-        modelCmbBox.currentTextChanged.connect(self.__modelChanged)
+        modelSearchBar = ModelSearchBar()
+        modelSearchBar.setText(self.__model)
+        modelSearchBar.textChanged.connect(self.__modelChanged)
 
         lay = QHBoxLayout()
         lay.addWidget(QLabel(LangClass.TRANSLATIONS["Model"]))
-        lay.addWidget(modelCmbBox)
+        lay.addWidget(modelSearchBar)
         lay.setContentsMargins(0, 0, 0, 0)
 
         setApiBtn = ModernButton()

pyqt_openai/mainWindow.py

@@ -65,7 +65,6 @@
     restart_app,
     show_message_box_after_change_to_restart,
     set_auto_start_windows,
-    set_api_key,
     init_llama,
 )
 from pyqt_openai.widgets.navWidget import NavBar
@@ -103,7 +102,7 @@ def __initUi(self):
         self.__setTrayMenu()
         self.__setToolBar()
 
-        self.__loadApiKeyInConf()
+        init_llama()
 
         self.setCentralWidget(self.__mainWidget)
         self.resize(*APP_INITIAL_WINDOW_SIZE)
@@ -340,28 +339,6 @@ def __setToolBar(self):
                 self.__settingsParamContainer.show_secondary_toolbar
             )
 
-    def __loadApiKeyInConf(self):
-        """
-        This function is used to utilize the existing OpenAI, Gemini, Anthropic, and Replicate modules. While these four modules are also available in LiteLLM, this function is additionally used to leverage various features such as image generation provided by these modules.
-        """
-        set_api_key(
-            "OPENAI_API_KEY", CONFIG_MANAGER.get_general_property("OPENAI_API_KEY")
-        )
-        set_api_key(
-            "GEMINI_API_KEY", CONFIG_MANAGER.get_general_property("GEMINI_API_KEY")
-        )
-        set_api_key(
-            "ANTHROPIC_API_KEY",
-            CONFIG_MANAGER.get_general_property("ANTHROPIC_API_KEY"),
-        )
-        set_api_key(
-            "REPLICATE_API_KEY",
-            CONFIG_MANAGER.get_replicate_property("REPLICATE_API_KEY"),
-        )
-
-        # Set llama index directory if it exists
-        init_llama()
-
     def __showAboutDialog(self):
         aboutDialog = AboutDialog(self)
         aboutDialog.exec()

pyqt_openai/util/script.py

@@ -725,6 +725,7 @@ def set_api_key(env_var_name, api_key):
     if env_var_name == "REPLICATE_API_KEY":
         REPLICATE_CLIENT.api_key = api_key
         os.environ["REPLICATE_API_KEY"] = api_key
+        os.environ["REPLICATE_API_TOKEN"] = api_key
 
     # Set environment variables dynamically
     os.environ[env_var_name] = api_key
@@ -977,7 +978,6 @@ def stream_response(response, is_g4f=False, get_content_only=True):
 
 def get_api_response(args, get_content_only=True):
     try:
-        print(args)
         response = completion(drop_params=True, **args)
         if args["stream"]:
             return stream_response(response)