pygpt-net 2.4.38__py3-none-any.whl → 2.4.40__py3-none-any.whl

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.11.26 19:00:00                  #
+# Updated Date: 2024.12.13 08:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Slot
@@ -127,12 +127,15 @@ class Plugin(BasePlugin):
         elif name == Event.CTX_AFTER:
             if mode == MODE_AUDIO:
                 return  # skip if audio mode
+            self.stop_audio()
             self.on_generate(ctx, event)
 
         elif name == Event.AUDIO_READ_TEXT:
+            self.stop_audio()
             self.on_generate(ctx, event)
 
         elif name == Event.AUDIO_PLAYBACK:
+            self.stop_audio()
             self.on_playback(ctx, event)
 
         elif name == Event.AUDIO_OUTPUT_STOP:

pygpt_net/plugin/base/plugin.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.12 20:00:00                  #
 # ================================================== #
 
 import copy
@@ -329,7 +329,12 @@ class BasePlugin(QObject):
         }))
 
     @Slot(object, object, dict)
-    def handle_finished(self, response: dict, ctx: CtxItem = None, extra_data: dict = None):
+    def handle_finished(
+            self,
+            response: dict,
+            ctx: CtxItem = None,
+            extra_data: dict = None
+    ):
         """
         Handle finished response signal
 
@@ -354,7 +359,12 @@ class BasePlugin(QObject):
             self.window.dispatch(event)
 
     @Slot(object, object, dict)
-    def handle_finished_more(self, responses: list, ctx: CtxItem = None, extra_data: dict = None):
+    def handle_finished_more(
+            self,
+            responses: list,
+            ctx: CtxItem = None,
+            extra_data: dict = None
+    ):
         """
         Handle finished response signal
 
@@ -379,7 +389,11 @@ class BasePlugin(QObject):
         })
         self.window.dispatch(event)
 
-    def prepare_reply_ctx(self, response: dict, ctx: CtxItem = None) -> dict:
+    def prepare_reply_ctx(
+            self,
+            response: dict,
+            ctx: CtxItem = None
+    ) -> dict:
         """
         Prepare reply context
 

pygpt_net/plugin/cmd_code_interpreter/__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.25 02:00:00                  #
+# Updated Date: 2024.12.12 01:00:00                  #
 # ================================================== #
 
 import os
@@ -118,42 +118,6 @@ class Plugin(BasePlugin):
                                            "directory is mapped as volume in host machine to: {}").format(legacy_data)
                 data['cmd'].append(cmd)  # append command
 
-    @Slot(object, str)
-    def handle_interpreter_output(self, data, type):
-        """
-        Handle interpreter output
-
-        :param data: output data
-        :param type: output type
-        """
-        if not self.get_option_value("attach_output"):
-            return
-        self.window.tools.get("interpreter").append_output(data, type)
-
-    @Slot()
-    def handle_interpreter_clear(self):
-        """Handle interpreter clear"""
-        self.window.tools.get("interpreter").clear_all()
-
-    @Slot(object)
-    def handle_html_output(self, data):
-        """
-        Handle HTML/JS canvas output
-
-        :param data: HTML/JS code
-        """
-        self.window.tools.get("html_canvas").set_output(data)
-        self.window.tools.get("html_canvas").open()
-    def get_interpreter(self):
-        """
-        Get interpreter
-
-        :return: interpreter
-        """
-        if self.get_option_value("sandbox_ipython"):
-            return self.ipython_docker
-        else:
-            return self.ipython_local
 
     def cmd(self, ctx: CtxItem, cmds: list, silent: bool = False):
         """
@@ -270,3 +234,41 @@ class Plugin(BasePlugin):
         self.window.tools.get("interpreter").append_output(cleaned_data)
         if self.window.tools.get("interpreter").opened:
             self.window.update_status("")
+
+    @Slot(object, str)
+    def handle_interpreter_output(self, data, type):
+        """
+        Handle interpreter output
+
+        :param data: output data
+        :param type: output type
+        """
+        if not self.get_option_value("attach_output"):
+            return
+        self.window.tools.get("interpreter").append_output(data, type)
+
+    @Slot()
+    def handle_interpreter_clear(self):
+        """Handle interpreter clear"""
+        self.window.tools.get("interpreter").clear_all()
+
+    @Slot(object)
+    def handle_html_output(self, data):
+        """
+        Handle HTML/JS canvas output
+
+        :param data: HTML/JS code
+        """
+        self.window.tools.get("html_canvas").set_output(data)
+        self.window.tools.get("html_canvas").auto_open()
+        
+    def get_interpreter(self):
+        """
+        Get interpreter
+
+        :return: interpreter
+        """
+        if self.get_option_value("sandbox_ipython"):
+            return self.ipython_docker
+        else:
+            return self.ipython_local

