pygpt-net 2.6.28__py3-none-any.whl → 2.6.30__py3-none-any.whl

pygpt_net/core/assistants/store.py

@@ -106,7 +106,7 @@ class Store:
         :return: store item
         """
         name = "New vector store"
-        vector_store = self.window.core.gpt.store.create_store(name, 0)
+        vector_store = self.window.core.api.openai.store.create_store(name, 0)
         if vector_store is None:
             return None
         store = AssistantStoreItem()
@@ -124,7 +124,7 @@ class Store:
         :param store: store
         :return: updated store or None if failed
         """
-        vector_store = self.window.core.gpt.store.update_store(store.id, store.name, store.expire_days)
+        vector_store = self.window.core.api.openai.store.update_store(store.id, store.name, store.expire_days)
         if vector_store is None:
             return None
         self.items[store.id] = store
@@ -139,7 +139,7 @@ class Store:
         :return: status data, store data
         """
         status = {}
-        data = self.window.core.gpt.store.get_store(id)
+        data = self.window.core.api.openai.store.get_store(id)
         if data is not None:
             status = self.parse_status(data)
         return status, data
@@ -236,7 +236,7 @@ class Store:
         if id in self.items:
             store = self.items[id]
             self.provider.delete_by_id(store.record_id)
-            self.window.core.gpt.store.remove_store(id)
+            self.window.core.api.openai.store.remove_store(id)
             del self.items[id]
             return True
         return False

pygpt_net/core/bridge/bridge.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 23:00:00                  #
+# Updated Date: 2025.08.28 09:00:00                  #
 # ================================================== #
 
 import time
@@ -59,7 +59,7 @@ class Bridge:
         if self.window.controller.kernel.stopped():
             return False
 
-        allowed_model_change = MODE_VISION
+        allowed_model_change = [MODE_CHAT]
         is_virtual = False
         force_sync = False
 
@@ -254,7 +254,7 @@ class Bridge:
                         context.mode = MODE_RESEARCH
 
         # default: OpenAI API call
-        return self.window.core.gpt.quick_call(
+        return self.window.core.api.openai.quick_call(
             context=context,
             extra=extra,
         )

pygpt_net/core/bridge/worker.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.11 14:00:00                  #
+# Updated Date: 2025.08.28 20:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import QObject, Signal, QRunnable, Slot
@@ -17,6 +17,8 @@ from pygpt_net.core.types import (
     MODE_LANGCHAIN,
     MODE_LLAMA_INDEX,
     MODE_ASSISTANT,
+    MODE_VISION,
+    MODE_LOOP_NEXT,
 )
 from pygpt_net.core.events import KernelEvent, Event
 
@@ -29,7 +31,7 @@ class BridgeSignals(QObject):
 class BridgeWorker(QRunnable):
     """Bridge worker"""
     def __init__(self, *args, **kwargs):
-        QRunnable.__init__(self)
+        super().__init__()
         self.signals = BridgeSignals()
         self.args = args
         self.kwargs = kwargs
@@ -64,6 +66,8 @@ class BridgeWorker(QRunnable):
                     extra=self.extra,
                 )
                 """
+            elif self.mode == MODE_VISION:
+                raise Exception("Vision mode is deprecated from v2.6.30 and integrated into Chat. ")
 
             # LlamaIndex: chat with files
             if self.mode == MODE_LLAMA_INDEX:
@@ -87,7 +91,7 @@ class BridgeWorker(QRunnable):
                     self.extra["error"] = str(self.window.core.agents.runner.get_error())
 
             # Loop: next step
-            elif self.mode == "loop_next":  # virtual mode
+            elif self.mode == MODE_LOOP_NEXT:  # virtual mode
                 result = self.window.core.agents.runner.loop.run_next(
                     context=self.context,
                     extra=self.extra,
@@ -98,12 +102,27 @@ class BridgeWorker(QRunnable):
                 else:
                     self.extra["error"] = str(self.window.core.agents.runner.get_error())
 
-            # API OpenAI: chat, completion, vision, image, assistants
+            # API SDK: chat, completion, vision, image, assistants
             else:
-                result = self.window.core.gpt.call(
-                    context=self.context,
-                    extra=self.extra,
-                )
+                sdk = "openai"
+                model = self.context.model
+                if model.provider == "google":
+                    if self.window.core.config.get("api_native_google", False):
+                        sdk = "google"
+
+                # call appropriate SDK
+                if sdk == "google":
+                    # print("Using Google SDK")
+                    result = self.window.core.api.google.call(
+                        context=self.context,
+                        extra=self.extra,
+                    )
+                elif sdk == "openai":
+                    # print("Using OpenAI SDK")
+                    result = self.window.core.api.openai.call(
+                        context=self.context,
+                        extra=self.extra,
+                    )
         except Exception as e:
             if self.signals:
                 self.extra["error"] = e
@@ -170,7 +189,7 @@ class BridgeWorker(QRunnable):
         ad_context = self.window.controller.chat.attachment.get_context(ctx, self.context.history)
         ad_mode = self.window.controller.chat.attachment.get_mode()
         if ad_context:
-            self.context.prompt += "\n\n" + ad_context  # append to input text
+            self.context.prompt += f"\n\n{ad_context}"  # append to input text
             if (ad_mode == self.window.controller.chat.attachment.MODE_QUERY_CONTEXT
                     or self.mode in [MODE_AGENT_LLAMA, MODE_AGENT_OPENAI]):
                 ctx.hidden_input = ad_context  # store for future use, only if query context

pygpt_net/core/debug/console/console.py

@@ -69,8 +69,8 @@ class Console:
         elif msg.lower() == "mpkfa":
             self.log("GOD MODE ACTIVATED ;)")
         elif msg == "oclr":
-            if self.window.core.gpt.client:
-                self.window.core.gpt.client.close()
+            if self.window.core.api.openai.client:
+                self.window.core.api.openai.client.close()
                 self.log("OpenAI client closed")
             else:
                 self.log("OpenAI client not initialized")

pygpt_net/core/debug/presets.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.30 00:00:00                  #
+# Updated Date: 2025.08.28 09:00:00                  #
 # ================================================== #
 
 import os
@@ -62,7 +62,7 @@ class PresetsDebug:
                 MODE_CHAT: preset.chat,
                 MODE_COMPLETION: preset.completion,
                 MODE_IMAGE: preset.img,
-                MODE_VISION: preset.vision,
+                # MODE_VISION: preset.vision,
                 # MODE_LANGCHAIN: preset.langchain,
                 MODE_ASSISTANT: preset.assistant,
                 MODE_LLAMA_INDEX: preset.llama_index,

pygpt_net/core/experts/experts.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.23 15:00:00                  #
+# Updated Date: 2025.08.28 09:00:00                  #
 # ================================================== #
 
 import json
@@ -49,7 +49,7 @@ class Experts:
         self.allowed_modes = [
             MODE_CHAT,
             MODE_COMPLETION,
-            MODE_VISION,
+            # MODE_VISION,
             # MODE_LANGCHAIN,
             MODE_LLAMA_INDEX,
             MODE_AUDIO,

pygpt_net/core/idx/llm.py

@@ -10,7 +10,7 @@
 # ================================================== #
 
 import os.path
-from typing import Optional, Union
+from typing import Optional, Union, List, Dict
 
 from llama_index.core.llms.llm import BaseLLM
 from llama_index.core.multi_modal_llms import MultiModalLLM
@@ -119,6 +119,8 @@ class Llm:
             window=self.window,
             env=env,
         )
+        model_name = self.extract_model_name_from_args(args)
+        self.window.core.idx.log(f"Embeddings: using global provider: {provider}, model_name: {model_name}")
         return self.window.core.llm.llms[provider].get_embeddings_model(
             window=self.window,
             config=args,
@@ -162,8 +164,8 @@ class Llm:
 
         # try to get custom args from config for the model provider
         is_custom_provider = False
-        default = self.window.core.config.get("llama.idx.embeddings.default", [])
-        for item in default:
+        defaults = self.window.core.config.get("llama.idx.embeddings.default", [])
+        for item in defaults:
             provider = item.get("provider", "")
             if provider and provider == model.provider:
                 is_custom_provider = True
@@ -188,6 +190,7 @@ class Llm:
                             "value": client_args.get("api_key", ""),
                         }
                     )
+                self.window.core.idx.log(f"Embeddings: trying to use {m.provider}, model_name: {model_name}")
                 break
 
         if is_custom_provider:
@@ -196,5 +199,20 @@ class Llm:
                 config=args,
             )
         if not embed_model:
+            self.window.core.idx.log(f"Embeddings: not configured for {model.provider}. Fallback: using global provider.")
             embed_model = self.get_embeddings_provider()
         return embed_model
+
+    def extract_model_name_from_args(self, args: List[Dict]) -> str:
+        """
+        Extract model name from provider args
+
+        :param args: List of args
+        :return: Model name if configured
+        """
+        model_name = ""
+        for item in args:
+            if item.get("name") in ["model", "model_name"]:
+                model_name = item.get("value")
+                break
+        return model_name

pygpt_net/core/modes/modes.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 23:00:00                  #
+# Updated Date: 2025.08.28 09:00:00                  #
 # ================================================== #
 
 from typing import Dict, List
@@ -53,7 +53,7 @@ class Modes:
             MODE_IMAGE,
             # MODE_LANGCHAIN,
             MODE_LLAMA_INDEX,
-            MODE_VISION,
+            # MODE_VISION,
             MODE_RESEARCH,
             MODE_COMPUTER,
         )

pygpt_net/core/presets/presets.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 23:00:00                  #
+# Updated Date: 2025.08.28 09:00:00                  #
 # ================================================== #
 
 import copy
@@ -165,8 +165,8 @@ class Presets:
             return MODE_COMPLETION
         if preset.img:
             return MODE_IMAGE
-        if preset.vision:
-            return MODE_VISION
+        # if preset.vision:
+            # return MODE_VISION
         # if preset.langchain:
             # return MODE_LANGCHAIN
         if preset.assistant:

pygpt_net/core/tokens/tokens.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 23:00:00                  #
+# Updated Date: 2025.08.28 09:00:00                  #
 # ================================================== #
 
 from typing import Tuple, List
