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

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,13 @@
+2.6.4 (2025-08-15)
+
+- Fix: tool execution in OpenAI Agents.
+- Optimizations.
+
+2.6.3 (2025-08-15)
+
+- Optimized streaming and CPU usage.
+- Fixed crash on set label color and ctx duplicate.
+
 2.6.2 (2025-08-15)
 
 - Added plugins (beta): Google, Facebook, X/Twitter, Telegram, Slack, GitHub, Bitbucket.

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.2"
+__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/calendar/note.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 08:00:00                  #
+# Updated Date: 2025.08.15 03:00:00                  #
 # ================================================== #
 
 import datetime
@@ -32,29 +32,47 @@ class Note:
         """Setup calendar notes"""
         self.counters_all = self.window.core.config.get("ctx.counters.all", True)
 
+    def _adjacent_months(self, year: int, month: int):
+        if month == 1:
+            py, pm = year - 1, 12
+        else:
+            py, pm = year, month - 1
+        if month == 12:
+            ny, nm = year + 1, 1
+        else:
+            ny, nm = year, month + 1
+        return (py, pm), (ny, nm)
+
     def update(self):
         """Update on content change"""
-        year = self.window.controller.calendar.selected_year
-        month = self.window.controller.calendar.selected_month
-        day = self.window.controller.calendar.selected_day
+        ctrl_cal = self.window.controller.calendar
+        year = ctrl_cal.selected_year
+        month = ctrl_cal.selected_month
+        day = ctrl_cal.selected_day
 
         if year is None or month is None or day is None:
             return
 
-        content = self.window.ui.calendar['note'].toPlainText()
-        note = self.window.core.calendar.get_by_date(year, month, day)
+        ui_note = self.window.ui.calendar['note']
+        content = ui_note.toPlainText()
+        cal = self.window.core.calendar
+        note = cal.get_by_date(year, month, day)
 
-        # update or create note
+        changed = False
         if note is None:
-            if content.strip() != "":
+            if content.strip():
                 note = self.create(year, month, day)
                 note.content = content
-                self.window.core.calendar.add(note)
+                cal.add(note)
+                changed = True
         else:
-            note.content = content
-            self.window.core.calendar.update(note)
+            if note.content != content:
+                note.content = content
+                cal.update(note)
+                changed = True
 
