pygpt-net 2.4.37__py3-none-any.whl → 2.4.39__py3-none-any.whl

pygpt_net/controller/theme/common.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.30 15:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
 import os
@@ -156,3 +156,24 @@ class Common:
                 with open(path) as file:
                     content += file.read()
         return content
+
+    def get_styles_list(self) -> list:
+        """
+        Return a list of available styles
+
+        :return: list of styles names
+        """
+        styles = []
+        app_dir = os.path.join(self.window.core.config.get_app_path(), 'data', 'css')
+        user_dir = os.path.join(self.window.core.config.path, 'css')
+        for path in [app_dir, user_dir]:
+            if not os.path.exists(path):
+                continue
+            for file in os.listdir(path):
+                if file.startswith("web-") and file.endswith('.css'):
+                    to_replace = ['web-', '.css', '.light', '.dark']
+                    for item in to_replace:
+                        file = file.replace(item, '')
+                    if file not in styles:
+                        styles.append(file)
+        return sorted(styles)

pygpt_net/controller/theme/markdown.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
 import os
@@ -23,6 +23,7 @@ class Markdown:
         """
         self.window = window
         self.css = {}  # external styles
+        self.web_style = ""
 
     def update(self, force: bool = False):
         """
@@ -60,7 +61,8 @@ class Markdown:
 
         :return: stylesheet
         """
-        if "web" not in self.css:
+        web_style = self.window.core.config.get("theme.style", "blocks")
+        if "web" not in self.css or self.web_style != web_style:
             self.load()
         if "web" in self.css:
             return self.css["web"]
@@ -73,31 +75,41 @@ class Markdown:
         self.window.dispatch(event)  # per current engine
         self.window.controller.ctx.refresh()
         self.window.controller.ctx.refresh_output()
-        data = {
+        event = RenderEvent(RenderEvent.END, {
             "meta": meta,
-        }
-        event = RenderEvent(RenderEvent.END, data)
+        })
         self.window.dispatch(event)
 
     def load(self):
         """Load markdown styles"""
-        parents = ["markdown", "web"]
+        parents = [
+            "markdown",
+            "web",
+        ]
+        web_style = self.window.core.config.get("theme.style", "blocks")
         for base_name in parents:
+            suffix = ""
+            if base_name == 'web':
+                suffix = "-" + web_style
+                self.web_style = web_style
             theme = self.window.core.config.get('theme')
             name = str(base_name)
-            color_name = str(base_name)
             if theme.startswith('light'):
-                color_name += '.light'
+                color = '.light'
             else:
-                color_name += '.dark'
+                color = '.dark'
+
+            # load CSS, app + user
+            file_base = name + suffix + '.css'
+            file_color = name + suffix + color + '.css'
             paths = []
-            paths.append(os.path.join(self.window.core.config.get_app_path(), 'data', 'css', name + '.css'))
-            paths.append(os.path.join(self.window.core.config.get_app_path(), 'data', 'css', color_name + '.css'))
-            paths.append(os.path.join(self.window.core.config.get_user_path(), 'css', name + '.css'))
-            paths.append(os.path.join(self.window.core.config.get_user_path(), 'css', color_name + '.css'))
+            paths.append(os.path.join(self.window.core.config.get_app_path(), 'data', 'css', file_base))
+            paths.append(os.path.join(self.window.core.config.get_app_path(), 'data', 'css', file_color))
+            paths.append(os.path.join(self.window.core.config.get_user_path(), 'css', file_base))
+            paths.append(os.path.join(self.window.core.config.get_user_path(), 'css', file_color))
             content = ''
             for path in paths:
-                if os.path.exists(path):
+                if os.path.exists(path) and os.path.isfile(path):
                     with open(path, 'r') as file:
                         content += file.read()
 

pygpt_net/controller/theme/menu.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.05 23:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction
@@ -30,6 +30,18 @@ class Menu:
         # setup themes list menu
         if self.loaded:
             return
+
+        # styles
+        styles = self.window.controller.theme.common.get_styles_list()
+        for style in styles:
+            style_id = style.lower()
+            title = style.replace('_', ' ').title()
+            self.window.ui.menu['theme_style'][style_id] = QAction(title, self.window, checkable=True)
+            self.window.ui.menu['theme_style'][style_id].triggered.connect(
+                lambda checked=None, style=style_id: self.window.controller.theme.toggle_style(style))
+            self.window.ui.menu['theme.style'].addAction(self.window.ui.menu['theme_style'][style_id])
+
+        # color themes
         themes = self.window.controller.theme.common.get_themes_list()
         for theme in themes:
             name = self.window.controller.theme.common.translate(theme)
@@ -42,6 +54,7 @@ class Menu:
                 self.window.ui.menu['theme.dark'].addAction(self.window.ui.menu['theme'][theme])
             elif theme.startswith('light'):
                 self.window.ui.menu['theme.light'].addAction(self.window.ui.menu['theme'][theme])
+
         self.loaded = True
 
     def setup_syntax(self):
@@ -86,14 +99,22 @@ class Menu:
 
     def update_list(self):
         """Update theme list menu"""
-        current = self.window.core.config.get('theme')
+        # styles
+        current_style = self.window.core.config.get('theme.style')
+        for style in self.window.ui.menu['theme_style']:
+            self.window.ui.menu['theme_style'][style].setChecked(False)
+        if current_style in self.window.ui.menu['theme_style']:
+            self.window.ui.menu['theme_style'][current_style].setChecked(True)
+
+        # color themes
+        current_theme = self.window.core.config.get('theme')
         for theme in self.window.ui.menu['theme']:
             self.window.ui.menu['theme'][theme].setChecked(False)
-        if current in self.window.ui.menu['theme']:
-            self.window.ui.menu['theme'][current].setChecked(True)
+        if current_theme in self.window.ui.menu['theme']:
+            self.window.ui.menu['theme'][current_theme].setChecked(True)
 
     def update_syntax(self):
-        """Update syntax menu"""
+        """Update code syntax highlight menu"""
         current = self.window.core.config.get('render.code_syntax')
         for style in self.window.ui.menu['theme_syntax']:
             self.window.ui.menu['theme_syntax'][style].setChecked(False)

pygpt_net/controller/ui/tabs.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import QTimer
@@ -29,35 +29,66 @@ class Tabs:
         self.initialized = False
         self.appended = False
         self.current = 0
+        self.column_idx = 0
+        self.tmp_column_idx = 0
+        self.locked = False
 
     def setup(self):
         """Setup tabs"""
         self.window.core.tabs.load()
         self.window.controller.notepad.load()
+        self.setup_options()
         self.initialized = True
 
-    def add(self, type: int, title: str, icon=None, reference=None, data_id=None):
+    def setup_options(self):
+        """Setup options"""
+        state = self.window.core.config.get("layout.split", False)
+        self.window.ui.nodes['layout.split'].setChecked(state)
+        if not state:
+            self.window.ui.splitters['columns'].setSizes([1, 0])
+
+    def add(
+            self,
+            type: int,
+            title: str,
+            icon=None,
+            child=None,
+            data_id=None
+    ):
         """