pygpt_net/plugin/cmd_code_interpreter/runner.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 04:00:00                  #
+# Updated Date: 2024.12.12 01:00:00                  #
 # ================================================== #
 
 import os.path
@@ -164,6 +164,14 @@ class Runner:
         """
         return self.plugin.get_option_value('sandbox_docker')
 
+    def is_sandbox_ipython(self) -> bool:
+        """
+        Check if sandbox is enabled for IPython
+
+        :return: True if sandbox is enabled
+        """
+        return self.plugin.get_option_value('sandbox_ipython')
+
     def get_docker(self) -> docker.client.DockerClient:
         """
         Get docker client
@@ -392,13 +400,14 @@ class Runner:
         :param all: execute all
         :return: response dict
         """
+        sandbox = self.is_sandbox_ipython()
         data = item["params"]['code']
         if not all:
             path = self.plugin.window.tools.get("interpreter").file_current
             if "path" in item["params"]:
                 path = item["params"]['path']
             msg = "Saving Python file: {}".format(path)
-            self.log(msg, sandbox=True)
+            self.log(msg, sandbox=sandbox)
             with open(self.prepare_path(path, on_host=True), 'w', encoding="utf-8") as file:
                 file.write(data)
         else:
@@ -412,12 +421,13 @@ class Runner:
 
         # run code in IPython interpreter
         msg = "Executing Python code: {}".format(item["params"]['code'])
-        self.log(msg, sandbox=True)
-        self.log("Connecting to IPython interpreter...", sandbox=True)
+        self.log(msg, sandbox=sandbox)
+        self.log("Connecting to IPython interpreter...", sandbox=sandbox)
         try:
-            self.log("Please wait...", sandbox=True)
+            self.log("Please wait...", sandbox=sandbox)
             result = self.plugin.get_interpreter().execute(data, current=False)
             result = self.handle_result_ipython(ctx, result)
+            self.log("Python Code Executed.", sandbox=sandbox)
         except Exception as e:
             self.error(e)
             result = str(e)
@@ -437,13 +447,14 @@ class Runner:
         :param all: execute all
         :return: response dict
         """
+        sandbox = self.is_sandbox_ipython()
         data = item["params"]['code']
         if not all:
             path = self.plugin.window.tools.get("interpreter").file_current
             if "path" in item["params"]:
                 path = item["params"]['path']
             msg = "Saving Python file: {}".format(path)
-            self.log(msg, sandbox=True)
+            self.log(msg, sandbox=sandbox)
             with open(self.prepare_path(path, on_host=True), 'w', encoding="utf-8") as file:
                 file.write(data)
         else:
@@ -457,12 +468,13 @@ class Runner:
 
         # run code in IPython interpreter
         msg = "Executing Python code: {}".format(item["params"]['code'])
-        self.log(msg, sandbox=True)
-        self.log("Connecting to IPython interpreter...", sandbox=True)
+        self.log(msg, sandbox=sandbox)
+        self.log("Connecting to IPython interpreter...", sandbox=sandbox)
         try:
-            self.log("Please wait...", sandbox=True)
+            self.log("Please wait...", sandbox=sandbox)
             result = self.plugin.get_interpreter().execute(data, current=True)
             result = self.handle_result_ipython(ctx, result)
+            self.log("Python Code Executed.", sandbox=sandbox)
         except Exception as e:
             self.error(e)
             result = str(e)
@@ -482,13 +494,14 @@ class Runner:
         :param all: execute all
         :return: response dict
         """
+        sandbox = self.is_sandbox_ipython()
         self.append_input("")
         self.send_interpreter_input("")  # send input to interpreter tool
 
         # restart IPython interpreter
-        self.log("Connecting to IPython interpreter...", sandbox=True)
+        self.log("Connecting to IPython interpreter...", sandbox=sandbox)
         try:
-            self.log("Restarting IPython kernel...", sandbox=True)
+            self.log("Restarting IPython kernel...", sandbox=sandbox)
             response = self.plugin.get_interpreter().restart_kernel()
         except Exception as e:
             self.error(e)
@@ -497,7 +510,7 @@ class Runner:
             result = "Kernel restarted"
         else:
             result = "Kernel not restarted"
-        self.log(result)
+        self.log(result, sandbox=sandbox)
         return {
             "request": request,
             "result": str(result),

pygpt_net/plugin/cmd_web/__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 21:00:00                  #
+# Updated Date: 2024.12.13 08:00:00                  #
 # ================================================== #
 
 import ssl
@@ -40,6 +40,8 @@ class Plugin(BasePlugin):
             "web_url_raw",
             "web_index",
             "web_index_query",
+            "web_extract_links",
+            "web_extract_images",
         ]
         self.order = 100
         self.use_locale = True
@@ -269,26 +271,66 @@ class Plugin(BasePlugin):
 
         :param data: event data dict
         """