-        self.refresh_num(year, month)  # update note cells when note is changed
+        if changed:
+            self.refresh_num(year, month)
 
     def update_content(
             self,
@@ -69,13 +87,12 @@ class Note:
         :param month: month
         :param day: day
         """
+        ui_note = self.window.ui.calendar['note']
         note = self.window.core.calendar.get_by_date(year, month, day)
-        if note is None:
-            self.window.ui.calendar['note'].setPlainText("")
-            self.window.ui.calendar['note'].on_update()
-        else:
-            self.window.ui.calendar['note'].setPlainText(note.content)
-            self.window.ui.calendar['note'].on_update()
+        new_text = "" if note is None else note.content
+        if ui_note.toPlainText() != new_text:
+            ui_note.setPlainText(new_text)
+        ui_note.on_update()
 
     def update_label(
             self,
@@ -90,15 +107,13 @@ class Note:
         :param month: month
         :param day: day
         """
-        suffix = datetime.datetime(year, month, day).strftime("%Y-%m-%d")
-        self.window.ui.calendar['note.label'].setText(trans('calendar.note.label') + " (" + suffix + ")")
+        suffix = f"{year:04d}-{month:02d}-{day:02d}"
+        self.window.ui.calendar['note.label'].setText(f"{trans('calendar.note.label')} ({suffix})")
 
     def update_current(self):
         """Update label to current selected date"""
-        year = self.window.ui.calendar['select'].currentYear
-        month = self.window.ui.calendar['select'].currentMonth
-        day = self.window.ui.calendar['select'].currentDay
-        self.update_label(year, month, day)
+        select = self.window.ui.calendar['select']
+        self.update_label(select.currentYear, select.currentMonth, select.currentDay)
 
     def update_status(
             self,
@@ -115,16 +130,22 @@ class Note:
         :param month: month
         :param day: day
         """
-        note = self.window.core.calendar.get_by_date(year, month, day)
+        cal = self.window.core.calendar
+        note = cal.get_by_date(year, month, day)
+        changed = False
         if note is None:
             note = self.create(year, month, day)
             note.status = status
-            self.window.core.calendar.add(note)
+            cal.add(note)
+            changed = True
         else:
-            note.status = status
-            self.window.core.calendar.update(note)
+            if note.status != status:
+                note.status = status
+                cal.update(note)
+                changed = True
 
-        self.refresh_num(year, month)  # update note cells when note is changed
+        if changed:
+            self.refresh_num(year, month)
 
     def get_counts_around_month(
             self,
@@ -138,27 +159,12 @@ class Note:
         :param month: month
         :return: combined counters
         """
-        current_month_start = datetime.datetime(year, month, 1)
-        last_month_start = (current_month_start - datetime.timedelta(days=1)).replace(day=1)
-
-        if month == 12:
-            next_month_start = datetime.datetime(year + 1, 1, 1)
-        else:
-            next_month_start = datetime.datetime(year, month + 1, 1)
-
-        current = self.get_ctx_counters(
-            year,
-            month,
-        )
-        last = self.get_ctx_counters(
-            last_month_start.year,
-            last_month_start.month,
-        )
-        next = self.get_ctx_counters(
-            next_month_start.year,
-            next_month_start.month,
-        )
-        return {**last, **current, **next}  # combine counters
+        (ly, lm), (ny, nm) = self._adjacent_months(year, month)
+        result: Dict[str, int] = {}
+        result.update(self.get_ctx_counters(ly, lm))
+        result.update(self.get_ctx_counters(year, month))
+        result.update(self.get_ctx_counters(ny, nm))
+        return result
 
     def get_labels_counts_around_month(
             self,
@@ -172,27 +178,12 @@ class Note:
         :param month: month
         :return: combined counters
         """
-        current_month_start = datetime.datetime(year, month, 1)
-        last_month_start = (current_month_start - datetime.timedelta(days=1)).replace(day=1)
-
-        if month == 12:
-            next_month_start = datetime.datetime(year + 1, 1, 1)
-        else:
-            next_month_start = datetime.datetime(year, month + 1, 1)
-
-        current = self.get_ctx_labels_counters(
-            year,
-            month,
-        )
-        last = self.get_ctx_labels_counters(
-            last_month_start.year,
-            last_month_start.month,
-        )
-        next = self.get_ctx_labels_counters(
-            next_month_start.year,
-            next_month_start.month,
-        )
-        return {**last, **current, **next}  # combine counters
+        (ly, lm), (ny, nm) = self._adjacent_months(year, month)
+        result: Dict[str, Dict[int, int]] = {}
+        result.update(self.get_ctx_labels_counters(ly, lm))
+        result.update(self.get_ctx_labels_counters(year, month))
+        result.update(self.get_ctx_labels_counters(ny, nm))
+        return result
 
     def get_ctx_counters(
             self,
@@ -206,18 +197,17 @@ class Note:
         :param month: month
         :return: ctx counters
         """
-        # default values (no filters)
-        search_string = None
-        search_content = False
-        filters = None
-
-        # + filters
-        if not self.counters_all:
-            search_string = self.window.core.ctx.get_search_string()
-            search_content = self.window.core.ctx.is_search_content()
-            filters = self.window.core.ctx.get_parsed_filters()
-
-        return self.window.core.ctx.provider.get_ctx_count_by_day(
+        ctx = self.window.core.ctx
+        if self.counters_all:
+            search_string = None
+            search_content = False
+            filters = None
+        else:
+            search_string = ctx.get_search_string()
+            search_content = ctx.is_search_content()
+            filters = ctx.get_parsed_filters()
+
+        return ctx.provider.get_ctx_count_by_day(
             year=year,
             month=month,
             day=None,
@@ -238,18 +228,17 @@ class Note:
         :param month: month
         :return: ctx counters
         """
-        # default values (no filters)
-        search_string = None
-        search_content = False
-        filters = None
-
-        # + filters
-        if not self.counters_all:
-            search_string = self.window.core.ctx.get_search_string()
-            search_content = self.window.core.ctx.is_search_content()
-            filters = self.window.core.ctx.get_parsed_filters()
-
-        return self.window.core.ctx.provider.get_ctx_labels_count_by_day(
+        ctx = self.window.core.ctx
+        if self.counters_all:
+            search_string = None
+            search_content = False
+            filters = None
+        else:
+            search_string = ctx.get_search_string()
+            search_content = ctx.is_search_content()
+            filters = ctx.get_parsed_filters()
+
+        return ctx.provider.get_ctx_labels_count_by_day(
             year=year,
             month=month,
             day=None,
@@ -305,26 +294,13 @@ class Note:
         :param month: month
         :return: combined notes existence
         """
-        current_month_start = datetime.datetime(year, month, 1)
-        last_month_start = (current_month_start - datetime.timedelta(days=1)).replace(day=1)
-        if month == 12:
-            next_month_start = datetime.datetime(year + 1, 1, 1)
-        else:
-            next_month_start = datetime.datetime(year, month + 1, 1)
-
-        current = self.window.core.calendar.get_notes_existence_by_day(
-            year,
-            month,
-        )
-        last = self.window.core.calendar.get_notes_existence_by_day(
-            last_month_start.year,
-            last_month_start.month,
-        )
-        next = self.window.core.calendar.get_notes_existence_by_day(
-            next_month_start.year,
-            next_month_start.month,
-        )
-        return {**last, **current, **next}  # combine notes existence
+        (ly, lm), (ny, nm) = self._adjacent_months(year, month)
+        cal = self.window.core.calendar
+        result: Dict[str, Dict[int, int]] = {}
+        result.update(cal.get_notes_existence_by_day(ly, lm))
+        result.update(cal.get_notes_existence_by_day(year, month))
+        result.update(cal.get_notes_existence_by_day(ny, nm))
+        return result
 
     def refresh_num(self, year: int, month: int):
         """
@@ -342,6 +318,8 @@ class Note:
 
         :param state: state
         """
+        if self.counters_all == state:
+            return
         self.counters_all = state
         self.window.core.config.set("ctx.counters.all", state)
         self.window.core.config.save()
@@ -355,17 +333,14 @@ class Note:
         """
         dt = ""  # TODO: add to config append date/time
         # dt = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + ":\n--------------------------\n"
-        prev_text = self.window.ui.calendar['note'].toPlainText()
-        if prev_text != "":
-            prev_text += "\n\n"
-        new_text = prev_text + dt + text.strip()
-        self.window.ui.calendar['note'].setText(new_text)
-        self.update()
-
-        # move cursor to end
-        cursor = self.window.ui.calendar['note'].textCursor()
+        editor = self.window.ui.calendar['note']
+        cursor = editor.textCursor()
         cursor.movePosition(QTextCursor.End)
-        self.window.ui.calendar['note'].setTextCursor(cursor)
+        if not editor.document().isEmpty():
+            cursor.insertText("\n\n")
+        cursor.insertText(dt + text.strip())
+        editor.setTextCursor(cursor)
+        self.update()
 
     def clear_note(self):
         """Clear note"""
@@ -379,4 +354,4 @@ class Note:
 
         :return: notepad text
         """
-        return self.window.ui.calendar['note'].toPlainText()
+        return self.window.ui.calendar['note'].toPlainText()