pygpt-net 2.4.36.post1__py3-none-any.whl → 2.4.41__py3-none-any.whl

pygpt_net/controller/presets/__init__.py

@@ -6,12 +6,14 @@
 # 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 08:00:00                  #
 # ================================================== #
 
 import re
+from typing import Optional, List, Dict
 
 from PySide6.QtGui import QTextCursor
+from PySide6.QtWidgets import QTextEdit
 
 from pygpt_net.core.types import (
     MODE_AGENT,
@@ -57,7 +59,7 @@ class Presets:
         self.window.controller.model.select_current()
         self.window.dispatch(AppEvent(AppEvent.PRESET_SELECTED))  # app event
 
-    def get_current(self) -> PresetItem or None:
+    def get_current(self) -> Optional[PresetItem]:
         """
         Get current preset
 
@@ -92,7 +94,11 @@ class Presets:
             self.window.ui.nodes['preset.prompt'].toPlainText()
         )
 
-    def paste_prompt(self, idx: int, parent: str = "global"):
+    def paste_prompt(
+            self,
+            idx: int,
+            parent: str = "global"
+    ):
         """
         Paste prompt from template
 
@@ -109,7 +115,11 @@ class Presets:
         elif parent == "editor":
             self.paste_to_textarea(self.window.ui.config["preset"]["prompt"], template['prompt'])
 
-    def paste_custom_prompt(self, idx: int, parent: str = "global"):
+    def paste_custom_prompt(
+            self,
+            idx: int,
+            parent: str = "global"
+    ):
         """
         Paste prompt from custom template
 
@@ -126,7 +136,11 @@ class Presets:
         elif parent == "editor":
             self.paste_to_textarea(self.window.ui.config["preset"]["prompt"], template.content)
 
-    def save_prompt(self, name: str = "", force: bool = False):
+    def save_prompt(
+            self,
+            name: str = "",
+            force: bool = False
+    ):
         """
         Save prompt to file
 
@@ -147,7 +161,12 @@ class Presets:
         self.window.core.prompt.custom.new(name, content)
         self.window.update_status("Prompt saved")
 
-    def rename_prompt(self, uuid: str, name: str = "", force: bool = False):
+    def rename_prompt(
+            self,
+            uuid: str,
+            name: str = "",
+            force: bool = False
+    ):
         """
         Rename prompt
 
@@ -169,7 +188,11 @@ class Presets:
         self.window.core.prompt.custom.save()
         self.window.update_status("Prompt renamed")
 
-    def delete_prompt(self, uuid: str, force: bool = False):
+    def delete_prompt(
+            self,
+            uuid: str,
+            force: bool = False
+    ):
         """
         Delete prompt
 
@@ -189,7 +212,11 @@ class Presets:
         self.window.core.prompt.custom.delete(uuid)
         self.window.update_status("Prompt deleted")
 
-    def paste_to_textarea(self, textarea, text: str):
+    def paste_to_textarea(
+            self,
+            textarea: QTextEdit,
+            text: str
+    ):
         """
         Paste text to textarea
 
@@ -213,7 +240,11 @@ class Presets:
         textarea.setTextCursor(cur)
         textarea.setFocus()
 
-    def set(self, mode: str, preset_id: str):
+    def set(
+            self,
+            mode: str,
+            preset_id: str
+    ):
         """
         Set preset
 
@@ -227,7 +258,11 @@ class Presets:
             self.window.core.config.data['current_preset'] = {}
         self.window.core.config.data['current_preset'][mode] = preset_id
 
-    def set_by_idx(self, mode: str, idx: int):
+    def set_by_idx(
+            self,
+            mode: str,
+            idx: int
+    ):
         """
         Set preset by index
 
@@ -327,7 +362,7 @@ class Presets:
         else:
             self.window.core.config.set('prompt', None)
 
-    def get_current_functions(self) -> list or None:
+    def get_current_functions(self) -> Optional[List[Dict]]:
         """
         Get current preset functions
 
@@ -404,7 +439,7 @@ class Presets:
         filename = re.sub(r'[^a-zA-Z0-9_\-\.]', '_', filename)
         return filename
 
-    def duplicate(self, idx: int = None):
+    def duplicate(self, idx: Optional[int] = None):
         """
         Duplicate preset
 
@@ -422,7 +457,7 @@ class Presets:
                     self.editor.edit(idx)
                     self.window.update_status(trans('status.preset.duplicated'))
 
-    def enable(self, idx: int = None):
+    def enable(self, idx: Optional[int] = None):
         """
         Enable preset
 
@@ -436,7 +471,7 @@ class Presets:
                     self.window.core.presets.enable(preset_id)
                     self.refresh()
 
-    def disable(self, idx: int = None):
+    def disable(self, idx: Optional[int] = None):
         """
         Disable preset
 
@@ -486,7 +521,11 @@ class Presets:
         if mode == MODE_ASSISTANT:
             self.window.core.assistants.load()
 
-    def delete(self, idx: int = None, force: bool = False):
+    def delete(
+            self,
+            idx: Optional[int] = None,
+            force: bool = False
+    ):
         """
         Delete preset
 
@@ -533,7 +572,7 @@ class Presets:
         self.window.core.presets.restore(mode)
         self.refresh()
 
-    def is_current(self, idx: int = None) -> bool:
+    def is_current(self, idx: Optional[int] = None) -> bool:
         """
         Check if preset is current
 

pygpt_net/controller/presets/editor.py

@@ -6,11 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 19:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import datetime
 import os
+from typing import Any, Optional, Dict
 
 from pygpt_net.core.types import (
     MODE_AGENT,
@@ -30,7 +31,6 @@ from pygpt_net.utils import trans
 
 from .experts import Experts
 
-
 class Editor:
     def __init__(self, window=None):
         """
@@ -160,7 +160,7 @@ class Editor:
         self.id = "preset"
         self.current = None
 
-    def get_options(self) -> dict:
+    def get_options(self) -> Dict[str, Dict[str, Any]]:
         """
         Get preset options
 
@@ -168,7 +168,7 @@ class Editor:
         """
         return self.options
 
-    def get_option(self, id: str) -> dict:
+    def get_option(self, id: str) -> Dict[str, Any]:
         """
         Get preset option
 
@@ -212,7 +212,14 @@ class Editor:
             self.get_option(key),
         )
 
-    def hook_update(self, key, value, caller, *args, **kwargs):
+    def hook_update(
+            self,
+            key: str,
+            value: Any,
+            caller,
+            *args,
+            **kwargs
+    ):
         """
         Hook: on settings update in real-time (prompt)
 
@@ -230,7 +237,7 @@ class Editor:
             else:
                 self.window.controller.presets.from_global()  # update current preset
 
-    def edit(self, idx: int = None):
+    def edit(self, idx: Optional[int] = None):
         """
         Open preset editor
 
@@ -243,7 +250,7 @@ class Editor:
         self.init(preset)
         self.window.ui.dialogs.open_editor('editor.preset.presets', idx, width=800)
 
-    def init(self, id: str = None):
+    def init(self, id: Optional[str] = None):
         """
         Initialize preset editor
 
@@ -337,7 +344,11 @@ class Editor:
         self.window.ui.config[self.id]['name'].setFocus()
         self.show_hide_by_mode()
 
-    def save(self, force: bool = False, close: bool = True):
+    def save(
+            self,
+            force: bool = False,
+            close: bool = True
+    ):
         """
         Save ore create preset
 
@@ -559,8 +570,13 @@ class Editor:
             value=self.window.core.config.get('model'),
         )
 
-    def update_from_global(self, key, value):
-        """Update field from global config"""
+    def update_from_global(self, key: str, value: Any):
+        """
+        Update field from global config
+
+        :param key: field key
+        :param value: field value
+        """
         preset_id = self.window.core.config.get('preset')
         if preset_id is not None and preset_id != "":
             if preset_id in self.window.core.presets.items:

pygpt_net/controller/settings/__init__.py

@@ -6,10 +6,11 @@
 # 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 00:00:00                  #
 # ================================================== #
 
 import os
+from typing import Optional
 
 from .editor import Editor
 from .profile import Profile
@@ -149,7 +150,7 @@ class Settings:
             i += 1
         return section_idx
 
-    def toggle_file_editor(self, file: str = None):
+    def toggle_file_editor(self, file: Optional[str] = None):
         """
         Toggle file editor
 

pygpt_net/controller/settings/editor.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 17:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import copy
+from typing import Optional, Any, Dict
 
 from pygpt_net.utils import trans
 
@@ -63,6 +64,7 @@ class Editor:
         self.window.ui.add_hook("update.config.debug", self.hook_update)
         self.window.ui.add_hook("update.config.notepad.num", self.hook_update)
         self.window.ui.add_hook("update.config.render.code_syntax", self.hook_update)
+        self.window.ui.add_hook("update.config.theme.style", self.hook_update)
         # self.window.ui.add_hook("llama.idx.storage", self.hook_update)  # vector store update
         # self.window.ui.add_hook("update.config.llama.idx.list", self.hook_update)
 
@@ -93,7 +95,7 @@ class Editor:
         if initialize:
             self.initialized = True
 
-    def save(self, id: str = None):
+    def save(self, id: Optional[str] = None):
         """
         Save settings
 
@@ -163,6 +165,11 @@ class Editor:
             value = self.window.core.config.get('render.code_syntax')
             self.window.controller.theme.toggle_syntax(value, update_menu=True)
 
+        # style
+        if self.config_changed('theme.style'):
+            value = self.window.core.config.get('theme.style')
+            self.window.controller.theme.toggle_style(value)
+
         # convert lists
         if self.config_changed('ctx.convert_lists'):
             self.window.controller.ctx.refresh()
@@ -206,7 +213,14 @@ class Editor:
             return True
         return False
 
-    def hook_update(self, key, value, caller, *args, **kwargs):
+    def hook_update(
+            self,
+            key: str,
+            value: Any,
+            caller,
+            *args,
+            **kwargs
+    ):
         """
         Hook: on settings update
 
@@ -301,7 +315,12 @@ class Editor:
             self.window.core.config.set(key, value)
             self.window.controller.debug.toggle_menu()
 
-    def toggle_collapsed(self, id: str, value: any, section: str):
+    def toggle_collapsed(
+            self,
+            id: str,
+            value: Any,
+            section: str
+    ):
         """
         Toggle collapsed state of section
 
@@ -386,7 +405,7 @@ class Editor:
             return
         self.window.core.settings.load_default_editor_app()
 
-    def get_sections(self) -> dict:
+    def get_sections(self) -> Dict[str, dict]:
         """
         Return settings sections dict
 
@@ -394,7 +413,10 @@ class Editor:
         """
         return self.sections
 
-    def get_options(self, section: str = None) -> dict:
+    def get_options(
+            self,
+            section: Optional[str] = None
+    ) -> Dict[str, Any]:
         """
         Return settings options dict
 
@@ -411,7 +433,7 @@ class Editor:
                     options[key] = self.options[key]
             return options
 
-    def get_option(self, key: str) -> dict:
+    def get_option(self, key: str) -> Dict[str, Any]:
         """
         Return settings option
 

pygpt_net/controller/settings/profile.py

@@ -6,12 +6,13 @@
 # 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 copy
 import os
 from pathlib import Path
+from typing import Optional, Dict, Any
 from uuid import uuid4
 
 from PySide6.QtGui import QAction
@@ -40,7 +41,12 @@ class Profile:
             self.window.profiles.setup()  # widget dialog
             self.dialog_initialized = True
 
-    def switch(self, uuid: str, force: bool = False, save_current: bool = True):
+    def switch(
+            self,
+            uuid: str,
+            force: bool = False,
+            save_current: bool = True
+    ):
         """
         Switch profile
 
@@ -87,7 +93,7 @@ class Profile:
                 break
             idx += 1
 
-    def get_profiles(self) -> dict:
+    def get_profiles(self) -> Dict[str, Dict[str, Any]]:
         """
         Get profiles
 
@@ -158,7 +164,13 @@ class Profile:
         else:
             self.open()
 
-    def handle_update(self, mode: str, name: str, path: str, uuid: str = None):
+    def handle_update(
+            self,
+            mode: str,
+            name: str,
+            path: str,
+            uuid: Optional[str] = None
+    ):
         """
         Handle new/edit profile dialog
 
@@ -356,7 +368,12 @@ class Profile:
                 self.update_list()
                 self.update_menu()
 
-    def duplicate(self, uuid: str, new_name: str, new_path: str):
+    def duplicate(
+            self,
+            uuid: str,
+            new_name: str,
+            new_path: str
+    ):
         """
         Duplicate profile
 

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)