+        max_urls = self.get_option_value("max_open_urls")
+        is_summary = True
+        if self.get_option_value("raw"):
+            is_summary = False
+
         for option in self.allowed_cmds:
             if not self.has_cmd(option):
                 continue
 
-            # special case for web_index
             if option == "web_index":
                 data['cmd'].append(self.prepare_idx_syntax())  # prepare params
                 continue
             elif option == "web_index_query":
                 data['cmd'].append(self.prepare_idx_query_syntax())  # prepare params
                 continue
+            elif option == "web_url_open":
+                cmd = self.get_cmd(option)
+                try:
+                    cmd["instruction"] = cmd["instruction"].format(
+                        max_urls=max_urls,
+                    )
+                    if not is_summary:
+                        for param in list(cmd["params"]):
+                            if param["name"] == "summarize_prompt":
+                                cmd["params"].remove(param)
+                    data['cmd'].append(cmd)
+                    continue
+                except Exception as e:
+                    pass
+            elif option == "web_url_raw":
+                cmd = self.get_cmd(option)
+                try:
+                    cmd["instruction"] = cmd["instruction"].format(
+                        max_urls=max_urls,
+                    )
+                    if not is_summary:
+                        for param in list(cmd["params"]):
+                            if param["name"] == "summarize_prompt":
+                                cmd["params"].remove(param)
+                    data['cmd'].append(cmd)
+                    continue
+                except Exception as e:
+                    pass
             elif option == "web_search":
                 max_pages = self.get_option_value("num_pages")
                 cmd = self.get_cmd(option)
                 try:
-                    cmd["instruction"] = cmd["instruction"].format(max_pages=max_pages)
+                    cmd["instruction"] = cmd["instruction"].format(
+                        max_pages=max_pages,
+                        max_urls=max_urls,
+                    )
+                    if not is_summary:
+                        for param in list(cmd["params"]):
+                            if param["name"] == "summarize_prompt":
+                                cmd["params"].remove(param)
                     data['cmd'].append(cmd)
                     continue
                 except Exception as e:
                     pass
+
             data['cmd'].append(self.get_cmd(option))  # append command
 
     def cmd(self, ctx: CtxItem, cmds: list):
@@ -389,8 +431,6 @@ class Plugin(BasePlugin):
                     req,
                     timeout=self.get_option_value('timeout'),
                 ).read()
-        except HTTPError as e:
-            data = str(e)
         except Exception as e:
-            raise e
+            data = str(e)
         return data

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.11.18 19:00:00                  #
+# Updated Date: 2024.12.13 08:00:00                  #
 # ================================================== #
 
 from pygpt_net.plugin.base.config import BaseConfig, BasePlugin
@@ -41,6 +41,15 @@ class Config(BaseConfig):
             min=1,
             max=None,
         )
+        plugin.add_option(
+            "max_open_urls",
+            type="int",
+            value=1,
+            label="Number of max URLs to open at once",
+            description="Number of max URLs to open at once",
+            min=1,
+            max=None,
+        )
         plugin.add_option(
             "max_page_content_length",
             type="int",
@@ -59,6 +68,14 @@ class Config(BaseConfig):
             min=1,
             max=None,
         )
+        plugin.add_option(
+            "raw",
+            type="bool",
+            value=True,
+            label="Use raw content (without summarization)",
+            description="Return raw content from web search instead of summarized content",
+            tooltip="Use raw content for search",
+        )
         plugin.add_option(
             "disable_ssl",
             type="bool",
@@ -67,6 +84,14 @@ class Config(BaseConfig):
             description="Disables SSL verification when crawling web pages",
             tooltip="Disable SSL verify",
         )
+        plugin.add_option(
+            "img_thumbnail",
+            type="bool",
+            value=True,
+            label="Show thumbnail images",
+            description="Enable fetching thumbnails from opened websites",
+            tooltip="Enable fetching thumbnails from opened websites",
+        )
         plugin.add_option(
             "timeout",
             type="int",
@@ -86,7 +111,7 @@ class Config(BaseConfig):
         plugin.add_option(
             "max_result_length",
             type="int",
-            value=1500,
+            value=50000,
             label="Max result length",
             description="Max length of summarized result (characters)",
             min=0,
@@ -104,10 +129,10 @@ class Config(BaseConfig):
         plugin.add_option(
             "model_tmp_query",
             type="combo",
-            value="gpt-3.5-turbo",
+            value="gpt-4o-mini",
             label="Model for query in-memory index",
             description="Model used for query in-memory index for `web_index_query` command, "
-                        "default: gpt-3.5-turbo",
+                        "default: gpt-4o-mini",
             tooltip="Query model",
             use="models",
             tab="indexing",
@@ -134,10 +159,11 @@ class Config(BaseConfig):
         )
         plugin.add_option(
             "summary_model",
-            type="text",
-            value="gpt-3.5-turbo-1106",
+            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",
+            use="models",
             advanced=True,
         )
         plugin.add_option(
@@ -163,39 +189,9 @@ class Config(BaseConfig):
         )
 
         # commands
-        plugin.add_cmd(
-            "web_search",
-            instruction="search the Web for more info, prepare a query for the search engine itself, start from page 1. "
-                        "If no results, then try the next page. "
-                        "Use a custom summary prompt if necessary, otherwise, a default summary will be used. "
-                        "Max pages: {max_pages}",
-            params=[
-                {
-                    "name": "query",
-                    "type": "str",
-                    "description": "search query",
-                    "required": True,
-                },
-                {
-                    "name": "page",
-                    "type": "int",
-                    "description": "page number",
-                    "required": False,
-                },
-                {
-                    "name": "summarize_prompt",
-                    "type": "str",
-                    "description": "summary prompt",
-                    "required": False,
-                },
-            ],
-            enabled=True,
-            description="If enabled, model will be able to search the Web",
-        )
         plugin.add_cmd(
             "web_url_open",
-            instruction="read and get summarized content from ANY website URL. Use a custom summary prompt if necessary, "
-                        "otherwise default summary will be used",
+            instruction="read and get text content from ANY website URL. Always open a max of {max_urls} URLs at a time.",
             params=[
                 {
                     "name": "url",
@@ -203,19 +199,13 @@ class Config(BaseConfig):
                     "description": "URL to website",
                     "required": True,
                 },
-                {
-                    "name": "summarize_prompt",
-                    "type": "str",
-                    "description": "summary prompt",
-                    "required": False,
-                },
             ],
             enabled=True,
-            description="If enabled, model will be able to open URL and summarize content",
+            description="If enabled, model will be able to open URL and read text content from it",
         )
         plugin.add_cmd(
             "web_url_raw",
-            instruction="read and get raw HTML/txt content (not summarized) from ANY website URL",
+            instruction="read and get raw HTML body from ANY website URL. Always open a max of {max_urls} URLs at a time.",
             params=[
                 {
                     "name": "url",
@@ -225,12 +215,14 @@ class Config(BaseConfig):
                 },
             ],
             enabled=True,
-            description="If enabled, model will be able to open specified URL and get raw content",
+            description="If enabled, model will be able to open specified URL and get raw HTML body from it",
         )
         plugin.add_cmd(
-            "web_urls",
+            "web_search",
             instruction="search the Web for list of URLs, prepare search query itself, list of "
-                        "URLs will be returned, 10 links per page max.",
+                        "URLs will be returned, 10 links per page max. After receiving the list of URLs, "
+                        "choose the best matched URLs and use the `web_url_open` command to read the content. "
+                        "Always open a max of {max_urls} URLs at a time.",
             params=[
                 {
                     "name": "query",
@@ -254,6 +246,40 @@ 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_extract_links",
+            instruction="open webpage and get list of all links from it",
+            params=[
+                {
+                    "name": "url",
+                    "type": "str",
+                    "description": "URL to website",
+                    "required": True,
+                },
+            ],
+            enabled=True,
+            description="If enabled, model will be able to open URL and get list of all links from it",
+        )
+        plugin.add_cmd(
+            "web_extract_images",
+            instruction="open webpage and get list of all images from it",
+            params=[
+                {
+                    "name": "url",
+                    "type": "str",
+                    "description": "URL to website",
+                    "required": True,
+                },
+                {
+                    "name": "download",
+                    "type": "bool",
+                    "description": "Download images to disk if user wants to, default: False",
+                    "required": False,
+                },
+            ],
+            enabled=True,
+            description="If enabled, model will be able to open URL and get list of all images from it",
+        )
         plugin.add_cmd(
             "web_index",
             instruction="",