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

pygpt_net/controller/kernel/stack.py

@@ -6,9 +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 08:00:00                  #
 # ================================================== #
 
+from typing import Any
+
 from PySide6.QtWidgets import QApplication
 
 from pygpt_net.core.events import KernelEvent
@@ -118,7 +120,7 @@ class Stack:
             self.execute(self.current)
             self.processed = True
 
-    def waiting(self):
+    def waiting(self) -> bool:
         """
         Check if reply stack is waiting
 
@@ -126,7 +128,7 @@ class Stack:
         """
         return self.has() and not self.is_locked()
 
-    def log(self, data: any):
+    def log(self, data: Any):
         """
         Log data to debug
 

pygpt_net/controller/lang/custom.py

@@ -6,7 +6,7 @@
 # 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.09 00:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -37,12 +37,7 @@ class Custom:
 
     def apply(self):
         """Apply custom mappings"""
-        # output: tabs
-        # self.window.ui.tabs['output'].setTabText(0, trans('output.tab.chat'))
-        # self.window.ui.tabs['output'].setTabText(1, trans('output.tab.files'))
-        # self.window.ui.tabs['output'].setTabText(2, trans('output.tab.calendar'))
-        # self.window.ui.tabs['output'].setTabText(3, trans('output.tab.painter'))
-
+        
         # tool: indexer
         self.window.ui.tabs['tool.indexer'].setTabText(0, trans('tool.indexer.tab.files'))
         self.window.ui.tabs['tool.indexer'].setTabText(1, trans('tool.indexer.tab.web'))

pygpt_net/controller/lang/mapping.py

@@ -6,9 +6,11 @@
 # 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 08:00:00                  #
 # ================================================== #
 
+from typing import Dict
+
 from pygpt_net.utils import trans
 
 
@@ -69,7 +71,7 @@ class Mapping:
             if k in self.window.ui.menu:
                 self.window.ui.menu[k].setText(trans("output.tab." + self.window.controller.tools.get_tab_tools()[k][0]))
 
-    def get_mapping(self) -> dict:
+    def get_mapping(self) -> Dict[str, Dict[str, str]]:
         """
         Get nodes => locale keys mapping
 
@@ -332,6 +334,7 @@ class Mapping:
         menu_title['theme.light'] = 'menu.theme.light'
         menu_title['theme.syntax'] = 'menu.theme.syntax'
         menu_title['theme.density'] = 'menu.theme.density'
+        menu_title['theme.style'] = 'menu.theme.style'
         menu_title['menu.plugins'] = 'menu.plugins'
         menu_title['menu.plugins.presets'] = 'menu.plugins.presets'
         menu_title['menu.about'] = 'menu.info'
@@ -357,7 +360,6 @@ class Mapping:
         menu_text['config.profile.new'] = 'menu.config.profile.new'
         menu_text['config.save'] = 'menu.config.save'
         menu_text['theme.tooltips'] = 'menu.theme.tooltips'
-        menu_text['theme.blocks'] = 'menu.theme.blocks'
         menu_text['theme.settings'] = 'menu.theme.settings'
         menu_text['plugins.presets.new'] = 'menu.plugins.presets.new'
         menu_text['plugins.presets.edit'] = 'menu.plugins.presets.edit'

pygpt_net/controller/layout.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.17 03:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 import os
@@ -26,7 +26,7 @@ class Layout:
         """
         self.window = window
         # self.splitters = ["main", "main.output", "toolbox", "toolbox.mode", "toolbox.presets"]
-        self.splitters = ["main", "main.output", "toolbox", "toolbox.mode", "calendar", "interpreter", "interpreter.columns"]
+        self.splitters = ["main", "main.output", "toolbox", "toolbox.mode", "calendar", "interpreter", "interpreter.columns", "columns"]
         self.text_nodes = ["input"]
 
     def setup(self):

pygpt_net/controller/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.26 19:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.events import Event, AppEvent
@@ -87,7 +87,7 @@ class Mode:
             self.window.controller.ctx.common.update_label_by_current()
         self.locked = False
 
-    def select_on_list(self, mode):
+    def select_on_list(self, mode: str):
         """
         Select mode on the list
 
@@ -142,7 +142,14 @@ class Mode:
                                                        hooks=False)  # disable hooks to prevent circular update
         '''
 
-    def hook_global_temperature(self, key, value, caller, *args, **kwargs):
+    def hook_global_temperature(
+            self,
+            key: str,
+            value,
+            caller,
+            *args,
+            **kwargs
+    ):
         """
         Hook: on update current temperature global field
         """
@@ -158,7 +165,12 @@ class Mode:
                 preset.temperature = temperature
                 self.window.core.presets.save(preset_id)
 
-    def switch_inline(self, mode: str, ctx: CtxItem, prompt: str) -> str:
+    def switch_inline(
+            self,
+            mode: str,
+            ctx: CtxItem,
+            prompt: str
+    ) -> str:
         """
         Switch inline mode
 

pygpt_net/controller/model/__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.20 21:00:00                  #
+# Updated Date: 2024.12.14 00:00:00                  #
 # ================================================== #
 
+from typing import Optional
+
 from pygpt_net.core.events import Event, AppEvent
 from pygpt_net.item.model import ModelItem
 
@@ -94,7 +96,12 @@ class Model:
         })
         self.window.dispatch(event)
 
-    def select_on_list(self, model):
+    def select_on_list(self, model: str):
+        """
+        Select model on list
+
+        :param model: model ID
+        """
         self.window.ui.nodes["prompt.model"].set_value(model)
 
     def select_current(self):
@@ -122,7 +129,11 @@ class Model:
                 # or set default model
                 self.window.core.config.set('model', self.window.core.models.get_default(mode))
 
-    def switch_inline(self, mode: str, model: ModelItem = None) -> ModelItem:
+    def switch_inline(
+            self,
+            mode: str,
+            model: Optional[ModelItem] = None
+    ) -> ModelItem:
         """
         Switch inline model instance (force change model if needed)
 

pygpt_net/controller/model/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.20 21:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import copy
+from typing import Optional
 
 from pygpt_net.utils import trans
 
@@ -261,7 +262,11 @@ class Editor:
         self.set_by_tab(idx)
         self.init()
 
-    def delete_by_idx(self, idx: int, force: bool = False):
+    def delete_by_idx(
+            self,
+            idx: int,
+            force: bool = False
+    ):
         """
         Delete model by idx
 
@@ -387,7 +392,7 @@ class Editor:
             i += 1
         return model_idx
 
-    def get_model_by_tab_idx(self, idx: int) -> str or None:
+    def get_model_by_tab_idx(self, idx: int) -> Optional[str]:
         """
         Get model key by list index
 

pygpt_net/controller/notepad.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.17 17:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Optional, Tuple
+
 from PySide6.QtGui import QTextCursor
 
 from pygpt_net.core.tabs.tab import Tab
@@ -16,6 +18,7 @@ from pygpt_net.item.notepad import NotepadItem
 from pygpt_net.ui.widget.tabs.body import TabBody
 from pygpt_net.ui.widget.textarea.notepad import NotepadWidget
 from pygpt_net.utils import trans
+
 import pygpt_net.icons_rc
 
 
@@ -29,7 +32,10 @@ class Notepad:
         self.window = window
         self.opened_once = False
 
-    def create(self, idx: int = None) -> (TabBody, int):
+    def create(
+            self,
+            idx: Optional[int] = None
+    ) -> Tuple[TabBody, int, int]:
         """
         Create notepad widget
 
@@ -38,13 +44,14 @@ class Notepad:
         """
         if idx is None:
             idx = self.window.core.tabs.count_by_type(Tab.TAB_NOTEPAD) + 1
-        self.window.ui.notepad[idx] = NotepadWidget(self.window)
-        self.window.ui.notepad[idx].id = idx
-        self.window.ui.notepad[idx].textarea.id = idx
+        data_id = idx
+        self.window.ui.notepad[data_id] = NotepadWidget(self.window)
+        self.window.ui.notepad[data_id].id = idx
+        self.window.ui.notepad[data_id].textarea.id = idx
         title = trans('output.tab.notepad')
         title += " " + str(idx)
-        children = self.window.core.tabs.from_widget(self.window.ui.notepad[idx])
-        return children, idx
+        children = self.window.core.tabs.from_widget(self.window.ui.notepad[data_id])
+        return children, idx, data_id
 
     def load(self):
         """Load all notepads contents"""
@@ -183,10 +190,11 @@ class Notepad:
             return
 
         # switch to first notepad tab if current tab is not notepad
+        tabs = self.window.ui.layout.get_active_tabs()
         if self.window.controller.ui.tabs.get_current_type() != Tab.TAB_NOTEPAD:
             idx = self.window.core.tabs.get_min_idx_by_type(Tab.TAB_NOTEPAD)
             if idx is not None:
-                self.window.ui.tabs['output'].setCurrentIndex(idx)
+                tabs.setCurrentIndex(idx)
 
         self.window.activateWindow()  # focus
 
@@ -201,7 +209,7 @@ class Notepad:
         self.load()
         self.window.core.notepad.locked = False
 
-    def switch_to_tab(self, idx: int = None):
+    def switch_to_tab(self, idx: Optional[int] = None):
         """
         Switch to notepad tab
 
@@ -209,11 +217,12 @@ class Notepad:
         """
         if idx is None:
             idx = self.get_first_notepad_tab_idx()
+        tabs = self.window.ui.layout.get_active_tabs()
         tab = self.window.core.tabs.get_tab_by_index(idx)
         if tab is not None:
-            self.window.ui.tabs['output'].setCurrentIndex(idx)
+            tabs.setCurrentIndex(idx)
         else:
-            self.window.ui.tabs['output'].setCurrentIndex(self.get_first_notepad_tab_idx())
+            tabs.setCurrentIndex(self.get_first_notepad_tab_idx())
 
     def get_first_notepad_tab_idx(self) -> int:
         """
@@ -257,11 +266,16 @@ class Notepad:
             return True
         return False
 
-    def on_open(self, tab_idx: int):
+    def on_open(
+            self,
+            tab_idx: int,
+            column_idx: int = 0
+    ):
         """
         On open notepad tab
 
         :param tab_idx: current tab idx
+        :param column_idx: column idx
         """
         tab = self.window.controller.ui.tabs.get_current_tab()
         if tab is None:

pygpt_net/controller/painter/capture.py

@@ -6,12 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.24 00:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import datetime
 import math
 import os
+from typing import Optional, Union
+
 import mss
 import mss.tools
 from PIL import Image, ImageDraw
@@ -45,7 +47,13 @@ class Capture:
         image = QImage(frame.data, width, height, bytes, QImage.Format_RGB888)
         self.window.ui.painter.set_image(image)
 
-    def capture_screen_with_custom_cursor(self, save_path) -> str:
+    def capture_screen_with_custom_cursor(self, save_path: str) -> str:
+        """
+        Capture screen with custom cursor
+
+        :param save_path: Save path
+        :return: Save path
+        """
         cursor_path = os.path.join(self.window.core.config.get_app_path(), "data", "icons", "cursor.png")
 
         with mss.mss() as sct:
@@ -72,12 +80,17 @@ class Capture:
         img.save(save_path)
         return save_path
 
-    def screenshot(self, attach_cursor: bool = False, silent: bool = False) -> str:
+    def screenshot(
+            self,
+            attach_cursor: bool = False,
+            silent: bool = False
+    ) -> Optional[Union[str, bool]]:
         """
         Make screenshot and append to attachments
 
         :param attach_cursor: True to with custom cursor
         :param silent: Silent mode
+        :return: Path to screenshot or False if failed
         """
         if not silent:
             # switch to vision mode if needed
@@ -152,7 +165,13 @@ class Capture:
             print("Image capture exception", e)
             self.window.core.debug.log(e)
 
-    def attach(self, name: str, path: str, type: str = 'drawing', silent: bool = False):
+    def attach(
+            self,
+            name: str,
+            path: str,
+            type: str = 'drawing',
+            silent: bool = False
+    ):
         """
         Attach image to attachments
 

pygpt_net/controller/painter/common.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.02.17 15:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Tuple, Optional, Dict, List
+
 from PySide6.QtCore import Qt, QSize
 from PySide6.QtGui import QColor
 
@@ -22,7 +24,7 @@ class Common:
         """
         self.window = window
 
-    def convert_to_size(self, canvas_size: str) -> tuple:
+    def convert_to_size(self, canvas_size: str) -> Tuple[int, int]:
         """
         Convert string to size
 
@@ -64,7 +66,7 @@ class Common:
             self.window.core.config.set('painter.brush.mode', "erase")
             self.window.core.config.save()
 
-    def change_canvas_size(self, selected=None):
+    def change_canvas_size(self, selected: Optional[str] = None):
         """
         Change the canvas size
 
@@ -79,7 +81,7 @@ class Common:
             self.window.core.config.set('painter.canvas.size', selected)
             self.window.core.config.save()
 
-    def change_brush_size(self, size):
+    def change_brush_size(self, size: int):
         """
         Change the brush size
 
@@ -143,7 +145,7 @@ class Common:
                 self.window.ui.nodes['painter.select.brush.size'].findText(str(size))
         )
 
-    def get_colors(self) -> dict:
+    def get_colors(self) -> Dict[str, QColor]:
         """
         Get colors dict
 
@@ -161,7 +163,7 @@ class Common:
             "Violet": QColor('violet')
         }
 
-    def get_sizes(self) -> list:
+    def get_sizes(self) -> List[str]:
         """
         Get brush sizes
 
@@ -169,7 +171,7 @@ class Common:
         """
         return ['1', '2', '3', '5', '8', '12', '15', '20', '25', '30', '50', '100', '200']
 
-    def get_canvas_sizes(self) -> list:
+    def get_canvas_sizes(self) -> List[str]:
         """
         Get canvas sizes
 

pygpt_net/controller/plugins/__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 08:00:00                  #
 # ================================================== #
 
+from typing import List, Dict, Any
+
 from PySide6.QtGui import QAction
 
 from pygpt_net.core.types import (
@@ -368,7 +370,11 @@ class Plugins:
         self.window.ui.nodes['chat.plugins'].setText(count_str)
         self.window.ui.nodes['chat.plugins'].setToolTip(tooltip)
 
-    def apply_cmds_all(self, ctx: CtxItem, cmds: list):
+    def apply_cmds_all(
+            self,
+            ctx: CtxItem,
+            cmds: List[Dict[str, Any]]
+    ):
         """
         Apply all commands (inline or not)
 
@@ -381,7 +387,11 @@ class Plugins:
         else:
             return self.apply_cmds_inline(ctx, cmds)
 
-    def apply_cmds(self, ctx: CtxItem, cmds: list):
+    def apply_cmds(
+            self,
+            ctx: CtxItem,
+            cmds: List[Dict[str, Any]]
+    ):
         """
         Apply commands
 
@@ -418,7 +428,11 @@ class Plugins:
 
         return ctx.results
 
-    def apply_cmds_inline(self, ctx: CtxItem, cmds: list):
+    def apply_cmds_inline(
+            self,
+            ctx: CtxItem,
+            cmds: List[Dict[str, Any]]
+    ):
         """
         Apply inline commands
 
@@ -462,7 +476,7 @@ class Plugins:
         self.settings.setup()
         self.update()
 
-    def log(self, data: any):
+    def log(self, data: Any):
         """
         Log data to debug
 

pygpt_net/controller/plugins/presets.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 08:00:00                  #
 # ================================================== #
 
 import copy
+from typing import Dict
 from uuid import uuid4
 
 from PySide6.QtGui import QAction
@@ -156,7 +157,7 @@ class Presets:
         self.update_list()
         self.update_menu()
 
-    def store(self, presets: dict):
+    def store(self, presets: Dict[str, Dict]):
         """
         Store presets
 
@@ -185,7 +186,11 @@ class Presets:
         self.toggle(id)
         self.update_menu()
 
-    def delete_by_idx(self, idx: int, force:bool = False):
+    def delete_by_idx(
+            self,
+            idx: int,
+            force: bool = False
+    ):
         """
         Delete preset by index
 
@@ -241,7 +246,11 @@ class Presets:
                 self.toggle(id)
             self.window.update_status("Preset cleared: " + presets[id]['name'])
 
-    def reset_by_idx(self, idx: int, force: bool = False):
+    def reset_by_idx(
+            self,
+            idx: int,
+            force: bool = False
+    ):
         """
         Reset preset by index
 
@@ -258,7 +267,7 @@ class Presets:
         id = self.get_id_by_idx(idx)
         self.reset(id)
 
-    def get_preset(self, id: str) -> dict:
+    def get_preset(self, id: str) -> Dict:
         """
         Get preset by id
 
@@ -269,7 +278,7 @@ class Presets:
         if id in presets:
             return presets[id]
 
-    def get_presets(self) -> dict:
+    def get_presets(self) -> Dict[str, Dict]:
         """
         Get presets dict
 

pygpt_net/controller/plugins/settings.py

@@ -6,9 +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                  #
 # ================================================== #
 
+from typing import Any
+
 from pygpt_net.core.events import Event
 from pygpt_net.utils import trans
 
@@ -49,7 +51,11 @@ class Settings:
             self.config_initialized = True
         if not self.config_dialog:
             self.init()
-            self.window.ui.dialogs.open('plugin_settings', width=self.width, height=self.height)
+            self.window.ui.dialogs.open(
+                'plugin_settings',
+                width=self.width,
+                height=self.height
+            )
             self.config_dialog = True
 
     def open_plugin(self, id: str):
@@ -161,7 +167,7 @@ class Settings:
         self.init()
         self.window.ui.dialogs.alert(trans('dialog.plugin.settings.defaults.app.result'))
 
-    def get_option(self, id: str, key: str) -> any:
+    def get_option(self, id: str, key: str) -> Any:
         """
         Get plugin option