pygpt-net 2.4.41__py3-none-any.whl → 2.4.44__py3-none-any.whl

pygpt_net/item/ctx.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.13 19:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
 
 import copy
@@ -20,7 +20,7 @@ class CtxItem:
         """
         Context item
 
-        :param mode: Mode (completion, chat, img, vision, langchain, assistant, llama_index, agent)
+        :param mode: Mode (completion, chat, img, vision, langchain, assistant, llama_index, agent, expert)
         """
         self.id = None
         self.meta = None  # CtxMeta object
@@ -137,6 +137,17 @@ class CtxItem:
         """
         return len(self.cmds) > 0 or len(self.tool_calls) > 0
 
+    def audio_read_allowed(self) -> bool:
+        """
+        Check if audio read allowed
+
+        :return: True if audio read allowed
+        """
+        allowed = True
+        if self.has_commands() or '~###~{"cmd":' in self.output:
+            allowed = False
+        return allowed
+
     def add_doc_meta(self, meta: dict):
         """
         Add document meta
@@ -351,18 +362,76 @@ class CtxMeta:
         self.label = 0  # label color
         self.indexes = {}  # indexes data
         self.additional_ctx = [] # additional context data
+        self.group = None  # parent group
         self.group_id = None
         self.root_id = None
         self.parent_id = None
         self.owner_uuid = None
 
+    def has_additional_ctx(self) -> bool:
+        """
+        Check if additional context data is attached
+
+        :return: True if additional context data is present
+        """
+        if self.additional_ctx is not None and len(self.additional_ctx) > 0:
+            return True
+        if self.group:
+            if self.group.additional_ctx is not None and len(self.group.additional_ctx) > 0:
+                return True
+        return False
+
+    def get_additional_ctx(self) -> list:
+        """
+        Get additional context data
+
+        :return: list
+        """
+        if self.group:
+            if self.group.additional_ctx:
+                return self.group.additional_ctx
+        if self.additional_ctx:
+            return self.additional_ctx
+        return []
+
+    def reset_additional_ctx(self):
+        """Delete additional context data"""
+        if self.group:
+            self.group.additional_ctx = []
+        else:
+            self.additional_ctx = []
+
+    def remove_additional_ctx(self, item: dict):
+        """
+        Remove additional context data item
+
+        :param item: dict
+        """
+        if self.group:
+            if item in self.group.additional_ctx:
+                self.group.additional_ctx.remove(item)
+        else:
+            if item in self.additional_ctx:
+                self.additional_ctx.remove(item)
+
+    def get_attachment_names(self) -> list:
+        """
+        Get attachment names
+
+        :return: list
+        """
+        if self.group:
+            if self.group.additional_ctx:
+                return self.group.get_attachment_names()
+        return [item['name'] for item in self.additional_ctx]
+
     def to_dict(self) -> dict:
         """
         Dump context meta to dict
 
         :return: dict
         """
-        return {
+        data = {
             "id": self.id,
             "external_id": self.external_id,
             "uuid": self.uuid,
@@ -393,6 +462,9 @@ class CtxMeta:
             "parent_id": self.parent_id,
             "owner_uuid": self.owner_uuid,
         }
+        if self.group:
+            data["__group__"] = self.group.to_dict()
+        return data
 
     def from_dict(self, data: dict):
         """
@@ -447,8 +519,43 @@ class CtxGroup:
         self.items = []
         self.created = int(time.time())
         self.updated = int(time.time())
+        self.additional_ctx = []
         self.count = 0
 
+    def has_additional_ctx(self) -> bool:
+        """
+        Check if additional context data is attached
+
+        :return: True if additional context data is present
+        """
+        if self.additional_ctx is not None and len(self.additional_ctx) > 0:
+            return True
+        return False
+
+    def get_additional_ctx(self) -> list:
+        """
+        Get additional context data
+
+        :return: list
+        """
+        return self.additional_ctx
+
+    def get_attachments_count(self) -> int:
+        """
+        Get attachments count
+
+        :return: int
+        """
+        return len(self.additional_ctx)
+
+    def get_attachment_names(self) -> list:
+        """
+        Get attachment names
+
+        :return: list
+        """
+        return [item['name'] for item in self.additional_ctx]
+
     def to_dict(self) -> dict:
         """
         Dump context group to dict
@@ -460,6 +567,7 @@ class CtxGroup:
             "uuid": self.uuid,
             "name": self.name,
             "items": self.items,
+            "additional_ctx": self.additional_ctx,
             "created": self.created,
             "updated": self.updated,
             "count": self.count,

pygpt_net/migrations/Version20241215110000.py

@@ -0,0 +1,25 @@
+#!/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: 2024.11.23 00:00:00                  #
+# ================================================== #
+
+from sqlalchemy import text
+
+from .base import BaseMigration
+
+
+class Version20241215110000(BaseMigration):
+    def __init__(self, window=None):
+        super(Version20241215110000, self).__init__(window)
+        self.window = window
+
+    def up(self, conn):
+        conn.execute(text("""
+        ALTER TABLE ctx_group ADD COLUMN additional_ctx_json TEXT;
+        """))

pygpt_net/migrations/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 19:00:00                  #
+# Updated Date: 2024.12.15 11:00:00                  #
 # ================================================== #
 
 from .Version20231227152900 import Version20231227152900  # 2.0.59
@@ -22,6 +22,7 @@ from .Version20240426050000 import Version20240426050000  # 2.1.79
 from .Version20240501030000 import Version20240501030000  # 2.2.7
 from .Version20241122130000 import Version20241122130000  # 2.4.21
 from .Version20241126170000 import Version20241126170000  # 2.4.34
+from .Version20241215110000 import Version20241215110000  # 2.4.43
 
 class Migrations:
     def __init__(self):
@@ -48,4 +49,5 @@ class Migrations:
             Version20240501030000(),  # 2.2.7
             Version20241122130000(),  # 2.4.21
             Version20241126170000(),  # 2.4.34
+            Version20241215110000(),  # 2.4.43
         ]

