pygpt-net 2.7.9__py3-none-any.whl → 2.7.10__py3-none-any.whl

pygpt_net/provider/api/google/image.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.31 16:00:00                  #
+# Updated Date: 2026.01.23 23:00:00                  #
 # ================================================== #
 
 import mimetypes
@@ -234,6 +234,13 @@ class ImageWorker(QRunnable):
                         reference_images=[raw_ref, mask_ref],
                         config=cfg,
                     )
+
+                    # record usage if provided
+                    try:
+                        self._record_usage_google(resp)
+                    except Exception:
+                        pass
+
                     imgs = getattr(resp, "generated_images", None) or []
                     for idx, gi in enumerate(imgs[: min(self.num, self.imagen_max_num)]):
                         data = self._extract_imagen_bytes(gi)
@@ -258,6 +265,13 @@ class ImageWorker(QRunnable):
                             image_config=img_cfg,
                         ),
                     )
+
+                    # record usage if provided
+                    try:
+                        self._record_usage_google(resp)
+                    except Exception:
+                        pass
+
                     saved = 0
                     for cand in getattr(resp, "candidates", []) or []:
                         parts = getattr(getattr(cand, "content", None), "parts", None) or []
@@ -291,6 +305,13 @@ class ImageWorker(QRunnable):
                 if self._using_vertex():
                     # Vertex Imagen edit API (preferred)
                     resp = self._imagen_edit(self.input_prompt, self.attachments, self.num)
+
+                    # record usage if provided
+                    try:
+                        self._record_usage_google(resp)
+                    except Exception:
+                        pass
+
                     imgs = getattr(resp, "generated_images", None) or []
                     for idx, gi in enumerate(imgs[: self.num]):
                         data = self._extract_imagen_bytes(gi)
@@ -303,6 +324,13 @@ class ImageWorker(QRunnable):
                 else:
                     # Gemini Developer API via Gemini image models (Nano Banana / Nano Banana Pro)
                     resp = self._gemini_edit(self.input_prompt, self.attachments, self.num)
+
+                    # record usage if provided
+                    try:
+                        self._record_usage_google(resp)
+                    except Exception:
+                        pass
+
                     saved = 0
                     for cand in getattr(resp, "candidates", []) or []:
                         parts = getattr(getattr(cand, "content", None), "parts", None) or []
@@ -326,6 +354,13 @@ class ImageWorker(QRunnable):
                 if self._is_imagen_generate(self.model) and self._using_vertex():
                     num = min(self.num, self.imagen_max_num)
                     resp = self._imagen_generate(self.input_prompt, num, self.resolution)
+
+                    # record usage if provided
+                    try:
+                        self._record_usage_google(resp)
+                    except Exception:
+                        pass
+
                     imgs = getattr(resp, "generated_images", None) or []
                     for idx, gi in enumerate(imgs[: num]):
                         data = self._extract_imagen_bytes(gi)
@@ -338,6 +373,13 @@ class ImageWorker(QRunnable):
                 else:
                     # Gemini Developer API image generation (Nano Banana / Nano Banana Pro) with robust sizing + optional reference images
                     resp = self._gemini_generate_image(self.input_prompt, self.model, self.resolution)
+
+                    # record usage if provided
+                    try:
+                        self._record_usage_google(resp)
+                    except Exception:
+                        pass
+
                     saved = 0
                     for cand in getattr(resp, "candidates", []) or []:
                         parts = getattr(getattr(cand, "content", None), "parts", None) or []
@@ -809,7 +851,7 @@ class ImageWorker(QRunnable):
         try:
             if not isinstance(self.ctx.extra, dict):
                 self.ctx.extra = {}
-            self.ctx.extra["image_id"] = str(value)
+            self.ctx.extra["image_id"] = self.window.core.filesystem.make_local(str(value))
             self.window.core.ctx.update_item(self.ctx)
         except Exception:
             pass
@@ -853,6 +895,51 @@ class ImageWorker(QRunnable):
         mime, _ = mimetypes.guess_type(uri)
         return mime or None
 
