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

pygpt_net/controller/theme/__init__.py

@@ -6,17 +6,18 @@
 # 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.14 08:00:00                  #
 # ================================================== #
 
 import os
+from typing import Any, Optional
+
+from pygpt_net.core.events import RenderEvent
 
 from .common import Common
 from .markdown import Markdown
 from .menu import Menu
 from .nodes import Nodes
-from ...core.events import RenderEvent
-
 
 class Theme:
     def __init__(self, window=None):
@@ -47,7 +48,11 @@ class Theme:
         # apply current theme to nodes
         self.reload(force=False)
 
-    def toggle(self, name: str, force: bool = True):
+    def toggle(
+            self,
+            name: str,
+            force: bool = True
+    ):
         """
         Toggle theme by name
 
@@ -68,12 +73,27 @@ class Theme:
         # update themes menu
         self.menu.update_list()
         self.menu.update_syntax()
-        self.window.ui.menu['theme.blocks'].setChecked(self.window.core.config.get("render.blocks"))
 
         if force:
             self.window.controller.ui.restore_state()  # restore state after theme change
 
-    def toggle_option(self, name: str, value: any = None):
+    def toggle_style(self, name: str):
+        """
+        Toggle theme style (web)
+
+        :param name: web style name
+        """
+        self.window.core.config.set('theme.style', name)
+        self.window.core.config.save()
+        event = RenderEvent(RenderEvent.ON_THEME_CHANGE)
+        self.window.dispatch(event)
+        self.reload()
+
+    def toggle_option(
+            self,
+            name: str,
+            value: Any = None
+    ):
         """
         Toggle theme menu option
 
@@ -106,7 +126,11 @@ class Theme:
         self.window.core.config.save()
         self.nodes.apply_all()
 
-    def toggle_syntax(self, name: str, update_menu: bool = False):
+    def toggle_syntax(
+            self,
+            name: str,
+            update_menu: bool = False
+    ):
         """
         Toggle syntax highlight
 
@@ -120,10 +144,24 @@ class Theme:
         if update_menu:
             self.menu.update_syntax()
 
+    def update_style(self):
+        """Update style"""
+        current = self.window.core.config.get('theme.style')
+        self.toggle_style(current)
+
+    def update_theme(self, force: bool = True):
+        """
+        Update theme
+
+        :param force: force theme change (manual trigger)
+        """
+        current = self.window.core.config.get('theme')
+        self.toggle(current, force=force)
+
     def update_syntax(self):
         """Update syntax menu"""
-        curr = self.window.core.config.get('render.code_syntax')
-        self.toggle_syntax(curr, update_menu=True)
+        current = self.window.core.config.get('render.code_syntax')
+        self.toggle_syntax(current, update_menu=True)
 
     def reload(self, force: bool = True):
         """
@@ -131,10 +169,13 @@ class Theme:
 
         :param force: force theme change (manual trigger)
         """
-        current = self.window.core.config.get('theme')
-        self.toggle(current, force=force)
+        self.update_theme(force=force)
 
-    def apply(self, theme: str = 'dark_teal.xml', custom: str = None):
+    def apply(
+            self,
+            theme: str = 'dark_teal.xml',
+            custom: Optional[str] = None
+    ):
         """
         Update material theme and apply custom CSS
 
@@ -183,4 +224,5 @@ class Theme:
     def reload_all(self):
         """Reload all"""
         self.setup()
+        self.update_style()
         self.update_syntax()

pygpt_net/controller/theme/common.py

@@ -6,10 +6,11 @@
 # 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.14 08:00:00                  #
 # ================================================== #
 
 import os
+from typing import List
 
 from pygpt_net.utils import trans
 
@@ -108,7 +109,7 @@ class Common:
         elif element == "font.toolbox":
             return 'font-size: {}px;'.format(self.window.core.config.get('font_size.toolbox'))
 
-    def get_themes_list(self) -> list:
+    def get_themes_list(self) -> List[str]:
         """
         Return a list of available themes
 
@@ -156,3 +157,24 @@ class Common:
                 with open(path) as file:
                     content += file.read()
         return content
+
+    def get_styles_list(self) -> List[str]:
+        """
+        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.14 08: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()
 
@@ -107,8 +119,12 @@ class Markdown:
             except KeyError as e:  # ignore missing env vars
                 pass
 
