pygpt-net 2.4.28__py3-none-any.whl → 2.4.34__py3-none-any.whl

pygpt_net/plugin/audio_output/__init__.py

@@ -6,11 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 03:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Slot
 
+from pygpt_net.core.types import MODE_AUDIO
 from pygpt_net.plugin.base.plugin import BasePlugin
 from pygpt_net.provider.audio_output.base import BaseProvider
 from pygpt_net.core.events import Event
@@ -118,15 +119,21 @@ class Plugin(BasePlugin):
         name = event.name
         data = event.data
         ctx = event.ctx
+        mode = self.window.core.config.get("mode")
 
         if name == Event.INPUT_BEFORE:
             self.on_input_before(data['value'])
 
-        elif name in [
-            Event.CTX_AFTER,
-            Event.AUDIO_READ_TEXT
-        ]:
-            self.on_ctx_after(ctx, event)
+        elif name == Event.CTX_AFTER:
+            if mode == MODE_AUDIO:
+                return  # skip if audio mode
+            self.on_generate(ctx, event)
+
+        elif name == Event.AUDIO_READ_TEXT:
+            self.on_generate(ctx, event)
+
+        elif name == Event.AUDIO_PLAYBACK:
+            self.on_playback(ctx, event)
 
         elif name == Event.AUDIO_OUTPUT_STOP:
             self.stop_audio()
@@ -139,7 +146,7 @@ class Plugin(BasePlugin):
         """
         self.input_text = text
 
-    def on_ctx_after(self, ctx: CtxItem, event: Event):
+    def on_generate(self, ctx: CtxItem, event: Event):
         """
         Events: CTX_AFTER, AUDIO_READ_TEXT
 
@@ -166,6 +173,7 @@ class Plugin(BasePlugin):
                 worker.event = name
                 worker.cache_file = cache_file
                 worker.text = self.window.core.audio.clean_text(text)
+                worker.mode = "generate"
 
                 # signals
                 worker.signals.playback.connect(self.handle_playback)
@@ -180,6 +188,28 @@ class Plugin(BasePlugin):
         except Exception as e:
             self.error(e)
 
+    def on_playback(self, ctx: CtxItem, event: Event):
+        """
+        Events: AUDIO_PLAYBACK
+
+        :param ctx: CtxItem
+        :param event: Event
+        """     
+        try:
+            worker = Worker()
+            worker.from_defaults(self)
+            worker.audio_file = event.data["audio_file"]
+            worker.mode = "playback"
+
+            # signals
+            worker.signals.playback.connect(self.handle_playback)
+            worker.signals.stop.connect(self.handle_stop)
+
+            worker.run_async()
+
+        except Exception as e:
+            self.error(e)
+
     def destroy(self):
         """Destroy thread"""
         pass

pygpt_net/plugin/audio_output/worker.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 21:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 import time
@@ -30,28 +30,50 @@ class Worker(BaseWorker):
         self.text = None
         self.event = None
         self.cache_file = None  # path to cache file
+        self.mode = "generate"  # generate|playback
+        self.audio_file = None
 
     @Slot()
     def run(self):
-        from pygame import mixer
         try:
-            if self.text is None or self.text == "":
-                time.sleep(0.2)  # wait
-                return
-            path = self.plugin.get_provider().speech(self.text)
-            if path:
-                mixer.init()
-                playback = mixer.Sound(path)
-                self.stop_playback()  # stop previous playback
-                playback.play()
-                self.send(playback)  # send playback object to main thread
-
-                # store in cache if enabled
-                if self.cache_file:
-                    self.cache_audio_file(path, self.cache_file)
+            if self.mode == "generate":
+                self.generate()
+            elif self.mode == "playback":
+                self.play()
         except Exception as e:
             self.error(e)
 
