pygpt-net 2.6.0.post2__py3-none-any.whl → 2.6.2__py3-none-any.whl

pygpt_net/core/idx/chat.py

@@ -6,9 +6,9 @@
 # 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.14 01:00:00                  #
 # ================================================== #
-import asyncio
+
 import json
 from typing import Optional, Dict, Any, List
 
@@ -338,7 +338,7 @@ class Chat:
                         tools=tools,
                         ctx=ctx,
                         query=query,
-                        history=history,
+                        history=context.history,
                         llm=llm,
                         index=index,
                         system_prompt=system_prompt,
@@ -377,7 +377,7 @@ class Chat:
                         tools=tools,
                         ctx=ctx,
                         query=query,
-                        history=history,
+                        history=context.history,
                         llm=llm,
                         index=index,
                         system_prompt=system_prompt,
@@ -490,7 +490,7 @@ class Chat:
             chat_mode: str = MODE_CHAT,
             verbose: bool = False,
 
-    ) -> bool:
+    ) -> str:
         """
         Call agent with tools and index
 
@@ -507,7 +507,6 @@ class Chat:
         :param verbose: Verbose mode, default is False
         :return: True if success, False otherwise
         """
-        index_tool = None
         if index:
             query_engine = index.as_query_engine(
                 llm=llm,
@@ -522,35 +521,26 @@ class Chat:
             )
             tools.append(index_tool)
 
