Fix bugs related to LlamaIndex, refactoring

yjg30737 · yjg30737 · commit 41c67cf06990 · 2024-11-14T16:12:41.000+09:00
diff --git a/pyqt_openai/chat_widget/center/aiChatUnit.py b/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
 
diff --git a/pyqt_openai/chat_widget/center/chatBrowser.py b/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):
diff --git a/pyqt_openai/chat_widget/center/chatWidget.py b/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:
diff --git a/pyqt_openai/chat_widget/center/prompt.py b/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,
diff --git a/pyqt_openai/chat_widget/center/responseInfoDialog.py b/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):
diff --git a/pyqt_openai/chat_widget/chatMainWidget.py b/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,
diff --git a/pyqt_openai/chat_widget/left_sidebar/chatImportDialog.py b/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,
 )
diff --git a/pyqt_openai/chat_widget/llamaIndexThread.py b/pyqt_openai/chat_widget/llamaIndexThread.py
@@ -5,7 +5,7 @@
 
 
 # Should combine with ChatThread
-class LlamaOpenAIThread(QThread):
+class LlamaIndexThread(QThread):
     replyGenerated = Signal(str, bool, ChatMessageContainer)
     streamFinished = Signal(ChatMessageContainer)
 
@@ -37,6 +37,15 @@ def run(self):
                         self.replyGenerated.emit(chunk, True, self.__info)
             else:
                 self.__info.content = resp.response
+                # self.__info.prompt_tokens = ""
+                # self.__info.completion_tokens = ""
+                # self.__info.total_tokens = ""
+
+            self.__info.finish_reason = "stop"
+
+            if self.__input_args["stream"]:
+                self.streamFinished.emit(self.__info)
+            else:
                 self.replyGenerated.emit(self.__info.content, False, self.__info)
         except Exception as e:
             self.__info.finish_reason = "Error"
diff --git a/pyqt_openai/chat_widget/prompt_gen_widget/formPage.py b/pyqt_openai/chat_widget/prompt_gen_widget/formPage.py
@@ -44,7 +44,7 @@
 )
 from pyqt_openai.lang.translations import LangClass
 from pyqt_openai.globals import DB
-from pyqt_openai.util.script import open_directory, get_prompt_data
+from pyqt_openai.util.common import open_directory, get_prompt_data
 from pyqt_openai.widgets.button import Button
 
 
diff --git a/pyqt_openai/chat_widget/prompt_gen_widget/promptEntryDirectInputDialog.py b/pyqt_openai/chat_widget/prompt_gen_widget/promptEntryDirectInputDialog.py
@@ -11,7 +11,7 @@
 )
 
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.util.script import is_prompt_entry_name_valid, getSeparator
+from pyqt_openai.util.common import is_prompt_entry_name_valid, getSeparator
 
 
 class PromptEntryDirectInputDialog(QDialog):
diff --git a/pyqt_openai/chat_widget/prompt_gen_widget/promptGroupDirectInputDialog.py b/pyqt_openai/chat_widget/prompt_gen_widget/promptGroupDirectInputDialog.py
@@ -10,7 +10,7 @@
 )
 
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.util.script import is_prompt_group_name_valid, getSeparator
+from pyqt_openai.util.common import is_prompt_group_name_valid, getSeparator
 
 
 class PromptGroupDirectInputDialog(QDialog):
diff --git a/pyqt_openai/chat_widget/prompt_gen_widget/promptGroupExportDialog.py b/pyqt_openai/chat_widget/prompt_gen_widget/promptGroupExportDialog.py
@@ -10,7 +10,7 @@
 
 from pyqt_openai import SENTENCE_PROMPT_GROUP_SAMPLE, FORM_PROMPT_GROUP_SAMPLE
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.util.script import showJsonSample
+from pyqt_openai.util.common import showJsonSample
 from pyqt_openai.widgets.checkBoxListWidget import CheckBoxListWidget
 from pyqt_openai.widgets.jsonEditor import JSONEditor
 
diff --git a/pyqt_openai/chat_widget/prompt_gen_widget/promptGroupImportDialog.py b/pyqt_openai/chat_widget/prompt_gen_widget/promptGroupImportDialog.py
@@ -22,7 +22,7 @@
     FORM_PROMPT_GROUP_SAMPLE,
 )
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.util.script import (
+from pyqt_openai.util.common import (
     validate_prompt_group_json,
     is_prompt_group_name_valid,
     showJsonSample,
diff --git a/pyqt_openai/chat_widget/prompt_gen_widget/sentencePage.py b/pyqt_openai/chat_widget/prompt_gen_widget/sentencePage.py
@@ -44,7 +44,7 @@
 )
 from pyqt_openai.lang.translations import LangClass
 from pyqt_openai.globals import DB
-from pyqt_openai.util.script import open_directory, get_prompt_data
+from pyqt_openai.util.common import open_directory, get_prompt_data
 from pyqt_openai.widgets.button import Button
 
 
diff --git a/pyqt_openai/chat_widget/right_sidebar/llama_widget/listWidget.py b/pyqt_openai/chat_widget/right_sidebar/llama_widget/listWidget.py
@@ -15,7 +15,7 @@
 
 from pyqt_openai import TEXT_FILE_EXT_LIST, QFILEDIALOG_DEFAULT_DIRECTORY
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.util.script import getSeparator
+from pyqt_openai.util.common import getSeparator
 
 
 class FileListWidget(QWidget):
diff --git a/pyqt_openai/chat_widget/right_sidebar/modelSearchBar.py b/pyqt_openai/chat_widget/right_sidebar/modelSearchBar.py
@@ -1,7 +1,7 @@
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QLineEdit, QCompleter
 
-from pyqt_openai.util.script import get_chat_model
+from pyqt_openai.util.common import get_chat_model
 
 
 class ModelSearchBar(QLineEdit):
diff --git a/pyqt_openai/chat_widget/right_sidebar/usingAPIPage.py b/pyqt_openai/chat_widget/right_sidebar/usingAPIPage.py
@@ -35,7 +35,7 @@
 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 (
+from pyqt_openai.util.common import (
     getSeparator,
     init_llama,
 )
diff --git a/pyqt_openai/chat_widget/right_sidebar/usingG4FPage.py b/pyqt_openai/chat_widget/right_sidebar/usingG4FPage.py
@@ -11,7 +11,7 @@
 from pyqt_openai import G4F_PROVIDER_DEFAULT
 from pyqt_openai.config_loader import CONFIG_MANAGER
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.util.script import (
+from pyqt_openai.util.common import (
     get_g4f_providers,
     get_g4f_models_by_provider,
     get_chat_model,
diff --git a/pyqt_openai/customizeDialog.py b/pyqt_openai/customizeDialog.py
@@ -15,7 +15,7 @@
 from pyqt_openai.fontWidget import FontWidget
 from pyqt_openai.lang.translations import LangClass
 from pyqt_openai.models import CustomizeParamsContainer
-from pyqt_openai.util.script import getSeparator
+from pyqt_openai.util.common import getSeparator
 from pyqt_openai.widgets.circleProfileImage import RoundedImage
 from pyqt_openai.widgets.findPathWidget import FindPathWidget
 from pyqt_openai.widgets.normalImageView import NormalImageView
diff --git a/pyqt_openai/dalle_widget/dalleThread.py b/pyqt_openai/dalle_widget/dalleThread.py
@@ -4,7 +4,7 @@
 
 from pyqt_openai.models import ImagePromptContainer
 from pyqt_openai.globals import OPENAI_CLIENT
-from pyqt_openai.util.script import generate_random_prompt
+from pyqt_openai.util.common import generate_random_prompt
 
 
 class DallEThread(QThread):
diff --git a/pyqt_openai/doNotAskAgainDialog.py b/pyqt_openai/doNotAskAgainDialog.py
@@ -12,7 +12,7 @@
 )
 
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.util.script import getSeparator
+from pyqt_openai.util.common import getSeparator
 
 
 class DoNotAskAgainDialog(QDialog):
diff --git a/pyqt_openai/g4f_image_widget/g4fImageRightSideBar.py b/pyqt_openai/g4f_image_widget/g4fImageRightSideBar.py
@@ -12,7 +12,7 @@
 from pyqt_openai.config_loader import CONFIG_MANAGER
 from pyqt_openai.g4f_image_widget.g4fImageThread import G4FImageThread
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.util.script import (
+from pyqt_openai.util.common import (
     get_g4f_image_providers,
     get_g4f_image_models_from_provider,
     get_g4f_image_models,
diff --git a/pyqt_openai/g4f_image_widget/g4fImageThread.py b/pyqt_openai/g4f_image_widget/g4fImageThread.py
@@ -3,8 +3,8 @@
 from pyqt_openai import G4F_PROVIDER_DEFAULT
 from pyqt_openai.globals import G4F_CLIENT
 from pyqt_openai.models import ImagePromptContainer
-from pyqt_openai.util.replicate_script import download_image_as_base64
-from pyqt_openai.util.script import generate_random_prompt, convert_to_provider
+from pyqt_openai.util.replicate import download_image_as_base64
+from pyqt_openai.util.common import generate_random_prompt, convert_to_provider
 
 
 class G4FImageThread(QThread):
diff --git a/pyqt_openai/globals.py b/pyqt_openai/globals.py
@@ -6,12 +6,12 @@
 from openai import OpenAI
 
 from pyqt_openai.sqlite import SqliteDatabase
-from pyqt_openai.util.llamapage_script import GPTLLamaIndexWrapper
-from pyqt_openai.util.replicate_script import ReplicateWrapper
+from pyqt_openai.util.llamaindex import LlamaIndexWrapper
+from pyqt_openai.util.replicate import ReplicateWrapper
 
 DB = SqliteDatabase()
 
-LLAMAINDEX_WRAPPER = GPTLLamaIndexWrapper()
+LLAMAINDEX_WRAPPER = LlamaIndexWrapper()
 
 G4F_CLIENT = Client()
 
diff --git a/pyqt_openai/main.py b/pyqt_openai/main.py
@@ -24,7 +24,7 @@
 from pyqt_openai.config_loader import CONFIG_MANAGER
 
 from pyqt_openai.mainWindow import MainWindow
-from pyqt_openai.util.script import handle_exception
+from pyqt_openai.util.common import handle_exception
 from pyqt_openai.updateSoftwareDialog import update_software
 from pyqt_openai.sqlite import get_db_filename
 
diff --git a/pyqt_openai/mainWindow.py b/pyqt_openai/mainWindow.py
@@ -61,7 +61,7 @@
 from pyqt_openai.settings_dialog.settingsDialog import SettingsDialog
 from pyqt_openai.shortcutDialog import ShortcutDialog
 from pyqt_openai.updateSoftwareDialog import update_software
-from pyqt_openai.util.script import (
+from pyqt_openai.util.common import (
     restart_app,
     show_message_box_after_change_to_restart,
     set_auto_start_windows,
diff --git a/pyqt_openai/replicate_widget/replicateMainWidget.py b/pyqt_openai/replicate_widget/replicateMainWidget.py
@@ -23,7 +23,7 @@
 from pyqt_openai.replicate_widget.replicateRightSideBar import (
     ReplicateRightSideBarWidget,
 )
-from pyqt_openai.util.script import (
+from pyqt_openai.util.common import (
     get_image_filename_for_saving,
     open_directory,
     get_image_prompt_filename_for_saving,
diff --git a/pyqt_openai/replicate_widget/replicateThread.py b/pyqt_openai/replicate_widget/replicateThread.py
@@ -2,7 +2,7 @@
 
 from pyqt_openai.globals import REPLICATE_CLIENT
 from pyqt_openai.models import ImagePromptContainer
-from pyqt_openai.util.script import generate_random_prompt
+from pyqt_openai.util.common import generate_random_prompt
 
 
 class ReplicateThread(QThread):
diff --git a/pyqt_openai/settings_dialog/apiWidget.py b/pyqt_openai/settings_dialog/apiWidget.py
@@ -14,7 +14,7 @@
     DEFAULT_API_CONFIGS,
 )
 from pyqt_openai.config_loader import CONFIG_MANAGER
-from pyqt_openai.util.script import set_api_key
+from pyqt_openai.util.common import set_api_key
 from pyqt_openai.widgets.linkLabel import LinkLabel
 
 
diff --git a/pyqt_openai/util/common.py b/pyqt_openai/util/common.py
diff --git a/pyqt_openai/util/llamaindex.py b/pyqt_openai/util/llamaindex.py
diff --git a/pyqt_openai/util/replicate.py b/pyqt_openai/util/replicate.py
diff --git a/pyqt_openai/widgets/imageControlWidget.py b/pyqt_openai/widgets/imageControlWidget.py
diff --git a/pyqt_openai/widgets/imageMainWidget.py b/pyqt_openai/widgets/imageMainWidget.py
diff --git a/pyqt_openai/widgets/inputDialog.py b/pyqt_openai/widgets/inputDialog.py

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`UploadedImageFileWidget,`
`42`	`42`	`)`
`43`	`43`	`from pyqt_openai.lang.translations import LangClass`
`44`		`-from pyqt_openai.util.script import (`
	`44`	`+from pyqt_openai.util.common import (`
`45`	`45`	`get_content_of_text_file_for_send,`
`46`	`46`	`RecorderThread,`
`47`	`47`	`STTThread,`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`CustomizeParamsContainer,`
`44`	`44`	`)`
`45`	`45`	`from pyqt_openai.globals import DB, LLAMAINDEX_WRAPPER`
`46`		`-from pyqt_openai.util.script import (`
	`46`	`+from pyqt_openai.util.common import (`
`47`	`47`	`open_directory,`
`48`	`48`	`get_generic_ext_out_of_qt_ext,`
`49`	`49`	`message_list_to_txt,`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`HOW_TO_EXPORT_CHATGPT_CONVERSATION_HISTORY_URL,`
`22`	`22`	`)`
`23`	`23`	`from pyqt_openai.lang.translations import LangClass`
`24`		`-from pyqt_openai.util.script import (`
	`24`	`+from pyqt_openai.util.common import (`
`25`	`25`	`get_chatgpt_data_for_import,`
`26`	`26`	`get_chatgpt_data_for_preview,`
`27`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`)`
`45`	`45`	`from pyqt_openai.lang.translations import LangClass`
`46`	`46`	`from pyqt_openai.globals import DB`
`47`		`-from pyqt_openai.util.script import open_directory, get_prompt_data`
	`47`	`+from pyqt_openai.util.common import open_directory, get_prompt_data`
`48`	`48`	`from pyqt_openai.widgets.button import Button`
`49`	`49`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`from pyqt_openai.lang.translations import LangClass`
`14`		`-from pyqt_openai.util.script import is_prompt_entry_name_valid, getSeparator`
	`14`	`+from pyqt_openai.util.common import is_prompt_entry_name_valid, getSeparator`
`15`	`15`
`16`	`16`
`17`	`17`	`class PromptEntryDirectInputDialog(QDialog):`