Merge pull request #156 from yjg30737/Dev

v1.4.0

Author: yjg30737

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyqt-openai"
-version = "1.3.0"
+version = "1.4.0"
 description = "Python multipurpose chatbot that user can use GPT, other AI models altogether (Release Name: VividNode)"
 authors = [{ name = "Jung Gyu Yoon", email = "[email protected]" }]
 license = { text = "MIT" }
@@ -25,7 +25,7 @@ dependencies = [
     "g4f",
     "curl_cffi"
 ]
-keywords = ['openai', 'pyqt', 'pyqt5', 'pyqt6', 'pyside6', 'desktop', 'app', 'chatbot', 'gpt', 'replicate', 'gemini', 'claude', 'llama', 'llm']
+keywords = ['openai', 'pyqt', 'pyqt5', 'pyqt6', 'pyside6', 'desktop', 'app', 'chatbot', 'gpt', 'replicate', 'gemini', 'claude', 'llama', 'llm', 'gpt4free']
 
 requires-python = ">= 3.11"
 # 3.11

pyqt_openai/__init__.py

@@ -186,6 +186,8 @@ def move_updater():
 ICON_SEND = os.path.join(ICON_PATH, 'send.svg')
 ICON_RECORD = os.path.join(ICON_PATH, 'record.svg')
 ICON_SPEAKER = os.path.join(ICON_PATH, 'speaker.svg')
+ICON_PAYPAL = os.path.join(ICON_PATH, 'paypal.png')
+ICON_KOFI = os.path.join(ICON_PATH, 'kofi.png')
 
 ## CUSTOMIZE
 DEFAULT_ICON_SIZE = (24, 24)
@@ -247,7 +249,14 @@ def move_updater():
 MAIN_INDEX = 'main.py'
 IMAGE_DEFAULT_SAVE_DIRECTORY = 'image_result'
 INI_FILE_NAME = os.path.join(get_config_directory(), 'config.yaml')
-LANGUAGE_FILE = os.path.join(get_config_directory(), 'translations.json')
+LANGUAGE_FILE_BASE_NAME = 'translations.json'
+LANGUAGE_FILE = os.path.join(get_config_directory(), LANGUAGE_FILE_BASE_NAME)
+LANGUAGE_FILE_SRC = os.path.join(os.path.join(EXEC_PATH, 'lang'), LANGUAGE_FILE_BASE_NAME)
+
+# Make sure the language file exists
+if not os.path.exists(LANGUAGE_FILE):
+    shutil.copy(LANGUAGE_FILE_SRC, LANGUAGE_FILE)
+
 
 DB_FILE_NAME = 'conv'
 FILE_NAME_LENGTH = 32
@@ -355,6 +364,8 @@ def move_updater():
 # This doesn't need endpoint
 DALLE_ARR = ['dall-e-2', 'dall-e-3']
 
+DEFAULT_DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+
 OPENAI_CHAT_ENDPOINT = '/v1/chat/completions'
 
 # Other models' configuration data
@@ -392,6 +403,8 @@ def move_updater():
 
 G4F_PROVIDER_DEFAULT = 'Auto'
 
