pygpt-net 2.1.37__py3-none-any.whl → 2.4.48__py3-none-any.whl

pygpt_net/controller/layout.py

@@ -6,9 +6,16 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.02.24 00:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
+import os
+
+from PySide6.QtWidgets import QApplication
+from PySide6.QtCore import QRect
+
+from pygpt_net.utils import trans
+
 
 class Layout:
     def __init__(self, window=None):
@@ -19,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):
@@ -31,7 +38,7 @@ class Layout:
         self.text_nodes_restore()
         self.state_restore()
         self.splitters_restore()
-        self.tabs_restore()
+        #  self.tabs_restore()
         self.groups_restore()
         self.scroll_restore()
 
@@ -105,7 +112,8 @@ class Layout:
             # do not save main splitter state if notepad was not opened yet
             if splitter == "calendar" and not self.window.controller.notepad.opened_once:
                 continue
-            data[splitter] = self.window.ui.splitters[splitter].sizes()
+            if splitter in self.window.ui.splitters:
+                data[splitter] = self.window.ui.splitters[splitter].sizes()
         self.window.core.config.set('layout.splitters', data)
 
     def splitters_restore(self):
@@ -116,7 +124,8 @@ class Layout:
         for splitter in self.splitters:
             if splitter in data:
                 try:
-                    self.window.ui.splitters[splitter].setSizes(data[splitter])
+                    if splitter in self.window.ui.splitters:
+                        self.window.ui.splitters[splitter].setSizes(data[splitter])
                 except Exception as e:
                     print("Error while restoring splitter state: " + str(e))
                     self.window.core.debug.log(e)
@@ -137,7 +146,9 @@ class Layout:
     def scroll_save(self):
         """Save scroll state"""
         data = {}
-        data['output'] = self.window.ui.nodes['output'].verticalScrollBar().value()
+        if hasattr(self.window.ui.nodes['output'], 'verticalScrollBar'):
+            data['output'] = self.window.ui.nodes['output'].verticalScrollBar().value()
+
         # notepads
         for id in self.window.ui.notepad:
             scroll_id = "notepad." + str(id)
@@ -161,7 +172,8 @@ class Layout:
                         self.window.core.debug.log(e)
         if 'output' in data:
             try:
-                self.window.ui.nodes['output'].verticalScrollBar().setValue(data['output'])
+                if hasattr(self.window.ui.nodes['output'], 'verticalScrollBar'):
+                    self.window.ui.nodes['output'].verticalScrollBar().setValue(data['output'])
             except Exception as e:
                 print("Error while restoring scroll state: " + str(e))
                 self.window.core.debug.log(e)
@@ -172,15 +184,29 @@ class Layout:
             return
         data = self.window.core.config.get('layout.window')
         try:
+            screen = QApplication.primaryScreen()
+            available_geometry = screen.availableGeometry()
+
             if 'geometry' in data:
                 geometry_data = data['geometry']
-                self.window.move(geometry_data['x'], geometry_data['y'])
-                self.window.resize(geometry_data['width'], geometry_data['height'])
+                x, y, width, height = (geometry_data['x'],
+                                       geometry_data['y'],
+                                       geometry_data['width'],
+                                       geometry_data['height'])
+
+                window_rect = QRect(x, y, width, height)
+                adjusted_rect = available_geometry.intersected(window_rect)
+
+                if not available_geometry.contains(window_rect):
+                    adjusted_rect.adjust(0, 0, -20, -20)  # Adjust to fit within the screen
+
+                self.window.move(adjusted_rect.x(), adjusted_rect.y())
+                self.window.resize(adjusted_rect.width(), adjusted_rect.height())
+
             if 'maximized' in data and data['maximized']:
                 self.window.showMaximized()
         except Exception as e:
             print("Error while restoring window state: " + str(e))
-            self.window.core.debug.log(e)
 
     def state_save(self):
         """Save window state"""
@@ -195,6 +221,12 @@ class Layout:
         data['maximized'] = self.window.isMaximized()
         self.window.core.config.set('layout.window', data)
 
+        # ------------------
+
+        # output zoom save (Chromium, web engine only)
+        if hasattr(self.window.ui.nodes['output'], 'get_zoom_value'):
+            self.window.core.config.set('zoom', self.window.ui.nodes['output'].get_zoom_value())
+
     def restore_plugin_settings(self):
         """Restore groups state"""
         if not self.window.core.config.has('layout.groups'):
@@ -220,3 +252,39 @@ class Layout:
                 except Exception as e:
                     print("Error while restoring group state: " + str(e))
                     self.window.core.debug.log(e)
