pygpt-net 2.4.47__tar.gz → 2.4.49__tar.gz

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 2.4.49 (2025-01-16)
+
+- Fix: stream render in Assistants mode.
+- Fix: items remove in context regen/edit.
+
+## 2.4.48 (2025-01-16)
+
+- Fix: parsing lists in data loaders configuration.
+- Fix: crash on Windows on PySide6 v6.6.0.
+- Added Gemini embeddings to LlamaIndex settings.
+- LlamaIndex upgraded to 0.12.11.
+- Security updates.
+
 ## 2.4.47 (2025-01-14)
 
 - Added support for Python 3.12.

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygpt-net
-Version: 2.4.47
+Version: 2.4.49
 Summary: Desktop AI Assistant powered by models: OpenAI o1, GPT-4o, GPT-4, GPT-4 Vision, GPT-3.5, DALL-E 3, Llama 3, Mistral, Gemini, Claude, Bielik, and other models supported by Langchain, Llama Index, and Ollama. Features include chatbot, text completion, image generation, vision analysis, speech-to-text, internet access, file handling, command execution and more.
 Home-page: https://pygpt.net
 License: MIT
@@ -19,15 +19,16 @@ Requires-Dist: EbookLib (>=0.18,<0.19)
 Requires-Dist: Markdown (>=3.7,<4.0)
 Requires-Dist: PyAudio (>=0.2.14,<0.3.0)
 Requires-Dist: PyAutoGUI (>=0.9.54,<0.10.0)
-Requires-Dist: PySide6 (==6.6.0)
+Requires-Dist: PySide6 (==6.6.1)
 Requires-Dist: Pygments (>=2.18.0,<3.0.0)
 Requires-Dist: SQLAlchemy (>=2.0.27,<3.0.0)
 Requires-Dist: SpeechRecognition (>=3.10.1,<4.0.0)
 Requires-Dist: beautifulsoup4 (>=4.12.3,<5.0.0)
-Requires-Dist: chromadb (>=0.4.23,<0.5.0)
+Requires-Dist: chromadb (>=0.5.17,<0.6.0)
 Requires-Dist: croniter (>=2.0.1,<3.0.0)
 Requires-Dist: docker (>=7.0.0,<8.0.0)
 Requires-Dist: docx2txt (>=0.8,<0.9)
+Requires-Dist: google-generativeai (>=0.8.3,<0.9.0)
 Requires-Dist: httpx (>=0.27.2,<0.28.0)
 Requires-Dist: httpx-socks (>=0.9.2,<0.10.0)
 Requires-Dist: ipykernel (>=6.29.5,<7.0.0)
@@ -36,33 +37,34 @@ Requires-Dist: langchain (>=0.2.14,<0.3.0)
 Requires-Dist: langchain-community (>=0.2.12,<0.3.0)
 Requires-Dist: langchain-experimental (>=0.0.64,<0.0.65)
 Requires-Dist: langchain-openai (>=0.1.22,<0.2.0)
