pygpt-net 2.6.20__py3-none-any.whl → 2.6.22__py3-none-any.whl

pygpt_net/controller/idx/indexer.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.03 14:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 import datetime
@@ -14,7 +14,7 @@ import os
 from typing import Any, List, Dict
 
 from PySide6.QtCore import Slot, QObject
-from qasync import QApplication
+from PySide6.QtWidgets import QApplication
 
 from pygpt_net.core.idx.worker import IndexWorker
 from pygpt_net.item.ctx import CtxMeta
@@ -83,7 +83,7 @@ class Indexer(QObject):
         """
         if not force:
             self.tmp_idx = idx  # store tmp index name (for confirmation)
-            content = trans('idx.confirm.db.content') + "\n" + trans('idx.token.warn')
+            content = f"{trans('idx.confirm.db.content')}\n{trans('idx.token.warn')}"
             self.window.ui.dialogs.confirm(
                 type='idx.index.db',
                 id=meta_id,
@@ -92,18 +92,19 @@ class Indexer(QObject):
             return
 
         meta = self.window.core.ctx.get_meta_by_id(meta_id)
-        from_ts = meta.indexed
         self.window.update_status(trans('idx.status.indexing'))
 
-        self.worker = IndexWorker()
-        self.worker.window = self.window
-        self.worker.content = meta_id
-        self.worker.idx = idx
-        self.worker.type = "db_meta"
-        self.worker.from_ts = from_ts
-        self.worker.signals.finished.connect(self.handle_finished_db_meta)
-        self.worker.signals.error.connect(self.handle_error)
-        self.window.threadpool.start(self.worker)
+        worker = IndexWorker()
+        worker.window = self.window
+        worker.content = meta_id
+        worker.idx = idx
+        worker.type = "db_meta"
+        worker.from_ts = meta.indexed
+        worker.signals.finished.connect(self.handle_finished_db_meta)
+        worker.signals.error.connect(self.handle_error)
+        self.window.threadpool.start(worker)
+        self.worker = worker
+
         self.window.controller.idx.on_idx_start()  # on start
 
     def index_ctx_current(
@@ -146,15 +147,16 @@ class Indexer(QObject):
         :param idx: index name
         :param sync: sync mode
         """
-        self.worker = IndexWorker()
-        self.worker.window = self.window
-        self.worker.content = meta.id
-        self.worker.idx = idx
-        self.worker.type = "db_meta"
-        self.worker.from_ts = meta.indexed
-        self.worker.silent = True
-        self.worker.signals.finished.connect(self.handle_finished_db_meta)
-        self.worker.signals.error.connect(self.handle_error)
+        worker = IndexWorker()
+        worker.window = self.window
+        worker.content = meta.id
+        worker.idx = idx
+        worker.type = "db_meta"
+        worker.from_ts = meta.indexed
+        worker.silent = True
+        worker.signals.finished.connect(self.handle_finished_db_meta)
+        worker.signals.error.connect(self.handle_error)
+        self.worker = worker
 
         if sync:
             self.worker.run()
@@ -204,15 +206,17 @@ class Indexer(QObject):
             )
             return
 
