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

pygpt_net/controller/config/field/cmd.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.29 18:00:00                  #
+# Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any
@@ -36,24 +36,21 @@ class Cmd:
         :param key: Option key
         :param option: Option data
         """
-        if "value" not in option or option["value"] is None:
-            option["value"] = {
-                "enabled": False,
-                "instruction": "",
-                "params": [],
-            }
-        if "params" not in option["value"]:
-            option["value"]["params"] = []
-        if "enabled" not in option["value"]:
-            option["value"]["enabled"] = False
-        if "instruction" not in option["value"]:
-            option["value"]["instruction"] = ""
-
-        params = list(option["value"]["params"])
-        self.window.ui.config[parent_id][key].params.items = params  # replace model data list
-        self.window.ui.config[parent_id][key].params.model.updateData(params)  # update model data
-        self.window.ui.config[parent_id][key].enabled.box.setChecked(option["value"]["enabled"])
-        self.window.ui.config[parent_id][key].instruction.setText(str(option["value"]["instruction"]))
+        v = option.get("value")
+        if not isinstance(v, dict):
+            v = {"enabled": False, "instruction": "", "params": []}
+            option["value"] = v
+        else:
+            v.setdefault("enabled", False)
+            v.setdefault("instruction", "")
+            v.setdefault("params", [])
+
+        params = list(v["params"])
+        cfg = self.window.ui.config[parent_id][key]
+        cfg.params.items = params
+        cfg.params.model.updateData(params)
+        cfg.enabled.box.setChecked(v["enabled"])
+        cfg.instruction.setText(str(v["instruction"]))
 
     def apply_row(
             self,
@@ -70,10 +67,10 @@ class Cmd:
         :param values: dictionary data values
         :param idx: row index
         """
-        # remove .params suffix
         if key.endswith(".params"):
