Merge pull request #123 from yjg30737/feature/general

Feature/general -> Dev 2

Author: yjg30737

pyqt_openai/chatNavWidget.py

@@ -1,6 +1,6 @@
 from qtpy.QtCore import Signal, QSortFilterProxyModel, Qt
 from qtpy.QtSql import QSqlTableModel, QSqlQuery
-from qtpy.QtWidgets import QWidget, QVBoxLayout, QMessageBox, QStyledItemDelegate, QTableView, \
+from qtpy.QtWidgets import QWidget, QVBoxLayout, QMessageBox, QPushButton, QStyledItemDelegate, QTableView, \
     QAbstractItemView, \
     QHBoxLayout, \
     QLabel, QSpacerItem, QSizePolicy, QFileDialog, QComboBox, QDialog
@@ -61,6 +61,7 @@ class ChatNavWidget(QWidget):
     onImport = Signal(str)
     onExport = Signal(list)
     onChatGPTImport = Signal(list)
+    onFavoriteClicked = Signal(bool)
 
     def __init__(self, columns, table_nm):
         super().__init__()
@@ -146,7 +147,7 @@ def __initUi(self):
             self.__model.setHeaderData(i, Qt.Orientation.Horizontal, self.__columns[i])
         self.__model.select()
         # descending order by insert date
-        idx = self.__columns.index('insert_dt')
+        idx = self.__columns.index(THREAD_ORDERBY)
         self.__model.sort(idx, Qt.SortOrder.DescendingOrder)
 
         # init the proxy model
@@ -174,9 +175,14 @@ def __initUi(self):
         self.__tableView.clicked.connect(self.__clicked)
         self.__tableView.activated.connect(self.__clicked)
 
+        self.__favoriteBtn = QPushButton('Favorite List')
+        self.__favoriteBtn.setCheckable(True)
+        self.__favoriteBtn.toggled.connect(self.__onFavoriteClicked)
+
         lay = QVBoxLayout()
         lay.addWidget(menuWidget)
         lay.addWidget(self.__tableView)
+        lay.addWidget(self.__favoriteBtn)
         self.setLayout(lay)
 
         self.refreshData()
@@ -231,11 +237,15 @@ def refreshData(self, title=None):
         self.__proxyModel.setFilterRegularExpression(title)
 
     def __clicked(self, idx):
-        # get id of record
-        id = self.__model.data(self.__proxyModel.mapToSource(idx.siblingAtColumn(0)), role=Qt.ItemDataRole.DisplayRole)
-        title = self.__model.data(self.__proxyModel.mapToSource(idx.siblingAtColumn(1)), role=Qt.ItemDataRole.DisplayRole)
+        # get the source index
+        source_idx = self.__proxyModel.mapToSource(idx)
+        # get the primary key value of the row
+        cur_id = self.__model.record(source_idx.row()).value("id")
+        clicked_thread = DB.selectThread(cur_id)
+        # get the title
+        title = clicked_thread['name']
 
-        self.clicked.emit(id, title)
+        self.clicked.emit(cur_id, title)
 
     def __getSelectedIds(self):
         selected_idx_s = self.__tableView.selectedIndexes()
@@ -285,4 +295,10 @@ def setColumns(self, columns):
         self.__model.clear()
         self.__model.setTable(self.__table_nm)
         self.__model.setQuery(QSqlQuery(f"SELECT {','.join(self.__columns)} FROM {self.__table_nm}"))
-        self.__model.select()
+        self.__model.select()
+
+    def __onFavoriteClicked(self, f):
+        self.onFavoriteClicked.emit(f)
+
+    def activateFavoriteFromParent(self, f):
+        self.__favoriteBtn.setChecked(f)

pyqt_openai/chat_widget/aiChatUnit.py

@@ -127,17 +127,16 @@ def __initUi(self):
     def __copy(self):
         pyperclip.copy(self.text())
 
-    def __favorite(self, f):
+    def __favorite(self, f, insert_f=True):
         favorite = 1 if f else 0
         if favorite:
             self.__favoriteBtn.setStyleAndIcon('ico/favorite_yes.svg')
         else:
             self.__favoriteBtn.setStyleAndIcon('ico/favorite_no.svg')
-        if self.__result_info.id:
-            DB.updateMessage(self.__result_info.id, favorite)
+        if insert_f:
+            current_date = DB.updateMessage(self.__result_info.id, favorite)
             self.__result_info.favorite = favorite
-        else:
-            QMessageBox.warning(self, 'Warning', 'Working for providing ID for this message. Please try again later.')
+            self.__result_info.favorite_set_date = current_date
 
     def __showInfo(self):
         dialog = MessageResultDialog(self.__result_info)