+
+    def restore_default_css(self, force: bool = False):
+        """
+        Restore app CSS to default
+
+        :param force: Force restore
+        """
+        if not force:
+            self.window.ui.dialogs.confirm(
+                type='restore.css',
+                id=0,
+                msg=trans('dialog.css.restore.confirm'),
+            )
+            return
+
+        # restore css
+        self.window.core.debug.info("Restoring CSS...")
+        self.window.core.filesystem.backup_custom_css()
+        self.window.core.filesystem.install_css(force=True)
+        self.window.core.debug.info("CSS restored.")
+
+        # update editor if opened
+        current_file = self.window.ui.dialog['config.editor'].file
+        if current_file is not None:
+            if current_file.endswith('.css') and self.window.core.settings.active['editor']:
+                self.window.core.settings.load_editor(current_file)
+
+        # show success message
+        self.window.ui.dialogs.alert(trans('dialog.css.restore.confirm.success'))
+        self.window.core.debug.info("Reloading theme...")
+        self.window.controller.theme.reload(force=True)  # reload theme
+        self.window.core.debug.info("Theme reloaded.")
+
+    def reload(self):
+        """Reload layout"""
+        self.post_setup()

pygpt_net/controller/mode.py

@@ -6,10 +6,10 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.15 15:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
-from pygpt_net.core.dispatcher import Event
+from pygpt_net.core.events import Event, AppEvent
 from pygpt_net.item.ctx import CtxItem
 from pygpt_net.utils import trans
 
@@ -24,22 +24,25 @@ class Mode:
         self.window = window
         self.locked = False
 
-    def select(self, idx: int):
+    def select(self, mode: str):
         """
-        Select mode by idx
+        Select mode by id
 
-        :param idx: value of the list (row idx)
+        :param mode
         """
         # check if mode change is not locked
-        if self.change_locked():
+        if self.change_locked() or mode is None:
             return
-        mode = self.window.core.modes.get_by_idx(idx)
         self.set(mode)
 
         event = Event(Event.MODE_SELECT, {
             'value': mode,
         })
-        self.window.core.dispatcher.dispatch(event)
+        self.window.dispatch(event)
+        self.window.controller.attachment.update()
+        self.window.controller.chat.attachment.update()
+        self.window.controller.chat.audio.update()
+        self.window.dispatch(AppEvent(AppEvent.MODE_SELECTED))  # app event
 
     def set(self, mode: str):
         """
@@ -51,10 +54,10 @@ class Mode:
         # if ctx loaded with assistant ID assigned then switch to assistant from ctx
         if mode == "assistant":
             self.window.controller.presets.select_default()
-            if self.window.core.ctx.current is not None \
-                    and self.window.core.ctx.assistant is not None:
+            if self.window.core.ctx.get_current() is not None \
+                    and self.window.core.ctx.get_assistant() is not None:
                 self.window.controller.assistant.select_by_id(
-                    self.window.core.ctx.assistant
+                    self.window.core.ctx.get_assistant()
                 )
             else:
                 self.window.controller.assistant.select_current()
@@ -72,21 +75,39 @@ class Mode:
         # update toolbox, mode, presets, model, assistant and rest of the UI
         self.window.controller.ui.update()
 
+        # update model list
+        self.window.controller.model.init_list()
+        self.window.controller.model.select_current()
+
         # set status: ready
-        self.window.ui.status(trans('status.started'))
+        self.window.update_status(trans('status.started'))
 
         # if assistant mode then update ctx label
         if mode == "assistant":
             self.window.controller.ctx.common.update_label_by_current()
         self.locked = False
 
+    def select_on_list(self, mode: str):
+        """
+        Select mode on the list
+
+        :param mode: mode name
+        """
+        self.window.ui.nodes["prompt.mode"].set_value(mode)
+
+    def init_list(self):
+        """Init modes list"""
+        items = {}
+        data = self.window.core.modes.get_all()
+        for k in data:
+            items[k] = trans(data[k].label)
+        self.window.ui.nodes["prompt.mode"].set_keys(items)
+
     def select_current(self):
         """Select current mode on the list"""
         mode = self.window.core.config.get('mode')
         if mode:
-            idx = self.window.core.modes.get_idx_by_name(mode)
-            current = self.window.ui.models['prompt.mode'].index(idx, 0)
-            self.window.ui.nodes['prompt.mode'].setCurrentIndex(current)
+            self.select_on_list(mode)
 
     def select_default(self):
         """Set default mode"""
@@ -101,10 +122,6 @@ class Mode:
         self.window.controller.presets.select_default()
         self.window.controller.assistant.select_default()
 
-    def update_list(self):
-        """Update modes list"""
-        self.window.ui.toolbox.mode.update(self.window.core.modes.get_all())
-
     def update_temperature(self, temperature: float = None):
         """
         Update current temperature field