+G4F_USE_CHAT_HISTORY = True
+
 # Dictionary that stores the platform and model pairs
 PROVIDER_MODEL_DICT = {
     'OpenAI': ['gpt-4o', 'gpt-4o-mini']+O1_MODELS,
@@ -529,7 +542,12 @@ def move_updater():
         'OPENAI_API_KEY': '',
         'GEMINI_API_KEY': '',
         'CLAUDE_API_KEY': '',
-        'LLAMA_API_KEY': ''
+        'LLAMA_API_KEY': '',
+
+        # G4F
+        'g4f_model': DEFAULT_LLM,
+        'provider': G4F_PROVIDER_DEFAULT,
+        'g4f_use_chat_history': G4F_USE_CHAT_HISTORY,
     },
     'DALLE': {
         'quality': 'standard',

pyqt_openai/chat_widget/center/aiChatUnit.py

@@ -6,7 +6,8 @@
 from pyqt_openai.chat_widget.center.chatUnit import ChatUnit
 from pyqt_openai.chat_widget.center.responseInfoDialog import ResponseInfoDialog
 from pyqt_openai.models import ChatMessageContainer
-from pyqt_openai.globals import DB, stream_to_speakers
+from pyqt_openai.globals import DB
+from pyqt_openai.util.script import stream_to_speakers
 from pyqt_openai.widgets.button import Button
 
 

pyqt_openai/chat_widget/center/chatWidget.py

@@ -4,13 +4,14 @@
 from PySide6.QtCore import Signal
 from PySide6.QtWidgets import QStackedWidget, QWidget, QSizePolicy, QHBoxLayout, QVBoxLayout, QMessageBox
 
-from pyqt_openai.config_loader import CONFIG_MANAGER
-from pyqt_openai.globals import LLAMAINDEX_WRAPPER, DB, get_openai_chat_model, get_argument, ChatThread
 from pyqt_openai.chat_widget.center.chatBrowser import ChatBrowser
 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.chatThread import LlamaOpenAIThread
+from pyqt_openai.chat_widget.llamaOpenAIThread import LlamaOpenAIThread
+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.lang.translations import LangClass
 from pyqt_openai.models import ChatMessageContainer
 from pyqt_openai.widgets.notifier import NotifierWidget
@@ -21,7 +22,7 @@ class ChatWidget(QWidget):
     onMenuCloseClicked = Signal()
 
     def __init__(self, parent=None):
-        super(ChatWidget, self).__init__(parent)
+        super().__init__(parent)
         self.__initVal()
         self.__initUi()
 
@@ -115,7 +116,7 @@ def __chat(self):
         try:
             # Get necessary parameters
             stream = CONFIG_MANAGER.get_general_property('stream')
-            model = CONFIG_MANAGER.get_general_property('model')
+            model = CONFIG_MANAGER.get_general_property('g4f_model') if self.__is_g4f else CONFIG_MANAGER.get_general_property('model')
             system = CONFIG_MANAGER.get_general_property('system')
             temperature = CONFIG_MANAGER.get_general_property('temperature')
             max_tokens = CONFIG_MANAGER.get_general_property('max_tokens')
@@ -125,11 +126,16 @@ def __chat(self):
             presence_penalty = CONFIG_MANAGER.get_general_property('presence_penalty')
             use_llama_index = CONFIG_MANAGER.get_general_property('use_llama_index')
             use_max_tokens = CONFIG_MANAGER.get_general_property('use_max_tokens')
+            provider = CONFIG_MANAGER.get_general_property('provider')
+            g4f_use_chat_history = CONFIG_MANAGER.get_general_property('g4f_use_chat_history')
 
             # Get image files
             images = self.__prompt.getImageBuffers()
 
-            messages = self.__browser.getMessages(CONFIG_MANAGER.get_general_property('maximum_messages_in_parameter'))
+            maximum_messages_in_parameter = CONFIG_MANAGER.get_general_property('maximum_messages_in_parameter')
+            messages = self.__browser.getMessages(maximum_messages_in_parameter)
+            if self.__is_g4f and not g4f_use_chat_history:
+                messages = []
 
             cur_text = self.__prompt.getContent()
 
@@ -197,7 +203,7 @@ def __chat(self):
                 # Run a different thread based on whether the llama-index is enabled or not.
                 self.__t = LlamaOpenAIThread(param, container, LLAMAINDEX_WRAPPER, query_text)
             else:
-                self.__t = ChatThread(param, info=container, is_g4f=self.__is_g4f)
+                self.__t = ChatThread(param, info=container, is_g4f=self.__is_g4f, provider=provider)
 
             self.__t.started.connect(self.__beforeGenerated)
             self.__t.replyGenerated.connect(self.__browser.showLabel)

pyqt_openai/chat_widget/center/messageTextBrowser.py

@@ -51,7 +51,7 @@ def adjustBrowserHeight(self):
             self.setMinimumHeight(int(max_height))
         self.verticalScrollBar().setSliderPosition(self.verticalScrollBar().maximum())
 
-    # TODO WILL_BE_IMPLEMENTED AFTER v1.3.0
+    # TODO WILL_BE_IMPLEMENTED AFTER v1.4.0
     def setMarkdown(self, markdown: str) -> None:
         super().setMarkdown(markdown)
         # Convert markdown to HTML using QTextDocument

pyqt_openai/chat_widget/center/prompt.py

@@ -11,12 +11,12 @@
     IMAGE_FILE_EXT_LIST, \
     TEXT_FILE_EXT_LIST, QFILEDIALOG_DEFAULT_DIRECTORY, DEFAULT_SHORTCUT_SEND, DEFAULT_SHORTCUT_RECORD, ICON_RECORD
 from pyqt_openai.config_loader import CONFIG_MANAGER
-from pyqt_openai.globals import DB, STTThread, RecorderThread
+from pyqt_openai.globals import DB
 from pyqt_openai.chat_widget.center.commandSuggestionWidget import CommandSuggestionWidget
 from pyqt_openai.chat_widget.center.textEditPromptGroup import TextEditPromptGroup
 from pyqt_openai.chat_widget.center.uploadedImageFileWidget import UploadedImageFileWidget
 from pyqt_openai.lang.translations import LangClass
-from pyqt_openai.util.script import get_content_of_text_file_for_send
+from pyqt_openai.util.script import get_content_of_text_file_for_send, RecorderThread, STTThread
 from pyqt_openai.widgets.button import Button
 from pyqt_openai.widgets.toolButton import ToolButton
 

pyqt_openai/chat_widget/chatMainWidget.py

@@ -52,6 +52,7 @@ def __initUi(self):
 
         self.__chatRightSideBarWidget = ChatRightSideBarWidget()
         self.__chatRightSideBarWidget.onToggleJSON.connect(self.__chatWidget.toggleJSON)
+
         self.__chatRightSideBarWidget.onTabChanged.connect(self.__chatWidget.setG4F)
 
         self.__chatWidget.setG4F(self.__chatRightSideBarWidget.currentTabIdx())

pyqt_openai/chat_widget/chatThread.py renamed to pyqt_openai/chat_widget/llamaOpenAIThread.py

@@ -1,9 +1,12 @@
 from llama_index.core.base.response.schema import StreamingResponse
 from PySide6.QtCore import QThread, Signal
 
+import pyqt_openai.util.script
 from pyqt_openai.models import ChatMessageContainer
 
 
+# TODO
+# Should combine with ChatThread
 class LlamaOpenAIThread(QThread):
     replyGenerated = Signal(str, bool, ChatMessageContainer)
     streamFinished = Signal(ChatMessageContainer)
@@ -24,7 +27,7 @@ def stop(self):
 
     def run(self):
         try:
-            resp = self.__wrapper.get_response(self.__query_text)
+            resp = pyqt_openai.util.script.get_response(self.__query_text)
             f = isinstance(resp, StreamingResponse)
             if f:
                 for response_text in resp.response_gen:

pyqt_openai/chat_widget/right_sidebar/apiWidget.py

@@ -3,9 +3,9 @@
     QDialogButtonBox, QWidget, QPushButton
 
 from pyqt_openai import HOW_TO_GET_OPENAI_API_KEY_URL, HOW_TO_GET_CLAUDE_API_KEY_URL, HOW_TO_GET_GEMINI_API_KEY_URL, \
-    HOW_TO_GET_LLAMA_API_KEY_URL, DEFAULT_API_CONFIGS
+    HOW_TO_GET_LLAMA_API_KEY_URL, DEFAULT_API_CONFIGS, HOW_TO_REPLICATE
 from pyqt_openai.config_loader import CONFIG_MANAGER
-from pyqt_openai.globals import set_api_key
+from pyqt_openai.util.script import set_api_key
 from pyqt_openai.widgets.linkLabel import LinkLabel
 
 
@@ -33,13 +33,21 @@ def __initVal(self):
             }
             self.__api_keys.append(_conf)
 
