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

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
 

pygpt_net/plugin/cmd_web/worker.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                  #
 # ================================================== #
 
 import json
@@ -64,6 +64,9 @@ class Worker(BaseWorker):
                 elif item["cmd"] == "web_extract_images":
                     response = self.cmd_web_extract_images(item)
 
+                elif item["cmd"] == "web_request":
+                    response = self.cmd_web_request(item)
+
                 if response:
                     responses.append(response)
 
@@ -363,7 +366,7 @@ class Worker(BaseWorker):
             url = self.get_param(item, "url")
         if not url:
             return self.make_response(item, "No URL provided")
-        links = self.plugin.window.core.web.get_links(url)
+        links = self.plugin.window.core.web.helpers.get_links(url)
         result = {
             'links': links,
         }
@@ -385,17 +388,77 @@ class Worker(BaseWorker):
             download = bool(self.get_param(item, "download"))
         if not url:
             return self.make_response(item, "No URL provided")
-        images = self.plugin.window.core.web.get_images(url)
+        images = self.plugin.window.core.web.helpers.get_images(url)
         result = {
             'images': images,
         }
         if images and download:
             for img in images:
                 try:
-                    path = self.plugin.window.core.web.download_image(img)
+                    path = self.plugin.window.core.web.helpers.download_image(img)
                     if path:
                         self.ctx.images_before.append(path)
                 except Exception as e:
                     print(e)
         self.ctx.urls_before.append(url)
         return self.make_response(item, result)
+
+    def cmd_web_request(self, item: dict) -> dict:
+        """
+        Web request command
+
+        :param item: command item
+        :return: response item
+        """
+        url = ""
+        method = "GET"
+        data = None
+        raw = None
+        json = None
+        headers = None
+        params = None
+        cookies = None
+        files = None
+
+        if self.has_param(item, "url"):
+            url = self.get_param(item, "url")
+        if not url:
+            return self.make_response(item, "No URL provided")
+        if self.has_param(item, "method"):
+            method = self.get_param(item, "method")
+        if self.has_param(item, "data_form"):
+            data = self.get_param(item, "data_form")
+        if self.has_param(item, "data"):
+            raw = self.get_param(item, "data")
+        if self.has_param(item, "data_json"):
+            json = self.get_param(item, "data_json")
+        if self.has_param(item, "headers"):
+            headers = self.get_param(item, "headers")
+        if self.has_param(item, "params"):
+            params = self.get_param(item, "params")
+        if self.has_param(item, "cookies"):
+            cookies = self.get_param(item, "cookies")
+        if self.has_param(item, "files"):
+            files = self.get_param(item, "files")
+
+        code, response = self.window.core.web.helpers.request(
+            url=url,
+            method=method,
+            headers=headers,
+            params=params,
+            data=data if data else raw,
+            json=json,
+            cookies=cookies,
+            files=files,
+            timeout=self.plugin.get_option_value("timeout"),
+            disable_ssl_verify=self.plugin.get_option_value("disable_ssl"),
+            allow_redirects=True,
+            stream=False,
+            user_agent=self.plugin.get_option_value("user_agent"))
+        result = {
+            'url': url,
+            'code': code,
+            'response': response,
+        }
+        self.ctx.urls_before.append(url)
+        return self.make_response(item, result)

pygpt_net/plugin/idx_llama_index/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
@@ -71,7 +71,7 @@ class Config(BaseConfig):
             "model_prepare_question",
             type="combo",
             use="models",
-            value="gpt-3.5-turbo",
+            value="gpt-4o-mini",
             label="Model for question preparation",
             description="Model used to prepare question before asking Llama-index, default: gpt-3.5-turbo",
             tooltip="Model",