+    def generate(self):
+        """
+        Generate and play audio file
+        """
+        if self.text is None or self.text == "":
+            time.sleep(0.2)  # wait
+            return
+        path = self.plugin.get_provider().speech(self.text)
+        if path:
+            from pygame import mixer
+            mixer.init()
+            playback = mixer.Sound(path)
+            self.stop_playback()  # stop previous playback
+            playback.play()
+            self.send(playback)  # send playback object to main thread to allow force stop
+
+            # store in cache if enabled
+            if self.cache_file:
+                self.cache_audio_file(path, self.cache_file)
+
+    def play(self):
+        """
+        Play audio file only
+        """
+        if self.audio_file:
+            from pygame import mixer
+            mixer.init()
+            playback = mixer.Sound(self.audio_file)
+            playback.play()
+            self.send(playback)  # send playback object to main thread to allow force stop
+
     def cache_audio_file(self, src: str, dst: str):
         """
         Store audio file in cache
@@ -81,28 +103,3 @@ class Worker(BaseWorker):
     def stop(self):
         """Send stop signal to main thread"""
         self.signals.stop.emit()
-
-
-class PlayWorker(BaseWorker):
-    def __init__(self, *args, **kwargs):
-        super(PlayWorker, self).__init__()
-        self.signals = WorkerSignals()
-        self.args = args
-        self.kwargs = kwargs
-        self.window = None
-        self.path = None
-
-    @Slot()
-    def run(self):
-        from pygame import mixer
-        try:
-            if self.path:
-                mixer.init()
-                playback = mixer.Sound(self.path)
-                playback.play()
-        except Exception as e:
-            self.error(e)
-
-
-
-

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.24 06:00:00                  #
+# Updated Date: 2024.11.25 02:00:00                  #
 # ================================================== #
 
 import os
@@ -20,7 +20,8 @@ from pygpt_net.item.ctx import CtxItem
 from .config import Config
 from .docker import Docker
 from .builder import Builder
-from .ipython import IPythonInterpreter
+from .ipython import LocalKernel
+from .ipython import DockerKernel
 from .output import Output
 from .runner import Runner
 from .worker import Worker
@@ -55,7 +56,8 @@ class Plugin(BasePlugin):
         self.use_locale = True
         self.docker = Docker(self)
         self.runner = Runner(self)
-        self.ipython = IPythonInterpreter(self)
+        self.ipython_docker = DockerKernel(self)
+        self.ipython_local = LocalKernel(self)
         self.builder = Builder(self)
         self.output = Output(self)
         self.worker = None
@@ -100,17 +102,20 @@ class Plugin(BasePlugin):
         :param data: event data dict
         """
         # get current working directory
-        cwd = self.window.core.config.get_user_dir('data')
-        ipython_data = os.path.join(cwd, 'ipython')
-        if self.get_option_value("sandbox_docker"):
-            cwd = "/data (in docker sandbox)"
+        legacy_data = self.window.core.config.get_user_dir('data')
+        ipython_data = os.path.join(legacy_data, 'ipython')
 
         for item in self.allowed_cmds:
             if self.has_cmd(item):
                 cmd = self.get_cmd(item)
-                if item == "ipython_execute" or item == "ipython_execute_new":
-                    cmd["instruction"] += ("\nIPython works in Docker container. Directory /data is the container's workdir - "
-                                           "directory is bound in host machine to: {}").format(ipython_data)
+                if item in ["ipython_execute", "ipython_execute_new"]:
+                    if self.get_option_value("sandbox_ipython"):
+                        cmd["instruction"] += ("\nIPython works in Docker container. Directory /data is the container's workdir - "
+                                           "directory is mapped as volume in host machine to: {}").format(ipython_data)
+                elif item in ["code_execute", "code_execute_file", "code_execute_all"]:
+                    if self.get_option_value("sandbox_docker"):
+                        cmd["instruction"] += ("\nPython works in Docker container. Directory /data is the container's workdir - "
+                                           "directory is mapped as volume in host machine to: {}").format(legacy_data)
                 data['cmd'].append(cmd)  # append command
 
     @Slot(object, str)
@@ -139,6 +144,16 @@ class Plugin(BasePlugin):
         """
         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):
         """
@@ -161,30 +176,31 @@ class Plugin(BasePlugin):
         if not is_cmd:
             return
 
-        ipython_commands = [
-            "ipython_execute_new",
-            "ipython_execute",
-            "ipython_kernel_restart",
-        ]
         # ipython
-        if any(x in [x["cmd"] for x in my_commands] for x in ipython_commands):
-            # check for Docker installed
-            if not self.ipython.is_docker_installed():
-                # snap version
-                if self.window.core.platforms.is_snap():
-                    self.error(trans('ipython.docker.install.snap'))
-                    self.window.update_status(trans('ipython.docker.install.snap'))
-                # other versions
-                else:
-                    self.error(trans('ipython.docker.install'))
-                    self.window.update_status(trans('ipython.docker.install'))
-                return
-            # check if image exists
-            if not self.ipython.is_image():
-                self.error(trans('ipython.image.build'))
-                self.window.update_status(trans('ipython.docker.build.start'))
-                self.builder.build_image()
-                return
+        if self.get_option_value("sandbox_ipython"):
+            ipython_commands = [
+                "ipython_execute_new",
+                "ipython_execute",
+                "ipython_kernel_restart",
+            ]
+            if any(x in [x["cmd"] for x in my_commands] for x in ipython_commands):
+                # check for Docker installed
+                if not self.get_interpreter().is_docker_installed():
+                    # snap version
+                    if self.window.core.platforms.is_snap():
+                        self.error(trans('ipython.docker.install.snap'))
+                        self.window.update_status(trans('ipython.docker.install.snap'))
+                    # other versions
+                    else:
+                        self.error(trans('ipython.docker.install'))
+                        self.window.update_status(trans('ipython.docker.install'))
+                    return
+                # check if image exists
+                if not self.get_interpreter().is_image():
+                    self.error(trans('ipython.image.build'))
+                    self.window.update_status(trans('ipython.docker.build.start'))
+                    self.builder.build_image()
+                    return
 
         # legacy python
         if self.get_option_value("sandbox_docker"):
@@ -227,7 +243,7 @@ class Plugin(BasePlugin):
             worker.signals.clear.connect(self.handle_interpreter_clear)
             worker.signals.html_output.connect(self.handle_html_output)
             worker.signals.ipython_output.connect(self.handle_ipython_output)
-            self.ipython.attach_signals(worker.signals)
+            self.get_interpreter().attach_signals(worker.signals)
             self.runner.attach_signals(worker.signals)
 
             if not self.is_async(ctx) and not force:
@@ -250,7 +266,7 @@ class Plugin(BasePlugin):
         # if self.is_threaded():
             # return
         # print(data)
-        cleaned_data = self.ipython.remove_ansi(data)
+        cleaned_data = self.get_interpreter().remove_ansi(data)
         self.window.tools.get("interpreter").append_output(cleaned_data)
         if self.window.tools.get("interpreter").opened:
             self.window.update_status("")

pygpt_net/plugin/cmd_code_interpreter/builder.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.11.25 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Slot, Signal, QObject
@@ -21,11 +21,20 @@ class Builder(QObject):
         self.plugin = plugin
         self.worker = None
 
-    def build_image(self):
-        """Run IPython image build"""
+    def build_and_restart(self):
+        """Run IPython image build and restart container"""
+        self.build_image(restart=True)
+
+    def build_image(self, restart: bool = False):
+        """
+        Run IPython image build
+
+        :param restart: Restart container
+        """
         try:
             self.worker = Worker()
             self.worker.plugin = self.plugin
+            self.worker.restart = restart
             self.worker.signals.build_finished.connect(self.handle_build_finished)
             self.worker.signals.error.connect(self.handle_build_failed)
             self.plugin.window.threadpool.start(self.worker)
@@ -60,11 +69,14 @@ class Worker(BaseWorker):
         self.args = args
         self.kwargs = kwargs
         self.plugin = None
+        self.restart = False
 
     @Slot()
     def run(self):
         try:
-            self.plugin.ipython.build_image()
+            self.plugin.get_interpreter().build_image()
+            if self.restart:
+                self.plugin.get_interpreter().restart()
             self.signals.build_finished.emit()
         except Exception as e:
             self.signals.error.emit(e)

pygpt_net/plugin/cmd_code_interpreter/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.24 06:00:00                  #
+# Updated Date: 2024.11.25 02:00:00                  #
 # ================================================== #
 
 from pygpt_net.plugin.base.config import BaseConfig, BasePlugin
@@ -23,35 +23,36 @@ class Config(BaseConfig):
 
         :param plugin: plugin instance
         """
-        dockerfile = '# Tip: After making changes to this Dockerfile, you must rebuild the image to apply the changes'
-        dockerfile += '(Menu -> Tools -> Rebuild IPython Docker Image)'
-        dockerfile += '\n\n'
-        dockerfile += 'FROM python:3.9'
-        dockerfile += '\n\n'
-        dockerfile += '# You can customize the packages installed by default here:'
-        dockerfile += '\n# ========================================================'
-        dockerfile += '\nRUN pip install jupyter ipykernel'
-        dockerfile += '\n# ========================================================'
-        dockerfile += '\n\n'
-        dockerfile += 'RUN mkdir /data'
-        dockerfile += '\n\n'
-        dockerfile += '# Expose the necessary ports for Jupyter kernel communication'
-        dockerfile += '\nEXPOSE 5555 5556 5557 5558 5559'
-        dockerfile += '\n\n'
-        dockerfile += '# Data directory, bound as a volume to the local \'data/ipython\' directory'
-        dockerfile += '\nWORKDIR /data'
-        dockerfile += '\n\n'
-        dockerfile += '# Start the IPython kernel with specified ports and settings'
-        dockerfile += '\nCMD ["ipython", "kernel", \\'
-        dockerfile += '\n--ip=0.0.0.0, \\'
-        dockerfile += '\n--transport=tcp, \\'
-        dockerfile += '\n--shell=5555, \\'
-        dockerfile += '\n--iopub=5556, \\'
-        dockerfile += '\n--stdin=5557, \\'
-        dockerfile += '\n--control=5558, \\'
-        dockerfile += '\n--hb=5559, \\'
-        dockerfile += '\n--Session.key=19749810-8febfa748186a01da2f7b28c, \\'
-        dockerfile += '\n--Session.signature_scheme=hmac-sha256]'
+        dockerfile = '''
+        # Tip: After making changes to this Dockerfile, you must rebuild the image to apply the changes(Menu -> Tools -> Rebuild IPython Docker Image)
+
+        FROM python:3.9
+
+        # You can customize the packages installed by default here:
+        # ========================================================
+        RUN pip install jupyter ipykernel
+        # ========================================================
+
+        RUN mkdir /data
+
+        # Expose the necessary ports for Jupyter kernel communication
+        EXPOSE 5555 5556 5557 5558 5559
+
+        # Data directory, bound as a volume to the local 'data/ipython' directory
+        WORKDIR /data
+
+        # Start the IPython kernel with specified ports and settings
+        CMD ["ipython", "kernel", \
+        "--ip=0.0.0.0", \
+        "--transport=tcp", \
+        "--shell=5555", \
+        "--iopub=5556", \
+        "--stdin=5557", \
+        "--control=5558", \
+        "--hb=5559", \
+        "--Session.key=19749810-8febfa748186a01da2f7b28c", \
+        "--Session.signature_scheme=hmac-sha256"]
+        '''
 
         dockerfile_legacy = 'FROM python:3.9-alpine'
         dockerfile_legacy += '\n\n'
@@ -60,6 +61,15 @@ class Config(BaseConfig):
         dockerfile_legacy += '# Data directory, bound as a volume to the local \'data/\' directory'
         dockerfile_legacy += '\nWORKDIR /data'
 
+        plugin.add_option(
+            "sandbox_ipython",
+            type="bool",
+            value=False,
+            label="Sandbox (docker container)",
+            description="Executes commands in sandbox (docker container). "
+                        "Docker must be installed and running.",
+            tab="ipython",
+        )
         plugin.add_option(
             "ipython_dockerfile",
             type="textarea",
@@ -131,6 +141,26 @@ class Config(BaseConfig):
             tab="ipython",
         )
         """
+
+        volumes_keys = {
+            "enabled": "bool",
+            "docker": "text",
+            "host": "text",
+        }
+        volumes_items = [
+            {
+                "enabled": True,
+                "docker": "/data",
+                "host": "{workdir}",
+            },
+        ]
+        ports_keys = {
+            "enabled": "bool",
+            "docker": "text",
+            "host": "int",
+        }
+        ports_items = []
+
         plugin.add_cmd(
             "ipython_kernel_restart",
             instruction="restart IPython kernel",
@@ -179,15 +209,6 @@ class Config(BaseConfig):
             tab="ipython",
             advanced=True,
         )