-Requires-Dist: llama-index (>=0.10.65,<0.11.0)
-Requires-Dist: llama-index-agent-openai (>=0.2.9,<0.3.0)
-Requires-Dist: llama-index-core (==0.10.67)
-Requires-Dist: llama-index-embeddings-azure-openai (>=0.1.6,<0.2.0)
-Requires-Dist: llama-index-embeddings-huggingface-api (>=0.1.0,<0.2.0)
-Requires-Dist: llama-index-embeddings-ollama (>=0.2.0,<0.3.0)
-Requires-Dist: llama-index-embeddings-openai (>=0.1.0,<0.2.0)
-Requires-Dist: llama-index-llms-anthropic (>=0.1.17,<0.2.0)
-Requires-Dist: llama-index-llms-azure-openai (>=0.1.10,<0.2.0)
-Requires-Dist: llama-index-llms-gemini (>=0.2.0,<0.3.0)
-Requires-Dist: llama-index-llms-huggingface-api (>=0.1.0,<0.2.0)
-Requires-Dist: llama-index-llms-ollama (>=0.2.2,<0.3.0)
-Requires-Dist: llama-index-llms-openai (>=0.1.0,<0.2.0)
-Requires-Dist: llama-index-llms-openai-like (>=0.1.3,<0.2.0)
-Requires-Dist: llama-index-multi-modal-llms-openai (>=0.1.9,<0.2.0)
-Requires-Dist: llama-index-readers-chatgpt-plugin (>=0.1.3,<0.2.0)
-Requires-Dist: llama-index-readers-database (>=0.1.4,<0.2.0)
-Requires-Dist: llama-index-readers-file (>=0.1.33,<0.2.0)
-Requires-Dist: llama-index-readers-github (>=0.1.9,<0.2.0)
-Requires-Dist: llama-index-readers-google (>=0.2.11,<0.3.0)
-Requires-Dist: llama-index-readers-microsoft-onedrive (>=0.1.9,<0.2.0)
-Requires-Dist: llama-index-readers-twitter (>=0.1.3,<0.2.0)
-Requires-Dist: llama-index-readers-web (>=0.1.23,<0.2.0)
-Requires-Dist: llama-index-vector-stores-chroma (>=0.1.4,<0.2.0)
-Requires-Dist: llama-index-vector-stores-elasticsearch (>=0.1.4,<0.2.0)
-Requires-Dist: llama-index-vector-stores-pinecone (>=0.1.3,<0.2.0)
-Requires-Dist: llama-index-vector-stores-redis (>=0.1.2,<0.2.0)
+Requires-Dist: llama-index (>=0.12.11,<0.13.0)
+Requires-Dist: llama-index-agent-openai (>=0.4.2,<0.5.0)
+Requires-Dist: llama-index-core (==0.12.11)
+Requires-Dist: llama-index-embeddings-azure-openai (>=0.3.0,<0.4.0)
+Requires-Dist: llama-index-embeddings-gemini (>=0.3.1,<0.4.0)
+Requires-Dist: llama-index-embeddings-huggingface-api (>=0.3.0,<0.4.0)
+Requires-Dist: llama-index-embeddings-ollama (>=0.5.0,<0.6.0)
+Requires-Dist: llama-index-embeddings-openai (>=0.3.1,<0.4.0)
+Requires-Dist: llama-index-llms-anthropic (>=0.6.3,<0.7.0)
+Requires-Dist: llama-index-llms-azure-openai (>=0.3.0,<0.4.0)
+Requires-Dist: llama-index-llms-gemini (>=0.4.3,<0.5.0)
+Requires-Dist: llama-index-llms-huggingface-api (>=0.3.1,<0.4.0)
+Requires-Dist: llama-index-llms-ollama (>=0.5.0,<0.6.0)
+Requires-Dist: llama-index-llms-openai (>=0.3.13,<0.4.0)
+Requires-Dist: llama-index-llms-openai-like (>=0.3.3,<0.4.0)
+Requires-Dist: llama-index-multi-modal-llms-openai (>=0.4.2,<0.5.0)
+Requires-Dist: llama-index-readers-chatgpt-plugin (>=0.3.0,<0.4.0)
+Requires-Dist: llama-index-readers-database (>=0.3.0,<0.4.0)
+Requires-Dist: llama-index-readers-file (>=0.4.3,<0.5.0)
+Requires-Dist: llama-index-readers-github (>=0.5.0,<0.6.0)
+Requires-Dist: llama-index-readers-google (>=0.5.0,<0.6.0)
+Requires-Dist: llama-index-readers-microsoft-onedrive (>=0.3.0,<0.4.0)
+Requires-Dist: llama-index-readers-twitter (>=0.3.0,<0.4.0)
+Requires-Dist: llama-index-readers-web (>=0.3.3,<0.4.0)
+Requires-Dist: llama-index-vector-stores-chroma (>=0.4.1,<0.5.0)
+Requires-Dist: llama-index-vector-stores-elasticsearch (>=0.4.0,<0.5.0)
+Requires-Dist: llama-index-vector-stores-pinecone (>=0.4.2,<0.5.0)
+Requires-Dist: llama-index-vector-stores-redis (>=0.4.0,<0.5.0)
 Requires-Dist: mss (>=9.0.2,<10.0.0)
 Requires-Dist: nbconvert (>=7.16.1,<8.0.0)
 Requires-Dist: openai (>=1.55.1,<1.60.0)
@@ -74,7 +76,7 @@ Requires-Dist: pinecone-client (>=3.1.0,<4.0.0)
 Requires-Dist: pydub (>=0.25.1,<0.26.0)
 Requires-Dist: pygame (>=2.5.2,<3.0.0)
 Requires-Dist: pynput (>=1.7.7,<2.0.0)
-Requires-Dist: pypdf (>=4.0.2,<5.0.0)
+Requires-Dist: pypdf (>=5.1.0,<6.0.0)
 Requires-Dist: pyserial (>=3.5,<4.0)
 Requires-Dist: python-markdown-math (>=0.8,<0.9)
 Requires-Dist: qt-material (>=2.14,<3.0)
@@ -91,7 +93,7 @@ Description-Content-Type: text/markdown
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.4.47** | build: **2025.01.14** | Python: **>=3.10, <3.13**
+Release: **2.4.49** | build: **2025.01.16** | Python: **>=3.10, <3.13**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -99,7 +101,7 @@ Release: **2.4.47** | build: **2025.01.14** | Python: **>=3.10, <3.13**
 > 
 > Compiled version for Linux (`zip`) and Windows 10/11 (`msi`) 64-bit: https://pygpt.net/#download
 > 
-> ❤️ Donate: https://www.buymeacoffee.com/szczyglis
+> ❤️ Donate: https://www.buymeacoffee.com/szczyglis | https://github.com/sponsors/szczyglis-dev
 
 ## Overview
 
@@ -4041,6 +4043,19 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.4.49 (2025-01-16)**
+
+- Fix: stream render in Assistants mode.
+- Fix: items remove in context regen/edit.
+
+**2.4.48 (2025-01-16)**
+
+- Fix: parsing lists in data loaders configuration.
+- Fix: crash on Windows on PySide6 v6.6.0.
+- Added Gemini embeddings to LlamaIndex settings.
+- LlamaIndex upgraded to 0.12.11.
+- Security updates.
+
 **2.4.47 (2025-01-14)**
 
 - Added support for Python 3.12.

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/README.md

@@ -2,7 +2,7 @@
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.4.47** | build: **2025.01.14** | Python: **>=3.10, <3.13**
+Release: **2.4.49** | build: **2025.01.16** | Python: **>=3.10, <3.13**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -10,7 +10,7 @@ Release: **2.4.47** | build: **2025.01.14** | Python: **>=3.10, <3.13**
 > 
 > Compiled version for Linux (`zip`) and Windows 10/11 (`msi`) 64-bit: https://pygpt.net/#download
 > 
-> ❤️ Donate: https://www.buymeacoffee.com/szczyglis
+> ❤️ Donate: https://www.buymeacoffee.com/szczyglis | https://github.com/sponsors/szczyglis-dev
 
 ## Overview
 
@@ -3952,6 +3952,19 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.4.49 (2025-01-16)**
+
+- Fix: stream render in Assistants mode.
+- Fix: items remove in context regen/edit.
+
+**2.4.48 (2025-01-16)**
+
+- Fix: parsing lists in data loaders configuration.
+- Fix: crash on Windows on PySide6 v6.6.0.
+- Added Gemini embeddings to LlamaIndex settings.
+- LlamaIndex upgraded to 0.12.11.
+- Security updates.
+
 **2.4.47 (2025-01-14)**
 
 - Added support for Python 3.12.

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pygpt-net"
-version = "2.4.47"
+version = "2.4.49"
 description = "Desktop AI Assistant powered by models: OpenAI o1, GPT-4o, GPT-4, GPT-4 Vision, GPT-3.5, DALL-E 3, Llama 3, Mistral, Gemini, Claude, Bielik, and other models supported by Langchain, Llama Index, and Ollama. Features include chatbot, text completion, image generation, vision analysis, speech-to-text, internet access, file handling, command execution and more."
 authors = ["Marcin Szczyglinski <info@pygpt.net>"]
 license = "MIT"
@@ -28,10 +28,11 @@ include = [
 [tool.poetry.dependencies]
 python = ">=3.10,<3.13"
 beautifulsoup4 = "^4.12.3"
-chromadb = "^0.4.23"
+chromadb = "^0.5.17"
 croniter = "^2.0.1"
 docker = "^7.0.0"
 docx2txt = "^0.8"
+google-generativeai = "^0.8.3"
 EbookLib = "^0.18"
 httpx = "^0.27.2"
 httpx-socks = "^0.9.2"
@@ -41,33 +42,34 @@ langchain = "^0.2.14"
 langchain-community = "^0.2.12"
 langchain-experimental = "^0.0.64"
 langchain-openai = "^0.1.22"
-llama-index = "^0.10.65"
-llama-index-agent-openai = "^0.2.9"
-llama-index-core = "0.10.67"
-llama-index-embeddings-azure-openai = "^0.1.6"
-llama-index-embeddings-huggingface-api = "^0.1.0"
-llama-index-embeddings-openai = "^0.1.0"
-llama-index-embeddings-ollama = "^0.2.0"
-llama-index-llms-anthropic = "^0.1.17"
-llama-index-llms-huggingface-api = "^0.1.0"
-llama-index-llms-openai = "^0.1.0"
-llama-index-llms-openai-like = "^0.1.3"
-llama-index-llms-azure-openai = "^0.1.10"
-llama-index-llms-gemini = "^0.2.0"
-llama-index-llms-ollama = "^0.2.2"
-llama-index-multi-modal-llms-openai = "^0.1.9"
-llama-index-vector-stores-chroma = "^0.1.4"
-llama-index-vector-stores-elasticsearch = "^0.1.4"
-llama-index-vector-stores-pinecone = "^0.1.3"
-llama-index-vector-stores-redis = "^0.1.2"
-llama-index-readers-chatgpt-plugin = "^0.1.3"
-llama-index-readers-database = "^0.1.4"
-llama-index-readers-file = "^0.1.33"
-llama-index-readers-github = "^0.1.9"
-llama-index-readers-google = "^0.2.11"
-llama-index-readers-microsoft-onedrive = "^0.1.9"
-llama-index-readers-twitter = "^0.1.3"
-llama-index-readers-web = "^0.1.23"
+llama-index = "^0.12.11"
+llama-index-agent-openai = "^0.4.2"
+llama-index-core = "0.12.11"
+llama-index-embeddings-azure-openai = "^0.3.0"
+llama-index-embeddings-huggingface-api = "^0.3.0"
+llama-index-embeddings-gemini = "^0.3.1"
+llama-index-embeddings-openai = "^0.3.1"
+llama-index-embeddings-ollama = "^0.5.0"
+llama-index-llms-anthropic = "^0.6.3"
+llama-index-llms-huggingface-api = "^0.3.1"
+llama-index-llms-openai = "^0.3.13"
+llama-index-llms-openai-like = "^0.3.3"
+llama-index-llms-azure-openai = "^0.3.0"
+llama-index-llms-gemini = "^0.4.3"
+llama-index-llms-ollama = "^0.5.0"
+llama-index-multi-modal-llms-openai = "^0.4.2"
+llama-index-vector-stores-chroma = "^0.4.1"
+llama-index-vector-stores-elasticsearch = "^0.4.0"
+llama-index-vector-stores-pinecone = "^0.4.2"
+llama-index-vector-stores-redis = "^0.4.0"
+llama-index-readers-chatgpt-plugin = "^0.3.0"
+llama-index-readers-database = "^0.3.0"
+llama-index-readers-file = "^0.4.3"
+llama-index-readers-github = "^0.5.0"
+llama-index-readers-google = "^0.5.0"
+llama-index-readers-microsoft-onedrive = "^0.3.0"
+llama-index-readers-twitter = "^0.3.0"
+llama-index-readers-web = "^0.3.3"
 Markdown = "^3.7"
 mss = "^9.0.2"
 nbconvert = "^7.16.1"
@@ -82,10 +84,10 @@ PyAutoGUI = "^0.9.54"
 Pygments = "^2.18.0"
 pydub = "^0.25.1"
 pygame = "^2.5.2"
-pypdf = "^4.0.2"
+pypdf = "^5.1.0"
 pynput = "^1.7.7"
 pyserial = "^3.5"
-PySide6 = "6.6.0"
+PySide6 = "6.6.1"
 python-markdown-math = "^0.8"
 redis = "^5.0.1"
 qt-material = "^2.14"

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/src/pygpt_net/CHANGELOG.txt

@@ -1,3 +1,16 @@
+2.4.49 (2025-01-16)
+
+- Fix: stream render in Assistants mode.
+- Fix: items remove in context regen/edit.
+
+2.4.48 (2025-01-16)
+
+- Fix: parsing lists in data loaders configuration.
+- Fix: crash on Windows on PySide6 v6.6.0.
+- Added Gemini embeddings to LlamaIndex settings.
+- LlamaIndex upgraded to 0.12.11.
+- Security updates.
+
 2.4.47 (2025-01-14)
 
 - Added support for Python 3.12.

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/src/pygpt_net/__init__.py

@@ -6,17 +6,18 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.13 21:00:00                  #
+# Updated Date: 2025.01.16 01:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.4.47"
-__build__ = "2025.01.14"
+__version__ = "2.4.49"
+__build__ = "2025.01.16"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
+__report__ = "https://github.com/szczyglis-dev/py-gpt/issues"
 __website__ = "https://pygpt.net"
 __pypi__ = "https://pypi.org/project/pygpt-net"
 __snap__ = "https://snapcraft.io/pygpt"
@@ -24,3 +25,6 @@ __donate__ = "https://pygpt.net/#donate"
 __documentation__ = "https://pygpt.readthedocs.io"
 __discord__ = "https://pygpt.net/discord"
 __email__ = "info@pygpt.net"
+__donate_coffee__ = "https://pygpt.net/donate/buymeacoffee"
+__donate_paypal__ = "https://pygpt.net/donate/paypal"
+__donate_github__ = "https://github.com/sponsors/szczyglis-dev"

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/src/pygpt_net/controller/assistant/threads.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.01.16 04:00:00                  #
 # ================================================== #
 
 import json
@@ -442,6 +442,11 @@ class Threads(QObject):
             'msg': trans('assistant.run.completed'),
         })
         self.window.dispatch(event)
+        event = RenderEvent(RenderEvent.RELOAD, {
+            "meta": ctx.meta,
+            "ctx": ctx,
+        })
+        self.window.dispatch(event)
         self.window.controller.chat.common.show_response_tokens(ctx)  # update tokens
 
     def handle_status_error(self, ctx: CtxItem):

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/src/pygpt_net/controller/dialogs/info.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.01.16 01:00:00                  #
 # ================================================== #
 
 import webbrowser
@@ -93,6 +93,23 @@ class Info:
         """Open discord page"""
         webbrowser.open(self.window.meta['discord'])
 
+    def goto_report(self):
+        """Open report a bug page"""
+        webbrowser.open(self.window.meta['report'])
+
+    def donate(self, id: str):
+        """
+        Donate action
+
+        :param id: donate id
+        """
+        if id == 'coffee':
+            webbrowser.open(self.window.meta['donate_coffee'])
+        elif id == 'paypal':
+            webbrowser.open(self.window.meta['donate_paypal'])
+        elif id == 'github':
+            webbrowser.open(self.window.meta['donate_github'])
+
     def update_menu(self):
         """Update info menu"""
         for id in self.ids:

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/src/pygpt_net/controller/lang/mapping.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.01.16 01:00:00                  #
 # ================================================== #
 
 from typing import Dict
@@ -364,6 +364,7 @@ class Mapping:
         menu_title['menu.audio'] = 'menu.audio'
         menu_title['menu.video'] = 'menu.video'
         menu_title['menu.tools'] = 'menu.tools'
+        menu_title['menu.donate'] = 'menu.info.donate'
 
         # menu text
         menu_text = {}
@@ -393,9 +394,9 @@ class Mapping:
         menu_text['info.docs'] = 'menu.info.docs'
         menu_text['info.pypi'] = 'menu.info.pypi'
         menu_text['info.snap'] = 'menu.info.snap'
-        menu_text['info.donate'] = 'menu.info.donate'
         menu_text['info.website'] = 'menu.info.website'
         menu_text['info.github'] = 'menu.info.github'
+        menu_text['info.report'] = 'menu.info.report'
         menu_text['audio.output'] = 'menu.audio.output'
         menu_text['audio.input'] = 'menu.audio.input'
         menu_text['audio.control.plugin'] = 'menu.audio.control.plugin'
@@ -453,7 +454,6 @@ class Mapping:
         tooltips['icon.audio.output'] = 'icon.audio.output'
         tooltips['icon.audio.input'] = 'icon.audio.input'
         tooltips['assistant.store.btn.refresh_status'] = 'dialog.assistant.store.btn.refresh_status'
-        tooltips['inline.vision'] = 'vision.checkbox.tooltip'
         tooltips['agent.llama.loop.score'] = 'toolbox.agent.llama.loop.score.tooltip'
 
         # menu tooltips

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/src/pygpt_net/core/agents/tools.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.01.16 01:00:00                  #
 # ================================================== #
 
 import json
@@ -54,8 +54,8 @@ class Tools:
         # add query engine tool if idx is provided
         idx = extra.get("agent_idx", None)
         if idx is not None and idx != "_":
-            service_context = self.window.core.idx.llm.get_service_context(model=context.model)
-            index = self.window.core.idx.storage.get(idx, service_context=service_context)  # get index
+            llm, embed_model = self.window.core.idx.llm.get_service_context(model=context.model)
+            index = self.window.core.idx.storage.get(idx, llm, embed_model)  # get index
             if index is not None:
                 query_engine = index.as_query_engine(similarity_top_k=3)
                 query_engine_tools = [

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/src/pygpt_net/core/ctx/__init__.py

@@ -856,6 +856,13 @@ class Ctx:
         :param meta_id: meta_id
         :param item_id: item_id
         """
+        items = self.get_items()
+        remove = False
+        for item in items:
+            if item.id == item_id:
+                remove = True
+            if remove:
+                items.remove(item)
         return self.provider.remove_items_from(meta_id, item_id)
 
     def truncate(self):

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/src/pygpt_net/core/idx/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.16 01:00:00                  #
+# Updated Date: 2025.01.16 01:00:00                  #
 # ================================================== #
 
 import datetime
@@ -146,10 +146,11 @@ class Idx:
         :param recursive: recursive indexing
         :return: dict with indexed files (path -> id), list with errors
         """
-        context = self.llm.get_service_context()
+        llm, embed_model = self.llm.get_service_context()
         index = self.storage.get(
             id=idx,
-            service_context=context,
+            llm=llm,
+            embed_model=embed_model,
         )  # get or create index
         files, errors = self.indexing.index_files(
             idx=idx,
@@ -182,10 +183,11 @@ class Idx:
         :param from_ts: timestamp from
         :return: num of indexed files, list with errors
         """
-        context = self.llm.get_service_context()
+        llm, embed_model = self.llm.get_service_context()
         index = self.storage.get(
             id=idx,
-            service_context=context,
+            llm=llm,
+            embed_model=embed_model,
         )  # get or create index
         num, errors = self.indexing.index_db_by_meta_id(
             idx=idx,
@@ -215,10 +217,11 @@ class Idx:
         :param from_ts: timestamp from
         :return: num of indexed files, list with errors
         """
-        context = self.llm.get_service_context()
+        llm, embed_model = self.llm.get_service_context()
         index = self.storage.get(
             id=idx,
-            service_context=context,
+            llm=llm,
+            embed_model=embed_model,
         )  # get or create index
         num, errors = self.indexing.index_db_from_updated_ts(
             idx=idx,
@@ -251,10 +254,11 @@ class Idx:
         :param extra_args: extra args
         :return: num of indexed, list with errors
         """
-        context = self.llm.get_service_context()
+        llm, embed_model = self.llm.get_service_context()
         index = self.storage.get(
             id=idx,
-            service_context=context,
+            llm=llm,
+            embed_model=embed_model,
         )  # get or create index
         n, errors = self.indexing.index_urls(
             idx=idx,
@@ -294,10 +298,11 @@ class Idx:
         # update config params
         self.indexing.update_loader_args(type, config)
 
-        context = self.llm.get_service_context()
+        llm, embed_model = self.llm.get_service_context()
         index = self.storage.get(
             id=idx,
-            service_context=context,
+            llm=llm,
+            embed_model=embed_model,
         )  # get or create index
         n, errors = self.indexing.index_url(
             idx=idx,

{pygpt_net-2.4.47 → pygpt_net-2.4.49}/src/pygpt_net/core/idx/chat.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.16 20:00:00                  #
+# Updated Date: 2025.01.16 01:00:00                  #
 # ================================================== #
 
 import json
@@ -126,8 +126,7 @@ class Chat:
             model.id,
         ))
 
-        index, service_context = self.get_index(idx, model)
-        llm = service_context.llm
+        index, llm = self.get_index(idx, model)
         input_tokens = self.window.core.tokens.from_llama_messages(
             query,
             [],
@@ -192,7 +191,7 @@ class Chat:
             query,
         ))
 
-        index, service_context = self.get_index(idx, model)
+        index, llm = self.get_index(idx, model)
         retriever = index.as_retriever()
         nodes = retriever.retrieve(query)
         outputs = []
@@ -251,8 +250,7 @@ class Chat:
         # use index only if idx is not empty, otherwise use only LLM
         index = None
         if use_index:
-            index, service_context = self.get_index(idx, model)
-            llm = service_context.llm  # no multimodal LLM in service context
+            index, llm = self.get_index(idx, model)
         else:
             llm = self.window.core.idx.llm.get(model)
 
@@ -382,9 +380,8 @@ class Chat:
         if model is None:
             model = self.window.core.models.from_defaults()
 
-        service_context = self.window.core.idx.llm.get_service_context(model=model)
-        llm = service_context.llm
-        tmp_id, index = self.storage.get_tmp(path, service_context=service_context)  # get or create tmp index
+        llm, embed_model = self.window.core.idx.llm.get_service_context(model=model)
+        tmp_id, index = self.storage.get_tmp(path, llm, embed_model)  # get or create tmp index
 
         idx = "tmp:{}".format(path)  # tmp index id
         self.log("Indexing to temporary in-memory index: {}...".format(idx))
@@ -443,9 +440,8 @@ class Chat:
         id = json.dumps(parts)
         if model is None:
             model = self.window.core.models.from_defaults()
-        context = self.window.core.idx.llm.get_service_context(model=model)
-        tmp_id, index = self.storage.get_tmp(id, service_context=context)  # get or create tmp index
-        llm = context.llm
+        llm, embed_model = self.window.core.idx.llm.get_service_context(model=model)
+        tmp_id, index = self.storage.get_tmp(id, llm, embed_model)  # get or create tmp index
 
         idx = "tmp:{}".format(id)  # tmp index id
         self.log("Indexing to temporary in-memory index: {}...".format(idx))
@@ -498,8 +494,8 @@ class Chat:
         """
         if model is None:
             model = self.window.core.models.from_defaults()
-        service_context = self.window.core.idx.llm.get_service_context(model=model)
-        index = self.storage.get_ctx_idx(path, service_context=service_context)
+        llm, embed_model = self.window.core.idx.llm.get_service_context(model=model)
+        index = self.storage.get_ctx_idx(path, llm, embed_model)
 
         # 1. try to retrieve directly from index
         retriever = index.as_retriever()
@@ -524,9 +520,9 @@ class Chat:
                 "",
                 history,
             )
-            memory = self.get_memory_buffer(history, service_context.llm)
+            memory = self.get_memory_buffer(history, llm)
             response = index.as_chat_engine(
-                llm=service_context.llm,
+                llm=llm,
                 streaming=False,
                 memory=memory,
             ).chat(query)
@@ -550,7 +546,7 @@ class Chat:
         """
         if model is None:
             model = self.window.core.models.from_defaults()
-        index, service_context = self.get_index(idx, model)
+        index, llm = self.get_index(idx, model)
         retriever = index.as_retriever()
         nodes = retriever.retrieve(query)
         response = ""
@@ -628,14 +624,14 @@ class Chat:
         if not self.storage.exists(idx):
             if idx is None:
                 # create empty in memory idx
-                service_context = self.window.core.idx.llm.get_service_context(model=model)
+                llm, embed_model = self.window.core.idx.llm.get_service_context(model=model)
                 index = self.storage.index_from_empty()
-                return index, service_context
+                return index, llm
             # raise Exception("Index not prepared")
 
-        service_context = self.window.core.idx.llm.get_service_context(model=model)
-        index = self.storage.get(idx, service_context=service_context)  # get index
-        return index, service_context
+        llm, embed_model = self.window.core.idx.llm.get_service_context(model=model)
+        index = self.storage.get(idx, llm, embed_model)  # get index
+        return index, llm
 
     def get_metadata(
             self,