pygpt-net 2.6.60__py3-none-any.whl → 2.6.61__py3-none-any.whl

pygpt_net/core/presets/presets.py

@@ -6,12 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.28 09:00:00                  #
+# Updated Date: 2025.09.26 03:00:00                  #
 # ================================================== #
 
 import copy
 import uuid
-from typing import Optional, Tuple, Dict
+from collections import OrderedDict
+from typing import Optional, Tuple, Dict, List
 
 from packaging.version import Version
 from pygpt_net.core.types import (
@@ -165,10 +166,6 @@ class Presets:
             return MODE_COMPLETION
         if preset.img:
             return MODE_IMAGE
-        # if preset.vision:
-            # return MODE_VISION
-        # if preset.langchain:
-            # return MODE_LANGCHAIN
         if preset.assistant:
             return MODE_ASSISTANT
         if preset.llama_index:
@@ -214,12 +211,10 @@ class Presets:
         attr = self._MODE_TO_ATTR.get(mode)
         if not attr:
             return
-        i = 0
-        for key, item in self.items.items():
-            if getattr(item, attr, False):
-                if i == idx:
-                    return key
-                i += 1
+        ids = list(self.get_by_mode(mode).keys())
+        if idx < 0 or idx >= len(ids):
+            return
+        return ids[idx]
 
     def get_by_id(self, mode: str, id: str) -> Optional[PresetItem]:
         """
@@ -265,7 +260,19 @@ class Presets:
         attr = self._MODE_TO_ATTR.get(mode)
         if not attr:
             return {}
-        return {id: item for id, item in self.items.items() if getattr(item, attr, False)}
+        data = {id: item for id, item in self.items.items() if getattr(item, attr, False)}
+        if not self._dnd_enabled():
+            return data
+        ordered_ids = self._ordered_ids_for_mode(mode)
+        out = OrderedDict()
+        for pid in ordered_ids:
+            itm = data.get(pid)
+            if itm is not None:
+                out[pid] = itm
+        for pid, itm in data.items():
+            if pid not in out:
+                out[pid] = itm
+        return out
 
     def get_idx_by_id(self, mode: str, id: str) -> int:
         """
@@ -275,16 +282,13 @@ class Presets:
         :param id: preset id
         :return: preset idx
         """
-        attr = self._MODE_TO_ATTR.get(mode)
-        if not attr:
+        if id is None:
+            return 0
+        ids = list(self.get_by_mode(mode).keys())
+        try:
+            return ids.index(id)
+        except ValueError:
             return 0
-        i = 0
-        for key, item in self.items.items():
-            if getattr(item, attr, False):
-                if key == id:
-                    return i
-                i += 1
-        return 0
 
     def get_default(self, mode: str) -> Optional[str]:
         """
@@ -293,12 +297,9 @@ class Presets:
         :param mode: mode name
         :return: default prompt name
         """
-        attr = self._MODE_TO_ATTR.get(mode)
-        if not attr:
-            return None
-        for key, item in self.items.items():
-            if getattr(item, attr, False):
-                return key
+        data = self.get_by_mode(mode)
+        for key in data.keys():
+            return key
         return None
 
     def get_duplicate_name(self, id: str) -> Tuple[str, str]:
@@ -331,6 +332,7 @@ class Presets:
         self.items[id].filename = id
         self.items[id].uuid = str(uuid.uuid4())
         self.sort_by_name()
+        self._order_append_new_item(id)
         return id
 
     def remove(
@@ -345,7 +347,10 @@ class Presets:
         :param remove_file: also remove preset JSON config file
         """
         if id in self.items:
+            item = self.items[id]
+            rem_uuid = item.uuid
             self.items.pop(id)
+            self._order_remove_uuid(rem_uuid)
 
         if remove_file:
             self.provider.remove(id)
@@ -366,6 +371,7 @@ class Presets:
         :param preset: preset item
         """
         self.items[preset.filename] = preset
+        self._order_append_new_item(preset.filename)
 
     def update_and_save(self, preset: PresetItem):
         """
@@ -375,6 +381,7 @@ class Presets:
         """
         self.items[preset.filename] = preset
         self.save(preset.filename)
+        self._order_append_new_item(preset.filename)
 
     def get_all(self) -> Dict[str, PresetItem]:
         """
@@ -411,6 +418,7 @@ class Presets:
         self.patch_duplicated()
         self.sort_by_name()
         self.append_current()
+        self._order_sync_all()
 
     def save(self, id: str):
         """
@@ -484,4 +492,183 @@ class Presets:
                 patched = True
             uuids.add(item.uuid)
         if patched:
-            self.save_all()
+            self.save_all()
+
+    # ----------------------------
+    # Ordering (drag & drop) logic
+    # ----------------------------
+
+    def _cfg_get(self, key, default=None):
+        try:
+            return self.window.core.config.get(key)
+        except Exception:
+            return default
+
+    def _cfg_set(self, key, value):
+        try:
+            self.window.core.config.set(key, value)
+        except Exception:
+            pass
+
+    def _dnd_enabled(self) -> bool:
+        """
+        Check global switch for DnD ordering.
+        """
+        v = self._cfg_get('presets.drag_and_drop.enabled', False)
+        return bool(v)
+
+    @staticmethod
+    def _is_special_id(pid: str) -> bool:
+        """
+        current.* presets are special and pinned at top; not movable.
+        """
+        return pid.startswith("current.")
+
+    def _uuid_to_id_map(self) -> Dict[str, str]:
+        return {item.uuid: pid for pid, item in self.items.items() if item.uuid}
+
+    def _visible_ids_for_mode(self, mode: str) -> List[str]:
+        attr = self._MODE_TO_ATTR.get(mode)
+        if not attr:
+            return []
+        return [pid for pid, it in self.items.items() if getattr(it, attr, False)]
+
+    def _visible_regular_ids_for_mode(self, mode: str) -> List[str]:
+        return [pid for pid in self._visible_ids_for_mode(mode) if not self._is_special_id(pid)]
+
+    def _visible_regular_uuids_for_mode(self, mode: str) -> List[str]:
+        ids = self._visible_regular_ids_for_mode(mode)
+        return [self.items[pid].uuid for pid in ids if pid in self.items and self.items[pid].uuid]
+
+    def _build_global_uuid_order(self) -> List[str]:
+        """
+        Rebuild 'global' order each time based on name-sorted presets (excluding current.*).
+        """
+        regs = [(pid, it) for pid, it in self.items.items() if not self._is_special_id(pid)]
+        regs.sort(key=lambda x: x[1].name)
+        return [it.uuid for pid, it in regs if it.uuid]
+
+    def _order_get_store(self) -> Dict[str, List[str]]:
+        store = self._cfg_get('presets_order', {}) or {}
+        fixed = {}
+        for k, v in store.items():
+            if isinstance(v, dict):
+                try:
+                    seq = [v[i] for i in sorted(v.keys(), key=lambda x: int(x))]
+                except Exception:
+                    seq = list(v.values())
+                fixed[k] = seq
+            elif isinstance(v, list):
+                fixed[k] = v
+        return fixed
+
+    def _order_set_store(self, store: Dict[str, List[str]]):
+        self._cfg_set('presets_order', store)
+
+    def _order_sync_mode(self, mode: str, store: Dict[str, List[str]]) -> List[str]:
+        """
+        Ensure mode order is valid:
+        - Start from mode order or fallback to global
+        - Drop unknown UUIDs
+        - Append missing visible UUIDs at the end
+        """
+        visible = self._visible_regular_uuids_for_mode(mode)
+        visible_set = set(visible)
+
+        base = list(store.get(mode) or [])
+        if not base:
+            base = [u for u in store.get('global', []) if u in visible_set]
+
+        base = [u for u in base if u in visible_set]
+
+        seen = set(base)
+        for u in visible:
+            if u not in seen:
+                base.append(u)
+                seen.add(u)
+
+        dedup = []
+        s = set()
+        for u in base:
+            if u not in s:
+                dedup.append(u)
+                s.add(u)
+
+        store[mode] = dedup
+        return dedup
+
+    def _order_sync_all(self):
+        """
+        Sync presets_order with current items and rebuild 'global' each time.
+        """
+        store = self._order_get_store()
+        store['global'] = self._build_global_uuid_order()
+
+        existing = set([it.uuid for it in self.items.values() if it.uuid])
+        for k, lst in list(store.items()):
+            if isinstance(lst, list):
+                store[k] = [u for u in lst if u in existing]
+
+        for mode in self._MODE_TO_ATTR.keys():
+            self._order_sync_mode(mode, store)
+
+        self._order_set_store(store)
+
+    def _ordered_ids_for_mode(self, mode: str) -> List[str]:
+        """
+        Produce ordered preset IDs for given mode:
+        - current.<mode> first (if exists)
+        - then remaining items by order stored as UUIDs
+        """
+        attr = self._MODE_TO_ATTR.get(mode)
+        if not attr:
+            return []
+        store = self._order_get_store()
+        ordered_uuids = self._order_sync_mode(mode, store)
+        self._order_set_store(store)
+
+        uuid_to_id = self._uuid_to_id_map()
+        head_id = f"current.{mode}"
+        out: List[str] = []
+        if head_id in self.items and getattr(self.items[head_id], attr, False):
+            out.append(head_id)
+        for u in ordered_uuids:
+            pid = uuid_to_id.get(u)
+            if pid and getattr(self.items.get(pid, PresetItem()), attr, False):
+                out.append(pid)
+        return out
+
+    def _order_append_new_item(self, pid: str):
+        """
+        Append new preset (by ID) to the end of all applicable mode orders.
+        """
+        if pid not in self.items:
+            return
+        if self._is_special_id(pid):
+            return
+        item = self.items[pid]
+        if not item.uuid:
+            return
+        store = self._order_get_store()
+        modes = [m for m, attr in self._MODE_TO_ATTR.items() if getattr(item, attr, False)]
+        for m in modes:
+            seq = list(store.get(m) or [])
+            if item.uuid not in seq:
+                seq.append(item.uuid)
+                store[m] = seq
+        self._order_set_store(store)
+
+    def _order_remove_uuid(self, rem_uuid: Optional[str]):
+        """
+        Remove a UUID from all order lists (including global).
+        """
+        if not rem_uuid:
+            return
+        store = self._order_get_store()
+        changed = False
+        for k, lst in list(store.items()):
+            if isinstance(lst, list) and rem_uuid in lst:
+                store[k] = [u for u in lst if u != rem_uuid]
+                changed = True
+        if changed:
+            self._order_set_store(store)

pygpt_net/core/render/markdown/parser.py

@@ -63,8 +63,6 @@ class Parser:
             html = self.md.convert(text.strip())
             soup = BeautifulSoup(html, 'html.parser')
             self.strip_whitespace_lists(soup)  # strip whitespace from codeblocks
-            if self.window.core.config.get("ctx.convert_lists"):
-                self.convert_lists_to_paragraphs(soup)  # convert lists to paragraphs
             self.strip_whitespace_codeblocks(soup)  # strip whitespace from codeblocks
             self.parse_code_blocks(soup)  # parse code blocks
             self.format_images(soup)  # add width to img tags

pygpt_net/data/config/config.json

@@ -1,8 +1,8 @@
 {
   "__meta__": {
-    "version": "2.6.60",
-    "app.version": "2.6.60",
-    "updated_at": "2025-09-25T00:00:00"
+    "version": "2.6.61",
+    "app.version": "2.6.61",
+    "updated_at": "2025-09-26T00:00:00"
   },
   "access.audio.event.speech": false,
   "access.audio.event.speech.disabled": [],
@@ -141,7 +141,6 @@
   "ctx.auto_summary": true,
   "ctx.auto_summary.model": "gpt-4o-mini",
   "ctx.code_interpreter": true,
-  "ctx.convert_lists": false,
   "ctx.counters.all": false,
   "ctx.edit_icons": true,
   "ctx.list.expanded": [],
@@ -219,7 +218,6 @@
   "interpreter.input": "",
   "interpreter.ipython": true,
   "lang": "en",
-  "layout.animation.disable": false,
   "layout.density": -1,
   "layout.dialog.geometry.store": true,
   "layout.dialog.geometry": {},
@@ -398,6 +396,8 @@
   "presence_penalty": 0.0,
   "preset": "current.chat",
   "preset.plugins": "",
+  "presets.drag_and_drop.enabled": true,
+  "presets_order": {},
   "prompt": "",
   "prompt.agent.continue": "Continue, or complete the run if the goal is fully achieved.",
   "prompt.agent.continue.always": "Continue reasoning...",
@@ -522,7 +522,6 @@
   },
   "temperature": 1.0,
   "theme": "dark_darker",
-  "theme.markdown": true,
   "theme.style": "chatgpt",
   "top_p": 1.0,
   "upload.data_dir": false,

pygpt_net/data/config/models.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.6.60",
-        "app.version": "2.6.60",
-        "updated_at": "2025-09-25T00:00:00"
+        "version": "2.6.61",
+        "app.version": "2.6.61",
+        "updated_at": "2025-09-26T00:00:00"
     },
     "items": {
         "SpeakLeash/bielik-11b-v2.3-instruct:Q4_K_M": {

pygpt_net/data/config/settings.json

@@ -838,19 +838,6 @@
         "step": 1,
         "advanced": false
     },
-    "layout.animation.disable": {
-        "section": "layout",
-        "type": "bool",
-        "slider": false,
-        "label": "settings.layout.animation.disable",
-        "description": "settings.layout.animation.disable.desc",
-        "value": false,
-        "min": 0,
-        "max": 0,
-        "multiplier": 1,
-        "step": 1,
-        "advanced": false
-    },
     "layout.dialog.geometry.store": {
         "section": "layout",
         "type": "bool",
@@ -863,18 +850,6 @@
         "step": 1,
         "advanced": false
     },
-    "theme.markdown": {
-        "section": "layout",
-        "type": "bool",
-        "slider": false,
-        "label": "settings.theme.markdown",
-        "value": true,
-        "min": 0,
-        "max": 0,
-        "multiplier": 1,
-        "step": 1,
-        "advanced": false
-    },    
     "upload.store": {
         "section": "files",
         "type": "bool",
@@ -1179,24 +1154,12 @@
         "step": null,
         "secret": false
     },
-    "ctx.convert_lists": {
-        "section": "ctx",
-        "type": "bool",
-        "slider": false,
-        "label": "settings.ctx.convert_lists",
-        "description": "settings.ctx.convert_lists.desc",
-        "value": true,
-        "min": null,
-        "max": null,
-        "multiplier": null,
-        "step": null,
-        "advanced": false
-    },
     "max_output_tokens": {
         "section": "model",
         "type": "int",
         "slider": true,
         "label": "settings.max_output_tokens",
+        "description": "settings.zero.limit.desc",
         "value": 50,
         "min": 0,
         "max": 32000,
@@ -1209,6 +1172,7 @@
         "type": "int",
         "slider": true,
         "label": "settings.max_total_tokens",
+        "description": "settings.zero.limit.desc",
         "value": 400,
         "min": 0,
         "max": 256000,

pygpt_net/data/locale/locale.de.ini

@@ -43,6 +43,7 @@ action.profile.delete = Profil entfernen (nur aus Liste)
 action.profile.delete_all = Profil löschen (und alle Benutzerdateien)
 action.redo = Wiederholen
 action.refresh = Aktualisieren
+action.reload: Neuladen
 action.rename = Umbenennen
 action.reset = Zurücksetzen
 action.restore = Wiederherstellen
@@ -50,7 +51,8 @@ action.save = Speichern
 action.save_as = Speichern unter...
 action.save_selection_as = Auswahl speichern unter...
 action.select_all = Alle auswählen
-action.tab.add.chat = Neuen Chat hinzufügen
+action.tab.add.chat: Neuen Chat hinzufügen
+action.tab.add.chat.tooltip: Neuen Chat hinzufügen (RMT für mehr Optionen...)
 action.tab.add.notepad = Neuen Notizblock hinzufügen
 action.tab.add.tool = Neues Werkzeug hinzufügen
 action.tab.close = Schließen
@@ -72,6 +74,8 @@ action.use.read_cmd = Bitten, diese Datei zu lesen...
 action.video.open = Video oder Audio öffnen...
 action.video.play = Video oder Audio abspielen...
 action.video.transcribe = Ton transkribieren...
+agent.builder.title = Agenten-Editor
+agent.builder.tooltip = Öffne den Agenten-Editor
 agent.coder.additional.label = Zusätzlicher Prompt
 agent.coder.additional.prompt.desc = Zusätzlicher Prompt für Agent (wird zum Basis-Prompt hinzugefügt)
 agent.coder.base.label = Basis-Prompt
@@ -101,6 +105,7 @@ agent.option.prompt.planner.desc = Prompt für Planer-Agent
 agent.option.prompt.search.desc = Prompt für Such-Agent
 agent.option.prompt.supervisor.desc = Prompt für Supervisor
 agent.option.prompt.worker.desc = Prompt für Arbeiter
+agent.option.role = Kurze Beschreibung des Betriebs des Agents zur Anweisung des Modells (optional)
 agent.option.section.base = Basisagent
 agent.option.section.chooser = Wähler
 agent.option.section.feedback = Feedback
@@ -239,6 +244,8 @@ clipboard.copied_to = In die Zwischenablage kopiert:
 cmd.enabled = + Werkzeuge
 cmd.tip = Tipp: Um die Ausführung von Werkzeugen aus Plugins zu ermöglichen, müssen Sie die Option "+ Werkzeuge" aktivieren.
 coming_soon = Demnächst...
+common.down = Nach unten verschieben
+common.up = Nach oben verschieben
 confirm.assistant.delete = Assistent löschen?
 confirm.assistant.files.clear = Dateien löschen (nur lokal)?
 confirm.assistant.files.truncate = Sind Sie sicher, dass Sie alle Dateien von allen Speichern entfernen möchten?
@@ -678,6 +685,8 @@ html_canvas.clear.confirm = HTML-Canvas-Ausgabe löschen?
 icon.audio.input = Audioeingang aktivieren/deaktivieren
 icon.audio.output = Audioausgang aktivieren/deaktivieren
 icon.remote_tool.web = Websuche (ferngesteuertes Werkzeug, kein lokales Werkzeug)
+icon.remote_tool.web.disabled: Websuche (Remote-Tool, kein lokales Tool) - deaktiviert
+icon.remote_tool.web.enabled: Websuche (Remote-Tool, kein lokales Tool) - aktiviert
 icon.video.capture = Videoaufnahme von der Kamera aktivieren/deaktivieren
 idx.btn.clear = Index löschen
 idx.btn.index_all = Alles indizieren
@@ -773,6 +782,7 @@ menu.config.save = Konfiguration speichern
 menu.config.settings = Einstellungen...
 menu.debug = Debug
 menu.debug.agent = Agent...
+menu.debug.agent_builder = Agenten-Editor
 menu.debug.app.log = Logdatei ansehen (app.log)
 menu.debug.assistants = Assistenten...
 menu.debug.attachments = Dateien/Anhänge...
@@ -826,6 +836,7 @@ menu.theme.style = Stil...
 menu.theme.syntax = Syntaxhervorhebung des Codes...
 menu.theme.tooltips = Tooltips anzeigen
 menu.tools = Werkzeuge
+menu.tools.agent.builder = Agenten-Editor
 menu.tools.audio.transcribe = Audio-/Videodateien transkribieren
 menu.tools.html_canvas = HTML/JS-Canvas
 menu.tools.image.viewer = Bildbetrachter
@@ -933,6 +944,57 @@ multimodal.audio = Audio
 multimodal.image = Bild
 multimodal.text = Text
 multimodal.video = Video
+node.editor.bottom.tip: Rechtsklick: Knoten hinzufügen / rückgängig machen / wiederherstellen • Mittelklick: Ansichts verschieben • Strg + Mausrad: zoom; Linksklick auf Port: Verbindung erstellen • Strg + Linksklick auf Port: neu verdrahten/lösen • Rechtsklick oder ENTF auf Knoten/Verbindung: entfernen
+node.editor.cap.na: k.A.
+node.editor.cap.unlimited: unbegrenzt (∞)
+node.editor.cmd.add: Hinzufügen
+node.editor.cmd.clear: Leeren
+node.editor.cmd.connect: Verbinden
+node.editor.cmd.delete_connection: Verbindung löschen
+node.editor.cmd.delete_node: Knoten löschen
+node.editor.cmd.move_node: Knoten verschieben
+node.editor.cmd.resize_node: Knotengröße ändern
+node.editor.cmd.rewire_connection: Verbindung neu verdrahten
+node.editor.edge.delete: Verbindung löschen
+node.editor.hint.click_start: Klicken: eine neue Verbindung starten
+node.editor.hint.ctrl_rewire: Strg+Klicken: bestehende neu verdrahten/lösen
+node.editor.label.id: ID
+node.editor.lbl.allowed: Erlaubte Verbindungen:
+node.editor.lbl.node: Knoten:
+node.editor.lbl.port: Anschluss:
+node.editor.list.tip: Liste der hinzugefügten benutzerdefinierten Agenten-Workflows
+node.editor.macro.delete_selection: Auswahl löschen
+node.editor.menu.add: Hinzufügen
+node.editor.menu.clear: Leeren
+node.editor.menu.redo: Wiederherstellen
+node.editor.menu.undo: Rückgängig
+node.editor.node.delete: Löschen
+node.editor.node.rename: Umbenennen
+node.editor.overlay.grab: Greifen: globales Schwenken mit LMT umschalten
+node.editor.overlay.zoom_in: Vergrößern
+node.editor.overlay.zoom_out: Verkleinern
+node.editor.property.agent.name = Agent
+node.editor.property.input.name = Eingabe
+node.editor.property.instruction.name = Anweisung
+node.editor.property.instruction.placeholder = Systemanweisung für den Agenten
+node.editor.property.local_tools.name = Lokale Werkzeuge
+node.editor.property.memory.name = Speicher
+node.editor.property.name.name = Name
+node.editor.property.name.placeholder = Name des Agenten
+node.editor.property.output.name = Ausgabe
+node.editor.property.remote_tools.name = Remote-Werkzeuge
+node.editor.property.role.name = Rolle
+node.editor.property.role.placeholder = Optionale kurze Beschreibung des Zwecks des Agenten
+node.editor.rename.label: Name:
+node.editor.rename.title: Knoten umbenennen
+node.editor.side.input: Eingang
+node.editor.side.output: Ausgang
+node.editor.spec.agent.title = Agent
+node.editor.spec.end.title = Ende
+node.editor.spec.memory.title = Speicher (Kontext)
+node.editor.spec.start.title = Start
+node.editor.status.no_nodes: Keine Knoten
+node.editor.type.unknown: Unbekannt
 notify.agent.goal.content = Agent: das Ziel wurde erreicht.
 notify.agent.goal.title = Ziel erreicht
 notify.agent.stop.content = Agent: gestoppt
@@ -1418,6 +1480,7 @@ settings.vision.capture.idx = Kameragerät
 settings.vision.capture.idx.desc = Wählen Sie ein Kameragerät für die Echtzeit-Videoaufnahme
 settings.vision.capture.quality = Aufnahmequalität (%)
 settings.vision.capture.width = Aufnahmewidth (in Pixeln)
+settings.zero.limit.desc: Stellen Sie 0 ein, um das Limit zu deaktivieren.
 settings.zoom = Zoomen des Chat-Ausgabefensters
 speech.enable = Sprachausgabe aktivieren
 speech.listening = Sprechen Sie jetzt...