+        # Add REPLICATE API
+        self.__api_keys.append({
+            'display_name': 'Replicate',
+            'env_var_name': 'REPLICATE_API_TOKEN',
+            'api_key': CONFIG_MANAGER.get_replicate_property('REPLICATE_API_TOKEN')
+        })
+
         # Set "get api key" here
         for i, obj in enumerate(self.__api_keys):
             obj['get_api_key'] = {
                 'OpenAI': HOW_TO_GET_OPENAI_API_KEY_URL,
                 'Claude': HOW_TO_GET_CLAUDE_API_KEY_URL,
                 'Gemini': HOW_TO_GET_GEMINI_API_KEY_URL,
-                'Llama': HOW_TO_GET_LLAMA_API_KEY_URL
+                'Llama': HOW_TO_GET_LLAMA_API_KEY_URL,
+                'Replicate': HOW_TO_REPLICATE
             }[obj['display_name']]
 
     def __initUi(self):
@@ -87,5 +95,8 @@ def setApiKeys(self):
         api_keys = {self.__api_keys[i]['env_var_name']: self.__tableWidget.cellWidget(i, 1).text() for i in range(self.__tableWidget.rowCount())}
         # Save the api keys to the conf file
         for k, v in api_keys.items():
-            CONFIG_MANAGER.set_general_property(k, v)
+            if k == 'REPLICATE_API_TOKEN':
+                CONFIG_MANAGER.set_replicate_property(k, v)
+            else:
+                CONFIG_MANAGER.set_general_property(k, v)
             set_api_key(k, v)