@@ -88,7 +88,7 @@ class Config(BaseConfig):
         plugin.add_option(
             "model_query",
             type="combo",
-            value="gpt-3.5-turbo",
+            value="gpt-4o-mini",
             label="Model",
             description="Model used for querying Llama-index, default: gpt-3.5-turbo",
             tooltip="Query model",

pygpt_net/plugin/mailer/__init__.py

@@ -0,0 +1,123 @@
+#!/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.12.15 04:00:00                  #
+# ================================================== #
+
+from pygpt_net.plugin.base.plugin import BasePlugin
+from pygpt_net.core.events import Event
+from pygpt_net.item.ctx import CtxItem
+
+from .config import Config
+from .runner import Runner
+from .worker import Worker
+
+from pygpt_net.utils import trans
+
+
+class Plugin(BasePlugin):
+    def __init__(self, *args, **kwargs):
+        super(Plugin, self).__init__(*args, **kwargs)
+        self.id = "mailer"
+        self.name = "Mailer"
+        self.description = "Provides email sending"
+        self.prefix = "Email"
+        self.type = [
+            'email',
+        ]
+        self.order = 100
+        self.allowed_cmds = [
+            "send_mail",
+            "get_emails",
+            "get_email_body",
+        ]
+        self.use_locale = True
+        self.runner = Runner(self)
+        self.worker = None
+        self.config = Config(self)
+        self.init_options()
+
+    def init_options(self):
+        """Initialize options"""
+        self.config.from_defaults(self)
+
+    def handle(self, event: Event, *args, **kwargs):
+        """
+        Handle dispatched event
+
+        :param event: event object
+        :param args: args
+        :param kwargs: kwargs
+        """
+        name = event.name
+        data = event.data
+        ctx = event.ctx
+        silent = data.get("silent", False)
+
+        if name == Event.CMD_SYNTAX:
+            self.cmd_syntax(data)
+
+        elif name == Event.CMD_EXECUTE:
+            self.cmd(
+                ctx,
+                data['commands'],
+                silent,
+            )
+
+    def cmd_syntax(self, data: dict):
+        """
+        Event: CMD_SYNTAX
+
+        :param data: event data dict
+        """
+        for item in self.allowed_cmds:
+            if self.has_cmd(item):
+                cmd = self.get_cmd(item)
+                data['cmd'].append(cmd)  # append command
+
+    def cmd(self, ctx: CtxItem, cmds: list, silent: bool = False):
+        """
+        Event: CMD_EXECUTE
+
+        :param ctx: CtxItem
+        :param cmds: commands dict
+        :param silent: silent mode
+        """
+        is_cmd = False
+        force = False
+        my_commands = []
+        for item in cmds:
+            if item["cmd"] in self.allowed_cmds:
+                my_commands.append(item)
+                is_cmd = True
+                if "force" in item and item["force"]:
+                    force = True  # call from tool
+
+        if not is_cmd:
+            return
+
+        # set state: busy
+        if not silent:
+            self.cmd_prepare(ctx, my_commands)
+
+        try:
+            worker = Worker()
+            worker.from_defaults(self)
+            worker.cmds = my_commands
+            worker.ctx = ctx
+
+            # connect signals
+            self.runner.attach_signals(worker.signals)
+
+            if not self.is_async(ctx) and not force:
+                worker.run()
+                return
+            worker.run_async()
+
+        except Exception as e:
+            self.error(e)

pygpt_net/plugin/mailer/config.py

@@ -0,0 +1,149 @@
+#!/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.12.15 04:00:00                  #
+# ================================================== #
+
+from pygpt_net.plugin.base.config import BaseConfig, BasePlugin
+
+
+class Config(BaseConfig):
+    def __init__(self, plugin: BasePlugin = None, *args, **kwargs):
+        super(Config, self).__init__(plugin)
+        self.plugin = plugin
+
+    def from_defaults(self, plugin: BasePlugin = None):
+        """
+        Set default options for plugin
+
+        :param plugin: plugin instance
+        """
+        plugin.add_option(
+            "smtp_host",
+            type="text",
+            value="",
+            label="SMTP Host",
+            persist=True,
+            tab="smtp",
+        )
+        plugin.add_option(
+            "smtp_port_inbox",
+            type="int",
+            value=995,
+            label="SMTP Port (Inbox)",
+            persist=True,
+            tab="smtp",
+        )
+        plugin.add_option(
+            "smtp_port_outbox",
+            type="int",
+            value=465,
+            label="SMTP Port (Outbox)",
+            persist=True,
+            tab="smtp",
+        )
+        plugin.add_option(
+            "smtp_user",
+            type="text",
+            value="",
+            label="SMTP User",
+            persist=True,
+            tab="smtp",
+        )
+        plugin.add_option(
+            "smtp_password",
+            type="text",
+            value="",
+            label="SMTP Password",
+            secret=True,
+            persist=True,
+            tab="smtp",
+        )
+        plugin.add_option(
+            "from_email",
+            type="text",
+            value="",
+            label="From (email)",
+        )
+        plugin.add_cmd(
+            "send_email",
+            instruction="Send email to specified address",
+            params=[
+                {
+                    "name": "recipient",
+                    "type": "str",
+                    "description": "Recipient email address",
+                    "required": True,
+                },
+                {
+                    "name": "subject",
+                    "type": "str",
+                    "description": "Email subject",
+                    "required": True,
+                },
+                {
+                    "name": "message",
+                    "type": "str",
+                    "description": "Email message",
+                    "required": True,
+                },
+            ],
+            enabled=True,
+            description="Allows sending emails",
+            tab="general",
+        )
+        plugin.add_cmd(
+            "get_emails",
+            instruction="Retrieve emails from the inbox. Use this to access emails from the inbox when the user "
+                        "requests fetching emails from their server.",
+            params=[
+                {
+                    "name": "limit",
+                    "type": "int",
+                    "description": "Limit of emails to receive, default: 10",
+                    "required": True,
+                },
+                {
+                    "name": "offset",
+                    "type": "int",
+                    "description": "Offset of emails to receive, default: 0",
+                    "required": False,
+                },
+                {
+                    "name": "order",
+                    "type": "text",
+                    "description": "Sort order, default: desc, options: asc, desc",
+                    "required": False,
+                },
+            ],
+            enabled=True,
+            description="Allows receiving emails",
+            tab="general",
+        )
+        plugin.add_cmd(
+            "get_email_body",
+            instruction="Retrieve the complete email content from the inbox. Use this to access the message body. "
+                        "To obtain email IDs, use the 'get_emails' function first.",
+            params=[
+                {
+                    "name": "id",
+                    "type": "int",
+                    "description": "Email ID (index)",
+                    "required": True,
+                },
+                {
+                    "name": "format",
+                    "type": "text",
+                    "description": "Display format, default: text, options: text, html",
+                    "required": False,
+                },
+            ],
+            enabled=True,
+            description="Allows receiving email body",
+            tab="general",
+        )