Merge pull request #187 from yjg30737/feature/general

v1.7.1

Author: yjg30737

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyqt-openai"
-version = "1.7.0"
+version = "1.7.1"
 description = "Python multipurpose chatbot that user can use GPT, other AI models altogether (Release Name: VividNode)"
 authors = [{ name = "Jung Gyu Yoon", email = "yjg30737@gmail.com" }]
 license = { text = "MIT" }

pyqt_openai/__init__.py

@@ -23,7 +23,7 @@
 # For the sake of following the PEP8 standard, we will declare module-level dunder names.
 # PEP8 standard about dunder names: https://peps.python.org/pep-0008/#module-level-dunder-names
 
-__version__ = "1.7.0"
+__version__ = "1.7.1"
 __author__ = "Jung Gyu Yoon"
 
 # Constants
@@ -1139,6 +1139,7 @@ def move_bin(filename, dst_dir):
             "model",
             "width",
             "height",
+            "provider",
             "prompt",
             "negative_prompt",
             "n",

pyqt_openai/aboutDialog.py

@@ -54,6 +54,7 @@ def __initUi(self):
         <p>Powered by PySide6</p>
         <p>Powered by GPT4Free</p>
         <p>Powered by LiteLLM</p>
+        <p>Powered by LlamaIndex</p>
         """
         )
 

pyqt_openai/chat_widget/center/aiChatUnit.py

@@ -14,7 +14,7 @@
 from pyqt_openai.chat_widget.center.responseInfoDialog import ResponseInfoDialog
 from pyqt_openai.models import ChatMessageContainer
 from pyqt_openai.globals import DB
-from pyqt_openai.util.script import stream_to_speakers
+from pyqt_openai.util.common import stream_to_speakers
 from pyqt_openai.widgets.button import Button
 from pyqt_openai.widgets.fileTableDialog import FileTableDialog
 

pyqt_openai/chat_widget/center/chatBrowser.py

@@ -14,7 +14,7 @@
 from pyqt_openai.chat_widget.center.userChatUnit import UserChatUnit
 from pyqt_openai.models import ChatMessageContainer
 from pyqt_openai.globals import DB
-from pyqt_openai.util.script import is_valid_regex
+from pyqt_openai.util.common import is_valid_regex
 
 
 class ChatBrowser(QScrollArea):

pyqt_openai/chat_widget/center/chatWidget.py

@@ -15,10 +15,10 @@
 from pyqt_openai.chat_widget.center.chatHome import ChatHome
 from pyqt_openai.chat_widget.center.menuWidget import MenuWidget
 from pyqt_openai.chat_widget.center.prompt import Prompt
-from pyqt_openai.chat_widget.llamaOpenAIThread import LlamaOpenAIThread
+from pyqt_openai.chat_widget.llamaIndexThread import LlamaIndexThread
 from pyqt_openai.config_loader import CONFIG_MANAGER
 from pyqt_openai.globals import LLAMAINDEX_WRAPPER, DB
-from pyqt_openai.util.script import get_argument, ChatThread
+from pyqt_openai.util.common import get_argument, ChatThread
 from pyqt_openai.lang.translations import LangClass
 from pyqt_openai.models import ChatMessageContainer
 from pyqt_openai.widgets.notifier import NotifierWidget
@@ -261,10 +261,9 @@ def __chat(self):
             query_text = self.__prompt.getContent()
             self.__browser.showLabel(query_text, False, container)
 
-            # Get parameters for OpenAI
+            # Run a different thread based on whether the llama-index is enabled or not.
             if is_llama_available:
-                # Run a different thread based on whether the llama-index is enabled or not.
-                self.__t = LlamaOpenAIThread(
+                self.__t = LlamaIndexThread(
                     param, container, LLAMAINDEX_WRAPPER, query_text
                 )
             else:

pyqt_openai/chat_widget/center/prompt.py

@@ -41,7 +41,7 @@
     UploadedImageFileWidget,
 )
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.util.script import (
+from pyqt_openai.util.common import (
     get_content_of_text_file_for_send,
     RecorderThread,
     STTThread,

pyqt_openai/chat_widget/center/responseInfoDialog.py

@@ -3,7 +3,7 @@
 
 from pyqt_openai.lang.translations import LangClass
 from pyqt_openai.models import ChatMessageContainer
-from pyqt_openai.util.script import getSeparator
+from pyqt_openai.util.common import getSeparator
 
 
 class ResponseInfoDialog(QDialog):

pyqt_openai/chat_widget/chatMainWidget.py

@@ -43,7 +43,7 @@
     CustomizeParamsContainer,
 )
 from pyqt_openai.globals import DB, LLAMAINDEX_WRAPPER
-from pyqt_openai.util.script import (
+from pyqt_openai.util.common import (
     open_directory,
     get_generic_ext_out_of_qt_ext,
     message_list_to_txt,

pyqt_openai/chat_widget/left_sidebar/chatImportDialog.py

@@ -21,7 +21,7 @@
     HOW_TO_EXPORT_CHATGPT_CONVERSATION_HISTORY_URL,
 )
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.util.script import (
+from pyqt_openai.util.common import (
     get_chatgpt_data_for_import,
     get_chatgpt_data_for_preview,
 )