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

pygpt_net/plugin/audio_input/simple.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 02:00:00                  #
+# Updated Date: 2024.12.08 00:00:00                  #
 # ================================================== #
 
 import pyaudio
@@ -84,11 +84,25 @@ class Simple:
                 self.timer.timeout.connect(self.stop_timeout)
                 self.timer.start(self.TIMEOUT_SECONDS * 1000)
 
+            # select audio input device
+            device_id = int(self.plugin.window.core.config.get('audio.input.device', 0))
+            rate = int(self.plugin.window.core.config.get('audio.input.rate', 44100))
+            channels = int(self.plugin.window.core.config.get('audio.input.channels', 1))
+            if not self.plugin.window.core.audio.is_device_compatible(device_id):
+                err = self.plugin.window.core.audio.get_last_error()
+                message = "Selected audio input device is not compatible. Please select another one. ERROR: " + str(err)
+                self.is_recording = False
+                self.plugin.window.core.debug.log(message)
+                self.plugin.window.ui.dialogs.alert(message)
+                self.switch_btn_start()  # switch button to start
+                return
+
             self.p = pyaudio.PyAudio()
             self.stream = self.p.open(format=pyaudio.paInt16,
-                                      channels=1,
-                                      rate=44100,
+                                      channels=channels,
+                                      rate=rate,
                                       input=True,
+                                      input_device_index=device_id,
                                       frames_per_buffer=1024,
                                       stream_callback=callback)
 
@@ -137,9 +151,11 @@ class Simple:
                     self.plugin.window.dispatch(AppEvent(AppEvent.VOICE_CONTROL_STOPPED))  # app event
                     return
                 wf = wave.open(path, 'wb')
-                wf.setnchannels(1)
+                channels = int(self.plugin.window.core.config.get('audio.input.channels', 1))
+                rate = int(self.plugin.window.core.config.get('audio.input.rate', 44100))
+                wf.setnchannels(channels)
                 wf.setsampwidth(self.p.get_sample_size(pyaudio.paInt16))
-                wf.setframerate(44100)
+                wf.setframerate(rate)
                 wf.writeframes(b''.join(self.frames))
                 wf.close()
                 self.plugin.handle_thread(True)  # handle transcription in simple mode

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.14 18: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:
@@ -164,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/config.py

@@ -6,16 +6,18 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.16 05:00:00                  #
+# Updated Date: 2024.12.14 00:00:00                  #
 # ================================================== #
 
+from typing import Optional
+
 from .plugin import BasePlugin
 
 class BaseConfig:
     def __init__(self, plugin: BasePlugin = None, *args, **kwargs):
         self.plugin = plugin
 
-    def from_defaults(self, plugin: BasePlugin = None):
+    def from_defaults(self, plugin: Optional[BasePlugin] = None):
         """
         Set default options for plugin
 

pygpt_net/plugin/base/plugin.py

@@ -6,16 +6,14 @@
 # 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                  #
 # ================================================== #
 
 import copy
+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
@@ -42,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
 
@@ -50,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
 
@@ -83,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
 
@@ -124,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
 
@@ -137,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
 
@@ -156,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
 
@@ -169,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
 
@@ -178,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
 
@@ -188,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
 
@@ -206,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
 
@@ -234,7 +264,10 @@ class BasePlugin(QObject):
         """
         return
 
-    def trans(self, text: str = None) -> str:
+    def trans(
+            self,
+            text: Optional[str] = None
+    ) -> str:
         """
         Translate text using plugin domain
 
@@ -246,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
 
@@ -256,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
 
@@ -264,7 +297,12 @@ class BasePlugin(QObject):
         """
         self.window.core.debug.info(data)
 
-    def reply(self, response: dict, ctx: CtxItem = None, extra_data: dict = None):
+    def reply(
+            self,
+            response: dict,
+            ctx: Optional[CtxItem] = None,
+            extra_data: Optional[dict] = None
+    ):
         """
         Send reply from plugin (command response)
 
@@ -329,7 +367,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[str, Any],
+            ctx: Optional[CtxItem] = None,
+            extra_data: Optional[Dict[str, Any]] = None
+    ):
         """
         Handle finished response signal
 