+    # ---------- usage helpers (Google GenAI) ----------
+
+    def _record_usage_google(self, response: Any) -> None:
+        """
+        Extract usage_metadata from Google GenAI response if present and store in ctx.
+        Saves to:
+          - ctx.set_tokens(prompt_token_count, candidates_token_count)
+          - ctx.extra["usage"] = {...}
+        """
+        try:
+            usage = getattr(response, "usage_metadata", None)
+            if not usage:
+                return
+
+            def _as_int(v) -> int:
+                try:
+                    return int(v)
+                except Exception:
+                    try:
+                        return int(float(v))
+                    except Exception:
+                        return 0
+
+            p = _as_int(getattr(usage, "prompt_token_count", 0) or 0)
+            c = _as_int(getattr(usage, "candidates_token_count", 0) or 0)
+            t = _as_int(getattr(usage, "total_token_count", (p + c)) or (p + c))
+
+            if self.ctx:
+                self.ctx.set_tokens(p, c)
+
+            if not isinstance(self.ctx.extra, dict):
+                self.ctx.extra = {}
+
+            self.ctx.extra["usage"] = {
+                "vendor": "google",
+                "model": str(self.model),
+                "input_tokens": p,
+                "output_tokens": c,
+                "total_tokens": t,
+                "source": "image",
+            }
+        except Exception:
+            # best-effort; ignore failures
+            pass
+
     def _cleanup(self):
         """Cleanup resources."""
         sig = self.signals

pygpt_net/provider/api/google/video.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.31 16:00:00                  #
+# Updated Date: 2026.01.23 23:00:00                  #
 # ================================================== #
 
 import base64, datetime, os, requests
@@ -480,7 +480,7 @@ class VideoWorker(QRunnable):
 
             if not isinstance(self.ctx.extra, dict):
                 self.ctx.extra = {}
-            self.ctx.extra["video_id"] = ref
+            self.ctx.extra["video_id"] = self.window.core.filesystem.make_local(ref)
             self.window.core.ctx.update_item(self.ctx)
         except Exception:
             pass

pygpt_net/provider/api/openai/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2026.01.03 17:00:00                  #
+# Updated Date: 2026.01.21 13:00:00                  #
 # ================================================== #
 
 from openai import OpenAI
@@ -263,7 +263,30 @@ class ApiOpenAI:
 
         return True
 
-    def quick_call(self, context: BridgeContext, extra: dict = None) -> str:
+    def redirect_call(
+            self,
+            context: BridgeContext,
+            extra: dict = None
+    ) -> str:
+        """
+        Redirect quick call to standard call and return the output text
+
+        :param context: BridgeContext
+        :param extra: Extra parameters
+        :return: Output text
+        """
+        context.stream = False
+        context.mode = MODE_CHAT
+        self.locked = True
+        self.call(context, extra)
+        self.locked = False
+        return context.ctx.output
+
+    def quick_call(
+            self,
+            context: BridgeContext,
+            extra: dict = None
+    ) -> str:
         """
         Quick call OpenAI API with custom prompt
 
@@ -273,19 +296,13 @@ class ApiOpenAI:
         """
         # if normal request call then redirect
         if context.request:
-            context.stream = False
-            context.mode = "chat"  # fake mode for redirect
-            self.locked = True
-            self.call(context, extra)
-            self.locked = False
-            return context.ctx.output
+            return self.redirect_call(context, extra)
 
         self.locked = True
         ctx = context.ctx
         mode = context.mode
         prompt = context.prompt
         system_prompt = context.system_prompt
-        max_tokens = context.max_tokens
         temperature = context.temperature
         functions = context.external_functions
         history = context.history
@@ -309,8 +326,6 @@ class ApiOpenAI:
                 })
         messages.append({"role": "user", "content": prompt})
         additional_kwargs = {}
-        # if max_tokens > 0:
-        # additional_kwargs["max_tokens"] = max_tokens
 
         # tools / functions
         tools = self.window.core.api.openai.tools.prepare(model, functions)

pygpt_net/provider/api/openai/image.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2026.01.05 20:00:00                  #
+# Updated Date: 2026.01.23 23:00:00                  #
 # ================================================== #
 
 import base64
@@ -350,6 +350,12 @@ class ImageWorker(QRunnable):
                 self.signals.status.emit("API Error: empty response")
                 return
 
+            # record usage if provided by API
+            try:
+                self._record_usage_openai(response)
+            except Exception:
+                pass
+
             # download images
             for i in range(self.num):
                 if i >= len(response.data):
@@ -383,7 +389,7 @@ class ImageWorker(QRunnable):
                 try:
                     if not isinstance(self.ctx.extra, dict):
                         self.ctx.extra = {}