pygpt_net/plugin/agent/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 20:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 from pygpt_net.plugin.base.plugin import BasePlugin
@@ -57,7 +57,12 @@ class Plugin(BasePlugin):
         data = event.data
         ctx = event.ctx
 
-        always_events = [Event.FORCE_STOP, Event.PLUGIN_SETTINGS_CHANGED, Event.ENABLE, Event.DISABLE]
+        always_events = [
+            Event.FORCE_STOP,
+            Event.PLUGIN_SETTINGS_CHANGED,
+            Event.ENABLE,
+            Event.DISABLE
+        ]
 
         if not self.is_allowed() and name != Event.DISABLE:
             return

pygpt_net/plugin/audio_output/__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.13 08:00:00                  #
+# Updated Date: 2024.12.14 18:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Slot
@@ -167,6 +167,11 @@ class Plugin(BasePlugin):
         cache_file = None
         if event.data is not None and isinstance(event.data, dict) and "cache_file" in event.data:
             cache_file = event.data["cache_file"]
+
+        # check for audio read allowed. Prevents reading audio in commands, results, etc.
+        if name == Event.CTX_AFTER:
+            if not ctx.audio_read_allowed():
+                return # abort if audio read is not allowed (commands, results, etc.)
         
         try:
             if text is not None and len(text) > 0:

pygpt_net/plugin/base/plugin.py

@@ -6,17 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 00:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import copy
-from typing import Optional
+from typing import Optional, Any, Dict, List
 
 from PySide6.QtCore import QObject, Slot
 
-from pygpt_net.core.types import (
-    MODE_AGENT_LLAMA,
-)
 from pygpt_net.core.bridge.context import BridgeContext
 from pygpt_net.core.events import Event, KernelEvent
 from pygpt_net.item.ctx import CtxItem
@@ -43,7 +40,7 @@ class BasePlugin(QObject):
         self.use_locale = False
         self.order = 0
 
-    def setup(self) -> dict:
+    def setup(self) -> Dict[str, Any]:
         """
         Return available config options
 
@@ -51,7 +48,12 @@ class BasePlugin(QObject):
         """
         return self.options
 
-    def add_option(self, name: str, type: str, **kwargs) -> dict:
+    def add_option(
+            self,
+            name: str,
+            type: str,
+            **kwargs
+    ) -> Dict[str, Any]:
         """
         Add plugin configuration option
 
@@ -84,7 +86,11 @@ class BasePlugin(QObject):
         self.options[name] = option
         return option
 
-    def add_cmd(self, cmd: str, **kwargs) -> dict:
+    def add_cmd(
+            self,
+            cmd: str,
+            **kwargs
+    ) -> Dict[str, Any]:
         """
         Add plugin command
 
@@ -125,7 +131,10 @@ class BasePlugin(QObject):
 
         return self.add_option(name, "cmd", **kwargs)
 
-    def has_cmd(self, cmd: str) -> bool:
+    def has_cmd(
+            self,
+            cmd: str
+    ) -> bool:
         """
         Check if command exists
 
@@ -138,7 +147,10 @@ class BasePlugin(QObject):
                 return self.options[key]["value"]["enabled"]
         return False
 
-    def cmd_allowed(self, cmd: str) -> bool:
+    def cmd_allowed(
+            self,
+            cmd: str
+    ) -> bool:
         """
         Check if command allowed
 