-            key = key.replace(".params", "")
-        self.window.ui.config[parent_id][key].params.update_item(idx, values["params"])
+            key = key[:-7]
+        params_cfg = self.window.ui.config[parent_id][key].params
+        params_cfg.update_item(idx, values["params"])
 
     def get_value(
             self,
@@ -89,12 +86,12 @@ class Cmd:
         :param option: Option data
         :return: list with dictionary values
         """
-        data = {
-            "enabled": self.window.ui.config[parent_id][key].enabled.box.isChecked(),
-            "instruction": self.window.ui.config[parent_id][key].instruction.toPlainText(),
-            "params": self.window.ui.config[parent_id][key].params.model.items,
+        cfg = self.window.ui.config[parent_id][key]
+        return {
+            "enabled": cfg.enabled.box.isChecked(),
+            "instruction": cfg.instruction.toPlainText(),
+            "params": cfg.params.model.items,
         }
-        return data
 
     def to_options(
             self,
@@ -108,37 +105,34 @@ class Cmd:
         :param option: dictionary items option
         :return: options dict
         """
-        # option type: dict
-        if option["type"] == "dict":
-            if "keys" not in option:
+        ty = option.get("type")
+
+        if ty == "dict":
+            keys_map = option.get("keys")
+            if not keys_map:
                 return {}
-            options = {}
-            for key in option["keys"]:
-                item = option["keys"][key]
+            opts = {}
+            prefix = f"{parent_id}."
+            for k, item in keys_map.items():
                 if isinstance(item, str):
-                    item = {
-                        "label": parent_id + '.' + key,
-                        "type": item,  # field type is provided as value in this case
-                    }
-                options[key] = item
-                if "label" not in options[key]:
-                    options[key]["label"] = key
-                    options[key]["label"] = parent_id + "." + options[key]["label"]
-            return options
-
-        # option type: cmd
-        elif option["type"] == "cmd":
-            if "params_keys" not in option:  # keys are stored in "params_keys" in cmd type
+                    opts[k] = {"label": f"{prefix}{k}", "type": item}
+                else:
+                    opts[k] = item
+                    if "label" not in item:
+                        item["label"] = f"{prefix}{k}"
+            return opts
+
+        elif ty == "cmd":
+            params_map = option.get("params_keys")
+            if not params_map:
                 return {}
-            options = {}
-            for key in option["params_keys"]:
-                item = option["params_keys"][key]
+            opts = {}
+            prefix = "dictionary.cmd.param."
+            for k, item in params_map.items():
                 if isinstance(item, str):
-                    item = {
-                        "label": 'dictionary.cmd.param.' + key,
-                        "type": item,  # field type is provided as value in this case
-                    }
-                options[key] = item
-                if "label" not in options[key]:
-                    options[key]["label"] = 'dictionary.cmd.param.' + key
-            return options
+                    opts[k] = {"label": f"{prefix}{k}", "type": item}
+                else:
+                    opts[k] = item
+                    if "label" not in item:
+                        item["label"] = f"{prefix}{k}"
+            return opts

pygpt_net/controller/config/field/combo.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.29 18:00:00                  #
+# Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
 from typing import Any, Dict
@@ -38,12 +38,13 @@ class Combo:
         if "value" not in option:
             return
         value = option["value"]
-        if "idx" in option:  # by idx
-            self.window.ui.config[parent_id][key].combo.setCurrentIndex(option["idx"])
-        else: # by value
-            index = self.window.ui.config[parent_id][key].combo.findData(value)
+        combo = self.window.ui.config[parent_id][key].combo
+        if "idx" in option:
+            combo.setCurrentIndex(option["idx"])
+        else:
+            index = combo.findData(value)
             if index != -1:
-                self.window.ui.config[parent_id][key].combo.setCurrentIndex(index)
+                combo.setCurrentIndex(index)
 
     def on_update(
             self,
@@ -62,11 +63,11 @@ class Combo:
         :param value: Option value
         :param hooks: Run hooks
         """
-        # on update hooks
         if hooks:
-            hook_name = "update.{}.{}".format(parent_id, key)
-            if self.window.ui.has_hook(hook_name):
-                hook = self.window.ui.get_hook(hook_name)
+            ui = self.window.ui
+            hook_name = f"update.{parent_id}.{key}"
+            if ui.has_hook(hook_name):
+                hook = ui.get_hook(hook_name)
                 try:
                     hook(key, value, "combo")
                 except Exception as e:
@@ -88,10 +89,11 @@ class Combo:
         :param idx: return selected idx, not the value
         :return: Option text value or selected idx
         """
+        combo = self.window.ui.config[parent_id][key].combo
         if idx:
-            return self.window.ui.config[parent_id][key].combo.currentIndex()
+            return combo.currentIndex()
         else:
-            return self.window.ui.config[parent_id][key].combo.currentData()
+            return combo.currentData()
 
     def update_list(
             self,
@@ -106,7 +108,22 @@ class Combo:
         :param key: Option key
         :param items: Items dict
         """
-        self.window.ui.config[parent_id][key].combo.clear()
-        for item in items:
-            self.window.ui.config[parent_id][key].combo.addItem(items[item], item)
-        self.window.ui.config[parent_id][key].combo.setCurrentIndex(-1)
+        combo = self.window.ui.config[parent_id][key].combo
+        combo.setUpdatesEnabled(False)
+        try:
+            need_rebuild = True
+            if combo.count() == len(items):
+                i = 0
+                need_rebuild = False
+                for k, v in items.items():
+                    if combo.itemData(i) != k or combo.itemText(i) != v:
+                        need_rebuild = True
+                        break
+                    i += 1
+            if need_rebuild:
+                combo.clear()
+                for k, v in items.items():
+                    combo.addItem(v, k)
+            combo.setCurrentIndex(-1)
+        finally:
+            combo.setUpdatesEnabled(True)

pygpt_net/controller/config/field/dictionary.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.29 18:00:00                  #
+# Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, List
@@ -37,11 +37,15 @@ class Dictionary:
         :param key: Option key
         :param option: Option data
         """
-        if "value" not in option or option["value"] is None:
+        if option.get("value") is None:
             option["value"] = []
-        values = list(option["value"])
-        self.window.ui.config[parent_id][key].items = values  # replace model data list
-        self.window.ui.config[parent_id][key].model.updateData(values)  # update model data
+            values = []
+        else:
+            v = option["value"]
+            values = v.copy() if isinstance(v, list) else list(v)
+        cfg_item = self.window.ui.config[parent_id][key]
+        cfg_item.items = values
+        cfg_item.model.updateData(values)
 
     def apply_row(
             self,
@@ -58,9 +62,8 @@ class Dictionary:
         :param values: dictionary data values
         :param idx: row index
         """
-        # if cmd type, remove .params suffix
         if key.endswith(".params"):
-            key = key.replace(".params", "")
+            key = key[:-7]
         self.window.ui.config[parent_id][key].update_item(idx, values)
 
     def get_value(
@@ -103,15 +106,13 @@ class Dictionary:
             )
             return
 
-        # delete item
         if parent_object is not None:
             parent_object.delete_item_execute(id)
-
-            # on update hooks
             if hooks:
-                hook_name = "update.{}.{}".format(parent_object, id)
-                if self.window.ui.has_hook(hook_name):
-                    hook = self.window.ui.get_hook(hook_name)
+                hook_name = f"update.{parent_object}.{id}"
+                ui = self.window.ui
+                if ui.has_hook(hook_name):
+                    hook = ui.get_hook(hook_name)
                     try:
                         hook(id, {}, "dictionary")
                     except Exception as e:
@@ -129,20 +130,21 @@ class Dictionary:
         :param option: dictionary items option
         :return: options dict
         """
-        if "keys" not in option:
+        keys = option.get("keys")
+        if not keys:
             return {}
-        options = {}
-        for key in option["keys"]:
-            item = option["keys"][key]
+        options: Dict[str, Any] = {}
+        prefix = f"{parent_id}."
+        for key, item in keys.items():
             if isinstance(item, str):
                 item = {
-                    "label": parent_id + '.' + key,
-                    "type": item,  # field type is provided as value in this case
+                    "label": f"{prefix}{key}",
+                    "type": item,
                 }
+            else:
+                if "label" not in item:
+                    item["label"] = f"{prefix}{key}"
             options[key] = item
-            if "label" not in options[key]:
-                options[key]["label"] = key
-                options[key]["label"] = parent_id + "." + options[key]["label"]
         return options
 
     def append_editor(
@@ -158,15 +160,12 @@ class Dictionary:
         :param option: Option dict
         :param data: Option data
         """
-        parent_id = "dictionary." + id
+        parent_id = f"dictionary.{id}"
         sub_options = self.to_options(id, option)
-        for key in sub_options:
-            sub_option = sub_options[key]
-            if key in data:
-                sub_option["value"] = data[key]
-            else:
-                sub_option["value"] = ""
-            self.window.controller.config.apply(
+        apply_fn = self.window.controller.config.apply
+        for key, sub_option in sub_options.items():
+            sub_option["value"] = data.get(key, "")
+            apply_fn(
                 parent_id=parent_id,
                 key=key,
                 option=sub_option,
@@ -187,35 +186,29 @@ class Dictionary:
         :param fields: Fields dict
         :param hooks: run hooks
         """
-        values = {}
-        dict_id = parent + "." + option_key
-        dialog_id = "dictionary." + parent + "." + option_key  # dictionary parent ID
-        idx = self.window.ui.dialog["editor." + dialog_id].idx  # editing record idx is stored in dialog idx
-        for key in fields:
-            value = self.window.controller.config.get_value(
-                parent_id="dictionary." + dict_id,
+        values: Dict[str, Any] = {}
+        dict_id = f"{parent}.{option_key}"
+        dialog_id = f"dictionary.{dict_id}"
+        dialog_key = f"editor.{dialog_id}"
+        ui = self.window.ui
+        idx = ui.dialog[dialog_key].idx
+        get_value_fn = self.window.controller.config.get_value
+        fields_parent_id = f"dictionary.{dict_id}"
+        for key, field in fields.items():
+            values[key] = get_value_fn(
+                parent_id=fields_parent_id,
                 key=key,
-                option=fields[key],
+                option=field,
             )
-            values[key] = value
-
-        # update values in dictionary item on list in parent
-        self.apply_row(
-            parent,
-            option_key,
-            values,
-            idx,
-        )
 
-        # close dialog
-        self.window.ui.dialog['editor.' + dialog_id].close()
+        self.apply_row(parent, option_key, values, idx)
+        ui.dialog[dialog_key].close()
 
-        # on update hooks
         if hooks:
-            hook_name = "update.{}.{}".format(parent, option_key)
-            if self.window.ui.has_hook(hook_name):
-                hook = self.window.ui.get_hook(hook_name)
+            hook_name = f"update.{parent}.{option_key}"
+            if ui.has_hook(hook_name):
+                hook = ui.get_hook(hook_name)
                 try:
-                    hook(option_key, [values], "dictionary")  # value must be list here
+                    hook(option_key, [values], "dictionary")
                 except Exception as e:
-                    self.window.core.debug.log(e)
+                    self.window.core.debug.log(e)

pygpt_net/controller/config/field/input.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.29 18:00:00                  #
+# Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
 from typing import Any, Dict, Optional, Union
@@ -36,30 +36,45 @@ class Input:
         """
         if "value" not in option:
             return
+
+        ui = self.window.ui
+        parent = ui.config.get(parent_id)
+        if not parent:
+            return
+        widget = parent.get(key)
+        if widget is None:
+            return
+
         value = option["value"]
+        typ = option.get("type")
 
-        # type
-        if "type" in option and option["type"] == "int":
+        if typ == "int":
             try:
                 value = round(int(value), 0)
-            except Exception:
+            except (ValueError, TypeError):
                 value = 0
-        elif "type" in option and option["type"] == "float":
+        elif typ == "float":
             try:
                 value = float(value)
-            except Exception:
+            except (ValueError, TypeError):
                 value = 0.0
 
-        # min/max
-        if "type" in option and (option["type"] == "int" or option["type"] == "float"):
-            if value is not None:
-                if "min" in option and (option["min"] is not None and value < option["min"]):
-                    value = option["min"]
-                elif "max" in option and (option["max"] is not None and value > option["max"]):
-                    value = option["max"]
+        if typ in ("int", "float") and value is not None:
+            minv = option.get("min")
+            maxv = option.get("max")
+            if minv is not None and value < minv:
+                value = minv
+            elif maxv is not None and value > maxv:
+                value = maxv
 
-        if parent_id in self.window.ui.config and key in self.window.ui.config[parent_id]:
-            self.window.ui.config[parent_id][key].setText("{}".format(value))
+        new_text = str(value)
+        curr_val = None
+        if hasattr(widget, 'text'):
+            curr_val = widget.text()
+        elif hasattr(widget, 'toPlainText'):
+            curr_val = widget.toPlainText()
+        if curr_val != new_text:
+            widget.setText(new_text)
 
     def on_update(
             self,
@@ -68,7 +83,7 @@ class Input:
             option: Dict[str, Any],
             value: Any,
             hooks: bool = True,
-            only_hook = False,
+            only_hook: bool = False,
     ):
         """
         On update event handler
@@ -84,11 +99,11 @@ class Input:
         if not only_hook:
             self.apply(parent_id, key, option)
 
-        # on update hooks
         if hooks:
-            hook_name = "update.{}.{}".format(parent_id, key)
-            if self.window.ui.has_hook(hook_name):
-                hook = self.window.ui.get_hook(hook_name)
+            ui = self.window.ui
+            hook_name = f"update.{parent_id}.{key}"
+            if ui.has_hook(hook_name):
+                hook = ui.get_hook(hook_name)
                 try:
                     hook(key, value, "input")
                 except Exception as e:
@@ -108,17 +123,20 @@ class Input:
         :param option: Option data
         :return: Value
         """
-        value = None
-        if option["type"] == "int":
+        typ = option["type"]
+        widget = self.window.ui.config[parent_id][key]
+        text = widget.text()
+
+        if typ == "int":
             try:
-                value = int(self.window.ui.config[parent_id][key].text())
-            except Exception:
-                value = 0
-        elif option["type"] == "float":
+                return int(text)
+            except (ValueError, TypeError):
+                return 0
+        elif typ == "float":
             try:
-                value = float(self.window.ui.config[parent_id][key].text())
-            except Exception:
-                value = 0.0
-        elif option["type"] == "text":
-            value = self.window.ui.config[parent_id][key].text()
-        return value
+                return float(text)
+            except (ValueError, TypeError):
+                return 0.0
+        elif typ == "text":
+            return text
+        return None

pygpt_net/controller/config/field/slider.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.08 21:00:00                  #
+# Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
 from typing import Any, Optional, Dict, Union
@@ -38,61 +38,61 @@ class Slider:
         """
         if "value" not in option:
             return
-        value = option["value"]
-        is_integer = False
-        multiplier = 1
 
-        if "type" in option and option["type"] == "int":
-            is_integer = True
-        if "multiplier" in option:
-            multiplier = option["multiplier"]
+        ui = self.window.ui
+        cfg_parent = ui.config.get(parent_id)
+        field = cfg_parent.get(key) if cfg_parent else None
+
+        is_integer = option.get("type") == "int"
+        multiplier = option.get("multiplier", 1)
+
+        value = option["value"]
 
         if type != "slider":
             if is_integer:
                 try:
-                    value = round(int(value), 0)
-                except Exception as e:
+                    value = round(int(float(value)), 0)
+                except Exception:
                     value = 0
             else:
                 try:
                     value = float(value)
-                except Exception as e:
+                except Exception:
                     value = 0.0
 
-            if "min" in option and value < option["min"]:
-                value = option["min"]
-            elif "max" in option and value > option["max"]:
-                value = option["max"]
+            min_v = option.get("min")
+            max_v = option.get("max")
+            if min_v is not None and value < min_v:
+                value = min_v
+            elif max_v is not None and value > max_v:
+                value = max_v
 
-            # update connected input field
-            if parent_id in self.window.ui.config and key in self.window.ui.config[parent_id]:
-                self.window.ui.config[parent_id][key].input.setText(str(value))
+            if field:
+                field.input.setText(str(value))
 
         slider_value = round(float(value) * multiplier, 0)
 
-        # from slider
         if type == "slider":
             input_value = value / multiplier
             if is_integer:
-                input_value = round(int(input_value), 0)
-            txt = "{}".format(input_value)
-            self.window.ui.config[parent_id][key].input.setText(txt)
-
-        # from input
+                try:
+                    input_value = round(int(float(input_value)), 0)
+                except Exception:
+                    input_value = 0
+            if field:
+                field.input.setText(str(input_value))
         elif type == "input":
-            if "min" in option and slider_value < option["min"] * multiplier:
-                slider_value = option["min"] * multiplier
-            elif "max" in option and slider_value > option["max"] * multiplier:
-                slider_value = option["max"] * multiplier
-
-            if parent_id in self.window.ui.config and key in self.window.ui.config[parent_id]:
-                self.window.ui.config[parent_id][key].slider.setValue(slider_value)
-
-        # from value
+            min_v = option.get("min")
+            max_v = option.get("max")
+            if min_v is not None and slider_value < min_v * multiplier:
+                slider_value = min_v * multiplier
+            elif max_v is not None and slider_value > max_v * multiplier:
+                slider_value = max_v * multiplier
+            if field:
+                field.slider.setValue(slider_value)
         else:
-            if parent_id in self.window.ui.config and key in self.window.ui.config[parent_id]:
-                self.window.ui.config[parent_id][key].input.setText(str(value))
-                self.window.ui.config[parent_id][key].slider.setValue(slider_value)
+            if field:
+                field.slider.setValue(slider_value)
 
     def on_update(
             self,
@@ -116,9 +116,8 @@ class Slider:
         option['value'] = value
         self.apply(parent_id, key, option, type)
 
-        # on update hooks
         if hooks:
-            hook_name = "update.{}.{}".format(parent_id, key)
+            hook_name = f"update.{parent_id}.{key}"
             if self.window.ui.has_hook(hook_name):
                 hook = self.window.ui.get_hook(hook_name)
                 try:
@@ -140,14 +139,10 @@ class Slider:
         :param option: Option data
         :return: Slider value (int or float)
         """
-        is_integer = False
-        multiplier = 1
-        if "type" in option and option["type"] == "int":
-            is_integer = True
-        if "multiplier" in option:
-            multiplier = option["multiplier"]
+        is_integer = option.get("type") == "int"
+        multiplier = option.get("multiplier", 1)
         value = self.window.ui.config[parent_id][key].slider.value()
         if is_integer:
             return round(int(value), 0)
         else:
-            return value / multiplier
+            return value / multiplier