-                    self.ctx.extra["image_id"] = paths[0]
+                    self.ctx.extra["image_id"] = self.window.core.filesystem.make_local(paths[0])
                     self.window.core.ctx.update_item(self.ctx)
                 except Exception:
                     pass
@@ -430,4 +436,74 @@ class ImageWorker(QRunnable):
         neg = (negative or "").strip()
         if not neg:
             return base
-        return (base + ("\n" if base else "") + f"Negative prompt: {neg}").strip()
+        return (base + ("\n" if base else "") + f"Negative prompt: {neg}").strip()
+
+    # ---------- usage helpers (OpenAI Images API) ----------
+
+    def _record_usage_openai(self, response: Any) -> None:
+        """
+        Extract and store token usage from OpenAI Images API response if present.
+        Saves to:
+          - ctx.set_tokens(input_tokens, output_tokens)
+          - ctx.extra["usage"] = {...}
+        """
+        try:
+            usage = getattr(response, "usage", None)
+            if usage is None and isinstance(response, dict):
+                usage = response.get("usage")
+
+            if not usage:
+                return
+
+            def _as_int(v) -> int:
+                try:
+                    return int(v)
+                except Exception:
+                    try:
+                        return int(float(v))
+                    except Exception:
+                        return 0
+
+            # handle both attr and dict style
+            getv = lambda o, k: getattr(o, k, None) if not isinstance(o, dict) else o.get(k)
+
+            inp = _as_int(getv(usage, "input_tokens") or getv(usage, "prompt_tokens") or 0)
+            outp = _as_int(getv(usage, "output_tokens") or getv(usage, "completion_tokens") or 0)
+            total = _as_int(getv(usage, "total_tokens") or (inp + outp))
+
+            # store basic tokens
+            if self.ctx:
+                self.ctx.set_tokens(inp, outp)
+
+            # store detailed usage in ctx.extra["usage"]
+            if not isinstance(self.ctx.extra, dict):
+                self.ctx.extra = {}
+
+            # pass through details if available
+            input_details = getv(usage, "input_tokens_details") or getv(usage, "prompt_tokens_details") or {}
+            output_details = getv(usage, "output_tokens_details") or getv(usage, "completion_tokens_details") or {}
+
+            # normalize dict-like objects
+            def _to_plain(o):
+                try:
+                    if hasattr(o, "model_dump"):
+                        return o.model_dump()
+                    if hasattr(o, "to_dict"):
+                        return o.to_dict()
+                except Exception:
+                    pass
+                return o if isinstance(o, dict) else {}
+
+            self.ctx.extra["usage"] = {
+                "vendor": "openai",
+                "model": str(self.model),
+                "input_tokens": inp,
+                "output_tokens": outp,
+                "total_tokens": total,
+                "input_tokens_details": _to_plain(input_details),
+                "output_tokens_details": _to_plain(output_details),
+                "source": "images",
+            }
+        except Exception:
+            # do not raise, usage is best-effort
+            pass

pygpt_net/provider/api/openai/responses.py

@@ -6,11 +6,10 @@
 # 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: 2026.01.21 13:00:00                  #
 # ================================================== #
 
 import base64
-import json
 import time
 from typing import Optional, Dict, Any, List, Tuple
 
@@ -92,9 +91,11 @@ class Responses:
         user_name = ctx.input_name  # from ctx
         ai_name = ctx.output_name  # from ctx
 
-        client = self.window.core.api.openai.get_client(mode, model)
+        api = self.window.core.api.openai
+        client = api.get_client(mode, model)
 
         # build chat messages
+        self.reset_tokens()
         messages = self.build(
             prompt=prompt,
             system_prompt=system_prompt,
@@ -106,11 +107,12 @@ class Responses:
             multimodal_ctx=multimodal_ctx,
             is_expert_call=is_expert_call,  # use separated previous response ID for expert calls
         )
-
         msg_tokens = self.window.core.tokens.from_messages(
             messages,
             model.id,
         )
+        self.input_tokens += msg_tokens
+
         # check if max tokens not exceeded
         if max_tokens > 0 and model.ctx > 0:
             if msg_tokens + int(max_tokens) > model.ctx:
@@ -121,16 +123,16 @@ class Responses:
         # extra API kwargs
         response_kwargs = {}
 