-        workdir = self.window.core.config.get_user_dir('data')
-        if self.window.core.plugins.get_option("cmd_code_interpreter", "sandbox_ipython"):
-            workdir = "/data"
-
-        kwargs = {
-            "context": context,
-            "tools": tools,
-            "retriever_tool": index_tool,
-            "llm": llm,
-            "chat_history": history,
-            "max_iterations": 0,
-            "verbose": verbose,
-            "system_prompt": system_prompt,
-            "are_commands": True,
-            "workdir": workdir,
-        }
-        provider = self.window.core.agents.provider.get("react_workflow")
-        agent = provider.get_agent(self.window, kwargs)
-
-        kwargs = {
-            "agent": agent,
-            "ctx": ctx,
-            "prompt": query,
-            "signals": signals,
-            "verbose": verbose,
-            "history": history,
-            "llm": llm,
+        bridge_context = BridgeContext(
+            ctx=ctx,
+            model=context.model,
+            history=history,
+            prompt=query,
+            stream=False,
+        )
+        extra = {
+            "agent_provider": "react",  # use React workflow provider
+            "agent_tools": tools,
         }
-        return asyncio.run(self.window.core.agents.runner.llama_workflow.run(**kwargs))
+        response_ctx = self.window.core.agents.runner.call_once(
+            context=bridge_context,
+            extra=extra,
+            signals=None,
+        )
+        if response_ctx:
+            return str(response_ctx.output)
+        else:
+            return "No response from agent."
 
     def is_stream_allowed(self) -> bool:
         """

pygpt_net/core/idx/response.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 22:00:00                  #
+# Updated Date: 2025.08.14 01:00:00                  #
 # ================================================== #
 
 from typing import Any
@@ -28,7 +28,10 @@ class Response:
             model: ModelItem,
             response: Any
     ) -> None:
-        pass
+        output = str(response)
+        if output is None:
+            output = ""
+        ctx.set_output(output, "")
 
     def from_index(
             self,

pygpt_net/core/locale/locale.py

@@ -6,13 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 00:00:00                  #
+# Updated Date: 2025.08.13 16:00:00                  #
 # ================================================== #
 
 import os
 import configparser
-import io
-from typing import Optional
+from typing import Optional, Dict, Tuple
 
 from pygpt_net.config import Config
 
@@ -29,20 +28,27 @@ class Locale:
         :param domain: translation domain
         :param config: Config instance
         """
-        if config is None:
-            self.config = Config()
-        else:
-            self.config = config
+        self.config = config if config is not None else Config()
         self.lang = 'en'  # default language = en
         self.fallback = 'en'  # fallback language = en
         self.default_domain = 'locale'  # default translation domain
         self.ini_key = 'LOCALE'  # ini key for translations
-        self.data = {}
-        self.config.init(False)  # load config
+        self.data: Dict[str, Dict[str, str]] = {}
+
+        # cache: path -> (mtime, parsed_dict)
+        self._file_cache: Dict[str, Tuple[float, Dict[str, str]]] = {}
+
+        # load config once
+        self.config.init(False)
         if self.config.has('lang'):
             self.lang = self.config.get_lang()
+
         self.load(self.lang, domain)
 
+    def _clear_cache(self):
+        """Clear internal file cache."""
+        self._file_cache.clear()
+
     def reload_config(self):
         """Reload configuration"""
         workdir = self.config.prepare_workdir()
@@ -50,6 +56,7 @@ class Locale:
         self.config.load(False)
         if self.config.has('lang'):
             self.lang = self.config.get_lang()
+        self._clear_cache()  # ensure fresh read
         self.load(self.lang)
 
     def reload(self, domain: Optional[str] = None):
@@ -61,19 +68,32 @@ class Locale:
         self.config.load(False)
         if self.config.has('lang'):
             self.lang = self.config.get_lang()
+        self._clear_cache()  # ensure fresh read
         self.load(self.lang, domain)
 
     def from_file(self, path: str) -> dict:
         """
-        Load and parse translations from file
+        Load and parse translations from file (cached by mtime)
 
         :param path: path to ini file
         :return: dict with translations
         """
-        ini = configparser.ConfigParser()
-        data = io.open(path, mode="r", encoding="utf-8")
-        ini.read_string(data.read())
-        return dict(ini.items(self.ini_key))
+        try:
+            mtime = os.path.getmtime(path)
+        except FileNotFoundError:
+            return {}
+
+        cached = self._file_cache.get(path)
+        if cached is not None and cached[0] == mtime:
+            return cached[1]
+
+        # RawConfigParser with interpolation disabled
+        ini = configparser.RawConfigParser(interpolation=None)
+        ini.read(path, encoding='utf-8')
+
+        data = dict(ini.items(self.ini_key))
+        self._file_cache[path] = (mtime, data)
+        return data
 
     def load_by_lang(
             self,
@@ -86,22 +106,17 @@ class Locale:
         :param lang: language code
         :param domain: translation domain
         """
-        id = self.default_domain
-        if domain is not None:
-            id = domain
-        if id not in self.data:
-            self.data[id] = {}
+        domain_id = domain or self.default_domain
+        mapping = self.data.setdefault(domain_id, {})
+
         try:
-            path = self.get_base_path(id, lang)
-            if os.path.exists(path):
-                data = self.from_file(path)
-                for key in data:
-                    self.data[id][key] = data[key]
-            path = self.get_user_path(id, lang)
-            if os.path.exists(path):
-                data = self.from_file(path)
-                for key in data:
-                    self.data[id][key] = data[key]
+            base_path = self.get_base_path(domain_id, lang)
+            if os.path.isfile(base_path):
+                mapping.update(self.from_file(base_path))
+
+            user_path = self.get_user_path(domain_id, lang)
+            if os.path.isfile(user_path):
+                mapping.update(self.from_file(user_path))
         except Exception as e:
             print(e)
 
@@ -116,10 +131,11 @@ class Locale:
         :param lang: language code
         :param domain: translation domain
         """
-        if type(lang) is not str:
+        if not isinstance(lang, str) or not lang:
             lang = self.fallback
+
         if lang != self.fallback:
-            self.load_by_lang(self.fallback, domain)  # load fallback first
+            self.load_by_lang(self.fallback, domain)
         self.load_by_lang(lang, domain)
 
     def get(
@@ -136,20 +152,24 @@ class Locale:
         :param params: translation params dict for replacement
         :return: translated string or key if not found
         """
-        id = self.default_domain
-        if domain is not None:
-            id = domain
-        if id not in self.data:
+        domain_id = domain or self.default_domain
+        mapping = self.data.get(domain_id)
+
+        if mapping is None:
             self.load(self.lang, domain)
-        if id in self.data and key in self.data[id]:
-            if type(params) is dict and len(params) > 0:
-                try:
-                    return self.data[id][key].replace('\\n', "\n").format(**params)
-                except KeyError:
-                    pass
-            return self.data[id][key].replace('\\n', "\n")
-        else:
+            mapping = self.data.get(domain_id, {})
+
+        val = mapping.get(key)
+        if val is None:
             return key
+        text = val.replace('\\n', '\n')
+
+        if isinstance(params, dict) and params:
+            try:
+                return text.format(**params)
+            except KeyError:
+                pass
+        return text
 
     def get_base_path(
             self,
@@ -163,7 +183,11 @@ class Locale:
         :param lang: language code
         :return: path to translations file
         """
-        return os.path.join(self.config.get_app_path(), 'data', 'locale', domain + '.' + lang + '.ini')
+        return os.path.join(
+            self.config.get_app_path(),
+            'data', 'locale',
+            f'{domain}.{lang}.ini'
+        )
 
     def get_user_path(
             self,
@@ -177,4 +201,8 @@ class Locale:
         :param lang: language code
         :return: path to translations file
         """
-        return os.path.join(self.config.get_user_path(), 'locale', domain + '.' + lang + '.ini')
+        return os.path.join(
+            self.config.get_user_path(),
+            'locale',
+            f'{domain}.{lang}.ini'
+        )