pygpt-net 2.6.3__py3-none-any.whl → 2.6.4__py3-none-any.whl

pygpt_net/controller/lang/mapping.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.02 20:00:00                  #
+# Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
 from typing import Dict
@@ -24,76 +24,61 @@ class Mapping:
         self.window = window
         self.mapping = {}
 
+    def _apply_map(self, items, targets, getter_name: str, setter_name: str):
+        t = trans
+        get = getattr
+        for k, key in items.items():
+            w = targets.get(k)
+            if w is None:
+                continue
+            try:
+                v = t(key)
+                getter = get(w, getter_name, None)
+                setter = get(w, setter_name, None)
+                if setter is None:
+                    continue
+                if getter:
+                    try:
+                        if getter() == v:
+                            continue
+                    except Exception:
+                        pass
+                setter(v)
+            except Exception:
+                pass
+
     def apply(self):
         """Apply mapped keys"""
-
-        # load locale mapping
-        if len(self.mapping) == 0:
+        if not self.mapping:
             self.mapping = self.get_mapping()
 
-        # nodes labels
-        for k in self.mapping['nodes']:
-            if k in self.window.ui.nodes:
+        ui = self.window.ui
+        m = self.mapping
+
+        self._apply_map(m['nodes'], ui.nodes, 'text', 'setText')
+        self._apply_map(m['menu.title'], ui.menu, 'title', 'setTitle')
+        self._apply_map(m['menu.text'], ui.menu, 'text', 'setText')
+        self._apply_map(m['menu.tooltip'], ui.menu, 'toolTip', 'setToolTip')
+        self._apply_map(m['dialog.title'], ui.dialog, 'windowTitle', 'setWindowTitle')
+        self._apply_map(m['tooltip'], ui.nodes, 'toolTip', 'setToolTip')
+        self._apply_map(m['placeholder'], ui.nodes, 'placeholderText', 'setPlaceholderText')
+
+        tab_tools = self.window.controller.tools.get_tab_tools()
+        t = trans
+        for k, v in tab_tools.items():
+            w = ui.menu.get(k)
+            if w is None:
+                continue
+            try:
+                val = t("output.tab." + v[0])
                 try:
-                    self.window.ui.nodes[k].setText(trans(self.mapping['nodes'][k]))
-                except:
-                    pass
-
-        # menu title
-        for k in self.mapping['menu.title']:
-            if k in self.window.ui.menu:
-                try:
-                    self.window.ui.menu[k].setTitle(trans(self.mapping['menu.title'][k]))
-                except:
-                    pass
-
-        # menu text
-        for k in self.mapping['menu.text']:
-            if k in self.window.ui.menu:
-                try:
-                    self.window.ui.menu[k].setText(trans(self.mapping['menu.text'][k]))
-                except:
-                    pass
-
-        # menu tooltip
-        for k in self.mapping['menu.tooltip']:
-            if k in self.window.ui.menu:
-                try:
-                    self.window.ui.menu[k].setToolTip(trans(self.mapping['menu.tooltip'][k]))
-                except:
-                    pass
-
-        # dialog title
-        for k in self.mapping['dialog.title']:
-            if k in self.window.ui.dialog:
-                try:
-                    self.window.ui.dialog[k].setWindowTitle(trans(self.mapping['dialog.title'][k]))
-                except:
-                    pass
-
-        # tooltip
-        for k in self.mapping['tooltip']:
-            if k in self.window.ui.nodes:
-                try:
-                    self.window.ui.nodes[k].setToolTip(trans(self.mapping['tooltip'][k]))
-                except:
-                    pass
-
-        # placeholder
-        for k in self.mapping['placeholder']:
-            if k in self.window.ui.nodes:
-                try:
-                    self.window.ui.nodes[k].setPlaceholderText(trans(self.mapping['placeholder'][k]))
-                except:
-                    pass
-
-        # menu tab tools
-        for k in self.window.controller.tools.get_tab_tools():
-            if k in self.window.ui.menu:
-                try:
-                    self.window.ui.menu[k].setText(trans("output.tab." + self.window.controller.tools.get_tab_tools()[k][0]))
-                except:
+                    if hasattr(w, 'text') and w.text() == val:
+                        continue
+                except Exception:
                     pass