-        Add tab
+        Add a new tab
 
         :param type: Tab type
         :param title: Tab title
         :param icon: Tab icon
-        :param reference: Tab reference
-        :param data_id: Tab data ID
-        """
-        self.window.core.tabs.add(type, title, icon, reference, data_id)
-
-    def append(self, type: int, idx: int):
-        """
-        Append tab in place
+        :param child: Tab child (child widget)
+        :param data_id: Tab data ID (child data ID)
+        """
+        self.window.core.tabs.add(
+            type=type,
+            title=title,
+            icon=icon,
+            child=child,
+            data_id=data_id
+        )
+
+    def append(
+            self,
+            type: int,
+            idx: int,
+            column_idx: int = 0
+    ):
+        """
+        Append tab at tab index
 
         :param type: Tab type
         :param idx: Tab index
+        :param column_idx: Column index
         """
         self.appended = True  # lock reload in previous tab
-        self.window.core.tabs.append(type, idx)
-        self.switch_tab_by_idx(idx + 1)  # switch to new tab
+        self.column_idx = column_idx  # switch to column
+        self.window.core.tabs.append(type, idx, column_idx)
+        self.switch_tab_by_idx(idx + 1, column_idx)  # switch to new tab
 
     def reload_titles(self):
         """Reload tab titles"""
@@ -78,15 +109,16 @@ class Tabs:
             else:
                 self.window.ui.nodes['output_plain'][pid].setVisible(False)
                 self.window.ui.nodes['output'][pid].setVisible(True)
-        self.switch_tab(Tab.TAB_CHAT)
+        #self.switch_tab(Tab.TAB_CHAT)
 
-    def on_tab_changed(self, idx: int):
+    def on_tab_changed(self, idx: int, column_idx: int = 0):
         """
         Output tab changed
 
         :param idx: tab index
+        :param column_idx: column index
         """
-        tab = self.window.core.tabs.get_tab_by_index(idx)
+        tab = self.window.core.tabs.get_tab_by_index(idx, column_idx)
         if tab is None:
             self.appended = False
             return
@@ -101,41 +133,53 @@ class Tabs:
 
 
         prev_tab = self.current
+        prev_column = self.column_idx
         self.current = idx
+        self.column_idx = column_idx
         self.window.controller.ui.mode.update()
         self.window.controller.ui.vision.update()
 
         # check type
         if tab.type == Tab.TAB_NOTEPAD:
             self.window.controller.notepad.opened_once = True
-            self.window.controller.notepad.on_open(idx)
+            self.window.controller.notepad.on_open(idx, column_idx)
         elif tab.type == Tab.TAB_CHAT:
-            pid_meta = self.window.core.ctx.output.get_meta(tab.pid)
-            meta = self.window.core.ctx.get_meta_by_id(pid_meta)
+            # get meta for selected tab, if not loaded yet then append meta here
+            meta_id = self.window.core.ctx.output.prepare_meta(tab)
+            meta = self.window.core.ctx.get_meta_by_id(meta_id)
             if meta is not None:
-                self.window.controller.ctx.load(pid_meta)  # reload renderer
+                self.window.controller.ctx.load(meta.id)  # reload renderer
         elif tab.type == Tab.TAB_TOOL_PAINTER:
             if self.window.core.config.get('vision.capture.enabled'):
                 self.window.controller.camera.enable_capture()
 
-        if prev_tab != idx:
+        if prev_tab != idx or prev_column != column_idx:
             self.window.dispatch(AppEvent(AppEvent.TAB_SELECTED))  # app event
 
-    def get_current_idx(self) -> int:
+    def get_current_idx(self, column_idx: int = 0) -> int:
         """
         Get current tab index
 
+        :param column_idx: column index
         :return: tab index
         """
         return self.current
 
+    def get_current_column_idx(self) -> int:
+        """
+        Get current column index
+
+        :return: column index
+        """
+        return self.column_idx
+
     def get_current_tab(self) -> Tab or None:
         """
         Get current tab
 
         :return: tab
         """
-        return self.window.core.tabs.get_tab_by_index(self.current)
+        return self.window.core.tabs.get_tab_by_index(self.get_current_idx(), self.column_idx)
 
     def get_current_type(self) -> int or None:
         """
@@ -143,7 +187,7 @@ class Tabs:
 
         :return: tab type
         """
-        tab = self.window.core.tabs.get_tab_by_index(self.current)
+        tab = self.window.core.tabs.get_tab_by_index(self.get_current_idx(), self.column_idx)
         if tab is None:
             return None
         return tab.type
@@ -154,7 +198,7 @@ class Tabs:
 
         :return: tab PID
         """
-        tab = self.window.core.tabs.get_tab_by_index(self.current)
+        tab = self.window.core.tabs.get_tab_by_index(self.get_current_idx(), self.column_idx)
         if tab is None:
             return None
         return tab.pid
@@ -166,7 +210,7 @@ class Tabs:
         :param idx: tab index
         :return: tab type
         """
-        tab = self.window.core.tabs.get_tab_by_index(idx)
+        tab = self.window.core.tabs.get_tab_by_index(idx, self.column_idx)
         if tab is None:
             return None
         return tab.type
@@ -178,68 +222,105 @@ class Tabs:
         :param type: tab type
         :return: tab index
         """
-        return self.window.core.tabs.get_min_idx_by_type(type)
+        return self.window.core.tabs.get_min_idx_by_type(type, self.column_idx)
 
-    def on_tab_clicked(self, idx: int):
+    def on_column_changed(self):
+        """Column changed event"""
+        if self.locked:
+            return
+        tab = self.window.core.tabs.get_tab_by_index(self.current, self.column_idx)
+        if tab is None:
+            return
+        current_ctx = self.window.core.ctx.get_current()
+        if current_ctx is not None and current_ctx != tab.data_id:
+            self.window.controller.ctx.select_on_list_only(tab.data_id)
+
+    def on_tab_clicked(self, idx: int, column_idx: int = 0):
         """
         Tab click event
 
         :param idx: tab index
+        :param column_idx: column index
+        """
+        self.current = idx
+        self.column_idx = column_idx
+        self.on_column_changed()
+
+    def on_column_focus(self, idx: int):
+        """
+        Column focus event
+
+        :param idx: column index
         """
-        pass
+        self.column_idx = idx
+        self.on_column_changed()
 
-    def on_tab_dbl_clicked(self, idx: int):
+    def on_tab_dbl_clicked(self, idx: int, column_idx: int = 0):
         """
         Tab double click event
 
         :param idx: tab index
+        :param column_idx: column index
         """
-        pass
+        self.column_idx = column_idx
+        self.on_tab_changed(idx, column_idx)
 
-    def on_tab_closed(self, idx: int):
+    def on_tab_closed(self, idx: int, column_idx: int = 0):
         """
         Tab close event
 
         :param idx: tab index
+        :param column_idx: column index
         """
-        self.window.core.tabs.remove_tab_by_idx(idx)
+        self.window.core.tabs.remove_tab_by_idx(idx, column_idx)
 
-    def on_tab_moved(self, idx: int):
+    def on_tab_moved(self, idx: int, column_idx: int = 0):
         """
         Tab moved event
 
         :param idx: tab index
+        :param column_idx: column index
         """
         self.window.core.tabs.update()
 
-    def close(self, idx: int):
+    def close(self, idx: int, column_idx: int = 0):
         """
         Close tab
 
         :param idx: tab index
+        :param column_idx: column index
         """
-        self.on_tab_closed(idx)
+        self.on_tab_closed(idx, column_idx)
 
-    def close_all(self, type: int, force: bool = False):
+    def close_all(
+            self,
+            type: int,
+            column_idx: int = 0,
+            force: bool = False
+    ):
         """
         Close all tabs
 
         :param type: tab type
+        :param column_idx: column index
         :param force: force close
         """
         if not force:
+            self.tmp_column_idx = column_idx
             self.window.ui.dialogs.confirm(
                 type='tab.close_all',
                 id=type,
                 msg=trans('tab.close_all.confirm'),
             )
             return
-        self.window.core.tabs.remove_all_by_type(type)
+        column_idx = self.tmp_column_idx
+        self.window.core.tabs.remove_all_by_type(type, column_idx)
 
     def next_tab(self):
         """Switch to next tab"""
-        current = self.window.ui.tabs['output'].currentIndex()
-        all = len(self.window.ui.tabs['output'].children())
+        tabs = self.window.ui.layout.get_active_tabs()
+        current = tabs.currentIndex()
+        all = len(tabs.children())
         next = current + 1
         if next >= all:
             next = 0
@@ -247,8 +328,9 @@ class Tabs:
 
     def prev_tab(self):
         """Switch to previous tab"""
-        current = self.window.ui.tabs['output'].currentIndex()
-        all = len(self.window.ui.tabs['output'].children())
+        tabs = self.window.ui.layout.get_active_tabs()
+        current = tabs.currentIndex()
+        all = len(tabs.children())
         prev = current - 1
         if prev < 0:
             prev = all - 1
@@ -264,14 +346,16 @@ class Tabs:
         if idx is not None:
             self.switch_tab_by_idx(idx)
 
-    def switch_tab_by_idx(self, idx: int):
+    def switch_tab_by_idx(self, idx: int, column_idx: int = 0):
         """
         Switch tab by index
 
         :param idx: tab index
+        :param column_idx: column index
         """
-        self.window.ui.tabs['output'].setCurrentIndex(idx)
-        self.on_tab_changed(idx)
+        tabs = self.window.ui.layout.get_tabs_by_idx(column_idx)
+        tabs.setCurrentIndex(idx)
+        self.on_tab_changed(idx, column_idx)
 
     def get_current_tab_name(self) -> str:
         """
@@ -279,7 +363,8 @@ class Tabs:
 
         :return: tab name
         """