@@ -157,7 +169,10 @@ class BasePlugin(QObject):
         """
         return self.window.core.config.get("cmd")
 
-    def get_cmd(self, cmd: str) -> dict:
+    def get_cmd(
+            self,
+            cmd: str
+    ) -> Dict[str, Any]:
         """
         Return command
 
@@ -170,7 +185,10 @@ class BasePlugin(QObject):
             data = {"cmd": cmd, **data}
             return data
 
-    def has_option(self, name: str) -> bool:
+    def has_option(
+            self,
+            name: str
+    ) -> bool:
         """
         Check if option exists
 
@@ -179,7 +197,10 @@ class BasePlugin(QObject):
         """
         return name in self.options
 
-    def get_option(self, name: str) -> dict:
+    def get_option(
+            self,
+            name: str
+    ) -> Dict[str, Any]:
         """
         Return option
 
@@ -189,7 +210,10 @@ class BasePlugin(QObject):
         if self.has_option(name):
             return self.options[name]
 
-    def get_option_value(self, name: str) -> any:
+    def get_option_value(
+            self,
+            name: str
+    ) -> Any:
         """
         Return option value
 
@@ -207,7 +231,12 @@ class BasePlugin(QObject):
         """
         self.window = window
 
-    def handle(self, event: Event, *args, **kwargs):
+    def handle(
+            self,
+            event: Event,
+            *args,
+            **kwargs
+    ):
         """
         Handle event
 
@@ -235,7 +264,10 @@ class BasePlugin(QObject):
         """
         return
 
-    def trans(self, text: Optional[str] = None) -> str:
+    def trans(
+            self,
+            text: Optional[str] = None
+    ) -> str:
         """
         Translate text using plugin domain
 
@@ -247,7 +279,7 @@ class BasePlugin(QObject):
         domain = 'plugin.{}'.format(self.id)
         return trans(text, False, domain)
 
-    def error(self, err: any):
+    def error(self, err: Any):
         """
         Send error message to logger and alert dialog
 
@@ -257,7 +289,7 @@ class BasePlugin(QObject):
         msg = self.window.core.debug.parse_alert(err)
         self.window.ui.dialogs.alert("{}: {}".format(self.name, msg))
 
-    def debug(self, data: any):
+    def debug(self, data: Any):
         """
         Send debug message to logger window
 
@@ -337,9 +369,9 @@ class BasePlugin(QObject):
     @Slot(object, object, dict)
     def handle_finished(
             self,
-            response: dict,
+            response: Dict[str, Any],
             ctx: Optional[CtxItem] = None,
-            extra_data: Optional[dict] = None
+            extra_data: Optional[Dict[str, Any]] = None
     ):
         """
         Handle finished response signal
@@ -367,9 +399,9 @@ class BasePlugin(QObject):
     @Slot(object, object, dict)
     def handle_finished_more(
             self,
-            responses: list,
+            responses: List[Dict[str, Any]],
             ctx: Optional[CtxItem] = None,
-            extra_data: Optional[dict] = None
+            extra_data: Optional[Dict[str, Any]] = None
     ):
         """
         Handle finished response signal
@@ -397,9 +429,9 @@ class BasePlugin(QObject):
 
     def prepare_reply_ctx(
             self,
-            response: dict,
+            response: Dict[str, Any],
             ctx: Optional[CtxItem] = None
-    ) -> dict:
+    ) -> Dict[str, Any]:
         """
         Prepare reply context
 
@@ -454,7 +486,7 @@ class BasePlugin(QObject):
         self.window.update_status(str(data))
 
     @Slot(object)
-    def handle_error(self, err: any):
+    def handle_error(self, err: Any):
         """
         Handle thread error signal
 
@@ -463,7 +495,7 @@ class BasePlugin(QObject):
         self.error(err)
 
     @Slot(object)
-    def handle_debug(self, msg: any):
+    def handle_debug(self, msg: Any):
         """
         Handle debug message signal
 

pygpt_net/plugin/base/worker.py

@@ -6,10 +6,10 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 00:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
-from typing import Optional, Any
+from typing import Optional, Any, Dict, List
 
 from PySide6.QtCore import QObject, QRunnable
 from typing_extensions import deprecated
@@ -44,7 +44,7 @@ class BaseWorker(QObject, QRunnable):
         if self.signals is not None and hasattr(self.signals, "destroyed"):
             self.signals.destroyed.emit()
 
-    def error(self, err: any):
+    def error(self, err: Any):
         """
         Emit error signal
 
@@ -67,8 +67,8 @@ class BaseWorker(QObject, QRunnable):
     @deprecated("From 2.1.29: BaseWorker.response() is deprecated, use BaseWorker.reply() instead")
     def response(
             self,
-            response: dict,
-            extra_data: Optional[dict] = None
+            response: Dict[str, Any],
+            extra_data: Optional[Dict[str, Any]] = None
     ):
         """
         Emit finished signal (deprecated)
@@ -82,8 +82,8 @@ class BaseWorker(QObject, QRunnable):
 
     def reply(
             self,
-            response: dict,
-            extra_data: Optional[dict] = None
+            response: Dict[str, Any],
+            extra_data: Optional[Dict[str, Any]] = None
     ):
         """
         Emit finished signal (on reply from command output)
@@ -101,8 +101,8 @@ class BaseWorker(QObject, QRunnable):
 
     def reply_more(
             self,
-            responses: list,
-            extra_data: Optional[dict] = None
+            responses: List[Dict[str, Any]],
+            extra_data: Optional[Dict[str, Any]] = None
     ):
         """
         Emit finished_more signal (on reply from command output, multiple responses)
@@ -166,7 +166,10 @@ class BaseWorker(QObject, QRunnable):
         self.signals.status.connect(parent.handle_status)
         self.signals.error.connect(parent.handle_error)
 
-    def from_request(self, item: dict) -> dict:
+    def from_request(
+            self,
+            item: Dict[str, Any]
+    ) -> Dict[str, Any]:
         """
         Prepare request item for result
 
@@ -177,10 +180,10 @@ class BaseWorker(QObject, QRunnable):
 
     def make_response(
             self,
-            item: dict,
-            result: any,
-            extra: Optional[dict] = None
-    ) -> dict:
+            item: Dict[str, Any],
+            result: Any,
+            extra: Optional[Dict[str, Any]] = None
+    ) -> Dict[str, Any]:
         """
         Prepare response item
 
@@ -211,7 +214,7 @@ class BaseWorker(QObject, QRunnable):
 
     def has_param(
             self,
-            item: dict,
+            item: Dict[str, Any],
             param: str
     ) -> bool:
         """
@@ -227,10 +230,10 @@ class BaseWorker(QObject, QRunnable):
 
     def get_param(
             self,
-            item: dict,
+            item: Dict[str, Any],
             param: str,
             default: Any = None
-    ) -> any:
+    ) -> Any:
         """
         Get parameter value from item
 

pygpt_net/plugin/cmd_files/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 03:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
 
 import os
@@ -141,7 +141,8 @@ class Plugin(BasePlugin):
         """
         # use_loaders = False
         if use_loaders:
-            return str(self.window.core.idx.indexing.read_text_content(path))
+            content, docs = str(self.window.core.idx.indexing.read_text_content(path))
+            return content
         else:
             data = ""
             if os.path.isfile(path):

pygpt_net/plugin/cmd_history/config.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.18 19:00:00                  #
+# Updated Date: 2024.12.14 19:00:00                  #
 # ================================================== #
 
 from pygpt_net.plugin.base.config import BaseConfig, BasePlugin
@@ -34,7 +34,7 @@ class Config(BaseConfig):
         plugin.add_option(
             "model_summarize",
             type="combo",
-            value="gpt-3.5-turbo",
+            value="gpt-4o-mini",
             label="Model",
             description="Model used for summarize, default: gpt-3.5-turbo",
             tooltip="Summarize model",

pygpt_net/plugin/cmd_web/__init__.py

@@ -6,14 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.13 08:00:00                  #
+# Updated Date: 2024.12.15 01:00:00                  #
 # ================================================== #
 
 import ssl
 from urllib.request import Request, urlopen
 
-from requests import HTTPError
-
 from pygpt_net.plugin.base.plugin import BasePlugin
 from pygpt_net.provider.web.base import BaseProvider
 from pygpt_net.core.events import Event
@@ -38,6 +36,7 @@ class Plugin(BasePlugin):
             "web_urls",
             "web_url_open",
             "web_url_raw",
+            "web_request",
             "web_index",
             "web_index_query",
             "web_extract_links",
@@ -96,7 +95,7 @@ class Plugin(BasePlugin):
 
         :return: providers dict
         """
-        return self.window.core.web.get_providers("search_engine")
+        return self.window.core.web.get_providers(self.window.core.web.PROVIDER_SEARCH_ENGINE)
 
     def get_provider_options(self) -> list:
         """Get provider options"""