-        # tools / functions
-        tools = self.window.core.api.openai.tools.prepare_responses_api(model, functions)
+        # tools prepare
+        tools = api.tools.prepare_responses_api(model, functions)
 
-        # extra arguments, o3 only
+        # extra arguments, reasoning models only
         if model.extra and "reasoning_effort" in model.extra:
             response_kwargs['reasoning'] = {}
             response_kwargs['reasoning']['effort'] = model.extra["reasoning_effort"]
 
         # append remote tools
-        tools = self.window.core.api.openai.remote_tools.append_to_tools(
+        tools = api.remote_tools.append_to_tools(
             mode=mode,
             model=model,
             stream=stream,
@@ -217,11 +219,6 @@ class Responses:
         # tokens config
         mode = MODE_CHAT
         tool_call_native_enabled = self.window.core.config.get('func_call.native', False)
-        allowed_system = True
-        if (model.id is not None
-                and model.id in ["o1-mini", "o1-preview"]):
-            allowed_system = False
-
         used_tokens = self.window.core.tokens.from_user(
             prompt,
             system_prompt,
@@ -232,17 +229,6 @@ class Responses:
         if max_ctx_tokens > model.ctx > 0:
             max_ctx_tokens = model.ctx
 
-        # input tokens: reset
-        self.reset_tokens()
-
-        # append system prompt
-        if allowed_system:
-            pass
-            '''
-            if system_prompt is not None and system_prompt != "":
-                messages.append({"role": "developer", "content": system_prompt})
-            '''
-
         # append messages from context (memory)
         if self.window.core.config.get('use_context'):
             items = self.window.core.ctx.get_history(
@@ -384,7 +370,7 @@ class Responses:
                                                 break
 
                     # --- previous message ID ---
-                    if (item.msg_id and is_last_item
+                    if (item.msg_id
                             and ((item.cmds is None or len(item.cmds) == 0) or is_tool_output)):  # if no cmds before or tool output
                         if is_expert_call:
                             self.prev_internal_response_id = item.msg_id
@@ -414,12 +400,6 @@ class Responses:
                 "content": content,
             })
 
-        # input tokens: update
-        self.input_tokens += self.window.core.tokens.from_messages(
-            messages,
-            model.id,
-        )
-
         return messages
 
     def reset_tokens(self):

pygpt_net/provider/api/openai/video.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.31 16:00:00                  #
+# Updated Date: 2026.01.23 23:00:00                  #
 # ================================================== #
 
 import datetime
@@ -286,7 +286,7 @@ class VideoWorker(QRunnable):
             # Poll until completed (or failed/canceled)
             if not isinstance(self.ctx.extra, dict):
                 self.ctx.extra = {}
-            self.ctx.extra['video_id'] = video_id  # store video_id in ctx extra
+            self.ctx.extra['video_id'] = self.window.core.filesystem.make_local(video_id)  # store video_id in ctx extra
             self.window.core.ctx.update_item(self.ctx)
             last_progress = None
             last_status = None

pygpt_net/provider/api/x_ai/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2026.01.06 20:00:00                  #
+# Updated Date: 2026.01.21 13:00:00                  #
 # ================================================== #
 
 from typing import Optional, Dict, Any
@@ -203,6 +203,25 @@ class ApiXAI:
                 pass
         return True
 
+    def redirect_call(
+            self,
+            context: BridgeContext,
+            extra: dict = None
+    ) -> str:
+        """
+        Redirect quick call to standard call and return the output text
+
+        :param context: BridgeContext
+        :param extra: Extra parameters
+        :return: Output text
+        """
+        context.stream = False
+        context.mode = MODE_CHAT
+        self.locked = True
+        self.call(context, extra)
+        self.locked = False
+        return context.ctx.output
+
     def quick_call(
             self,
             context: BridgeContext,
@@ -222,12 +241,7 @@ class ApiXAI:
             return self.quick_call_old(context, extra)  # grok-3 uses old path
 
         if context.request:
-            context.stream = False
-            context.mode = MODE_CHAT
-            self.locked = True
-            self.call(context, extra)
-            self.locked = False
-            return context.ctx.output
+            return self.redirect_call(context, extra)
 
         self.locked = True
         try:

pygpt_net/provider/core/notepad/db_sqlite/storage.py

@@ -6,9 +6,9 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 22:00:00                  #
+# Updated Date: 2026.01.22 16:00:00                  #
 # ================================================== #
-
+import json
 import time
 from typing import Dict, Any
 
@@ -116,14 +116,18 @@ class Storage:
                                 title = :title,
                                 content = :content,
                                 is_initialized = :is_initialized,
-                                updated_ts = :updated_ts
+                                updated_ts = :updated_ts,
+                                highlights_json = :highlights_json,
+                                scroll_pos = :scroll_pos
                             WHERE idx = :idx
                         """).bindparams(
                     idx=int(notepad.idx or 0),
                     title=notepad.title,
                     content=notepad.content,
                     is_initialized=int(notepad.initialized),
-                    updated_ts=ts
+                    updated_ts=ts,
+                    highlights_json=self.pack_item_value(notepad.highlights),
+                    scroll_pos=int(notepad.scroll_pos)
                 )
             else:
                 stmt = text("""
@@ -136,7 +140,9 @@ class Storage:
                                 created_ts, 
                                 updated_ts,
                                 is_deleted,
-                                is_initialized
+                                is_initialized,
+                                highlights_json,
+                                scroll_pos
                             )
                             VALUES
                             (
@@ -147,7 +153,9 @@ class Storage:
                                 :created_ts,
                                 :updated_ts,
                                 :is_deleted,
-                                :is_initialized
+                                :is_initialized,
+                                :highlights_json,
+                                :scroll_pos
                             )
                         """).bindparams(
                     idx=notepad.idx,
@@ -157,7 +165,9 @@ class Storage:
                     created_ts=ts,
                     updated_ts=ts,
                     is_deleted=int(notepad.deleted),
-                    is_initialized=int(notepad.initialized)
+                    is_initialized=int(notepad.initialized),
+                    highlights_json=self.pack_item_value(notepad.highlights),
+                    scroll_pos=int(notepad.scroll_pos)
                 )
             conn.execute(stmt)
 
@@ -180,7 +190,9 @@ class Storage:
                     created_ts, 
                     updated_ts,
                     is_deleted,
-                    is_initialized
+                    is_initialized,
+                    highlights_json,
+                    scroll_pos
                 )
                 VALUES
                 (
@@ -191,7 +203,9 @@ class Storage:
                     :created_ts,
                     :updated_ts,
                     :is_deleted,
-                    :is_initialized
+                    :is_initialized,
+                    :highlights_json,
+                    :scroll_pos
                 )
             """).bindparams(
             idx=int(notepad.idx or 0),
@@ -201,7 +215,9 @@ class Storage:
             created_ts=ts,
             updated_ts=ts,
             is_deleted=int(notepad.deleted),
-            is_initialized=int(notepad.initialized)
+            is_initialized=int(notepad.initialized),
+            highlights_json=self.pack_item_value(notepad.highlights),
+            scroll_pos=int(notepad.scroll_pos)
         )
         with db.begin() as conn:
             result = conn.execute(stmt)
@@ -225,4 +241,31 @@ class Storage:
         notepad.content = row['content']
         notepad.deleted = bool(row['is_deleted'])
         notepad.initialized = bool(row['is_initialized'])
+        notepad.highlights = self.unpack_item_value(row['highlights_json'])
+        notepad.scroll_pos = int(row.get('scroll_pos', -1))
         return notepad
+
+    def pack_item_value(self, value: Any) -> str:
+        """
+        Pack item value to JSON
+
+        :param value: Value to pack
+        :return: JSON string or value itself
+        """
+        if isinstance(value, (list, dict)):
+            return json.dumps(value)
+        return value
+
+    def unpack_item_value(self, value: Any) -> Any:
+        """
+        Unpack item value from JSON
+
+        :param value: Value to unpack
+        :return: Unpacked value
+        """
+        if value is None:
+            return []
+        try:
+            return json.loads(value)
+        except:
+            return value

pygpt_net/tools/agent_builder/ui/dialogs.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.24 00:00:00                  #
+# Updated Date: 2026.01.22 17:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt, QEvent
@@ -38,6 +38,7 @@ class Builder:
     def setup_menu(self, parent=None) -> QMenuBar:
         """Setup agent_builder dialog menu"""
         self.menu_bar = QMenuBar(parent)
+        self.menu_bar.setNativeMenuBar(False)
         self.file_menu = self.menu_bar.addMenu(trans("menu.file"))
         t = self.tool