Exclude id from displaying/hiding columns

Author: yjg30737

pyqt_openai/chatNavWidget.py

@@ -147,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
@@ -237,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)
-
-        self.clicked.emit(id, title)
+        # 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(cur_id, title)
 
     def __getSelectedIds(self):
         selected_idx_s = self.__tableView.selectedIndexes()

pyqt_openai/constants.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'

pyqt_openai/models.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})'

pyqt_openai/settingsDialog.py

@@ -1,6 +1,7 @@
 import os
 import sys
 
+from pyqt_openai.constants import COLUMN_TO_EXCLUDE_FROM_SHOW_HIDE
 from pyqt_openai.widgets.checkBoxListWidget import CheckBoxListWidget
 
 # Get the absolute path of the current script file
@@ -104,7 +105,7 @@ def __initUi(self):
 
         chatColAllCheckBox = QCheckBox('Check all')
         self.__chatColCheckBoxListWidget = CheckBoxListWidget()
-        for k in ChatThreadContainer.get_keys():
+        for k in ChatThreadContainer.get_keys(excludes=COLUMN_TO_EXCLUDE_FROM_SHOW_HIDE):
             self.__chatColCheckBoxListWidget.addItem(k, checked=k in self.__chat_column_to_show)
 
         chatColAllCheckBox.stateChanged.connect(self.__chatColCheckBoxListWidget.toggleState)
@@ -119,7 +120,7 @@ def __initUi(self):
 
         imageColAllCheckBox = QCheckBox('Check all')
         self.__imageColCheckBoxListWidget = CheckBoxListWidget()
-        for k in ImagePromptContainer.get_keys():
+        for k in ImagePromptContainer.get_keys(excludes=COLUMN_TO_EXCLUDE_FROM_SHOW_HIDE):
             self.__imageColCheckBoxListWidget.addItem(k, checked=k in self.__image_column_to_show)
 
         imageColAllCheckBox.stateChanged.connect(self.__imageColCheckBoxListWidget.toggleState)
@@ -171,6 +172,6 @@ def getSettingsParam(self):
             show_toolbar=self.__showToolbarCheckBox.isChecked(),
             show_secondary_toolbar=self.__showSecondaryToolBarChkBox.isChecked(),
             thread_tool_widget=self.__showThreadToolWidgetChkBox.isChecked(),
-            chat_column_to_show=self.__chatColCheckBoxListWidget.getCheckedItemsText(),
-            image_column_to_show=self.__imageColCheckBoxListWidget.getCheckedItemsText()
+            chat_column_to_show=COLUMN_TO_EXCLUDE_FROM_SHOW_HIDE+self.__chatColCheckBoxListWidget.getCheckedItemsText(),
+            image_column_to_show=COLUMN_TO_EXCLUDE_FROM_SHOW_HIDE+self.__imageColCheckBoxListWidget.getCheckedItemsText()
         )

pyqt_openai/sqlite.py

@@ -710,7 +710,7 @@ def __createImage(self):
                 # To not make table every time to change column's name and type
                 self.__c.execute(f'PRAGMA table_info({self.__image_tb_nm})')
                 existing_columns = set([column[1] for column in self.__c.fetchall()])
-                required_columns = set(ImagePromptContainer.get_keys_for_insert(['id', 'update_dt', 'insert_dt']))
+                required_columns = set(ImagePromptContainer.get_keys(['id', 'update_dt', 'insert_dt']))
 
                 # Find missing columns
                 missing_columns = required_columns - existing_columns

pyqt_openai/widgets/imageNavWidget.py

@@ -142,7 +142,12 @@ def refresh(self):
         self.__model.select()
 
     def __clicked(self, idx):
-        cur_id = self.__proxyModel.data(self.__proxyModel.index(idx.row(), self.__columns.index('id')))
+        # 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")
+
         # Get data from DB id
         data = DB.selectCertainImage(cur_id)['data']
         if data: