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

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,8 @@
+2.6.4 (2025-08-15)
+
+- Fix: tool execution in OpenAI Agents.
+- Optimizations.
+
 2.6.3 (2025-08-15)
 
 - Optimized streaming and CPU usage.

pygpt_net/__init__.py

@@ -13,7 +13,7 @@ __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.6.3"
+__version__ = "2.6.4"
 __build__ = "2025-08-15"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"

pygpt_net/config.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.21 15:00:00                  #
+# Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
 import copy
@@ -16,11 +16,15 @@ import re
 
 from pathlib import Path
 from packaging.version import Version
+from operator import itemgetter
 
 from pygpt_net.core.profile import Profile
 from pygpt_net.provider.core.config.json_file import JsonFileProvider
 from pygpt_net.core.types.console import Color
 
+_RE_VERSION = re.compile(r'__version__\s*=\s*[\'"]([^\'"]*)[\'"]')
+_RE_BUILD = re.compile(r'__build__\s*=\s*[\'"]([^\'"]*)[\'"]')
+
 
 class Config:
     CONFIG_DIR = 'pygpt-net'
@@ -46,9 +50,9 @@ class Config:
         self.initialized_base = False
         self.initialized_workdir = False
         self.db_echo = False
-        self.data = {}  # user config
-        self.data_base = {}  # base config
-        self.data_session = {}  # temporary config (session only)
+        self.data = {}
+        self.data_base = {}
+        self.data_session = {}
         self.version = version
         self.dirs = {
             "capture": "capture",
@@ -63,6 +67,9 @@ class Config:
             "upload": "upload",
             "tmp": "tmp",
         }
+        self._app_path = None
+        self._version_cache = version if version else None
+        self._build_cache = None
         self.provider = JsonFileProvider(window)
         self.provider.path_app = self.get_app_path()
         self.provider.meta = self.append_meta()
@@ -81,10 +88,8 @@ class Config:
 
     def install(self):
         """Install database and provider data"""
-        self.window.core.db.echo = self.db_echo  # verbose on/off
+        self.window.core.db.echo = self.db_echo
         self.window.core.db.init()
-
-        # install provider configs
         self.provider.install()
 
     def get_path(self) -> str:
@@ -108,7 +113,6 @@ class Config:
         path = os.path.join(Path.home(), '.config', Config.CONFIG_DIR)
         if "PYGPT_WORKDIR" in os.environ and os.environ["PYGPT_WORKDIR"] != "":
             print("FORCE using workdir: {}".format(os.environ["PYGPT_WORKDIR"]))
-            # convert relative path to absolute path if needed
             if not os.path.isabs(os.environ["PYGPT_WORKDIR"]):
                 path = os.path.join(os.getcwd(), os.environ["PYGPT_WORKDIR"])
             else:
@@ -128,11 +132,11 @@ class Config:
         """
         is_test = os.environ.get('ENV_TEST') == '1'
         path = Path(Config.get_base_workdir())
-        if not path.exists() and not is_test:  # DISABLE in tests!!!
+        if not path.exists() and not is_test:
             path.mkdir(parents=True, exist_ok=True)
         path_file = "path.cfg"
         p = os.path.join(str(path), path_file)
-        if not os.path.exists(p) and not is_test:  # DISABLE in tests!!!
+        if not os.path.exists(p) and not is_test:
             with open(p, 'w', encoding='utf-8') as f:
                 f.write("")
         else:
@@ -155,6 +159,7 @@ class Config:
         """
         self.path = path
         self.provider.path = path
+        self.initialized_workdir = True
         if reload:
             self.initialized = False
             self.init(True)
@@ -178,7 +183,7 @@ class Config:
         if dir not in self.dirs:
             raise Exception('Unknown dir: {}'.format(dir))
 
-        dir_data_allowed = ["img", "capture", "upload"]
+        dir_data_allowed = ("img", "capture", "upload")
 
         if self.has("upload.data_dir") \
                 and self.get("upload.data_dir") \
@@ -186,8 +191,7 @@ class Config:
             path = os.path.join(self.get_user_path(), self.dirs["data"], self.dirs[dir])
         else:
             path = os.path.join(self.get_user_path(), self.dirs[dir])
-        if not os.path.exists(path):
-            os.makedirs(path, exist_ok=True)
+        os.makedirs(path, exist_ok=True)
 
         return path
 
@@ -208,10 +212,13 @@ class Config:
 
         :return: app root path
         """
-        if self.is_compiled():  # if compiled with pyinstaller
-            return os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+        if hasattr(self, '_app_path') and self._app_path is not None:
+            return self._app_path
+        if self.is_compiled():
+            self._app_path = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
         else:
-            return os.path.abspath(os.path.dirname(__file__))
+            self._app_path = os.path.abspath(os.path.dirname(__file__))
+        return self._app_path
 
     def get_user_path(self) -> str:
         """
@@ -229,15 +236,14 @@ class Config:
         """
         if not self.initialized:
 
-            # if app initialization
             if all:
                 v = self.get_version()
                 build = self.get_build().replace('.', '-')
-                os = self.window.core.platforms.get_os()
+                os_name = self.window.core.platforms.get_os()
                 architecture = self.window.core.platforms.get_architecture()
 
                 print("===================================================")
-                print(f" {Color.BOLD}PyGPT    {v}{Color.ENDC} build {build} ({os}, {architecture})")
+                print(f" {Color.BOLD}PyGPT    {v}{Color.ENDC} build {build} ({os_name}, {architecture})")
                 print(" Author:  Marcin Szczyglinski")
                 print(" GitHub:  https://github.com/szczyglis-dev/py-gpt")
                 print(" Website: https://pygpt.net")
@@ -246,7 +252,6 @@ class Config:
                 print("")
                 print(f"{Color.BOLD}Initializing...{Color.ENDC}")
 
-                # prepare and install
                 self.window.core.installer.install()
 
             self.load(all)
@@ -258,12 +263,15 @@ class Config:
 
         :return: version string
         """
+        if hasattr(self, '_version_cache') and self._version_cache is not None:
+            return self._version_cache
         path = os.path.abspath(os.path.join(self.get_app_path(), '__init__.py'))
         try:
             with open(path, 'r', encoding="utf-8") as f:
                 data = f.read()
-                result = re.search(r'{}\s*=\s*[\'"]([^\'"]*)[\'"]'.format("__version__"), data)
-                return result.group(1)
+                result = _RE_VERSION.search(data)
+                self._version_cache = result.group(1)
+                return self._version_cache
         except Exception as e:
             if self.window is not None:
                 self.window.core.debug.log(e)
@@ -276,12 +284,15 @@ class Config:
 
         :return: build string
         """
+        if self._build_cache is not None:
+            return self._build_cache
         path = os.path.abspath(os.path.join(self.get_app_path(), '__init__.py'))
         try:
             with open(path, 'r', encoding="utf-8") as f:
                 data = f.read()
-                result = re.search(r'{}\s*=\s*[\'"]([^\'"]*)[\'"]'.format("__build__"), data)
-                return result.group(1)
+                result = _RE_BUILD.search(data)
+                self._build_cache = result.group(1)
+                return self._build_cache
         except Exception as e:
             if self.window is not None:
                 self.window.core.debug.log(e)
@@ -312,9 +323,7 @@ class Config:
         :param default: default value
         :return: value
         """
-        if key in self.data:
-            return self.data[key]
-        return default
+        return self.data.get(key, default)
 
     def get_session(self, key: str, default: any = None) -> any:
         """
@@ -324,9 +333,7 @@ class Config:
         :param default: default value
         :return: value
         """
-        if key in self.data_session:
-            return self.data_session[key]
-        return default
+        return self.data_session.get(key, default)
 
     def get_lang(self) -> str:
         """
@@ -334,7 +341,7 @@ class Config:
 
         :return: language code
         """
-        test_lang = os.environ.get('TEST_LANGUAGE')  # if pytest
+        test_lang = os.environ.get('TEST_LANGUAGE')
         if test_lang:
             return test_lang
         return self.get('lang', 'en')
@@ -364,12 +371,7 @@ class Config:
         :param key: key
         :return: True if exists
         """
-        if self.data is None:
-            return False
-
-        if key in self.data:
-            return True
-        return False
+        return key in self.data
 
     def has_session(self, key: str) -> bool:
         """
@@ -378,9 +380,7 @@ class Config:
         :param key: key
         :return: True if exists
         """
-        if key in self.data_session:
-            return True
-        return False
+        return key in self.data_session
 
     def all(self) -> dict:
         """
@@ -404,32 +404,21 @@ class Config:
 
         :return: list with available languages (user + app)
         """
-        langs = []
-        path = os.path.join(self.get_app_path(), 'data', 'locale')
-        if os.path.exists(path):
-            for file in os.listdir(path):
+        langs_set = set()
+        path_app = os.path.join(self.get_app_path(), 'data', 'locale')
+        if os.path.exists(path_app):
+            for file in os.listdir(path_app):
                 if file.startswith('locale.') and file.endswith(".ini"):
-                    lang_id = file.replace('locale.', '').replace('.ini', '')
-                    if lang_id not in langs:
-                        langs.append(lang_id)
-
-        path = os.path.join(self.get_user_path(), 'locale')
-        if os.path.exists(path):
-            for file in os.listdir(path):
+                    langs_set.add(file.replace('locale.', '').replace('.ini', ''))
+        path_user = os.path.join(self.get_user_path(), 'locale')
+        if os.path.exists(path_user):
+            for file in os.listdir(path_user):
                 if file.startswith('locale.') and file.endswith(".ini"):
-                    lang_id = file.replace('locale.', '').replace('.ini', '')
-                    if lang_id not in langs:
-                        langs.append(lang_id)
-
-        # sort by name
-        langs.sort()
-
-        # make English first
+                    langs_set.add(file.replace('locale.', '').replace('.ini', ''))
+        langs = sorted(langs_set)
         if 'en' in langs:
             langs.remove('en')
             langs.insert(0, 'en')
-
-        # make Polish second
         if 'pl' in langs:
             langs.remove('pl')
             langs.insert(1, 'pl')
@@ -469,7 +458,7 @@ class Config:
         """
         self.data = self.provider.load(all)
         if self.data is not None:
-            self.data = dict(sorted(self.data.items(), key=lambda item: item[0]))  # sort by key
+            self.data = dict(sorted(self.data.items(), key=itemgetter(0)))
 
     def load_base_config(self):
         """
@@ -477,7 +466,7 @@ class Config:
         """
         self.data_base = self.provider.load_base()
         if self.data_base is not None:
-            self.data_base = dict(sorted(self.data_base.items(), key=lambda item: item[0]))  # sort by key
+            self.data_base = dict(sorted(self.data_base.items(), key=itemgetter(0)))
             self.initialized_base = True
 
     def from_base_config(self):
@@ -543,11 +532,12 @@ class Config:
         if "app.env" not in self.data or not isinstance(self.data["app.env"], list):
             return
         list_loaded = []
+        conf = self.all()
         for item in self.data["app.env"]:
             if item['name'] is None or item['name'] == "":
                 continue
             try:
-                value = str(item['value'].format(**self.all()))
+                value = str(item['value'].format(**conf))
                 os.environ[item['name']] = value
                 list_loaded.append(item['name'])
             except Exception as e:
@@ -561,4 +551,4 @@ class Config:
 
         :param filename: filename
         """
-        self.provider.save(self.data, filename)
+        self.provider.save(self.data, filename)

pygpt_net/controller/chat/chat.py

@@ -6,7 +6,7 @@
 # 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.15 23:00:00                  #
 # ================================================== #
 
 from typing import Any
@@ -37,68 +37,71 @@ class Chat:
         :param window: Window instance
         """
         self.window = window
-        self.attachment = Attachment(window)
-        self.audio = Audio(window)
-        self.command = Command(window)
-        self.common = Common(window)
-        self.files = Files(window)
-        self.image = Image(window)
-        self.input = Input(window)
-        self.output = Output(window)
-        self.render = Render(window)
-        self.response = Response(window)
-        self.stream = Stream(window)
-        self.text = Text(window)
-        self.vision = Vision(window)
-
-    def init(self):
+        w = window
+        self.attachment = Attachment(w)
+        self.audio = Audio(w)
+        self.command = Command(w)
+        self.common = Common(w)
+        self.files = Files(w)
+        self.image = Image(w)
+        self.input = Input(w)
+        self.output = Output(w)
+        self.render = Render(w)
+        self.response = Response(w)
+        self.stream = Stream(w)
+        self.text = Text(w)
+        self.vision = Vision(w)
+
+    def init(self) -> None:
         """Init"""
         self.render.setup()  # setup render engine
 
-    def setup(self):
+    def setup(self) -> None:
         """Setup"""
         self.common.setup()
         self.attachment.setup()
 
-    def reload(self):
+    def reload(self) -> None:
         """Reload"""
         self.common.setup()
         self.render.reload()
         self.attachment.reload()
 
-    def handle_error(self, err: Any):
+    def handle_error(self, err: Any) -> None:
         """
         Handle error
 
         :param err: Exception
         """
-        self.window.core.debug.log(err)
-        self.window.ui.dialogs.alert(str(err))
-        self.window.update_status(str(err))
-        self.window.controller.chat.common.unlock_input()  # always unlock input on error
-        self.window.stateChanged.emit(self.window.STATE_ERROR)
-        self.window.dispatch(AppEvent(AppEvent.INPUT_ERROR))  # app event
-
-        # stop agent on error
-        if self.window.controller.agent.legacy.enabled():
-            self.window.controller.agent.legacy.on_stop()
-
-    def log_ctx(self, ctx: CtxItem, mode: str):
+        w = self.window
+        err_str = str(err)
+        w.core.debug.log(err)
+        w.ui.dialogs.alert(err_str)
+        w.update_status(err_str)
+        self.common.unlock_input()  # always unlock input on error
+        w.stateChanged.emit(w.STATE_ERROR)
+        w.dispatch(AppEvent(AppEvent.INPUT_ERROR))  # app event
+
+        if w.controller.agent.legacy.enabled():
+            w.controller.agent.legacy.on_stop()
+
+    def log_ctx(self, ctx: CtxItem, mode: str) -> None:
         """
         Log context item
 
         :param ctx: CtxItem
         :param mode: mode (input/output)
         """
+        upper_mode = mode.upper()
         if self.window.core.config.get("log.ctx"):
-            self.log("[ctx] {}: {}".format(mode.upper(), ctx.dump()))  # log
+            self.log(f"[ctx] {upper_mode}: {ctx.dump()}")  # log
         else:
-            self.log("[ctx] {}.".format(mode.upper()))
+            self.log(f"[ctx] {upper_mode}.")
 
-    def log(self, data: Any):
+    def log(self, data: Any) -> None:
         """
         Log data to debug
 
         :param data: Data to log
         """
-        self.window.core.debug.info("[chat] " + str(data))
+        self.window.core.debug.info(f"[chat] {data}")