-        return self.window.ui.tabs['output'].tabText(self.current)
+        tabs = self.window.ui.layout.get_active_tabs()
+        return tabs.tabText(self.current)
 
     def get_current_tab_name_for_audio(self) -> str:
         """
@@ -309,18 +394,20 @@ class Tabs:
         """
         Update tab tooltip
 
-        :param tooltip: tooltip
+        :param tooltip: tooltip text
         """
-        self.window.ui.tabs['output'].setTabToolTip(self.current, tooltip)
+        tabs = self.window.ui.layout.get_active_tabs()
+        tabs.setTabToolTip(self.current, tooltip)
 
-    def rename(self, idx: int):
+    def rename(self, idx: int, column_idx: int = 0):
         """
-        Rename tab
+        Rename tab (show dialog)
 
         :param idx: tab idx
+        :param column_idx: column idx
         """
         # get tab
-        tab = self.window.core.tabs.get_tab_by_index(idx)
+        tab = self.window.core.tabs.get_tab_by_index(idx, column_idx)
         if tab is None:
             return
         # set dialog and show
@@ -329,7 +416,12 @@ class Tabs:
         self.window.ui.dialog['rename'].current = idx
         self.window.ui.dialog['rename'].show()
 
-    def update_name(self, idx: int, name: str, close: bool = True):
+    def update_name(
+            self,
+            idx: int,
+            name: str,
+            close: bool = True
+    ):
         """
         Update tab title
 
@@ -349,7 +441,11 @@ class Tabs:
         """
         self.update_name(self.current, name)
 
-    def update_title(self, idx: int, title: str):
+    def update_title(
+            self,
+            idx: int,
+            title: str
+    ):
         """
         Update tab title
 
@@ -359,8 +455,9 @@ class Tabs:
         # check if current tab is chat
         if self.get_current_type() != Tab.TAB_CHAT:
             return
+        tabs = self.window.ui.layout.get_active_tabs()
         tooltip = title
-        self.window.ui.tabs['output'].setTabToolTip(idx, tooltip)
+        tabs.setTabToolTip(idx, tooltip)
         if len(title) > 8:
             title = title[:8] + '...'  # truncate to max 8 chars
         self.window.core.tabs.update_title(idx, title, tooltip)
@@ -383,7 +480,53 @@ class Tabs:
         if idx is not None:
             self.switch_tab_by_idx(idx)
 
-    def new_tab(self):
-        """Handle [+} button"""
-        idx = self.get_current_idx()
-        self.append(Tab.TAB_CHAT, idx)
+    def new_tab(self, column_idx: int = 0):
+        """
+        Handle [+] button
+
+        :param column_idx: column index
+        """
+        idx = self.get_current_idx(column_idx)
+        self.append(Tab.TAB_CHAT, idx, column_idx)
+
+    def restore_data(self):
+        """Restore tab data"""
+        data = self.window.core.config.get("tabs.opened", [])
+        if not data:
+            self.switch_tab_by_idx(0, 0)
+            return
+        for col_idx in data:
+            tab_idx = data[col_idx]
+            self.switch_tab_by_idx(int(tab_idx), int(col_idx))
+
+        # set default column to 0
+        self.column_idx = 0
+        self.on_column_changed()
+
+    def move_tab(self, idx: int, column_idx: int, new_column_idx: int):
+        """
+        Move tab to another column
+
+        :param idx: tab index
+        :param column_idx: column index
+        :param new_column_idx: new column index
+        """
+        self.locked = True
+        tab = self.window.core.tabs.get_tab_by_index(idx, column_idx)
+        self.window.core.tabs.move_tab(tab, new_column_idx)
+        self.locked = False
+
+    def toggle_split_screen(self, state):
+        """
+        Toggle split screen
+
+        :param state: state
+        """
+        if state:
+            #self.rightWidget.show()
+            self.window.ui.splitters['columns'].setSizes([1, 1])
+        else:
+            #self.rightWidget.hide()
+            self.window.ui.splitters['columns'].setSizes([1, 0])
+        self.window.core.config.set("layout.split", state)
+        self.window.core.config.save()