pyqt_openai/chat_widget/right_sidebar/usingAPIPage.py

@@ -5,11 +5,10 @@
 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 init_llama, get_openai_chat_model
-from pyqt_openai.util.script import getSeparator, get_chat_model
+from pyqt_openai.settings_dialog.settingsDialog import SettingsDialog
+from pyqt_openai.util.script import getSeparator, get_chat_model, get_openai_chat_model, init_llama
 from pyqt_openai.widgets.linkLabel import LinkLabel
 
 
@@ -76,7 +75,30 @@ def __initUi(self):
         lay.addWidget(modelCmbBox)
         lay.setContentsMargins(0, 0, 0, 0)
 
-        apiWidget = ApiWidget()
+        # TODO LANGUAGE
+        setApiBtn = QPushButton('Set API Key')
+        setApiBtn.clicked.connect(lambda _: SettingsDialog(default_index=1, parent=self).exec_())
+        setApiBtn.setStyleSheet('''
+        QPushButton {
+            background-color: #007BFF;
+            color: white;
+            border-radius: 8px;
+            padding: 10px 20px;
+            font-size: 16px;
+            font-family: "Arial";
+            font-weight: bold;
+            border: 2px solid #007BFF;
+        }
+        QPushButton:hover {
+            background-color: #0056b3;
+            border-color: #0056b3;
+        }
+        QPushButton:pressed {
+            background-color: #003f7f;
+            border-color: #003f7f;
+        }
+        '''
+        )
 
         selectModelWidget = QWidget()
         selectModelWidget.setLayout(lay)
@@ -86,10 +108,7 @@ def __initUi(self):
         self.__warningLbl.setVisible(False)
 
         # TODO WILL_BE_REMOVED_AFTER v1.5.0
-        self.__warningLbl.setText('Currently LlamaIndex, JSON mode, and Image input are only available for the OpenAI Chat model.\n'
-        # TODO WILL_BE_REMOVED_AFTER v1.3.0
-                                  'Also you have to get OpenAI API key to use these features.\n'
-                                  'I will update this soon.')
+        self.__warningLbl.setText('Currently LlamaIndex, JSON mode, and Image input are only available for the OpenAI Chat model.')
         self.__warningLbl.setWordWrap(True)
 
         advancedSettingsScrollArea = QScrollArea()
@@ -196,7 +215,7 @@ def __initUi(self):
         lay.addWidget(self.__systemTextEdit)
         lay.addWidget(saveSystemBtn)
         lay.addWidget(getSeparator('horizontal'))
-        lay.addWidget(apiWidget)
+        lay.addWidget(setApiBtn)
         lay.addWidget(selectModelWidget)
         lay.addWidget(self.__warningLbl)
         lay.addWidget(streamChkBox)