@@ -354,7 +397,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[Dict[str, Any]],
+            ctx: Optional[CtxItem] = None,
+            extra_data: Optional[Dict[str, Any]] = None
+    ):
         """
         Handle finished response signal
 
@@ -379,7 +427,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[str, Any],
+            ctx: Optional[CtxItem] = None
+    ) -> Dict[str, Any]:
         """
         Prepare reply context
 
@@ -434,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
 
@@ -443,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,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.24 04:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import Optional, Any, Dict, List
+
 from PySide6.QtCore import QObject, QRunnable
 from typing_extensions import deprecated
 
@@ -17,7 +19,7 @@ from .signals import BaseSignals
 
 
 class BaseWorker(QObject, QRunnable):
-    def __init__(self, plugin: BasePlugin = None, *args, **kwargs):
+    def __init__(self, plugin: Optional[BasePlugin] = None, *args, **kwargs):
         QObject.__init__(self)
         QRunnable.__init__(self)
         self.plugin = plugin
@@ -42,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
 
@@ -63,7 +65,11 @@ class BaseWorker(QObject, QRunnable):
             self.signals.log.emit(msg)
 
     @deprecated("From 2.1.29: BaseWorker.response() is deprecated, use BaseWorker.reply() instead")
-    def response(self, response: dict, extra_data: dict = None):
+    def response(
+            self,
+            response: Dict[str, Any],
+            extra_data: Optional[Dict[str, Any]] = None
+    ):
         """
         Emit finished signal (deprecated)
 
@@ -74,7 +80,11 @@ class BaseWorker(QObject, QRunnable):
         self.debug("BaseWorker.response is deprecated from 2.1.29, use BaseWorker.reply instead")
         self.reply(response, extra_data)
 
-    def reply(self, response: dict, extra_data: dict = None):
+    def reply(
+            self,
+            response: Dict[str, Any],
+            extra_data: Optional[Dict[str, Any]] = None
+    ):
         """
         Emit finished signal (on reply from command output)
 
@@ -89,7 +99,11 @@ class BaseWorker(QObject, QRunnable):
         if self.signals is not None and hasattr(self.signals, "finished"):
             self.signals.finished.emit(response, self.ctx, extra_data)
 
-    def reply_more(self, responses: list, extra_data: dict = None):
+    def reply_more(
+            self,
+            responses: List[Dict[str, Any]],
+            extra_data: Optional[Dict[str, Any]] = None
+    ):
         """
         Emit finished_more signal (on reply from command output, multiple responses)
 
@@ -152,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
 
@@ -161,7 +178,12 @@ class BaseWorker(QObject, QRunnable):
         """
         return {"cmd": item["cmd"]}
 
-    def make_response(self, item: dict, result: any, extra: dict = None) -> dict:
+    def make_response(
+            self,
+            item: Dict[str, Any],
+            result: Any,
+            extra: Optional[Dict[str, Any]] = None
+    ) -> Dict[str, Any]:
         """
         Prepare response item
 
@@ -190,7 +212,11 @@ class BaseWorker(QObject, QRunnable):
         self.log(msg)
         return msg
 
-    def has_param(self, item: dict, param: str) -> bool:
+    def has_param(
+            self,
+            item: Dict[str, Any],
+            param: str
+    ) -> bool:
         """
         Check if item has parameter
 
@@ -202,7 +228,12 @@ class BaseWorker(QObject, QRunnable):
             return False
         return "params" in item and param in item["params"]
 
-    def get_param(self, item: dict, param: str, default: any = None) -> any:
+    def get_param(
+            self,
+            item: Dict[str, Any],
+            param: str,
+            default: Any = None
+    ) -> Any:
         """
         Get parameter value from item
 
@@ -215,7 +246,7 @@ class BaseWorker(QObject, QRunnable):
             return item["params"][param]
         return default
 
-    def is_stopped(self):
+    def is_stopped(self) -> bool:
         """
         Check if worker is stopped
 

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),