-    def get_default(self):
-        """Set default markdown CSS"""
+    def get_default(self) -> str:
+        """
+        Set default markdown CSS
+
+        :return: default CSS
+        """
         colors = {
             "dark": {
                 "a": "#fff",

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/theme/nodes.py

@@ -6,9 +6,9 @@
 # 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.12 01:00:00                  #
 # ================================================== #
-# 
+
 from pygpt_net.core.events import RenderEvent
 
 
@@ -93,9 +93,6 @@ class Nodes:
                     continue
                 self.apply(key, type)
 
-        # self.window.interpreter.update_stylesheet(self.window.controller.theme.style('font.chat.output'))
-        # self.window.ui.nodes['interpreter.input'].update_stylesheet(self.window.controller.theme.style('font.chat.input'))
-
         # apply to notepads
         num_notepads = self.window.controller.notepad.get_num_notepads()
         if num_notepads > 0:

pygpt_net/controller/tools/__init__.py

@@ -6,10 +6,17 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.07 23:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Dict, List
+
+from PySide6.QtGui import QAction, QIcon
+from PySide6.QtWidgets import QTabWidget, QMenu
+
 from pygpt_net.core.tabs.tab import Tab
+from pygpt_net.utils import trans
+
 
 class Tools:
     def __init__(self, window=None):
@@ -44,7 +51,38 @@ class Tools:
         if idx is not None:
             self.window.controller.ui.tabs.switch_tab_by_idx(idx)
 
-    def get_tab_tools(self) -> dict:
+    def append_tab_menu(
+            self,
+            parent: QTabWidget,
+            menu: QMenu,
+            idx: int,
+            column_idx: int
+    ) -> QMenu:
+        """
+        Append tab menu
+
+        :param parent: parent widget
+        :param menu: menu
+        :param idx: tab index
+        :param column_idx: column index
+        :return: tab add submenu
+        """
+        submenu = menu.addMenu(QIcon(":/icons/add.svg"), trans("action.tab.add.tool"))
+        tools = self.window.tools.get_all()
+        for id in tools:
+            tool = tools[id]
+            if not tool.has_tab:
+                continue
+            icon = tool.tab_icon
+            title = trans(tool.tab_title)
+            action = QAction(QIcon(icon), title, parent)
+            action.triggered.connect(
+                lambda idx=idx, column_idx=column_idx, id=id: parent.add_tab(idx, column_idx, Tab.TAB_TOOL, id)
+            )
+            submenu.addAction(action)
+        return submenu
+
+    def get_tab_tools(self) -> Dict[str, List[str]]:
         """
         Get tab tools
 

pygpt_net/controller/ui/__init__.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 20:00:00                  #
+# Updated Date: 2024.12.14 00:00:00                  #
 # ================================================== #
 
+from typing import Optional
+
 from PySide6.QtGui import QColor
 
 from pygpt_net.utils import trans
@@ -47,10 +49,6 @@ class UI:
         self.update()
         self.init_toolbox()
 
-    def pre_setup(self):
-        """Post setup UI"""
-        self.tabs.setup()
-
     def update(self):
         """Update all elements"""
 
@@ -149,7 +147,7 @@ class UI:
             model_str = str(model)
         self.window.ui.nodes['chat.model'].setText(model_str)
 
-    def update_ctx_label(self, label: str = None):
+    def update_ctx_label(self, label: Optional[str] = None):
         """
         Update ctx label
 

pygpt_net/controller/ui/mode.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.12.14 19:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.types import (
@@ -189,8 +189,12 @@ class Mode:
                 self.window.ui.tabs['input'].setTabVisible(2, False)
                 self.window.ui.tabs['input'].setTabVisible(3, False)
 
-        # toggle chat footer
-        if not self.is_chat_tab():
+        # chat footer
+        self.toggle_chat_footer()
+
+    def toggle_chat_footer(self):
+        """Toggle chat footer"""
+        if self.window.controller.ui.tabs.get_current_type() != Tab.TAB_CHAT:
             self.hide_chat_footer()
         else:
             self.show_chat_footer()
@@ -200,18 +204,12 @@ class Mode:
         Check if vision is allowed
 
         :param mode: current mode
+        :return: True if vision is allowed
         """
-        if mode == MODE_VISION:
-            return True
-
-        allowed = self.window.controller.painter.is_active()
-        if allowed:
+        if self.window.controller.ui.vision.has_vision():
             return True
 
-        if mode in [MODE_IMAGE, MODE_ASSISTANT]:
-            return False
-
-        if self.window.controller.ui.vision.is_vision_model():
+        if self.window.controller.painter.is_active():
             return True
 
         # event: UI: vision
@@ -224,7 +222,12 @@ class Mode:
         return event.data['value']
 
     def are_attachments(self, mode: str) -> bool:
-        """Check if attachments are allowed"""
+        """
+        Check if attachments are allowed
+
+        :param mode: current mode
+        :return: True if attachments are allowed
+        """
         if mode in [MODE_VISION, MODE_ASSISTANT]:
             return True
 
@@ -243,14 +246,6 @@ class Mode:
         self.window.dispatch(event)
         return event.data['value']
 
-    def is_chat_tab(self) -> bool:
-        """
-        Check if current tab is chat
-
-        :return: True if chat tab
-        """
-        return self.window.controller.ui.tabs.get_current_type() == Tab.TAB_CHAT
-
     def show_chat_footer(self):
         """Show chat footer"""
         self.window.ui.nodes['chat.footer'].setVisible(True)