+                w.setText(val)
+            except Exception:
+                pass
 
     def get_mapping(self) -> Dict[str, Dict[str, str]]:
         """
@@ -132,8 +117,6 @@ class Mapping:
         nodes['preset.presets.label'] = 'toolbox.presets.label'
         nodes['preset.agents.label'] = 'toolbox.agents.label'
         nodes['preset.experts.label'] = 'toolbox.experts.label'
-        # nodes['preset.presets.new'] = 'preset.new'
-        # nodes['preset.clear'] = 'preset.clear'
         nodes['preset.use'] = 'preset.use'
         nodes['cmd.enabled'] = 'cmd.enabled'
         nodes['toolbox.prompt.label'] = 'toolbox.prompt'
@@ -146,7 +129,6 @@ class Mapping:
         nodes["agent.auto_stop"] = "toolbox.agent.auto_stop.label"
         nodes["agent.continue"] = "toolbox.agent.continue.label"
         nodes['layout.split'] = "layout.split"
-        # nodes["indexes.new"] = "idx.new"
 
         # input
         nodes['input.label'] = 'input.label'
@@ -171,7 +153,6 @@ class Mapping:
 
         # assistants
         nodes['assistants.label'] = 'toolbox.assistants.label'
-        # nodes['assistants.new'] = 'assistant.new'
         nodes['assistants.import'] = 'assistant.import'
         nodes['assistant.btn.save'] = 'dialog.assistant.btn.save'
         nodes['assistant.btn.close'] = 'dialog.assistant.btn.close'
@@ -190,13 +171,7 @@ class Mapping:
         nodes['assistant.store.btn.close'] = 'dialog.assistant.store.btn.close'
         nodes['assistant.store.hide_thread'] = 'assistant.store.hide_threads'
 
-        # nodes['assistant.id_tip'] = 'assistant.new.id_tip'
-        # nodes['assistant.api.tip'] = 'assistant.api.tip'
-
         # vision
-        # nodes['vision.capture.enable'] = 'vision.capture.enable'
-        # nodes['vision.capture.auto'] = 'vision.capture.auto'
-        # nodes['vision.capture.label'] = 'vision.capture.options.title'
         nodes['inline.vision'] = 'inline.vision'
 
         # dialog: plugin settings
@@ -241,7 +216,7 @@ class Mapping:
 
         # extra settings
         nodes["idx.api.warning"] = "settings.llama.extra.api.warning"
-        nodes["idx.db.settings.legend"] = "settings.llama.extra.btn.idx_head"
+        nodes["idx.db.settings.legend.head"] = "settings.llama.extra.btn.idx_head"
 
         # start
         nodes['start.title'] = 'dialog.start.title.text'
@@ -290,7 +265,6 @@ class Mapping:
         nodes['dialog.find.btn.clear'] = 'dialog.find.btn.clear'
         nodes['dialog.find.btn.find_prev'] = 'dialog.find.btn.find_prev'
         nodes['dialog.find.btn.find_next'] = 'dialog.find.btn.find_next'
-        nodes['dialog.find.btn.find_prev'] = 'dialog.find.btn.find_prev'
 
         # dialog: profile
         nodes['dialog.profile.item.btn.dismiss'] = 'dialog.profile.item.btn.dismiss'
@@ -316,10 +290,9 @@ class Mapping:
         nodes['tip.toolbox.presets'] = 'tip.toolbox.presets'
         nodes['tip.toolbox.prompt'] = 'tip.toolbox.prompt'
         nodes['tip.toolbox.assistants'] = 'tip.toolbox.assistants'
-        # nodes['tip.toolbox.indexes'] = 'tip.toolbox.indexes'
         nodes['tip.toolbox.ctx'] = 'tip.toolbox.ctx'
         nodes['tip.toolbox.mode'] = 'tip.toolbox.mode'
-        nodes['plugin.settings.cmd.footer'] = 'cmd.tip'  # plugin settings cmd footer
+        nodes['plugin.settings.cmd.footer'] = 'cmd.tip'
 
         # tool: indexer
         nodes['tool.indexer.idx.label'] = 'tool.indexer.idx'
@@ -344,7 +317,6 @@ class Mapping:
         nodes['tool.indexer.ctx.header.tip'] = 'tool.indexer.tab.ctx.tip'
         nodes['tool.indexer.browse.header.tip'] = 'tool.indexer.tab.browse.tip'
 
-        # menu title
         menu_title = {}
         menu_title['menu.app'] = 'menu.file'
         menu_title['menu.config'] = 'menu.config'
@@ -368,7 +340,6 @@ class Mapping:
         menu_title['menu.tools'] = 'menu.tools'
         menu_title['menu.donate'] = 'menu.info.donate'
 
-        # menu text
         menu_text = {}
         menu_text['app.ctx.new'] = 'menu.file.new'
         menu_text['app.ctx.group.new'] = 'menu.file.group.new'
@@ -408,8 +379,8 @@ class Mapping:
         menu_text['video.capture'] = 'menu.video.capture'
         menu_text['video.capture.auto'] = 'menu.video.capture.auto'
 
-        # debug menu
-        if 'menu.debug' in self.window.ui.menu:
+        ui_menu = self.window.ui.menu
+        if 'menu.debug' in ui_menu:
             menu_text['debug.config'] = 'menu.debug.config'
             menu_text['debug.context'] = 'menu.debug.context'
             menu_text['debug.presets'] = 'menu.debug.presets'
@@ -424,7 +395,6 @@ class Mapping:
             menu_text['debug.logger'] = 'menu.debug.logger'
             menu_text['debug.app.log'] = 'menu.debug.app.log'
 
-        # dialog titles
         dialog_title = {}
         dialog_title['info.about'] = 'dialog.about.title'
         dialog_title['info.changelog'] = 'dialog.changelog.title'
@@ -445,13 +415,10 @@ class Mapping:
         dialog_title['profile.item'] = 'dialog.profile.item.editor'
         dialog_title['tool.indexer'] = 'tool.indexer.title'
 
-        # tooltips
         tooltips = {}
         tooltips['prompt.context'] = 'tip.tokens.ctx'
         tooltips['input.counter'] = 'tip.tokens.input'
         tooltips['inline.vision'] = 'vision.checkbox.tooltip'
-        # tooltips['vision.capture.enable'] = 'vision.capture.enable.tooltip'
-        # tooltips['vision.capture.auto'] = 'vision.capture.auto.tooltip'
         tooltips['cmd.enabled'] = 'cmd.tip'
         tooltips['icon.video.capture'] = 'icon.video.capture'
         tooltips['icon.audio.output'] = 'icon.audio.output'
@@ -459,17 +426,14 @@ class Mapping:
         tooltips['assistant.store.btn.refresh_status'] = 'dialog.assistant.store.btn.refresh_status'
         tooltips['agent.llama.loop.score'] = 'toolbox.agent.llama.loop.score.tooltip'
 
-        # menu tooltips
         menu_tooltips = {}
         menu_tooltips['video.capture'] = 'vision.capture.enable.tooltip'
         menu_tooltips['video.capture.auto'] = 'vision.capture.auto.tooltip'
 
-        # placeholders
         placeholders = {}
         placeholders['ctx.search'] = 'ctx.list.search.placeholder'
         placeholders['interpreter.input'] = 'interpreter.input.placeholder'
 
-        # mapping
         mapping = {}
         mapping['nodes'] = nodes
         mapping['menu.title'] = menu_title
@@ -479,10 +443,8 @@ class Mapping:
         mapping['tooltip'] = tooltips
         mapping['placeholder'] = placeholders
 
-        # tools
         tool_mappings = self.window.tools.get_lang_mappings()
-        for type in tool_mappings:
-            for k in tool_mappings[type]:
-                mapping[type][k] = tool_mappings[type][k]
+        for t, d in tool_mappings.items():
+            mapping.setdefault(t, {}).update(d)
 
-        return mapping
+        return mapping

pygpt_net/controller/lang/plugins.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.22 00:00:00                  #
+# Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
 from pygpt_net.utils import trans
@@ -27,71 +27,80 @@ class Plugins:
         # plugins: info
         self.window.controller.plugins.update_info()
 
-        # reload all domains (plugin locale files)
-        ids = self.window.core.plugins.plugins.keys()
-        for id in ids:
-            plugin = self.window.core.plugins.plugins[id]
+        plugins_dict = self.window.core.plugins.plugins
+        plugin_ids = tuple(plugins_dict.keys())
+        win = self.window
+        ui = win.ui
+        ui_nodes = ui.nodes
+        ui_tabs = ui.tabs
+        settings_tab = ui_tabs['plugin.settings']
+        ui_menu_plugins = ui.menu.get('plugins', {})
+        ui_config = ui.config
+        ctrl_plugins = win.controller.plugins
+
+        for plugin_id in plugin_ids:
+            plugin = plugins_dict[plugin_id]
             if not plugin.use_locale:
                 continue
-            domain = 'plugin.{}'.format(id)
+            domain = f'plugin.{plugin_id}'
             trans('', True, domain)
 
-        # apply to plugin settings
-        for id in ids:
-            plugin = self.window.core.plugins.plugins[id]
+        for plugin_id in plugin_ids:
+            plugin = plugins_dict[plugin_id]
             if not plugin.use_locale:
                 continue
-            domain = 'plugin.{}'.format(id)
+            domain = f'plugin.{plugin_id}'
 
-            # set name, translate if localization is enabled
             name_txt = trans('plugin.name', False, domain)
 
-            # set description, translate if localization is enabled
-            desc_key = 'plugin.settings.' + id + '.desc'
-            desc_txt = trans('plugin.description', False, domain)
-            if desc_key in self.window.ui.nodes:
-                self.window.ui.nodes[desc_key].setText(desc_txt)
+            plugin_settings_desc_key = f'plugin.settings.{plugin_id}.desc'
+            if plugin_settings_desc_key in ui_nodes:
+                desc_txt = trans('plugin.description', False, domain)
+                ui_nodes[plugin_settings_desc_key].setText(desc_txt)
 
-            # update tab name
-            tab_idx = self.window.controller.plugins.get_tab_idx(id)
-            # update tab name
+            tab_idx = ctrl_plugins.get_tab_idx(plugin_id)
             if tab_idx is not None:
-                self.window.ui.tabs['plugin.settings'].setTabText(tab_idx, name_txt)
+                settings_tab.setTabText(tab_idx, name_txt)
 
-            if id in self.window.ui.menu['plugins']:
-                self.window.ui.menu['plugins'][id].setText(name_txt)
+            if plugin_id in ui_menu_plugins:
+                ui_menu_plugins[plugin_id].setText(name_txt)
 
             options = plugin.setup()
-            option_ids = options.keys()
-            for option_id in option_ids:
-                # prepare element nodes keys
-                label_key = 'plugin.' + id + '.' + option_id + '.label'
-                desc_key = 'plugin.' + id + '.' + option_id + '.desc'
-
-                # update options label, description and tooltip
-                label_str = trans(option_id + '.label', False, domain)
-                desc_str = trans(option_id + '.description', False, domain)
-                tooltip_str = trans(option_id + '.tooltip', False, domain)
-
-                if tooltip_str == option_id + '.tooltip':
-                    tooltip_str = desc_str
-                if label_key in self.window.ui.nodes:
-                    self.window.ui.nodes[label_key].setText(label_str)
-                if desc_key in self.window.ui.nodes:
-                    self.window.ui.nodes[desc_key].setText(desc_str)
-                    self.window.ui.nodes[desc_key].setToolTip(tooltip_str)
-
-                if options[option_id]['type'] == 'bool':
-                    # update checkbox label
-                    if domain in self.window.ui.config and option_id in self.window.ui.config[domain]:
-                        try:
-                            if hasattr(self.window.ui.config[domain][option_id], 'setText'):
-                                self.window.ui.config[domain][option_id].setText(label_str)
-                            self.window.ui.config[domain][option_id].box.setText(label_str)
-                        except Exception as e:
-                            pass
-
-        # update settings dialog list
-        idx = self.window.ui.tabs['plugin.settings'].currentIndex()
-        self.window.plugin_settings.update_list('plugin.list', self.window.core.plugins.plugins)
-        self.window.controller.plugins.set_by_tab(idx)
+            if not options:
+                continue
+
+            cfg_domain = ui_config.get(domain)
+            for option_id, option in options.items():
+                label_key = f'plugin.{plugin_id}.{option_id}.label'
+                desc_key = f'plugin.{plugin_id}.{option_id}.desc'
+
+                is_bool = option.get('type') == 'bool'
+                need_label = (label_key in ui_nodes) or (is_bool and cfg_domain and option_id in cfg_domain)
+                need_desc = desc_key in ui_nodes
+
+                label_str = None
+                if need_label:
+                    label_str = trans(f'{option_id}.label', False, domain)
+
+                if need_desc:
+                    desc_str = trans(f'{option_id}.description', False, domain)
+                    tooltip_str = trans(f'{option_id}.tooltip', False, domain)
+                    if tooltip_str == f'{option_id}.tooltip':
+                        tooltip_str = desc_str
+                    ui_nodes[desc_key].setText(desc_str)
+                    ui_nodes[desc_key].setToolTip(tooltip_str)
+
+                if label_key in ui_nodes and label_str is not None:
+                    ui_nodes[label_key].setText(label_str)
+
+                if is_bool and cfg_domain and option_id in cfg_domain and label_str is not None:
+                    widget = cfg_domain[option_id]
+                    if hasattr(widget, 'setText'):
+                        widget.setText(label_str)
+                    box = getattr(widget, 'box', None)
+                    if box and hasattr(box, 'setText'):
+                        box.setText(label_str)
+
+        idx = settings_tab.currentIndex()
+        win.plugin_settings.update_list('plugin.list', plugins_dict)
+        ctrl_plugins.set_by_tab(idx)

pygpt_net/controller/lang/settings.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.22 00:00:00                  #
+# Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
 from pygpt_net.utils import trans
@@ -23,48 +23,49 @@ class Settings:
 
     def apply(self):
         """Apply locale to settings dialog"""
-        # load settings options if not loaded yet
         if not self.window.controller.settings.editor.initialized:
             self.window.controller.settings.editor.load_config_options(False)
 
-        # update settings options labels
-        for id in self.window.controller.settings.editor.options:
-            option = self.window.controller.settings.editor.options[id]
-            option_label = 'settings.{}.label'.format(id)  # TODO: check
-            trans_key = '{}'.format(option['label'])
+        w = self.window
+        tr = trans
+        ctrl_settings = w.controller.settings
+        editor = ctrl_settings.editor
+        options = editor.options
+        ui = w.ui
+        ui_nodes = ui.nodes
+        ui_tabs = ui.tabs
+        ui_config = ui.config['config']
 
-            # label
-            if option['type'] == 'bool':
-                if id in self.window.ui.config['config']:
-                    if hasattr(self.window.ui.config['config'][id], 'setText'):
-                        self.window.ui.config['config'][id].setText(trans(trans_key))
-                    self.window.ui.config['config'][id].box.setText(trans(trans_key))
+        for opt_id, option in options.items():
+            t_label = tr(option['label'])
+            if option.get('type') == 'bool':
+                if opt_id in ui_config:
+                    widget = ui_config[opt_id]
+                    if hasattr(widget, 'setText'):
+                        widget.setText(t_label)
+                    widget.box.setText(t_label)
             else:
-                if option_label in self.window.ui.nodes:
-                    self.window.ui.nodes[option_label].setText(trans(trans_key))
+                node_key = f'settings.{opt_id}.label'
+                node = ui_nodes.get(node_key)
+                if node is not None:
+                    node.setText(t_label)
 
-            # description
-            if 'description' in option \
-                    and option['description'] is not None \
-                    and option['description'].strip() != "":
-                option_desc = 'settings.{}.desc'.format(id)
-                if option_desc in self.window.ui.nodes:
-                    trans_desc_key = '{}'.format(option['description'])
-                    self.window.ui.nodes[option_desc].setText(trans(trans_desc_key))
-                option_desc = option["description"]
-                if option_desc in self.window.ui.nodes:
-                    trans_desc_key = '{}'.format(option['description'])
-                    self.window.ui.nodes[option_desc].setText(trans(trans_desc_key))
+            if 'description' in option and option['description'] is not None and option['description'].strip() != "":
+                desc = option['description']
+                t_desc = tr(desc)
+                node_key1 = f'settings.{opt_id}.desc'
+                node1 = ui_nodes.get(node_key1)
+                if node1 is not None:
+                    node1.setText(t_desc)
+                node2 = ui_nodes.get(desc)
+                if node2 is not None:
+                    node2.setText(t_desc)
 
-        # update sections tabs
-        sections = self.window.core.settings.get_sections()
-        i = 0
-        for section_id in sections.keys():
-            key = 'settings.section.' + section_id
-            self.window.ui.tabs['settings.section'].setTabText(i, trans(key))
-            i += 1
+        sections = w.core.settings.get_sections()
+        tabs = ui_tabs['settings.section']
+        for i, section_id in enumerate(sections.keys()):
+            tabs.setTabText(i, tr(f'settings.section.{section_id}'))
 
-        # update sections list
-        idx = self.window.ui.tabs['settings.section'].currentIndex()
-        self.window.settings.refresh_list()
-        self.window.controller.settings.set_by_tab(idx)
+        idx = tabs.currentIndex()
+        w.settings.refresh_list()
+        ctrl_settings.set_by_tab(idx)

pygpt_net/controller/layout/layout.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 03:00:00                  #
+# Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QApplication
@@ -24,7 +24,16 @@ 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", "columns"]
+        self.splitters = [
+            "main",
+            "main.output",
+            "toolbox",
+            "toolbox.mode",
+            "calendar",
+            "interpreter",
+            "interpreter.columns",
+            "columns",
+        ]
         self.text_nodes = ["input"]
 
     def setup(self):

pygpt_net/controller/plugins/plugins.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 03:00:00                  #
+# Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
 from typing import List, Dict, Any
@@ -386,6 +386,24 @@ class Plugins:
         """
         return self._apply_cmds_common(Event.CMD_EXECUTE, ctx, cmds, all=all, execute_only=execute_only)
 
+    def apply_cmds_all(
+            self,
+            ctx: CtxItem,
+            cmds: List[Dict[str, Any]]
+    ):
+        """
+        Apply all commands (inline or not)
+
+        :param ctx: context
+        :param cmds: commands
+        :return: results
+        """
+        if self.window.core.config.get("cmd"):
+            return self.apply_cmds(ctx, cmds)
+        else:
+            return self.apply_cmds_inline(ctx, cmds)
+
+
     def apply_cmds_inline(
             self,
             ctx: CtxItem,