-        self.worker = IndexWorker()
-        self.worker.window = self.window
-        self.worker.content = ts
-        self.worker.idx = idx
-        self.worker.type = "db_current"
-        self.worker.silent = silent
-        self.worker.signals.finished.connect(self.handle_finished_db_current)
-        self.worker.signals.error.connect(self.handle_error)
-        self.window.threadpool.start(self.worker)
+        worker = IndexWorker()
+        worker.window = self.window
+        worker.content = ts
+        worker.idx = idx
+        worker.type = "db_current"
+        worker.silent = silent
+        worker.signals.finished.connect(self.handle_finished_db_current)
+        worker.signals.error.connect(self.handle_error)
+        self.window.threadpool.start(worker)
+        self.worker = worker
+
         self.window.controller.idx.on_idx_start()  # on start
 
     def index_path(
@@ -231,16 +235,19 @@ class Indexer(QObject):
         :param recursive: recursive indexing
         """
         self.window.update_status(trans('idx.status.indexing'))
-        self.worker = IndexWorker()
-        self.worker.window = self.window
-        self.worker.content = path
-        self.worker.idx = idx
-        self.worker.type = "file"
-        self.worker.replace = replace
-        self.worker.recursive = recursive
-        self.worker.signals.finished.connect(self.handle_finished_file)
-        self.worker.signals.error.connect(self.handle_error)
-        self.window.threadpool.start(self.worker)
+
+        worker = IndexWorker()
+        worker.window = self.window
+        worker.content = path
+        worker.idx = idx
+        worker.type = "file"
+        worker.replace = replace
+        worker.recursive = recursive
+        worker.signals.finished.connect(self.handle_finished_file)
+        worker.signals.error.connect(self.handle_error)
+        self.window.threadpool.start(worker)
+        self.worker = worker
+
         self.window.controller.idx.on_idx_start()  # on start
 
     def index_paths(
@@ -259,17 +266,20 @@ class Indexer(QObject):
         :param recursive: recursive indexing
         """
         self.window.update_status(trans('idx.status.indexing'))
-        self.worker = IndexWorker()
-        self.worker.window = self.window
-        self.worker.content = paths
-        self.worker.idx = idx
-        self.worker.type = "files"
-        self.worker.replace = replace
-        self.worker.recursive = recursive
-        self.worker.silent = False
-        self.worker.signals.finished.connect(self.handle_finished_file)
-        self.worker.signals.error.connect(self.handle_error)
-        self.window.threadpool.start(self.worker)
+
+        worker = IndexWorker()
+        worker.window = self.window
+        worker.content = paths
+        worker.idx = idx
+        worker.type = "files"
+        worker.replace = replace
+        worker.recursive = recursive
+        worker.silent = False
+        worker.signals.finished.connect(self.handle_finished_file)
+        worker.signals.error.connect(self.handle_error)
+        self.window.threadpool.start(worker)
+        self.worker = worker
+
         self.window.controller.idx.on_idx_start()  # on start
 
     def index_all_files(
@@ -393,19 +403,21 @@ class Indexer(QObject):
         :param config: loader config
         :param replace: replace index
         """
-        self.worker = IndexWorker()
-        self.worker.window = self.window
-        self.worker.content = None
-        self.worker.loader = loader
-        self.worker.params = params
-        self.worker.config = config
-        self.worker.replace = replace
-        self.worker.silent = False
-        self.worker.idx = idx
-        self.worker.type = "web"
-        self.worker.signals.finished.connect(self.handle_finished_web)
-        self.worker.signals.error.connect(self.handle_error)
-        self.window.threadpool.start(self.worker)
+        worker = IndexWorker()
+        worker.window = self.window
+        worker.content = None
+        worker.loader = loader
+        worker.params = params
+        worker.config = config
+        worker.replace = replace
+        worker.silent = False
+        worker.idx = idx
+        worker.type = "web"
+        worker.signals.finished.connect(self.handle_finished_web)
+        worker.signals.error.connect(self.handle_error)
+        self.window.threadpool.start(worker)
+        self.worker = worker
+
         self.window.controller.idx.on_idx_start()  # on start
 
     def index_ctx_meta_remove(
@@ -444,8 +456,7 @@ class Indexer(QObject):
 
         :param idx: on list idx
         """
-        idx_name = self.window.core.idx.get_by_idx(idx)
-        self.clear(idx_name)
+        self.clear(self.window.core.idx.get_by_idx(idx))
 
     def truncate_by_idx(self, idx: int):
         """
@@ -453,8 +464,7 @@ class Indexer(QObject):
 
         :param idx: on list idx
         """
-        idx_name = self.window.core.idx.get_by_idx(idx)
-        self.clear(idx_name)
+        self.clear(self.window.core.idx.get_by_idx(idx))
 
     def clear(
             self,
@@ -496,7 +506,7 @@ class Indexer(QObject):
             else:
                 self.window.update_status(trans('idx.status.truncate.error'))
         except Exception as e:
-            print(e)
+            self.window.core.debug.log(e)
             self.window.update_status(e)
 
         self.window.tools.get("indexer").refresh()
@@ -544,7 +554,7 @@ class Indexer(QObject):
             else:
                 self.window.update_status(trans('idx.status.truncate.error'))
         except Exception as e:
-            print(e)
+            self.window.core.debug.log(e)
             self.window.update_status(e)
 
         self.window.tools.get("indexer").refresh()
@@ -559,7 +569,6 @@ class Indexer(QObject):
         self.window.ui.dialogs.alert(err)
         self.window.update_status(str(err))
         self.window.core.debug.log(err)
-        print(err)
         self.window.tools.get("indexer").refresh()
         self.window.controller.idx.on_idx_error()  # on error
 
@@ -580,7 +589,7 @@ class Indexer(QObject):
         :param silent: silent mode (no msg and status update)
         """
         if num > 0:
-            msg = trans('idx.status.success') + f" {num}"
+            msg = f"{trans('idx.status.success')}  {num}"
 
             # store last DB update timestamp
             self.window.core.config.set('llama.idx.db.index', idx)
@@ -620,7 +629,7 @@ class Indexer(QObject):
         :param silent: silent mode (no msg and status update)
         """
         if num > 0:
-            msg = trans('idx.status.success') + f" {num}"
+            msg = f"{trans('idx.status.success')}  {num}"
             self.update_idx_status(idx)
             self.window.controller.idx.after_index(idx)  # post-actions (update UI, etc.)
             if not silent:
@@ -654,7 +663,7 @@ class Indexer(QObject):
         """
         num = len(files)
         if num > 0:
-            msg = trans('idx.status.success') + f" {num}"
+            msg = f"{trans('idx.status.success')}  {num}"
             self.window.core.idx.append(idx, files)  # append files list to index
             self.update_idx_status(idx)
             self.window.controller.idx.after_index(idx)  # post-actions (update UI, etc.)
@@ -688,7 +697,7 @@ class Indexer(QObject):
         :param silent: silent mode (no msg and status update)
         """
         if num > 0:
-            msg = trans('idx.status.success') + f" {num}"
+            msg = f"{trans('idx.status.success')} {num}"
             if not silent:
                 self.window.update_status(msg)
                 self.window.ui.dialogs.alert(msg)

pygpt_net/controller/kernel/reply.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.01 01:00:00                  #
+# Updated Date: 2025.08.23 15:00:00                  #
 # ================================================== #
 
 import json
@@ -20,7 +20,7 @@ from pygpt_net.item.ctx import CtxItem
 class Reply:
     def __init__(self, window=None):
         """
-        Reply handler
+        Reply handler (response from plugins, tools, etc.)
 
         :param window: Window instance
         """
@@ -42,28 +42,33 @@ class Reply:
         :param extra: extra data
         :return: list of results
         """
-        flush = False
-        if "flush" in extra and extra["flush"]:
-            flush = True
+        flush = extra.get("flush", False) if isinstance(extra, dict) else False
         ctx = context.ctx
-        if ctx is not None:
-            self.run_post_response(ctx, extra)
-            self.last_result = ctx.results
-            if ctx.agent_call:
-                return ctx.results # abort if called in agent and return here, TODO: check if needed!!!!!
-            self.window.core.debug.info("Reply...")
-            if self.window.core.debug.enabled() and self.is_log():
-                self.window.core.debug.debug("CTX REPLY: " + str(ctx))
-            if ctx.reply:
-                if self.reply_idx >= ctx.pid:  # skip if reply already sent for this context
-                    # >>> this prevents multiple replies from the same ctx item <<<
-                    return []
-                self.reply_idx = ctx.pid 
-                self.append(ctx)
-            if flush or self.window.controller.kernel.async_allowed(ctx):
-                self.flush()
-            return ctx.results
-        return []
+        if ctx is None:
+            return []
+
+        core = self.window.core
+        self.last_result = ctx.results
+        self.on_post_response(ctx, extra)
+
+        if ctx.agent_call:
+            # TODO: clear() here?
+            return ctx.results # abort if called by agent, TODO: check if needed!!!!!
+
+        core.debug.info("Reply...")
+        if core.debug.enabled() and self.is_log():
+            core.debug.debug("CTX REPLY: " + str(ctx))
+
+        if ctx.reply:
+            if self.reply_idx >= ctx.pid:  # prevent multiple replies per ctx
+                return []
+            self.reply_idx = ctx.pid
+            self.append(ctx)
+
+        if flush or self.window.controller.kernel.async_allowed(ctx):
+            self.flush()
+
+        return ctx.results
 
     def append(self, ctx: CtxItem):
         """
@@ -73,76 +78,63 @@ class Reply:
         """
         self.window.core.debug.info("Reply stack (add)...")
         self.reply_stack.append(ctx.results)
-        ctx.results = []  # clear results
         self.reply_ctx = ctx
+        self.reply_ctx.results = []  # clear results
 
     def flush(self):
         """Flush reply stack"""
         if self.reply_ctx is None or len(self.reply_stack) == 0:
             return
 
-        self.window.core.debug.info("Reply stack (flush)...")
+        core = self.window.core
+        dispatch = self.window.dispatch
+        core.debug.info("Reply stack (flush)...")
+
         results = []
         for responses in self.reply_stack:
             for result in responses:
                 results.append(result)
 
         self.window.update_status("")  # clear status
-        if self.reply_ctx.internal:
-            if self.window.controller.agent.legacy.enabled():
-                self.window.controller.agent.legacy.add_run()
-                self.window.controller.agent.legacy.update()
+        self.window.controller.agent.on_reply(self.reply_ctx)  # handle reply in agent
 
         # prepare data to send as reply
         tool_data = json.dumps(results)
         if (len(self.reply_stack) < 2
                 and self.reply_ctx.extra_ctx
-                and self.window.core.config.get("ctx.use_extra")):
+                and core.config.get("ctx.use_extra")):
             tool_data = self.reply_ctx.extra_ctx  # if extra content is set, use it as data to send
 
-        prev_ctx = self.window.core.ctx.as_previous(self.reply_ctx)  # copy result to previous ctx and clear current ctx
-        self.window.core.ctx.update_item(self.reply_ctx)  # update context in db
+        prev_ctx = core.ctx.as_previous(self.reply_ctx)  # copy result to previous ctx and clear current ctx
+        core.ctx.update_item(self.reply_ctx)  # update context in db
         self.window.update_status('...')
 
-        # if response from sub call, from experts
-        parent_id = None
-        if self.reply_ctx.sub_call:
-            if self.reply_ctx.meta is not None:
-                parent_id = self.reply_ctx.meta.id  # slave meta id
-
         # tool output append
-        data = {
+        dispatch(RenderEvent(RenderEvent.TOOL_UPDATE, {
             "meta": self.reply_ctx.meta,
             "tool_data": tool_data,
-        }
-        event = RenderEvent(RenderEvent.TOOL_UPDATE, data)
-        self.window.dispatch(event)
+        }))
         self.clear()
 
         # disable reply if LlamaIndex agent is used
-        mode = self.window.core.config.get("mode")
-        if mode == MODE_LLAMA_INDEX:
-            if self.window.core.config.get("llama.idx.react", False):
-                self.window.core.debug.info("Reply disabled for LlamaIndex ReAct agent")
-                return
+        mode = core.config.get("mode")
+        if mode == MODE_LLAMA_INDEX and core.config.get("llama.idx.react", False):
+            return
 
         # send reply
         context = BridgeContext()
         context.ctx = prev_ctx
         context.prompt = str(tool_data)
-        extra = {
-            "force": True,
-            "reply": True,
-            "internal": True,
-            "parent_id": parent_id,
-        }
-        event = KernelEvent(KernelEvent.REPLY_RETURN, {
+        dispatch(KernelEvent(KernelEvent.REPLY_RETURN, {
             'context': context,
-            'extra': extra,
-        })
-        self.window.dispatch(event)
-
-    def run_post_response(
+            'extra': {
+                "force": True,
+                "reply": True,
+                "internal": True,
+            },
+        }))
+
+    def on_post_response(
             self,
             ctx: CtxItem,
             extra_data: Optional[Dict[str, Any]] = None
@@ -157,8 +149,7 @@ class Reply:
             if (ctx is None or not ctx.agent_call) or not self.window.controller.kernel.is_threaded():
                 if "post_update" in extra_data and isinstance(extra_data["post_update"], list):
                     if "file_explorer" in extra_data["post_update"]:
-                        # update file explorer view
-                        self.window.controller.files.update_explorer()
+                        self.window.controller.files.update_explorer()  # update file explorer view
 
     def clear(self):
         """Clear reply stack"""
@@ -172,8 +163,4 @@ class Reply:
 
         :return: true if can be logged
         """
-        is_log = False
-        if self.window.core.config.has("log.events") \
-                and self.window.core.config.get("log.events"):
-            is_log = True
-        return is_log
+        return self.window.core.config.get("log.events", False)

pygpt_net/controller/kernel/stack.py

@@ -6,12 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.03 14:00:00                  #
+# Updated Date: 2025.08.23 15:00:00                  #
 # ================================================== #
 
 from typing import Any
 
-from qasync import QApplication
+from PySide6.QtWidgets import QApplication
 
 from pygpt_net.core.events import KernelEvent
 from pygpt_net.core.bridge.context import BridgeContext
@@ -44,14 +44,12 @@ class Stack:
         """
         Check if reply stack has any item
 
-        :return: True if has
+        :return: True if has items
         """
         return self.current is not None
 
     def clear(self):
-        """
-        Clear reply stack
-        """
+        """Clear reply stack"""
         self.current = None
         self.unlock()
 
@@ -71,35 +69,37 @@ class Stack:
                 context.parent_id,  # expert id
                 context.input,  # query
             )
+        # cmd execute
         elif context.type == ReplyContext.CMD_EXECUTE:
             self.window.controller.plugins.apply_cmds(
                 context.ctx,  # current ctx
                 context.cmds,  # commands
             )
+        # cmd execute (force)
         elif context.type == ReplyContext.CMD_EXECUTE_FORCE:
             self.window.controller.plugins.apply_cmds(
                 context.ctx,  # current ctx
                 context.cmds,  # commands
                 all=True,
             )
+        # cmd execute (inline)
         elif context.type == ReplyContext.CMD_EXECUTE_INLINE:
             self.window.controller.plugins.apply_cmds_inline(
                 context.ctx,  # current ctx
                 context.cmds,  # commands
             )
+        # agent continue
         elif context.type == ReplyContext.AGENT_CONTINUE:
             bridge_context = BridgeContext()
             bridge_context.ctx = context.ctx
-            bridge_context.prompt = context.input
-            extra = {
-                "force": True,
-                "internal": True,
-            }
-            event = KernelEvent(KernelEvent.INPUT_SYSTEM, {
+            bridge_context.prompt = context.input  # from reply context
+            self.window.dispatch(KernelEvent(KernelEvent.INPUT_SYSTEM, {
                 'context': bridge_context,
-                'extra': extra,
-            })
-            self.window.dispatch(event)
+                'extra': {
+                    "force": True,
+                    "internal": True,
+                },
+            }))
 
     def is_locked(self) -> bool:
         """
@@ -131,7 +131,7 @@ class Stack:
 
     def waiting(self) -> bool:
         """
-        Check if reply stack is waiting
+        Check if reply stack is waiting for processing
 
         :return: True if waiting
         """