@@ -125,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
         """
@@ -141,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
 
@@ -155,15 +184,13 @@ class Mode:
             'prompt': prompt,
         })
         event.ctx = ctx
-        self.window.core.dispatcher.dispatch(event)
+        self.window.dispatch(event)
         return event.data['value']
 
     def update_mode(self):
         """Update mode"""
         self.select_default()  # set default mode
-        self.update_list()  # update modes list
         self.select_current()  # select current mode on the list
-        self.window.controller.chat.vision.update()
 
     def reset_current(self):
         """Reset current setup"""
@@ -171,6 +198,18 @@ class Mode:
         self.window.core.config.set('ai_name', None)
         self.window.core.config.set('user_name', None)
 
+    def next(self):
+        """Select next mode"""
+        mode = self.window.core.config.get('mode')
+        next = self.window.core.modes.get_next(mode)
+        self.select(next)
+
+    def prev(self):
+        """Select previous mode"""
+        mode = self.window.core.config.get('mode')
+        prev = self.window.core.modes.get_prev(mode)
+        self.select(prev)
+
     def change_locked(self) -> bool:
         """
         Check if mode change is locked

pygpt_net/controller/model/__init__.py

@@ -6,11 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.01.30 20:00:00                  #
+# Updated Date: 2024.12.14 00:00:00                  #
 # ================================================== #
 
-from pygpt_net.core.dispatcher import Event
+from typing import Optional
+
+from pygpt_net.core.events import Event, AppEvent
 from pygpt_net.item.model import ModelItem
+
 from .editor import Editor
 
 
@@ -24,22 +27,44 @@ class Model:
         self.window = window
         self.editor = Editor(window)
 
-    def select(self, idx: int):
+    def select(self, model: str):
         """
         Select model
 
-        :param idx: value of the list (row idx)
+        :param model: model ID
         """
         # check if model change is not locked
         if self.change_locked():
             return
-        self.set_by_idx(
-            self.window.core.config.get('mode'),
-            idx,
-        )
+
+        mode = self.window.core.config.get('mode')
+        self.window.core.config.set('model', model)
+        if 'current_model' not in self.window.core.config.data:
+            self.window.core.config.data['current_model'] = {}
+        self.window.core.config.data['current_model'][mode] = model
+
+        event = Event(Event.MODEL_SELECT, {
+            'value': model,
+        })
+        self.window.dispatch(event)
 
         # update all layout
         self.window.controller.ui.update()
+        self.window.dispatch(AppEvent(AppEvent.MODEL_SELECTED))  # app event
+
+    def next(self):
+        """Select next model"""
+        mode = self.window.core.config.get('mode')
+        model = self.window.core.config.get('model')
+        next = self.window.core.models.get_next(model, mode)
+        self.select(next)
+
+    def prev(self):
+        """Select previous model"""
+        mode = self.window.core.config.get('mode')
+        model = self.window.core.config.get('model')
+        prev = self.window.core.models.get_prev(model, mode)
+        self.select(prev)
 
     def set(self, mode: str, model: str):
         """
@@ -69,7 +94,15 @@ class Model:
         event = Event(Event.MODEL_SELECT, {
             'value': model,
         })
-        self.window.core.dispatcher.dispatch(event)
+        self.window.dispatch(event)
+
+    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):
         """Select current model on list"""
@@ -77,9 +110,7 @@ class Model:
         model = self.window.core.config.get('model')
         items = self.window.core.models.get_by_mode(mode)
         if model in items:
-            idx = list(items.keys()).index(model)
-            current = self.window.ui.models['prompt.model'].index(idx, 0)
-            self.window.ui.nodes['prompt.model'].setCurrentIndex(current)
+            self.select_on_list(model)
 
     def select_default(self):
         """Set default model"""
@@ -98,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)
 
@@ -110,23 +145,24 @@ class Model:
             'mode': mode,
             'model': model,  # model instance
         })
-        self.window.core.dispatcher.dispatch(event)
+        self.window.dispatch(event)
         tmp_model = event.data['model']
         if tmp_model is not None:
             model = tmp_model
         return model
 
-    def update_list(self):
-        """Update models list"""
+    def init_list(self):
+        """Init models list"""
         mode = self.window.core.config.get('mode')
-        self.window.ui.toolbox.model.update(
-            self.window.core.models.get_by_mode(mode)
-        )
+        items = {}
+        data = self.window.core.models.get_by_mode(mode)
+        for k in data:
+            items[k] = data[k].name
+        self.window.ui.nodes["prompt.model"].set_keys(items)
 
     def update(self):
         """Update models"""
         self.select_default()
-        self.update_list()
         self.select_current()
 
     def change_locked(self) -> bool:

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.02.22 02:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import copy
+from typing import Optional
 
 from pygpt_net.utils import trans
 
@@ -236,7 +237,7 @@ class Editor:
         if persist:
             self.window.core.models.save()
             self.close()
-            self.window.ui.status(trans("info.settings.saved"))
+            self.window.update_status(trans("info.settings.saved"))
 
     def reload_items(self):
         """Reload items"""
@@ -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