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

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_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"""

pygpt_net/plugin/cmd_web/config.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.15 01:00:00                  #
 # ================================================== #
 
 from pygpt_net.plugin.base.config import BaseConfig, BasePlugin
@@ -150,11 +150,12 @@ class Config(BaseConfig):
         )
         plugin.add_option(
             "idx",
-            type="text",
+            type="combo",
             value="base",
             label="Index to use",
             description="ID of index to use for web page indexing (persistent index)",
             tooltip="Index name",
+            use="idx",
             tab="indexing",
         )
         plugin.add_option(
@@ -162,7 +163,7 @@ class Config(BaseConfig):
             type="combo",
             value="gpt-4o-mini",
             label="Model used for web page summarize",
-            description="Model used for web page summarize, default: gpt-3.5-turbo-1106",
+            description="Model used for web page summarize, default: gpt-4o-mini",
             use="models",
             advanced=True,
         )
@@ -246,6 +247,73 @@ class Config(BaseConfig):
             enabled=True,
             description="If enabled, model will be able to search the Web and get founded URLs list",
         )
+        plugin.add_cmd(
+            "web_request",
+            instruction="send HTTP request to specified URL or API endpoint, using `requests` library. Tip: to "
+                        "send raw data, use `data` parameter. To send data in `application/x-www-form-urlencoded` format, "
+                        "use `data_form` parameter. To send data in `application/json` format, use `data_json` parameter. "
+                        "Sending data in `data_form` and `data_json` parameters will automatically set `Content-Type`. To "
+                        "upload files, use `files` parameter. To send cookies, use `cookies` parameter. To set custom headers, "
+                        "use `headers` parameter. You can combine all parameters.",
+            params=[
+                {
+                    "name": "url",
+                    "type": "str",
+                    "description": "URL to website or API endpoint",
+                    "required": True,
+                },
+                {
+                    "name": "method",
+                    "type": "str",
+                    "description": "HTTP method, default: GET",
+                    "required": False,
+                },
+                {
+                    "name": "headers",
+                    "type": "dict",
+                    "description": "HTTP headers",
+                    "required": False,
+                },
+                {
+                    "name": "params",
+                    "type": "dict",
+                    "description": "GET parameters",
+                    "required": False,
+                },
+                {
+                    "name": "data",
+                    "type": "str",
+                    "description": "raw data to send in POST requests",
+                    "required": False,
+                },
+                {
+                    "name": "data_form",
+                    "type": "dict",
+                    "description": "data to send in POST `application/x-www-form-urlencoded` requests",
+                    "required": False,
+                },
+                {
+                    "name": "data_json",
+                    "type": "dict",
+                    "description": "JSON data to send in POST `application/json` requests",
+                    "required": False,
+                },
+                {
+                    "name": "cookies",
+                    "type": "dict",
+                    "description": "Cookies",
+                    "required": False,
+                },
+                {
+                    "name": "files",
+                    "type": "dict",
+                    "description": "Files to upload, key is form field name, value is absolute path to file",
+                    "required": False,
+                },
+            ],
+            enabled=True,
+            description="If enabled, model will be able to send any HTTP request to specified URL or API endpoint",
+        )
         plugin.add_cmd(
             "web_extract_links",
             instruction="open webpage and get list of all links from it",

pygpt_net/plugin/cmd_web/websearch.py

@@ -6,10 +6,11 @@
 # 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 22:00:00                  #
 # ================================================== #
 
 import re
+from typing import Optional, Tuple, Any, List
 
 from bs4 import BeautifulSoup
 
@@ -32,7 +33,7 @@ class WebSearch:
             query: str,
             num: int,
             offset: int = 1
-    ) -> list:
+    ) -> List[str]:
         """
         Execute search query and return list of urls
 
@@ -43,7 +44,7 @@ class WebSearch:
         """
         return self.plugin.get_provider().search(query, num, offset)
 
-    def get_urls(self, query: str) -> list:
+    def get_urls(self, query: str) -> List[str]:
         """
         Search the web and returns URLs
 
@@ -104,7 +105,7 @@ class WebSearch:
             self,
             text: str,
             chunk_size: int
-    ) -> list:
+    ) -> List[str]:
         """
         Split text into chunks
 
@@ -120,7 +121,7 @@ class WebSearch:
             self,
             chunks: list,
             query: str,
-            summarize_prompt: str = None
+            summarize_prompt: Optional[str] = None
     ) -> str:
         """
         Get summarized text from chunks
@@ -195,7 +196,7 @@ class WebSearch:
             query: str,
             page_no: int = 1,
             summarize_prompt: str = ""
-    ) -> (str, int, int, str, str):
+    ) -> Tuple[str, int, int, str, str]:
         """
         Get result from search query
 
@@ -260,7 +261,7 @@ class WebSearch:
             if result is not None and result != "":
                 # get thumbnail image
                 if self.plugin.get_option_value("img_thumbnail"):
-                    img = self.plugin.window.core.web.get_main_image(url)
+                    img = self.plugin.window.core.web.helpers.get_main_image(url)
                 self.log("Summary generated (chars: {})".format(len(result)))
                 # index webpage if auto-index is enabled
                 self.index_url(url)
@@ -289,7 +290,11 @@ class WebSearch:
             url, \
             img
 
-    def open_url(self, url: str, summarize_prompt: str = "") -> (str, str, str):
+    def open_url(
+            self,
+            url: str,
+            summarize_prompt: str = ""
+    ) -> Tuple[Optional[str], str, Optional[str]]:
         """
         Get result from specified URL
 
@@ -337,7 +342,7 @@ class WebSearch:
 
         # get thumbnail image
         if self.plugin.get_option_value("img_thumbnail"):
-            img = self.plugin.window.core.web.get_main_image(url)
+            img = self.plugin.window.core.web.helpers.get_main_image(url)
 
         if result is not None and result != "":
             self.log("Summary generated (chars: {})".format(len(result)))
@@ -357,7 +362,10 @@ class WebSearch:
 
         return result, url, img
 
-    def open_url_raw(self, url: str) -> (str, str, str):
+    def open_url_raw(
+            self,
+            url: str
+    ) -> Tuple[str, str, Optional[str]]:
         """
         Get raw content from specified URL
 
@@ -377,7 +385,7 @@ class WebSearch:
         # index webpage if auto-index is enabled
         if result:
             if self.plugin.get_option_value("img_thumbnail"):
-                img = self.plugin.window.core.web.get_main_image(url)
+                img = self.plugin.window.core.web.helpers.get_main_image(url)
             self.index_url(url)
 
         # strip if too long
@@ -414,7 +422,7 @@ class WebSearch:
         except Exception as e:
             self.error(e)
 
-    def error(self, err: any):
+    def error(self, err: Any):
         """
         Log error message