@@ -36,8 +36,8 @@ from pygpt_net.item.ctx import CtxItem
 
 CHAT_MODES = [
     MODE_CHAT,
-    MODE_VISION,
-    MODE_LANGCHAIN,
+    # MODE_VISION,
+    # MODE_LANGCHAIN,
     MODE_ASSISTANT,
     MODE_LLAMA_INDEX,
     MODE_AGENT,
@@ -328,7 +328,7 @@ class Tokens:
         model_id = self.window.core.models.get_id(model)
         mode = self.window.core.config.get('mode')
         tokens = 0
-        if mode in [MODE_CHAT, MODE_VISION, MODE_AUDIO, MODE_RESEARCH]:
+        if mode in [MODE_CHAT, MODE_AUDIO, MODE_RESEARCH]:
             tokens += self.from_prompt(system_prompt, "", model_id)
             tokens += self.from_text("system", model_id)
             tokens += self.from_prompt(input_prompt, "", model_id)

pygpt_net/core/types/mode.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.23 21:00:00                  #
+# Updated Date: 2025.08.28 09:00:00                  #
 # ================================================== #
 
 MODE_AGENT = "agent"
@@ -22,4 +22,7 @@ MODE_IMAGE = "img"
 MODE_LANGCHAIN = "langchain"
 MODE_LLAMA_INDEX = "llama_index"
 MODE_RESEARCH = "research"
-MODE_VISION = "vision"
+MODE_VISION = "vision"
+
+# virtual modes
+MODE_LOOP_NEXT = "loop_next"

pygpt_net/core/vision/analyzer.py

@@ -51,7 +51,7 @@ class Analyzer:
 
         extra = {}
         output = ""
-        response = self.window.core.gpt.vision.send(context, extra)
+        response = self.window.core.api.openai.vision.send(context, extra)
         if response.choices[0] and response.choices[0].message.content:
             output = response.choices[0].message.content.strip()
         for id in files:

pygpt_net/data/config/config.json

@@ -1,8 +1,8 @@
 {
   "__meta__": {
-    "version": "2.6.28",
-    "app.version": "2.6.28",
-    "updated_at": "2025-08-27T00:00:00"
+    "version": "2.6.30",
+    "app.version": "2.6.30",
+    "updated_at": "2025-08-29T00:00:00"
   },
   "access.audio.event.speech": false,
   "access.audio.event.speech.disabled": [],
@@ -88,6 +88,7 @@
   "api_key_mistral": "",
   "api_key_voyage": "",
   "api_key_open_router": "",
+  "api_native_google": true,
   "api_proxy": "",
   "api_use_responses": true,
   "api_use_responses_llama": false,
@@ -396,6 +397,8 @@
   "remote_tools.file_search": false,  
   "remote_tools.file_search.args": "",
   "remote_tools.computer_use.env": "",
+  "remote_tools.google.web_search": true,
+  "remote_tools.google.code_interpreter": false,
   "send_clear": true,
   "send_mode": 2,
   "store_history": true,

pygpt_net/data/config/models.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.6.28",
-        "app.version": "2.6.28",
-        "updated_at": "2025-08-27T23:07:35"
+        "version": "2.6.30",
+        "app.version": "2.6.30",
+        "updated_at": "2025-08-29T23:07:35"
     },
     "items": {
         "SpeakLeash/bielik-11b-v2.3-instruct:Q4_K_M": {
@@ -2565,6 +2565,78 @@
             "provider": "x_ai",
             "tool_calls": true
         },
+        "imagen-3.0-generate-002": {
+            "id": "imagen-3.0-generate-002",
+            "name": "imagen-3.0-generate-002",
+            "mode": [
+                "img"
+            ],
+            "llama_index": {
+                "args": [
+                    {
+                        "name": "model",
+                        "value": "models/imagen-3.0-generate-002",
+                        "type": "str"
+                    }
+                ],
+                "env": [
+                    {
+                        "name": "GOOGLE_API_KEY",
+                        "value": "{api_key_google}",
+                        "type": "str"
+                    }
+                ]
+            },
+            "ctx": 128000,
+            "tokens": 0,
+            "default": false,
+            "input": [
+                "text"
+            ],
+            "output": [
+                "image"
+            ],
+            "extra": {},
+            "imported": true,
+            "provider": "google",
+            "tool_calls": true
+        },
+        "imagen-4.0-generate-001": {
+            "id": "imagen-4.0-generate-001",
+            "name": "imagen-4.0-generate-001",
+            "mode": [
+                "img"
+            ],
+            "llama_index": {
+                "args": [
+                    {
+                        "name": "model",
+                        "value": "models/imagen-4.0-generate-001",
+                        "type": "str"
+                    }
+                ],
+                "env": [
+                    {
+                        "name": "GOOGLE_API_KEY",
+                        "value": "{api_key_google}",
+                        "type": "str"
+                    }
+                ]
+            },
+            "ctx": 128000,
+            "tokens": 0,
+            "default": false,
+            "input": [
+                "text"
+            ],
+            "output": [
+                "image"
+            ],
+            "extra": {},
+            "imported": true,
+            "provider": "google",
+            "tool_calls": true
+        },
         "llama2-uncensored": {
             "id": "llama2-uncensored",
             "name": "llama2-uncensored",

pygpt_net/data/config/modes.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.5.28",
-        "app.version": "2.5.28",
-        "updated_at": "2025-07-08T00:00:00"
+        "version": "2.6.30",
+        "app.version": "2.6.30",
+        "updated_at": "2025-08-28T09:00:00"
     },
     "items": {
         "chat": {
@@ -41,12 +41,6 @@
             "label": "mode.img",
             "default": false
         },
-        "vision": {
-            "id": "vision",
-            "name": "vision",
-            "label": "mode.vision",
-            "default": false
-        },
         "assistant": {
             "id": "assistant",
             "name": "assistant",