-
-        plugin.add_option(
-            "python_cmd_tpl",
-            type="text",
-            value="python3 {filename}",
-            label="Python command template",
-            description="Python command template to execute, use {filename} for filename placeholder",
-            tab="python_legacy",
-        )
         plugin.add_option(
             "sandbox_docker",
             type="bool",
@@ -197,6 +218,14 @@ class Config(BaseConfig):
                         "Docker must be installed and running.",
             tab="python_legacy",
         )
+        plugin.add_option(
+            "python_cmd_tpl",
+            type="text",
+            value="python3 {filename}",
+            label="Python command template",
+            description="Python command template to execute, use {filename} for filename placeholder",
+            tab="python_legacy",
+        )
         plugin.add_option(
             "dockerfile",
             type="textarea",
@@ -220,6 +249,36 @@ class Config(BaseConfig):
             label="Docker container name",
             tab="python_legacy",
         )
+        plugin.add_option(
+            "docker_entrypoint",
+            type="text",
+            value='tail -f /dev/null',
+            label="Docker run command",
+            tab="python_legacy",
+            advanced=True,
+        )
+        plugin.add_option(
+            "docker_volumes",
+            type="dict",
+            value=volumes_items,
+            label="Docker volumes",
+            description="Docker volumes mapping",
+            tooltip="Docker volumes mapping",
+            keys=volumes_keys,
+            tab="python_legacy",
+            advanced=True,
+        )
+        plugin.add_option(
+            "docker_ports",
+            type="dict",
+            value=ports_items,
+            label="Docker ports",
+            description="Docker ports mapping",
+            tooltip="Docker ports mapping",
+            keys=ports_keys,
+            tab="python_legacy",
+            advanced=True,
+        )
         plugin.add_option(
             "attach_output",
             type="bool",

pygpt_net/plugin/cmd_code_interpreter/docker.py

@@ -26,6 +26,10 @@ class Docker(BaseDocker):
         """Run image build"""
         self.builder.build_image()
 
+    def build_and_restart(self):
+        """Run image build and restart container"""
+        self.builder.build_image(restart=True)
+
     def get_dockerfile(self) -> str:
         """
         Get the Dockerfile

pygpt_net/plugin/cmd_code_interpreter/ipython/__init__.py

@@ -0,0 +1,13 @@
+#!/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.11.25 02:00:00                  #
+# ================================================== #
+
+from .local_kernel import LocalKernel
+from .docker_kernel import DockerKernel

pygpt_net/plugin/cmd_code_interpreter/{ipython.py → ipython/docker_kernel.py}

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.17 17:00:00                  #
+# Updated Date: 2024.11.25 02:00:00                  #
 # ================================================== #
 
 import os
@@ -19,7 +19,7 @@ import tarfile
 from jupyter_client import BlockingKernelClient
 from docker.errors import DockerException
 
-class IPythonInterpreter:
+class DockerKernel:
     def __init__(self, plugin = None):
         self.plugin = plugin
         self.kernel_file = ".interpreter.kernel.json"
@@ -96,6 +96,10 @@ class IPythonInterpreter:
         except docker.errors.ImageNotFound:
             return False
 
+    def restart(self):
+        """Restart the container."""
+        self.restart_container(self.get_container_name())
+
     def build_image(self):
         """Build the Docker image for the IPython kernel."""
         client = self.get_docker_client()
@@ -231,6 +235,8 @@ class IPythonInterpreter:
 
         # run the container
         try:
+            print("Running container {}...".format(name))
+            self.prepare_conn()
             local_data_dir = self.get_local_data_dir()
             client.containers.run(
                 self.get_image_name(),
@@ -383,7 +389,8 @@ class IPythonInterpreter:
         self.restart_container(self.get_container_name())
         if self.client is not None:
             self.client.stop_channels()
-        self.client = BlockingKernelClient(connection_file=self.get_kernel_file_path())
+        else:
+            self.client = BlockingKernelClient(connection_file=self.get_kernel_file_path())
         self.client.load_connection_file()
         self.client.start_channels()
         self.client.wait_for_ready()