pygpt-net 2.7.3__py3-none-any.whl → 2.7.5__py3-none-any.whl

pygpt_net/provider/api/openai/worker/importer.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: 2026.01.02 19:00:00                  #
 # ================================================== #
 
 import os
@@ -36,17 +36,17 @@ class Importer(QObject):
         if mode == "assistants":
             self.window.controller.assistant.batch.handle_imported_assistants_failed(err)
         elif mode == "import_files":
-            self.window.controller.assistant.batch.handle_imported_files_failed(err)
+            self.window.controller.remote_store.openai.batch.handle_imported_files_failed(err)
         elif mode == "truncate_files":
-            self.window.controller.assistant.batch.handle_truncated_files_failed(err)
+            self.window.controller.remote_store.openai.batch.handle_truncated_files_failed(err)
         elif mode == "upload_files":
-            self.window.controller.assistant.batch.handle_uploaded_files_failed(err)
+            self.window.controller.remote_store.openai.batch.handle_uploaded_files_failed(err)
         elif mode in "vector_stores":
-            self.window.controller.assistant.batch.handle_imported_stores_failed(err)
+            self.window.controller.remote_store.openai.batch.handle_imported_stores_failed(err)
         elif mode in "truncate_vector_stores":
-            self.window.controller.assistant.batch.handle_truncated_stores_failed(err)
+            self.window.controller.remote_store.openai.batch.handle_truncated_stores_failed(err)
         elif mode in "refresh_vector_stores":
-            self.window.controller.assistant.batch.handle_refreshed_stores_failed(err)
+            self.window.controller.remote_store.openai.batch.handle_refreshed_stores_failed(err)
 
     @Slot(str, str, int)
     def handle_finished(self, mode: str, store_id: str = None, num: int = 0):
@@ -60,17 +60,17 @@ class Importer(QObject):
         if mode == "assistants":
             self.window.controller.assistant.batch.handle_imported_assistants(num)
         elif mode == "import_files":
-            self.window.controller.assistant.batch.handle_imported_files(num)
+            self.window.controller.remote_store.openai.batch.handle_imported_files(num)
         elif mode == "truncate_files":
-            self.window.controller.assistant.batch.handle_truncated_files(store_id, num)
+            self.window.controller.remote_store.openai.batch.handle_truncated_files(store_id, num)
         elif mode == "upload_files":
-            self.window.controller.assistant.batch.handle_uploaded_files(num)
+            self.window.controller.remote_store.openai.batch.handle_uploaded_files(num)
         elif mode == "vector_stores":
-            self.window.controller.assistant.batch.handle_imported_stores(num)
+            self.window.controller.remote_store.openai.batch.handle_imported_stores(num)
         elif mode == "truncate_vector_stores":
-            self.window.controller.assistant.batch.handle_truncated_stores(num)
+            self.window.controller.remote_store.openai.batch.handle_truncated_stores(num)
         elif mode == "refresh_vector_stores":
-            self.window.controller.assistant.batch.handle_refreshed_stores(num)
+            self.window.controller.remote_store.openai.batch.handle_refreshed_stores(num)
 
     @Slot(str, str)
     def handle_status(self, mode: str, msg: str):
@@ -264,10 +264,10 @@ class ImportWorker(QRunnable):
         """
         try:
             self.log("Importing vector stores...")
-            self.window.core.assistants.store.clear()
+            self.window.core.remote_store.openai.clear()
             items = {}
             self.window.core.api.openai.store.import_stores(items, callback=self.callback)
-            self.window.core.assistants.store.import_items(items)
+            self.window.core.remote_store.openai.import_items(items)
             if not silent:
                 self.signals.finished.emit("vector_stores", self.store_id, len(items))
             return True
@@ -286,8 +286,8 @@ class ImportWorker(QRunnable):
         try:
             self.log("Truncating stores...")
             num = self.window.core.api.openai.store.remove_all(callback=self.callback)
-            self.window.core.assistants.store.items = {}
-            self.window.core.assistants.store.save()
+            self.window.core.remote_store.openai.items = {}
+            self.window.core.remote_store.openai.save()
             if not silent:
                 self.signals.finished.emit("truncate_vector_stores", self.store_id, num)
             return True
@@ -306,11 +306,11 @@ class ImportWorker(QRunnable):
         try:
             self.log("Refreshing stores...")
             num = 0
-            stores = self.window.core.assistants.store.items
+            stores = self.window.core.remote_store.openai.items
             for id in stores:
                 store = stores[id]
                 try:
-                    self.window.controller.assistant.store.refresh_store(store, update=False)
+                    self.window.controller.remote_store.openai.refresh_store(store, update=False)
                     num += 1
                 except Exception as e:
                     self.log("Failed to refresh store: {}".format(id))
@@ -334,12 +334,12 @@ class ImportWorker(QRunnable):
             # if empty store_id, truncate all files, otherwise truncate only store files
             if self.store_id is None:
                 self.log("Truncating all files...")
-                self.window.core.assistants.files.truncate() # clear all files
+                self.window.core.remote_store.openai.files.truncate() # clear all files
                 # remove all files in API
                 num = self.window.core.api.openai.store.remove_files(callback=self.callback)
             else:
                 self.log("Truncating files for store: {}".format(self.store_id))
-                self.window.core.assistants.files.truncate(self.store_id)  # clear store files, remove from stores / DB
+                self.window.core.remote_store.openai.files.truncate(self.store_id)  # clear store files, remove from stores / DB
                 # remove store files in API
                 num = self.window.core.api.openai.store.remove_store_files(
                     self.store_id,
@@ -373,7 +373,7 @@ class ImportWorker(QRunnable):
                         )
                         if stored_file is not None:
                             data = self.window.core.api.openai.store.get_file(file_id)
-                            self.window.core.assistants.files.insert(self.store_id, data)  # insert to DB
+                            self.window.core.remote_store.openai.files.insert(self.store_id, data)  # insert to DB
                             msg = "Uploaded file: {}/{}".format((num + 1), len(self.files))
                             self.signals.status.emit("upload_files", msg)
                             self.log(msg)
@@ -402,11 +402,11 @@ class ImportWorker(QRunnable):
         try:
             if self.store_id is None:
                 self.log("Importing all files...")
-                self.window.core.assistants.files.truncate_local()  # clear local DB (all)
+                self.window.core.remote_store.openai.files.truncate_local()  # clear local DB (all)
                 num = self.window.core.api.openai.store.import_stores_files(self.callback)  # import all files
             else:
                 self.log("Importing files for store: {}".format(self.store_id))
-                self.window.core.assistants.files.truncate_local(self.store_id)  # clear local DB (all)
+                self.window.core.remote_store.openai.files.truncate_local(self.store_id)  # clear local DB (all)
                 items = self.window.core.api.openai.store.import_store_files(
                     self.store_id,
                     [],

pygpt_net/provider/api/x_ai/image.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.05 01:00:00                  #
+# Updated Date: 2025.12.31 16:00:00                  #
 # ================================================== #
 
 import base64
@@ -49,6 +49,7 @@ class Image:
         prompt = context.prompt
         num = int(extra.get("num", 1))
         inline = bool(extra.get("inline", False))
+        extra_prompt = extra.get("extra_prompt", "")
 
         # Optional prompt enhancement model (same as in your Google path)
         prompt_model = self.window.core.models.from_defaults()
@@ -66,6 +67,7 @@ class Image:
         worker.raw = self.window.core.config.get('img_raw')
         worker.num = num
         worker.inline = inline
+        worker.extra_prompt = extra_prompt
 
         self.worker = worker
         self.worker.signals.finished.connect(self.window.core.image.handle_finished)
@@ -102,6 +104,7 @@ class ImageWorker(QRunnable):
         self.input_prompt = ""
         self.system_prompt = ""
         self.inline = False
+        self.extra_prompt: Optional[str] = None
         self.raw = False
         self.num = 1
 
@@ -131,6 +134,13 @@ class ImageWorker(QRunnable):
                     self.signals.error.emit(e)
                     self.signals.status.emit(trans('img.status.prompt.error') + ": " + str(e))
 
+            # Negative prompt fallback: append as textual instruction (xAI has no native field for it)
+            if self.extra_prompt and str(self.extra_prompt).strip():
+                try:
+                    self.input_prompt = self._merge_negative_prompt(self.input_prompt or "", self.extra_prompt)
+                except Exception:
+                    pass
+
             self.signals.status.emit(trans('img.status.generating') + f": {self.input_prompt}...")
 
             cfg = self.window.core.config
@@ -205,4 +215,17 @@ class ImageWorker(QRunnable):
             try:
                 sig.deleteLater()
             except RuntimeError:
-                pass
+                pass
+
+    # ---------- prompt utilities ----------
+
+    @staticmethod
+    def _merge_negative_prompt(prompt: str, negative: Optional[str]) -> str:
+        """
+        Append a negative prompt to the main text prompt for providers without a native negative_prompt field.
+        """
+        base = (prompt or "").strip()
+        neg = (negative or "").strip()
+        if not neg:
+            return base
+        return (base + ("\n" if base else "") + f"Negative prompt: {neg}").strip()

pygpt_net/provider/core/config/patch.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.30 22:00:00                  #
+# Updated Date: 2026.01.02 02:00:00                  #
 # ================================================== #
 
 import copy
@@ -216,6 +216,28 @@ class Patch:
                     data["img.remix"] = False
                 updated = True
 
+            # < 2.7.4
+            if old < parse_version("2.7.4"):
+                print("Migrating config from < 2.7.4...")
+                patch_css('web-chatgpt.css', True)
+                patch_css('web-blocks.css', True)
+                updated = True
+
+            # < 2.7.5
+            if old < parse_version("2.7.5"):
+                print("Migrating config from < 2.7.5...")
+                if "remote_tools.computer_use.sandbox" not in data:
+                    data["remote_tools.computer_use.sandbox"] = False
+                if "remote_tools.google.file_search" not in data:
+                    data["remote_tools.google.file_search"] = False
+                if "remote_tools.google.file_search.args" not in data:
+                    data["remote_tools.google.file_search.args"] = ""
+                if "remote_tools.google.maps" not in data:
+                    data["remote_tools.google.maps"] = False
+                if "remote_store.openai.hide_threads" not in data:
+                    data["remote_store.openai.hide_threads"] = True
+                updated = True
+
         # update file
         migrated = False
         if updated:

pygpt_net/provider/core/config/patches/patch_before_2_6_42.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.12 00:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #
 
 import copy
@@ -1404,8 +1404,8 @@ class Patch:
             # < 2.1.79
             if old < parse_version("2.1.79"):
                 print("Migrating config from < 2.1.79...")
-                if 'assistant.store.hide_threads' not in data:
-                    data["assistant.store.hide_threads"] = True
+                if 'remote_store.openai.hide_threads' not in data:
+                    data["remote_store.openai.hide_threads"] = True
                 updated = True
 
             # < 2.2.2

pygpt_net/provider/core/model/patch.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.26 11:00:00                  #
+# Updated Date: 2026.01.03 02:10:00                  #
 # ================================================== #
 
 from packaging.version import parse as parse_version, Version
@@ -75,7 +75,7 @@ class Patch:
                         base_model = from_base(model)
                         if base_model:
                             data[model] = base_model
-                            updated = True
+                updated = True
 
             # <  2.6.67 <--- add missing image input
             if old < parse_version("2.6.67"):
@@ -100,7 +100,21 @@ class Patch:
                         m = data[model]
                         if not m.is_image_input():
                             m.input.append("image")
-                            updated = True
+                updated = True
+
+            # <  2.7.5 <--- add: gemini-2.5-computer-use-preview-10-2025
+            if old < parse_version("2.7.5"):
+                print("Migrating models from < 2.7.5...")
+                models_to_add = [
+                    "gemini-2.5-computer-use-preview-10-2025",
+                    "deep-research-pro-preview-12-2025"
+                ]
+                for model in models_to_add:
+                    if model not in data:
+                        base_model = from_base(model)
+                        if base_model:
+                            data[model] = base_model
+                updated = True
 
         # update file
         if updated:

pygpt_net/provider/core/preset/json_file.py

@@ -6,7 +6,7 @@
 # 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.02 19:00:00                  #
 # ================================================== #
 
 import json
@@ -77,9 +77,12 @@ class JsonFileProvider(BaseProvider):
                 if filename.endswith(".json"):
                     path = os.path.join(self.window.core.config.get_user_dir('presets'), filename)
                     with open(path, 'r', encoding="utf-8") as f:
-                        preset = PresetItem()
-                        self.deserialize(json.load(f), preset)
-                        items[filename[:-5]] = preset
+                        try:
+                            preset = PresetItem()
+                            self.deserialize(json.load(f), preset)
+                            items[filename[:-5]] = preset
+                        except Exception as e:
+                            pass
         except Exception as e:
             self.window.core.debug.log(e)
 
@@ -104,9 +107,12 @@ class JsonFileProvider(BaseProvider):
                         filename
                     )
                     with open(path, 'r', encoding="utf-8") as f:
-                        preset = PresetItem()
-                        self.deserialize(json.load(f), preset)
-                        items[filename[:-5]] = preset
+                        try:
+                            preset = PresetItem()
+                            self.deserialize(json.load(f), preset)
+                            items[filename[:-5]] = preset
+                        except Exception as e:
+                            pass
         except Exception as e:
             self.window.core.debug.log(e)
 

pygpt_net/provider/core/{assistant_file → remote_file}/__init__.py

@@ -6,5 +6,5 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.26 23:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #

pygpt_net/provider/core/{assistant_file → remote_file}/base.py

@@ -6,20 +6,20 @@
 # 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.02 20:00:00                  #
 # ================================================== #
 
 from typing import Dict
 from packaging.version import Version
 
-from pygpt_net.item.assistant import AssistantFileItem
+from pygpt_net.item.store import RemoteFileItem
 
 
 class BaseProvider:
     def __init__(self, window=None):
         self.window = window
         self.id = ""
-        self.type = "assistant_file"
+        self.type = "remote_file"
 
     def attach(self, window):
         self.window = window
@@ -30,25 +30,25 @@ class BaseProvider:
     def patch(self, version: Version) -> bool:
         pass
 
-    def create(self, file: AssistantFileItem):
+    def create(self, file: RemoteFileItem):
         pass
 
-    def load(self, id) ->  AssistantFileItem:
+    def load(self, id) ->  RemoteFileItem:
         pass
 
-    def load_all(self) -> Dict[str, AssistantFileItem]:
+    def load_all(self, provider: str) -> Dict[str, RemoteFileItem]:
         pass
 
-    def save(self, file:  AssistantFileItem):
+    def save(self, file:  RemoteFileItem):
         pass
 
-    def save_all(self, items: Dict[str, AssistantFileItem]):
+    def save_all(self, items: Dict[str, RemoteFileItem]):
         pass
 
     def remove(self, id):
         pass
 
-    def truncate(self):
+    def truncate(self, provider: str):
         pass
 
     def get_version(self) -> str:

pygpt_net/provider/core/remote_file/db_sqlite/__init__.py

@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ================================================== #
+# This file is a part of PYGPT package               #
+# Website: https://pygpt.net                         #
+# GitHub:  https://github.com/szczyglis-dev/py-gpt   #
+# MIT License                                        #
+# Created By  : Marcin Szczygliński                  #
+# Updated Date: 2026.01.02 20:00:00                  #
+# ================================================== #
+
+from .provider import *

pygpt_net/provider/core/{assistant_file → remote_file}/db_sqlite/patch.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.26 23:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #
 
 from packaging.version import parse as parse_version, Version

pygpt_net/provider/core/{assistant_file → remote_file}/db_sqlite/provider.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 22:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #
 
 import uuid
@@ -14,8 +14,8 @@ from typing import Dict
 
 from packaging.version import Version
 
-from pygpt_net.item.assistant import AssistantFileItem
-from pygpt_net.provider.core.assistant_file.base import BaseProvider
+from pygpt_net.item.store import RemoteFileItem
+from pygpt_net.provider.core.remote_file.base import BaseProvider
 
 from .patch import Patch
 from .storage import Storage
@@ -28,7 +28,7 @@ class DbSqliteProvider(BaseProvider):
         self.patcher = Patch(window, self)
         self.storage = Storage(window)
         self.id = "db_sqlite"
-        self.type = "assistant_file"
+        self.type = "remote_file"
 
     def attach(self, window):
         """
@@ -56,11 +56,11 @@ class DbSqliteProvider(BaseProvider):
         """
         return str(uuid.uuid4())
 
-    def create(self, file: AssistantFileItem) -> int:
+    def create(self, file: RemoteFileItem) -> int:
         """
         Create new and return its ID
 
-        :param file: AssistantFileItem
+        :param file: RemoteFileItem
         :return: file ID
         """
         if file.record_id is None or file.record_id == "":
@@ -68,15 +68,16 @@ class DbSqliteProvider(BaseProvider):
             file.record_id = self.storage.insert(file)
         return file.record_id
 
-    def load_all(self) -> Dict[str, AssistantFileItem]:
+    def load_all(self, provider: str) -> Dict[str, RemoteFileItem]:
         """
         Load files from DB
 
+        :param provider: provider ID
         :return: files dict
         """
-        return self.storage.get_all()
+        return self.storage.get_all(provider)
 
-    def load(self, id: int) -> AssistantFileItem:
+    def load(self, id: int) -> RemoteFileItem:
         """
         Load file from DB
 
@@ -85,11 +86,11 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.get_by_id(id)
 
-    def save(self, file: AssistantFileItem):
+    def save(self, file: RemoteFileItem):
         """
         Save file to DB
 
-        :param file: AssistantFileItem
+        :param file: RemoteFileItem
         """
         try:
             self.storage.save(file)
@@ -97,11 +98,11 @@ class DbSqliteProvider(BaseProvider):
             self.window.core.debug.log(e)
             print("Error while saving filed: {}".format(str(e)))
 
-    def save_all(self, items: Dict[str, AssistantFileItem]):
+    def save_all(self, items: Dict[str, RemoteFileItem]):
         """
         Save all files to DB
 
-        :param items: dict of AssistantFileItem objects
+        :param items: dict of RemoteFileItem objects
         """
         try:
             for id in items:
@@ -113,15 +114,15 @@ class DbSqliteProvider(BaseProvider):
 
     def get_by_store_or_thread(self, store_id: str, thread_id: str) -> dict:
         """
-        Return dict with AssistantFileItem objects, indexed by record ID
+        Return dict with RemoteFileItem objects, indexed by record ID
 
-        :return: dict of AssistantFileItem objects
+        :return: dict of RemoteFileItem objects
         """
         return self.storage.get_by_store_or_thread(store_id, thread_id)
 
     def count_by_store_or_thread(self, store_id: str, thread_id: str) -> int:
         """
-        Count AssistantFileItem objects, indexed by ID
+        Count RemoteFileItem objects, indexed by ID
 
         :return: number of files
         """
@@ -163,13 +164,14 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.clear_store_from_files(store_id)
 
-    def clear_all_stores_from_files(self) -> bool:
+    def clear_all_stores_from_files(self, provider: str) -> bool:
         """
         Clear all stores from files
 
+        :param provider: provider ID
         :return: True if deleted
         """
-        return self.storage.clear_all_stores_from_files()
+        return self.storage.clear_all_stores_from_files(provider)
 
     def rename_file(self, record_id: int, name: str) -> bool:
         """
@@ -181,13 +183,14 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.rename_file(record_id, name)
 
-    def truncate_all(self) -> bool:
+    def truncate_all(self, provider: str) -> bool:
         """
         Truncate all files
 
+        :param provider: provider ID
         :return: True if truncated
         """
-        return self.storage.truncate_all()
+        return self.storage.truncate_all(provider)
 
     def truncate_by_store(self, store_id: str) -> bool:
         """