Merge pull request #174 from yjg30737/feature/general

v1.6.0

Author: yjg30737

pyproject.toml

@@ -16,6 +16,7 @@ dependencies = [
     "requests",
     "pyaudio",
     "pillow",
+    "psutil",
 
     "openai",
     "anthropic",
@@ -24,7 +25,9 @@ dependencies = [
     "replicate",
 
     "g4f",
-    "curl_cffi"
+    "curl_cffi",
+
+    "edge-tts"
 ]
 keywords = ['openai', 'pyqt', 'pyqt5', 'pyqt6', 'pyside6', 'desktop', 'app', 'chatbot', 'gpt', 'replicate', 'gemini', 'claude', 'llama', 'llm', 'gpt4free']
 

pyqt_openai/__init__.py

@@ -199,6 +199,8 @@ def move_updater():
 ICON_PAYPAL = os.path.join(ICON_PATH, "paypal.png")
 ICON_KOFI = os.path.join(ICON_PATH, "kofi.png")
 ICON_PATREON = os.path.join(ICON_PATH, "patreon.svg")
+ICON_SHORTCUT = os.path.join(ICON_PATH, "shortcut.svg")
+ICON_REALTIME_API = os.path.join(ICON_PATH, "realtime_api.svg")
 
 ## CUSTOMIZE
 DEFAULT_ICON_SIZE = (24, 24)
@@ -243,7 +245,6 @@ def move_updater():
 DEFAULT_SHORTCUT_PROMPT_ENDING = "Ctrl+E"
 DEFAULT_SHORTCUT_SUPPORT_PROMPT_COMMAND = "Ctrl+Shift+P"
 DEFAULT_SHORTCUT_STACK_ON_TOP = "Ctrl+Shift+S"
-DEFAULT_SHORTCUT_SHOW_TOOLBAR = "Ctrl+T"
 DEFAULT_SHORTCUT_SHOW_SECONDARY_TOOLBAR = "Ctrl+Shift+T"
 DEFAULT_SHORTCUT_FOCUS_MODE = "F10"
 DEFAULT_SHORTCUT_FULL_SCREEN = "F11"
@@ -288,7 +289,6 @@ def move_updater():
 PROMPT_JSON_KEY_NAME = "prompt_json"
 PROMPT_MAIN_KEY_NAME = "prompt_main"
 PROMPT_END_KEY_NAME = "prompt_ending"
-PROMPT_NAME_REGEX = "^[a-zA-Z_0-9]+$"
 INDENT_SIZE = 4
 NOTIFIER_MAX_CHAR = 100
 
@@ -355,8 +355,16 @@ def move_updater():
 WHISPER_TTS_VOICE_TYPE = ["alloy", "echo", "fable", "onyx", "nova", "shimmer"]
 WHISPER_TTS_VOICE_SPEED_RANGE = 0.25, 4.0
 WHISPER_TTS_MODEL = "tts-1"
-WHISPER_TTS_DEFAULT_VOICE = "alloy"
-WHISPER_TTS_DEFAULT_SPEED = 1.0
+
+## EDGE-TTS (TTS)
+EDGE_TTS_VOICE_TYPE = ["en-GB-SoniaNeural", "en-US-GuyNeural", "en-US-JennyNeural", "en-US-AvaMultilingualNeural"]
+
+# TTS in general
+TTS_DEFAULT_PROVIDER = "OpenAI"
+TTS_DEFAULT_VOICE = "alloy"
+TTS_DEFAULT_SPEED = 1.0
+TTS_DEFAULT_AUTO_PLAY = False
+TTS_DEFAULT_AUTO_STOP_SILENCE_DURATION = 3
 
 STT_MODEL = "whisper-1"
 
@@ -413,6 +421,8 @@ def move_updater():
 
 G4F_USE_CHAT_HISTORY = True
 
+G4F_DEFAULT_IMAGE_MODEL = "flux"
+
 # Dictionary that stores the platform and model pairs
 PROVIDER_MODEL_DICT = {
     "OpenAI": ["gpt-4o", "gpt-4o-mini"] + O1_MODELS,
@@ -628,7 +638,6 @@ def move_updater():
         "notify_finish": True,
         "temperature": 1,
         "max_tokens": -1,
-        "show_toolbar": True,
         "show_secondary_toolbar": True,
         "top_p": 1,
         "chat_column_to_show": ["id", "name", "insert_dt", "update_dt"],
@@ -662,16 +671,23 @@ def move_updater():
         "llama_index_directory": "",
         "apply_user_defined_styles": False,
         "focus_mode": False,
-        "voice": WHISPER_TTS_DEFAULT_VOICE,
-        "voice_speed": WHISPER_TTS_DEFAULT_SPEED,
         "OPENAI_API_KEY": "",
         "GEMINI_API_KEY": "",
         "CLAUDE_API_KEY": "",
         "LLAMA_API_KEY": "",
+        'show_realtime_api': False,
+
         # G4F
         "g4f_model": DEFAULT_LLM,
         "provider": G4F_PROVIDER_DEFAULT,
         "g4f_use_chat_history": G4F_USE_CHAT_HISTORY,
+
+        # STT and TTS settings
+        "voice_provider": TTS_DEFAULT_PROVIDER,
+        "voice": TTS_DEFAULT_VOICE,
+        "voice_speed": TTS_DEFAULT_SPEED,
+        "auto_play_voice": TTS_DEFAULT_AUTO_PLAY,
+        "auto_stop_silence_duration": TTS_DEFAULT_AUTO_STOP_SILENCE_DURATION
     },
     "DALLE": {
         "quality": "standard",
@@ -712,7 +728,8 @@ def move_updater():
         "negative_prompt": "ugly, deformed, noisy, blurry, distorted",
     },
     "G4F_IMAGE": {
-        "model": "flux",
+        "model": G4F_DEFAULT_IMAGE_MODEL,
+        "provider": G4F_PROVIDER_DEFAULT,
 
         "show_history": True,
         "show_setting": True,

pyqt_openai/chat_widget/center/aiChatUnit.py

@@ -110,13 +110,15 @@ def __speak(self, f):
         if f:
             text = self._lbl.toPlainText()
             if text:
+                voice_provider = CONFIG_MANAGER.get_general_property("voice_provider")
+
                 args = {
                     "model": WHISPER_TTS_MODEL,
                     "voice": CONFIG_MANAGER.get_general_property("voice"),
                     "input": text,
                     "speed": CONFIG_MANAGER.get_general_property("voice_speed"),
                 }
-                self.thread = stream_to_speakers(args)
+                self.thread = stream_to_speakers(voice_provider, args)
                 self.thread.finished.connect(self.__on_thread_complete)
                 self.thread.errorGenerated.connect(
                     lambda x: QMessageBox.critical(self, "Error", x)

pyqt_openai/chat_widget/center/commandSuggestionWidget.py

@@ -1,9 +1,12 @@
+from PySide6.QtCore import Signal
 from PySide6.QtWidgets import QListWidget, QWidget, QVBoxLayout, QLabel
 
 from pyqt_openai.lang.translations import LangClass
 
 
 class CommandSuggestionWidget(QWidget):
+    toggleCommandSuggestion = Signal(bool)
+
     def __init__(self, parent=None):
         super().__init__(parent)
         self.__initUi()
@@ -29,3 +32,9 @@ def onCountChanged(self):
         scrollbarHeight = self.__commandList.verticalScrollBar().sizeHint().height()
         totalHeight = contentHeight + itemHeight
         self.setMaximumHeight(totalHeight + scrollbarHeight)
+
+    def showEvent(self, event):
+        self.toggleCommandSuggestion.emit(True)
+
+    def hideEvent(self, event):
+        self.toggleCommandSuggestion.emit(False)

pyqt_openai/chat_widget/center/prompt.py

@@ -47,6 +47,7 @@
     STTThread,
 )
 from pyqt_openai.widgets.button import Button
+from pyqt_openai.widgets.jsonEditor import JSONEditor
 from pyqt_openai.widgets.toolButton import ToolButton
 
 
@@ -86,6 +87,9 @@ def __initUi(self):
 
         # Create the command suggestion list
         self.__suggestionWidget = CommandSuggestionWidget()
+        self.__suggestionWidget.toggleCommandSuggestion.connect(
+            self.__setCommandSuggestionEnabled
+        )
         self.__suggestion_list = self.__suggestionWidget.getCommandList()
 
         self.__uploadedImageFileWidget = UploadedImageFileWidget()
@@ -246,6 +250,13 @@ def __getEveryPromptCommands(self, get_name_only=False):
             return [obj["name"] for obj in self.__p_grp]
         return self.__p_grp
 
+    def __setCommandSuggestionEnabled(self, f):
+        for w in self.__textEditGroup.getGroup().values():
+            if isinstance(w, JSONEditor):
+                pass
+            else:
+                w.setCommandSuggestionEnabled(f)
+
     def __updateSuggestions(self):
         w = self.__textEditGroup.getCurrentTextEdit()
         if w and self.__commandEnabled:
@@ -256,7 +267,6 @@ def __updateSuggestions(self):
                 input_text_chunk = input_text_chunk[-1]
                 starts_with_f = input_text_chunk.startswith("/")
                 self.__suggestionWidget.setVisible(starts_with_f)
-                w.setCommandSuggestionEnabled(starts_with_f)
                 if starts_with_f:
                     command_word = input_text_chunk[1:]
                     # Set every prompt commands first
@@ -299,7 +309,7 @@ def showWidgetInPromptDuringResponse(self, f):
         self.__controlWidgetDuringGeneration.setVisible(f)
 
     def executeCommand(self, item):
-        self.__textEditGroup.executeCommand(item, self.__p_grp)
+        self.__textEditGroup.showPromptContent(item, self.__p_grp)
 
     def updateHeight(self):
         overallHeight = self.__textEditGroup.adjustHeight()
@@ -338,7 +348,6 @@ def __showEnding(self, f):
 
     def __supportPromptCommand(self, f):
         self.__commandEnabled = f
-        self.__textEditGroup.setCommandEnabled(f)
 
     def __readingFiles(self):
         filenames = QFileDialog.getOpenFileNames(

pyqt_openai/chat_widget/center/realtimeApiWidget.py

@@ -0,0 +1,22 @@
+from PySide6.QtWidgets import QWidget, QVBoxLayout, QLabel
+from PySide6.QtGui import QFont
+from PySide6.QtCore import Qt
+
+from pyqt_openai import LARGE_LABEL_PARAM
+
+
+class RealtimeApiWidget(QWidget):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.initUI()
+
+    def initUI(self):
+        lay = QVBoxLayout()
+
+        title = QLabel('Coming Soon...', self)
+        title.setFont(QFont(*LARGE_LABEL_PARAM))
+        title.setAlignment(Qt.AlignmentFlag.AlignCenter)
+
+        lay.addWidget(title)
+
+        self.setLayout(lay)

pyqt_openai/chat_widget/center/textEditPromptGroup.py

@@ -50,7 +50,10 @@ def __initUi(self):
         lay = QVBoxLayout()
         for w in self.__textGroup.values():
             # Connect every group text edit widget to the signal
-            w.textChanged.connect(self.onUpdateSuggestion)
+            if isinstance(w, JSONEditor):
+                pass
+            else:
+                w.textChanged.connect(self.onUpdateSuggestion)
             w.textChanged.connect(self.textChanged)
             w.moveCursorToOtherPrompt.connect(self.__moveCursorToOtherPrompt)
 
@@ -70,7 +73,7 @@ def __initUi(self):
         self.__textGroup[PROMPT_MAIN_KEY_NAME].installEventFilter(self)
         self.__textGroup[PROMPT_MAIN_KEY_NAME].handleDrop.connect(self.handleDrop)
 
-    def executeCommand(self, item, grp):
+    def showPromptContent(self, item, grp):
         command_key = item.text()
         command = ""
         for i in range(len(grp)):
@@ -81,7 +84,7 @@ def executeCommand(self, item, grp):
         if w:
             cursor = w.textCursor()
             cursor.deletePreviousChar()
-            cursor.select(QTextCursor.WordUnderCursor)
+            cursor.select(QTextCursor.SelectionType.WordUnderCursor)
             w.setTextCursor(cursor)
             w.insertPlainText(command)
 
@@ -92,11 +95,6 @@ def getCurrentTextEdit(self):
             if w.hasFocus():
                 return w
 
-    def setCommandEnabled(self, f: bool):
-        for w in self.__textGroup.values():
-            if isinstance(w, TextEditPrompt):
-                w.setCommandSuggestionEnabled(f)
-
     def adjustHeight(self) -> int:
         """
         Adjust overall height of text edit group based on their contents and return adjusted height

pyqt_openai/chat_widget/chatMainWidget.py

@@ -8,7 +8,7 @@
     QSplitter,
     QFileDialog,
     QMessageBox,
-    QPushButton,
+    QPushButton, QStackedWidget,
 )
 
 from pyqt_openai import (
@@ -22,8 +22,9 @@
     DEFAULT_SHORTCUT_LEFT_SIDEBAR_WINDOW,
     DEFAULT_SHORTCUT_CONTROL_PROMPT_WINDOW,
     DEFAULT_SHORTCUT_RIGHT_SIDEBAR_WINDOW,
-    QFILEDIALOG_DEFAULT_DIRECTORY,
+    QFILEDIALOG_DEFAULT_DIRECTORY, ICON_REALTIME_API,
 )
+from pyqt_openai.chat_widget.center.realtimeApiWidget import RealtimeApiWidget
 from pyqt_openai.config_loader import CONFIG_MANAGER
 from pyqt_openai.chat_widget.center.chatWidget import ChatWidget
 from pyqt_openai.chat_widget.left_sidebar.chatNavWidget import ChatNavWidget
@@ -61,6 +62,7 @@ def __initVal(self):
         self.__notify_finish = CONFIG_MANAGER.get_general_property("notify_finish")
 
         self.__show_chat_list = CONFIG_MANAGER.get_general_property("show_chat_list")
+        self.__show_realtime_api = CONFIG_MANAGER.get_general_property("show_realtime_api")
         self.__show_setting = CONFIG_MANAGER.get_general_property("show_setting")
         self.__show_prompt = CONFIG_MANAGER.get_general_property("show_prompt")
 
@@ -83,6 +85,8 @@ def __initUi(self):
         self.__chatWidget.addThread.connect(self.__addThread)
         self.__chatWidget.onMenuCloseClicked.connect(self.__onMenuCloseClicked)
 
+        self.__realtimeApiWidget = RealtimeApiWidget()
+
         self.__browser = self.__chatWidget.getChatBrowser()
 
         self.__chatRightSideBarWidget = ChatRightSideBarWidget()
@@ -112,6 +116,15 @@ def __initUi(self):
         self.__sideBarBtn.toggled.connect(self.toggleSideBar)
         self.__sideBarBtn.setShortcut(DEFAULT_SHORTCUT_LEFT_SIDEBAR_WINDOW)
 
+        self.__useRealtimeApiBtn = Button()
+        self.__useRealtimeApiBtn.setStyleAndIcon(ICON_REALTIME_API)
+        self.__useRealtimeApiBtn.setToolTip(
+            LangClass.TRANSLATIONS["Use Realtime API"]
+        )
+        self.__useRealtimeApiBtn.setCheckable(True)
+        self.__useRealtimeApiBtn.setChecked(self.__show_realtime_api)
+        self.__useRealtimeApiBtn.toggled.connect(self.toggleRealtimeApiScreen)
+
         self.__settingBtn = Button()
         self.__settingBtn.setStyleAndIcon(ICON_SETTING)
         self.__settingBtn.setToolTip(
@@ -146,6 +159,7 @@ def __initUi(self):
 
         lay = QHBoxLayout()
         lay.addWidget(self.__sideBarBtn)
+        lay.addWidget(self.__useRealtimeApiBtn)
         lay.addWidget(self.__settingBtn)
         lay.addWidget(self.__promptBtn)
         lay.addWidget(sep)
@@ -181,9 +195,14 @@ def __initUi(self):
             """
         )
 
+        self.__centerWidget = QStackedWidget()
+        self.__centerWidget.addWidget(self.__chatWidget)
+        self.__centerWidget.addWidget(self.__realtimeApiWidget)
+        self.__centerWidget.setCurrentIndex(1 if self.__show_realtime_api else 0)
+
         mainWidget = QSplitter()
         mainWidget.addWidget(self.__chatNavWidget)
-        mainWidget.addWidget(self.__chatWidget)
+        mainWidget.addWidget(self.__centerWidget)
         mainWidget.addWidget(self.__rightSideBar)
         mainWidget.setSizes([100, 500, 400])
         mainWidget.setChildrenCollapsible(False)
@@ -221,6 +240,11 @@ def toggleSideBar(self, x):
         self.__show_chat_list = x
         CONFIG_MANAGER.set_general_property("show_chat_list", self.__show_chat_list)
 
+    def toggleRealtimeApiScreen(self, x):
+        self.__centerWidget.setCurrentIndex(1 if x else 0)
+        self.__show_realtime_api = x
+        CONFIG_MANAGER.set_general_property("show_realtime_api", self.__show_realtime_api)
+
     def toggleSetting(self, x):
         self.__chatRightSideBarWidget.setVisible(x)
         self.__show_setting = x

pyqt_openai/chat_widget/prompt_gen_widget/promptEntryDirectInputDialog.py

@@ -29,16 +29,9 @@ def __initUi(self):
 
         self.__name = QLineEdit()
         self.__name.setPlaceholderText(LangClass.TRANSLATIONS["Name"])
-        self.__name.textChanged.connect(
-            lambda x: self.__okBtn.setEnabled(x.strip() != "")
-        )
 
         self.__content = QPlainTextEdit()
         self.__content.setPlaceholderText(LangClass.TRANSLATIONS["Content"])
-        self.__content.textChanged.connect(
-            lambda x: self.__name.text().strip() != ""
-            and self.__okBtn.setEnabled(x.strip() != "")
-        )
 
         sep = getSeparator("horizontal")
 
@@ -68,6 +61,9 @@ def __initUi(self):
     def getPromptName(self):
         return self.__name.text()
 
+    def getPromptContent(self):
+        return self.__content.toPlainText()
+
     def __accept(self):
         exists_f = is_prompt_entry_name_valid(self.__group_id, self.__name.text())
         if exists_f: