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

pygpt_net/core/{web.py → web/helpers.py}

@@ -6,90 +6,116 @@
 # 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: 2024.12.15 01:00:00                  #
 # ================================================== #
 
 import os
 import uuid
-from typing import Optional, List, Dict
+from typing import Optional, List, Dict, Tuple, Union
 
 import requests
 
 from bs4 import BeautifulSoup
 from urllib.parse import urljoin
 
-from pygpt_net.provider.web.base import BaseProvider
 
-
-class Web:
+class Helpers:
     def __init__(self, window=None):
         """
-        Web access core
+        Web helpers core
 
         :param window: Window instance
         """
         self.window = window
-        self.providers = {
-            "search_engine": {},
-        }
-
-    def is_registered(self, id: str, type: str = "search_engine") -> bool:
-        """
-        Check if provider is registered
-
-        :param id: provider id
-        :param type: provider type
-        :return: True if registered
-        """
-        if type in self.providers:
-            return id in self.providers[type]
-        return False
-
-    def get_providers(self, type: str = "search_engine") -> dict:
-        """
-        Get all providers
-
-        :param type: provider type
-        :return: providers dict
-        """
-        if type in self.providers:
-            return self.providers[type]
-        return {}
-
-    def get_ids(self, type: str = "search_engine") -> list:
-        """
-        Get all providers ids
 
-        :param type: provider type
-        :return: providers ids list
-        """
-        if type in self.providers:
-            return list(self.providers[type].keys())
-        return []
-
-    def get(self, id: str, type: str = "search_engine") -> Optional[BaseProvider]:
-        """
-        Get provider instance
-
-        :param id: provider id
-        :param type: provider type
-        :return: provider instance
-        """
-        if self.is_registered(id, type):
-            return self.providers[type][id]
-        return None
-
-    def register(self, provider: BaseProvider):
-        """
-        Register provider
-
-        :param provider: provider instance
-        """
-        id = provider.id
-        type = provider.type
-        for t in type:
-            if t in self.providers:
-                self.providers[t][id] = provider
+    def request(
+            self,
+            url: str = "",
+            method: str = "GET",
+            headers: Optional[dict] = None,
+            params: Optional[dict] = None,
+            data: Optional[Union[str, dict]] = None,
+            json: Optional[dict] = None,
+            files: Optional[dict] = None,
+            cookies: Optional[dict] = None,
+            timeout: int = 10,
+            disable_ssl_verify: bool = False,
+            allow_redirects: bool = True,
+            stream: bool = False,
+            user_agent: Optional[str] = None,
+    ) -> Tuple[Optional[int], Optional[str]]:
+        """
+        Make HTTP request
+
+        :param url: URL
+        :param method: HTTP method
+        :param headers: Headers
+        :param params: GET parameters
+        :param data: POST data
+        :param json: JSON data
+        :param files: Files
+        :param cookies: Cookies
+        :param timeout: Timeout
+        :param disable_ssl_verify: Disable SSL verification
+        :param allow_redirects: Allow redirects
+        :param stream: Stream
+        :param user_agent: User agent
+        :return: status code, response text
+        """
+        upload = {}
+        try:
+            method = method.upper()
+            session = requests.Session()
+            args = {}
+
+            if data:
+                args['data'] = data
+            if json:
+                args['json'] = json
+            if cookies:
+                args['cookies'] = cookies
+            if params:
+                args['params'] = params
+            if headers:
+                args['headers'] = headers
+
+            args['timeout'] = timeout
+            if disable_ssl_verify:
+                args['verify'] = False
+            if not allow_redirects:
+                args['allow_redirects'] = False
+            if stream:
+                args['stream'] = True
+            if user_agent:
+                if 'headers' not in args:
+                    args['headers'] = {}
+                args['headers']['User-Agent'] = user_agent
+
+            if files:
+                for key, value in files.items():
+                    if os.path.exists(value) and os.path.isfile(value):
+                        upload[key] = open(value, 'rb')
+                args['files'] = upload
+
+            if method == 'GET':
+                response = session.get(url, **args)
+            elif method == 'POST':
+                response = session.post(url, **args)
+            elif method == 'PUT':
+                response = session.put(url, **args)
+            elif method == 'DELETE':
+                response = session.delete(url, **args)
+            elif method == 'PATCH':
+                response = session.patch(url, **args)
+            else:
+                return None, f'Invalid HTTP method: {method}'
+            for k in upload:
+                upload[k].close()  # close files if opened
+            return response.status_code, response.text
+        except Exception as e:
+            for k in upload:
+                upload[k].close()  # close files if opened
+            return None, f'Error: {e}'
 
     def get_main_image(self, url: str) -> Optional[str]:
         """
@@ -208,4 +234,4 @@ class Web:
         download_path = os.path.join(dir, name)
         with open(download_path, 'wb', ) as f:
             f.write(response.content)
-        return self.window.core.filesystem.make_local(download_path)
+        return self.window.core.filesystem.make_local(download_path)

pygpt_net/data/config/config.json

@@ -1,8 +1,8 @@
 {
   "__meta__": {
-    "version": "2.4.41",
-    "app.version": "2.4.41",
-    "updated_at": "2024-12-14T00:00:00"
+    "version": "2.4.42",
+    "app.version": "2.4.42",
+    "updated_at": "2024-12-15T00:00:00"
   },
   "access.audio.event.speech": false,
   "access.audio.event.speech.disabled": [],

pygpt_net/data/config/models.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.4.41",
-        "app.version": "2.4.41",
-        "updated_at": "2024-12-14T00:00:00"
+        "version": "2.4.42",
+        "app.version": "2.4.42",
+        "updated_at": "2024-12-15T00:00:00"
     },
     "items": {
         "claude-3-5-sonnet-20240620": {

pygpt_net/data/config/modes.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.4.41",
-        "app.version": "2.4.41",
-        "updated_at": "2024-12-13T00:00:00"
+        "version": "2.4.42",
+        "app.version": "2.4.42",
+        "updated_at": "2024-12-15T00:00:00"
     },
     "items": {
         "chat": {

pygpt_net/data/locale/locale.en.ini

@@ -683,6 +683,7 @@ menu.audio.control.global = Voice control (global)
 menu.audio.control.plugin = Voice control (inline)
 menu.audio.input = Input: Speech recognition
 menu.audio.output = Output: Speech synthesis
+menu.audio.stop = Stop audio playback
 menu.config = Config
 menu.config.access = Accessibility
 menu.config.change_dir = Change working directory...

pygpt_net/data/locale/plugin.cmd_web.en.ini

@@ -17,6 +17,8 @@ cmd.web_index_query.description = Enable `web_index_query` command execution.\nI
 cmd.web_index_query.label = Enable: quick query the Web and external content
 cmd.web_index_query.tooltip = Example prompt: Query the Website http://example.com about (question).
 cmd.web_index.tooltip = Example prompt: Index the Website http://example.com.
+cmd.web_request.description = Enable `web_request` command execution.\nIf enabled, model will be able to send any HTTP request to specified URL or API endpoint.
+cmd.web_request.label = Enable: sending any HTTP requests
 cmd.web_search.description = Enable `web_search` command execution.\nIf enabled, the model will be able to search the Web.
 cmd.web_search.label = Enable: search the Web
 cmd.web_search.tooltip = Example prompt: Search the Web for (question).

pygpt_net/data/locale/plugin.mailer.en.ini

@@ -0,0 +1,21 @@
+[LOCALE]
+cmd.send_mail.label = Enable: send email
+cmd.send_mail.description = Allows for sending emails.
+cmd.receive_emails.label = Enable: receive emails
+cmd.receive_emails.description = Allows for receiving emails.
+cmd.get_email_body.label = Enable: get email body
+cmd.get_email_body.description = Allows for receive email body.
+plugin.description = Provides the ability to send, receive and read emails.
+plugin.name = Mailer
+smtp_host.description = SMTP Host, e.g. smtp.domain.com
+smtp_host.label = Host
+smtp_port_inbox.description = SMTP Port (Inbox), default: 995
+smtp_port_inbox.label = Port (Inbox)
+smtp_port_outbox.description = SMTP Port (Outbox), default: 465
+smtp_port_outbox.label = Port (Outbox)
+smtp_user.description = SMTP User, e.g. user@domain.com
+smtp_user.label = User
+smtp_password.description = SMTP Password
+smtp_password.label = Password
+from_email.description = From (email), e.g. me@domain.com
+from_email.label = From (email)

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.14 18: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

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