@@ -168,13 +167,16 @@ def setAlignment(self, a0):
                     widget.setAlignment(a0)
 
     def disableGUIDuringGenerateResponse(self):
+        self.__favoriteBtn.setEnabled(False)
         self.__copyBtn.setEnabled(False)
         self.__infoBtn.setEnabled(False)
 
     def showConvResultInfo(self, arg: ChatMessageContainer):
+        self.__favoriteBtn.setEnabled(True)
         self.__copyBtn.setEnabled(True)
         self.__infoBtn.setEnabled(True)
         self.__result_info = arg
+        self.__favorite(True if arg.favorite else False, insert_f=False)
 
     def setText(self, text: str):
         self.__lbl = QLabel(text)

pyqt_openai/chat_widget/chatBrowser.py

@@ -7,7 +7,7 @@
 from pyqt_openai.chat_widget.aiChatUnit import AIChatUnit
 from pyqt_openai.chat_widget.userChatUnit import UserChatUnit
 from pyqt_openai.models import ChatMessageContainer
-from pyqt_openai.pyqt_openai_data import get_message_obj
+from pyqt_openai.pyqt_openai_data import get_message_obj, DB
 from pyqt_openai.util.script import is_valid_regex
 
 
@@ -39,13 +39,15 @@ def __initUi(self):
         self.setWidgetResizable(True)
 
     def showLabel(self, text, stream_f, arg: ChatMessageContainer):
-        arg.thread_id = self.__cur_id
-        # for question & response below the menu
+        arg.thread_id = arg.thread_id if arg.thread_id else self.__cur_id
         unit = self.__setLabel(text, stream_f, arg.role)
         if not stream_f:
+            arg.id = DB.insertMessage(arg)
             self.__showConvResultInfo(unit, arg)
-            # change user_f type from bool to int to insert in db
-            self.messageUpdated.emit(arg)
+
+    def showLabelForFavorite(self, arg: ChatMessageContainer):
+        unit = self.__setLabel(arg.content, False, arg.role)
+        self.__showConvResultInfo(unit, arg)
 
     def __getLastUnit(self) -> AIChatUnit | None:
         item = self.widget().layout().itemAt(self.widget().layout().count() - 1)
@@ -60,9 +62,9 @@ def __showConvResultInfo(self, unit, arg: ChatMessageContainer):
 
     def streamFinished(self, arg: ChatMessageContainer):
         unit = self.__getLastUnit()
-        self.__showConvResultInfo(unit, arg)
         arg.content = self.getLastResponse()
-        self.messageUpdated.emit(arg)
+        arg.id = DB.insertMessage(arg)
+        self.__showConvResultInfo(unit, arg)
 
     def __setLabel(self, text, stream_f, role):
         chatUnit = QLabel()
@@ -90,7 +92,6 @@ def __setLabel(self, text, stream_f, role):
 
     def event(self, e):
         if e.type() == 43:
-            print('scroll')
             self.verticalScrollBar().setSliderPosition(self.verticalScrollBar().maximum())
         return super().event(e)
 
