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

pygpt_net/plugin/cmd_web/worker.py

@@ -6,12 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.18 21:00:00                  #
+# Updated Date: 2024.12.15 01:00:00                  #
 # ================================================== #
 
 import json
 
 from PySide6.QtCore import Slot
+
 from pygpt_net.plugin.base.worker import BaseWorker, BaseSignals
 
 
@@ -40,7 +41,7 @@ class Worker(BaseWorker):
             response = None
             try:
                 if item["cmd"] == "web_search":
-                    response = self.cmd_web_search(item)
+                    response = self.cmd_web_urls(item)  # return URLs
 
                 elif item["cmd"] == "web_url_open":
                     response = self.cmd_web_url_open(item)
@@ -57,6 +58,15 @@ class Worker(BaseWorker):
                 elif item["cmd"] == "web_index_query":
                     response = self.cmd_web_index_query(item)
 
+                elif item["cmd"] == "web_extract_links":
+                    response = self.cmd_web_extract_links(item)
+
+                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)
 
@@ -91,7 +101,7 @@ class Worker(BaseWorker):
             prompt = self.get_param(item, "summarize_prompt")
 
         query = self.get_param(item, "query", "")
-        content, total_found, current, url = self.websearch.make_query(
+        content, total_found, current, url, img = self.websearch.make_query(
             query,
             page,
             prompt,
@@ -105,8 +115,12 @@ class Worker(BaseWorker):
             'total_found': total_found,
         }
         if url:
-            self.ctx.urls.append(url)
+            self.ctx.urls_before.append(url)
+        if img:
+            result["thumb_img"] = img
+            self.ctx.images_before.append(img)
 
+        self.ctx.save_reply = True  # leave links in context
         return self.make_response(item, result)
 
     def cmd_web_url_open(self, item: dict) -> dict:
@@ -122,7 +136,7 @@ class Worker(BaseWorker):
         url = self.get_param(item, "url", "")
 
         self.msg = "Opening Web URL: '{}'".format(url)
-        content, url = self.websearch.open_url(
+        content, url, img = self.websearch.open_url(
             url,
             prompt,
         )
@@ -130,9 +144,12 @@ class Worker(BaseWorker):
             'url': url,
             'content': content,
         }
-        context = "From: " + url + ":\n--------------------------------\n" + content
+        context = "From: " + url + ":\n--------------------------------\n" + str(content)
         if url:
-            self.ctx.urls.append(url)
+            self.ctx.urls_before.append(url)
+        if img:
+            result["thumb_img"] = img
+            self.ctx.images_before.append(img)
 
         extra = {
             "context": context,
@@ -148,16 +165,19 @@ class Worker(BaseWorker):
         """
         url = self.get_param(item, "url", "")
         self.msg = "Opening Web URL: '{}'".format(url)
-        content, url = self.websearch.open_url_raw(
+        content, url, img  = self.websearch.open_url_raw(
             url,
         )
         result = {
             'url': url,
             'content': content,
         }
-        context = "From: " + url + ":\n--------------------------------\n" + content
+        context = "From: " + url + ":\n--------------------------------\n" + str(content)
         if url:
-            self.ctx.urls.append(url)
+            self.ctx.urls_before.append(url)
+        if img:
+            result["thumb_img"] = img
+            self.ctx.images_before.append(img)
 
         extra = {
             "context": context,
@@ -201,7 +221,7 @@ class Worker(BaseWorker):
         }
         if urls:
             for url in urls:
-                self.ctx.urls.append(url)
+                self.ctx.urls_before.append(url)
 
         return self.make_response(item, result)
 
@@ -247,7 +267,7 @@ class Worker(BaseWorker):
             'errors': errors,
         }
         if url and (url.startswith("http://") or url.startswith("https://")):
-            self.ctx.urls.append(url)
+            self.ctx.urls_before.append(url)
 
         extra = {
             "url": url,
@@ -327,9 +347,118 @@ class Worker(BaseWorker):
 
         # add URL to context
         if url and (url.startswith("http://") or url.startswith("https://")):
-            self.ctx.urls.append(url)
+            self.ctx.urls_before.append(url)
 
         extra = {
             "context": context,
         }
         return self.make_response(item, result, extra=extra)
+
+    def cmd_web_extract_links(self, item: dict) -> dict:
+        """
+        Web extract links command
+
+        :param item: command item
+        :return: response item
+        """
+        url = ""
+        if self.has_param(item, "url"):
+            url = self.get_param(item, "url")
+        if not url:
+            return self.make_response(item, "No URL provided")
+        links = self.plugin.window.core.web.helpers.get_links(url)
+        result = {
+            'links': links,
+        }
+        self.ctx.urls_before.append(url)
+        return self.make_response(item, result)
+
+    def cmd_web_extract_images(self, item: dict) -> dict:
+        """
+        Web extract images command
+
+        :param item: command item
+        :return: response item
+        """
+        download = False
+        url = ""
+        if self.has_param(item, "url"):
+            url = self.get_param(item, "url")
+        if self.has_param(item, "download"):
+            download = bool(self.get_param(item, "download"))
+        if not url:
+            return self.make_response(item, "No URL provided")
+        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.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",
+        )