@@ -213,9 +214,9 @@ def setCurrentLabelIncludingTextBySliderPosition(self, text, case_sensitive=Fals
 
         return res_lbl
 
-    def replaceThread(self, id, args: List[ChatMessageContainer]):
+    def replaceThread(self, args: List[ChatMessageContainer], id):
         """
-        for showing old conversation
+        For showing messages from the thread
         """
         self.clear()
         self.setCurId(id)
@@ -226,6 +227,18 @@ def replaceThread(self, id, args: List[ChatMessageContainer]):
             unit = self.__setLabel(arg.content, False, arg.role)
             self.__showConvResultInfo(unit, arg)
 
+    def replaceThreadForFavorite(self, args: List[ChatMessageContainer]):
+        """
+        For showing favorite messages
+        """
+        self.clear()
+        self.onReplacedCurrentPage.emit(1)
+        for i in range(len(args)):
+            arg = args[i]
+            # stream is False no matter what
+            unit = self.__setLabel(arg.content, False, arg.role)
+            self.__showConvResultInfo(unit, arg)
+
     def setUserImage(self, img):
         self.__user_image = img
         lbls = self.__getEveryUserLabels()

pyqt_openai/chat_widget/conv.db

@@ -2,7 +2,7 @@
 
 from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QWidget, QLabel, \
-    QHBoxLayout, QGridLayout, QLineEdit
+    QHBoxLayout, QGridLayout, QLineEdit, QMessageBox
 
 from pyqt_openai.chat_widget.chatBrowser import ChatBrowser
 from pyqt_openai.widgets.button import Button
@@ -104,7 +104,7 @@ def widgetTextChanged(self):
     def __findInit(self, text):
         # show "bad pattern" message if text is "\"
         if self.__regexBtn.isChecked() and re.escape(text) == re.escape('\\'):
-            print('bad pattern!')
+            QMessageBox.warning(self, 'Warning', 'Bad pattern')
         else:
             self.__selections = self.__chatBrowser.setCurrentLabelIncludingTextBySliderPosition(text,
                                                                                                 case_sensitive=self.__caseBtn.isChecked(),

pyqt_openai/chat_widget/findTextWidget.py

@@ -1,6 +1,7 @@
 # APP
 IMAGE_FILE_EXT = 'Image file (*.jpg *.png)'
 DEFAULT_ICON_SIZE = (24, 24)
+COLUMN_TO_EXCLUDE_FROM_SHOW_HIDE = ['id']
 
 PAYPAL_URL = 'https://paypal.me/yjg30737'
 BUYMEACOFFEE_URL = 'https://www.buymeacoffee.com/yjg30737'
@@ -16,6 +17,8 @@
 THREAD_TRIGGER_NAME = 'thread_tr'
 MESSAGE_TABLE_NAME = 'message_tb'
 
+IMAGE_TABLE_NAME = 'image_tb'
+
 THREAD_MESSAGE_INSERTED_TR_NAME_OLD = 'conv_tb_updated_by_unit_inserted_tr'
 THREAD_MESSAGE_UPDATED_TR_NAME_OLD = 'conv_tb_updated_by_unit_updated_tr'
 THREAD_MESSAGE_DELETED_TR_NAME_OLD = 'conv_tb_updated_by_unit_deleted_tr'

pyqt_openai/constants.py

@@ -3,6 +3,7 @@
 from qtpy.QtCore import Qt, QSettings
 from qtpy.QtWidgets import QHBoxLayout, QVBoxLayout, QFrame, QWidget, QSplitter
 
+from pyqt_openai.constants import IMAGE_TABLE_NAME
 from pyqt_openai.dalle_widget.dallEControlWidget import DallEControlWidget
 from pyqt_openai.models import ImagePromptContainer
 from pyqt_openai.pyqt_openai_data import DB
@@ -39,7 +40,7 @@ def __initVal(self):
         self.__settings_ini.endGroup()
 
     def __initUi(self):
-        self.__imageNavWidget = ImageNavWidget(ImagePromptContainer.get_keys(), 'image_tb')
+        self.__imageNavWidget = ImageNavWidget(ImagePromptContainer.get_keys(), IMAGE_TABLE_NAME)
         self.__viewWidget = ThumbnailView()
         self.__rightSideBarWidget = DallEControlWidget()
 

pyqt_openai/dalle_widget/dallEWidget.py

@@ -17,18 +17,14 @@ def __init__(self, **kwargs):
                 setattr(self, key, value)
 
     @classmethod
-    def get_keys(cls):
-        return [field.name for field in fields(cls)]
-
-    @classmethod
-    def get_keys_for_insert(cls, excludes: list = None):
+    def get_keys(cls, excludes: list = None):
         """
         Function that returns the keys of the target data type as a list.
         Exclude the keys in the "excludes" list.
         """
         if excludes is None:
             excludes = []
-        arr = cls.get_keys()
+        arr = [field.name for field in fields(cls)]
         for exclude in excludes:
             if exclude in arr:
                 arr.remove(exclude)
@@ -40,7 +36,7 @@ def get_values_for_insert(self, excludes: list = None):
         """
         if excludes is None:
             excludes = []
-        arr = [getattr(self, key) for key in self.get_keys_for_insert(excludes)]
+        arr = [getattr(self, key) for key in self.get_keys(excludes)]
         return arr
 
     def get_items(self, excludes: list = None):
@@ -49,7 +45,7 @@ def get_items(self, excludes: list = None):
         """
         if excludes is None:
             excludes = []
-        return {key: getattr(self, key) for key in self.get_keys_for_insert(excludes)}.items()
+        return {key: getattr(self, key) for key in self.get_keys(excludes)}.items()
 
     def create_insert_query(self, table_name: str, excludes: list = None):
         if excludes is None:
@@ -58,7 +54,7 @@ def create_insert_query(self, table_name: str, excludes: list = None):
         Function to dynamically generate an SQLite insert statement.
         Takes the table name as a parameter.
         """
-        field_names = self.get_keys_for_insert(excludes)
+        field_names = self.get_keys(excludes)
         columns = ', '.join(field_names)
         placeholders = ', '.join(['?' for _ in field_names])
         query = f'INSERT INTO {table_name} ({columns}) VALUES ({placeholders})'
@@ -85,6 +81,7 @@ class ChatMessageContainer(Container):
     completion_tokens: str = ""
     total_tokens: str = ""
     favorite: int = 0
+    favorite_set_date: str = ""
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)

pyqt_openai/models.py

@@ -8,6 +8,7 @@
     QFileDialog, QMessageBox, QPushButton
 
 from pyqt_openai.chatNavWidget import ChatNavWidget
+from pyqt_openai.chat_widget.chatBrowser import ChatBrowser
 from pyqt_openai.chat_widget.chatWidget import ChatWidget
 from pyqt_openai.chat_widget.prompt import Prompt
 from pyqt_openai.constants import THREAD_TABLE_NAME
@@ -45,6 +46,8 @@ def __initVal(self):
         self.__show_setting = self.__settings_ini.value('show_setting', type=bool)
         self.__show_prompt = self.__settings_ini.value('show_prompt', type=bool)
 
+        self.__is_showing_favorite = False
+
     def __initUi(self):
         self.__chatNavWidget = ChatNavWidget(ChatThreadContainer.get_keys(), THREAD_TABLE_NAME)
         self.__chatWidget = ChatWidget()
@@ -118,10 +121,11 @@ def __initUi(self):
         self.__chatNavWidget.onImport.connect(self.__importChat)
         self.__chatNavWidget.onChatGPTImport.connect(self.__chatGPTImport)
         self.__chatNavWidget.onExport.connect(self.__exportChat)
+        self.__chatNavWidget.onFavoriteClicked.connect(self.__showFavorite)
 
         self.__lineEdit.returnPressed.connect(self.__chat)
 
-        self.__browser.messageUpdated.connect(self.__updateMessage)
+        # self.__browser.messageUpdated.connect(self.__updateMessage)
 
         lay = QHBoxLayout()
         lay.addWidget(self.__prompt)
@@ -266,7 +270,7 @@ def __chat(self, continue_f=False):
             # Conversation result information after response
             container = ChatMessageContainer(**container_param)
 
-            # For make GPT continue to respond
+            # For make chatbot continue to respond
             if continue_f:
                 query_text = 'Continue to respond.'
             else:
@@ -333,9 +337,11 @@ def __afterGenerated(self):
                 self.__notifierWidget.doubleClicked.connect(self.window().show)
 
     def __showChat(self, id, title):
+        self.__showFavorite(False)
+        self.__chatNavWidget.activateFavoriteFromParent(False)
         conv_data = DB.selectCertainThreadMessages(id)
         self.__chatWidget.showTitle(title)
-        self.__browser.replaceThread(id, conv_data)
+        self.__browser.replaceThread(conv_data, id)
         self.__prompt.activateDuringGeneratingWidget(False)
         self.__prompt.activateAfterResponseWidget(False)
 
@@ -350,7 +356,7 @@ def __addThread(self):
         cur_id = DB.insertThread(title)
         self.__browser.resetChatWidget(cur_id)
         self.__chatWidget.showTitle(title)
-        self.__browser.replaceThread(cur_id, DB.selectCertainThreadMessages(cur_id))
+        self.__browser.replaceThread(DB.selectCertainThreadMessages(cur_id), cur_id)
         self.__lineEdit.setFocus()
         self.__chatNavWidget.add(called_from_parent=True)
 
@@ -407,9 +413,25 @@ def __exportChat(self, ids):
                 DB.export(ids, filename)
             open_directory(os.path.dirname(filename))
 
-    def __updateMessage(self, arg: ChatMessageContainer):
-        if arg.content:
-            DB.insertMessage(arg)
+    # def __updateMessage(self, arg: ChatMessageContainer):
+    #     if arg.content:
+    #         DB.insertMessage(arg)
 
     def setColumns(self, columns):
-        self.__chatNavWidget.setColumns(columns)
+        self.__chatNavWidget.setColumns(columns)
+
+    def __showFavorite(self, f):
+        if f:
+            lst = DB.selectFavorite()
+            if len(lst) == 0:
+                return
+            else:
+                lst = [ChatMessageContainer(**dict(c)) for c in lst]
+                self.__browser.replaceThreadForFavorite(lst)
+                # self.__browser.show()
+    #             self.__browser.setWindowTitle('Favorite')
+    #             self.__browser.setWindowModality(Qt.WindowModality.ApplicationModal)
+    #     else:
+    #         self.__browser.messageUpdated.connect(self.__updateMessage)
+        self.__prompt.setEnabled(not f)
+        self.__is_showing_favorite = f