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

pygpt_net/plugin/cmd_code_interpreter/ipython/local_kernel.py

@@ -0,0 +1,220 @@
+#!/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                  #
+# ================================================== #
+
+import re
+from jupyter_client import KernelManager
+
+class LocalKernel:
+    def __init__(self, plugin = None):
+        self.plugin = plugin
+        self.client = None
+        self.manager = None
+        self.initialized = False
+        self.signals = None
+
+    def restart_kernel(self) -> bool:
+        """
+        Restart the IPython kernel.
+
+        :return: True if successful.
+        """
+        if self.initialized:
+            self.manager.stop_channels()
+            self.manager.restart_kernel(now=True)
+            self.manager = self.manager.client()
+            self.manager.start_channels()
+            self.log("IPython kernel restarted.")
+        else:
+            self.init()
+            self.log("IPython kernel started.")
+        return True
+
+    def shutdown_kernel(self):
+        """Shutdown the IPython kernel."""
+        self.manager.stop_channels()
+        self.manager.shutdown_kernel()
+
+    def init(self, force: bool = False):
+        """
+        Initialize the IPython kernel client.
+
+        :param force: Force reinitialization.
+        """
+        if self.initialized and not force:
+            return
+        self.manager = KernelManager()
+        self.manager.start_kernel()
+        self.client = self.manager.client()
+        self.client.start_channels()
+        self.client.wait_for_ready()
+        self.log("Connected to local IPython kernel.")
+        self.initialized = True
+        self.log("IPython kernel is ready.")
+
+    def process_message(self, msg: dict) -> str:
+        """
+        Process the message from the IPython kernel.
+
+        :param msg: Message from the IPython kernel.
+        :return: Processed message.
+        """
+        msg_type = msg['msg_type']
+        content = msg['content']
+        if msg_type == 'stream':
+            # standard output and error
+            return content['text']
+        elif msg_type == 'display_data':
+            # display data
+            data = content['data']
+            if 'text/plain' in data:
+                return data['text/plain']
+        elif msg_type == 'execute_result':
+            # execution result
+            data = content['data']
+            if 'text/plain' in data:
+                return data['text/plain']
+        elif msg_type == 'error':
+            # execution errors
+            return "Error executing code:" + "\n".join(content['traceback'])
+        return ""
+
+    def end(self, all: bool = False):
+        """
+        Stop the IPython kernel.
+
+        :param all: Stop the container as well.
+        """
+        self.client.stop_channels()  # stop the client
+        self.manager.shutdown_kernel()
+
+    def execute(self, code: str, current: bool = False) -> str:
+        """
+        Execute the code in the IPython kernel.
+
+        :param code: Python code to execute.
+        :param current: Use the current kernel.
+        :return: Output from the kernel.
+        """
+        self.init()
+        if not current:
+            self.restart_kernel()
+
+        self.log("Executing code: " + str(code)[:100] + "...")
+
+        msg_id = self.client.execute(code)
+        output = ""
+        while True:
+            try:
+                msg = self.client.get_iopub_msg(timeout=1)
+            except:
+                continue
+
+            if msg['parent_header'].get('msg_id') != msg_id:
+                continue
+
+            chunk = str(self.process_message(msg))
+            if chunk.strip() != "":
+                output += chunk
+                self.send_output(chunk)
+
+            if (msg['msg_type'] == 'status' and
+                    msg['content']['execution_state'] == 'idle'):
+                break
+
+        return self.remove_ansi(output).strip()
+
+    def send_output(self, output: str):
+        """
+        Send the output to the output.
+
+        :param output: Output.
+        :return: Output.
+        """
+        if self.signals is not None:
+            self.signals.ipython_output.emit(output)
+
+    def remove_ansi_more(self, text):
+        """
+        Clean the text from ANSI escape sequences, carriage returns, and progress bars.
+
+        :param text: Text to clean.
+        :return: Cleaned text.
+        """
+        # Remove ANSI escape sequences
+        ansi_escape = re.compile(r'''
+            \x1B  # ESC
+            (?:   # Start of sequence
+                [@-Z\\-_]  # ESC [@ to ESC _ (7-bit C1 Control codes)
+            |     # or
+                \[  # ESC[
+                [0-?]*  # Parameter bytes
+                [ -/]*  # Intermediate bytes
+                [@-~]   # Final byte
+            )
+        ''', re.VERBOSE)
+        text = ansi_escape.sub('', text)
+
+        # Split text into lines
+        lines = text.split('\n')
+
+        cleaned_lines = []
+        for line in lines:
+            # Handle carriage returns - keep only the text after the last '\r'
+            if '\r' in line:
+                line = line.split('\r')[-1]
+            # Optionally, remove progress bar lines by detecting lines containing box-drawing characters
+            # Skip the line if it contains box-drawing characters
+            if re.search(r'[\u2500-\u257F]', line):
+                continue  # Skip this line
+            # Append the cleaned line
+            cleaned_lines.append(line)
+        # Reconstruct the text
+        text = '\n'.join(cleaned_lines)
+        return text
+
+    def remove_ansi(self, text) -> str:
+        """
+        Clean the text from ANSI escape sequences.
+
+        :param text: Text to clean.
+        :return: Cleaned text.
+        """
+        ansi_escape = re.compile(
+            r'''
+            \x1B   # ESC
+            (?:    # 7-bit C1 Fe
+                [@-Z\\-_]
+            |      # or 8-bit C1 Fe
+                \[
+                [0-?]*   # Parameter bytes
+                [ -/]*   # Intermediate bytes
+                [@-~]    # Final byte
+            )
+            ''',
+            re.VERBOSE
+        )
+        return ansi_escape.sub('', text)
+
+    def attach_signals(self, signals):
+        """
+        Attach signals
+
+        :param signals: signals
+        """
+        self.signals = signals
+
+    def log(self, msg):
+        """
+        Log the message.
+
+        :param msg: Message to log.
+        """
+        print(msg)

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.21 22:00:00                  #
+# Updated Date: 2024.11.26 04:00:00                  #
 # ================================================== #
 
 import os.path
@@ -140,7 +140,7 @@ class Runner:
 
         # append to ctx
         ctx.files = paths
-        ctx.images = images_list
+        ctx.images = self.plugin.window.core.filesystem.make_local_list(list(images_list))
         return paths
 
     def handle_result_ipython(self, ctx: CtxItem, response) -> str:
@@ -416,7 +416,7 @@ class Runner:
         self.log("Connecting to IPython interpreter...", sandbox=True)
         try:
             self.log("Please wait...", sandbox=True)
-            result = self.plugin.ipython.execute(data, current=False)
+            result = self.plugin.get_interpreter().execute(data, current=False)
             result = self.handle_result_ipython(ctx, result)
         except Exception as e:
             self.error(e)
@@ -461,7 +461,7 @@ class Runner:
         self.log("Connecting to IPython interpreter...", sandbox=True)
         try:
             self.log("Please wait...", sandbox=True)
-            result = self.plugin.ipython.execute(data, current=True)
+            result = self.plugin.get_interpreter().execute(data, current=True)
             result = self.handle_result_ipython(ctx, result)
         except Exception as e:
             self.error(e)
@@ -489,7 +489,7 @@ class Runner:
         self.log("Connecting to IPython interpreter...", sandbox=True)
         try:
             self.log("Restarting IPython kernel...", sandbox=True)
-            response = self.plugin.ipython.restart_kernel()
+            response = self.plugin.get_interpreter().restart_kernel()
         except Exception as e:
             self.error(e)
             response = False

pygpt_net/plugin/cmd_mouse_control/__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 04:00:00                  #
+# Updated Date: 2024.11.26 04:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Slot, QTimer
@@ -141,7 +141,9 @@ class Plugin(BasePlugin):
             self.window.controller.attachment.clear_silent()
             path = self.window.controller.painter.capture.screenshot(attach_cursor=True,
                                                                      silent=True)  # attach screenshot
-            ctx.images.append(path)
+            
+            img_path = self.window.core.filesystem.make_local(path)
+            ctx.images.append(img_path)
             #ctx.images_before.append(path)
 
         context = BridgeContext()

pygpt_net/plugin/cmd_system/config.py

@@ -29,6 +29,26 @@ class Config(BaseConfig):
         dockerfile += '\n\n'
         dockerfile += '# Data directory, bound as a volume to the local \'data/\' directory'
         dockerfile += '\nWORKDIR /data'
+
+        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_option(
             "sandbox_docker",
             type="bool",
@@ -61,6 +81,36 @@ class Config(BaseConfig):
             label="Docker container name",
             tab="sandbox",
         )
+        plugin.add_option(
+            "docker_entrypoint",
+            type="text",
+            value='tail -f /dev/null',
+            label="Docker run command",
+            tab="sandbox",
+            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="sandbox",
+            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="sandbox",
+            advanced=True,
+        )
         plugin.add_option(
             "auto_cwd",
             type="bool",

pygpt_net/plugin/cmd_system/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/idx_llama_index/__init__.py

@@ -71,7 +71,7 @@ class Plugin(BasePlugin):
             if "mode" in data:
                 self.mode = data['mode']
 
-        elif name == Event.POST_PROMPT:
+        elif name == Event.POST_PROMPT_ASYNC:
             if self.mode in self.ignored_modes:  # ignore
                 return
 
@@ -167,6 +167,22 @@ class Plugin(BasePlugin):
             prepared_question = response
         return prepared_question
 
+    def get_from_retrieval(self, query: str) -> str:
+        """
+        Get response from retrieval
+
+        :param query: query
+        :return: response
+        """
+        idx = self.get_option_value("idx")
+        indexes = idx.split(",")
+        response = ""
+        for index in indexes:
+            response = self.window.core.idx.chat.query_retrieval(query, index)
+            if response is not None and response != "":
+                break
+        print(response)
+        return response
 
     def on_post_prompt(self, prompt: str, ctx: CtxItem) -> str:
         """
@@ -188,6 +204,12 @@ class Plugin(BasePlugin):
 
         self.log("Querying Llama-index for: " + question)
 
+        # at first, try to get from retrieval
+        response = self.get_from_retrieval(question)
+        if response is not None and response != "":
+            self.log("Found using retrieval...")
+            return prompt + "\nADDITIONAL CONTEXT: " + response
+
         response, doc_ids, metas = self.query(question)
         if response is None or len(response) == 0:
             self.log("No additional context. Aborting.")

pygpt_net/plugin/idx_llama_index/worker.py

@@ -69,6 +69,16 @@ class Worker(BaseWorker):
         """
         question = self.get_param(item, "query")
         self.status("Please wait... querying: {}...".format(question))
+        # at first, try to get from retrieval
+        response = self.plugin.get_from_retrieval(question)
+        if response is not None and response != "":
+            self.log("Found using retrieval...")
+            context = "ADDITIONAL CONTEXT (response from DB):\n--------------------------------\n" + response
+            extra = {
+                "context": context,
+            }
+            return self.make_response(item, response, extra=extra)
+
         content, doc_ids, metas = self.plugin.query(question)  # send question to Llama-index
         result = content
         context = "ADDITIONAL CONTEXT (response from DB):\n--------------------------------\n" + content

pygpt_net/plugin/openai_dalle/__init__.py

@@ -6,13 +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.11.26 19:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.types import (
     MODE_AGENT,
     MODE_AGENT_LLAMA,
     MODE_ASSISTANT,
+    MODE_AUDIO,
     MODE_CHAT,
     MODE_LANGCHAIN,
     MODE_LLAMA_INDEX,
@@ -44,6 +45,7 @@ class Plugin(BasePlugin):
             MODE_LLAMA_INDEX,
             MODE_ASSISTANT,
             MODE_AGENT,
+            MODE_AUDIO,
         ]
         self.allowed_cmds = [
             "image",

pygpt_net/plugin/openai_vision/__init__.py

@@ -6,12 +6,13 @@
 # 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.11.26 19:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.types import (
     MODE_AGENT,
     MODE_AGENT_LLAMA,
+    MODE_AUDIO,
     MODE_LANGCHAIN,
     MODE_LLAMA_INDEX,
     MODE_VISION,
@@ -59,6 +60,7 @@ class Plugin(BasePlugin):
             MODE_AGENT_LLAMA,
             MODE_LLAMA_INDEX,
             MODE_LANGCHAIN,
+            MODE_AUDIO,
         ]
         self.worker = None
         self.config = Config(self)

pygpt_net/provider/core/attachment/json_file.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2023.12.31 04:00:00                  #
+# Updated Date: 2024.11.26 02:00:00                  #
 # ================================================== #
 
 import json
@@ -143,6 +143,7 @@ class JsonFileProvider(BaseProvider):
             'remote': attachment.remote,
             'send': attachment.send,
             'vector_store_ids': attachment.vector_store_ids,
+            'type': attachment.type,
         }
 
     @staticmethod
@@ -165,6 +166,8 @@ class JsonFileProvider(BaseProvider):
             attachment.send = data['send']
         if 'vector_store_ids' in data:
             attachment.vector_store_ids = data['vector_store_ids']
+        if 'type' in data:
+            attachment.type = data['type']
 
     def dump(self, item: AttachmentItem) -> str:
         """

pygpt_net/provider/core/config/patch.py

@@ -1692,6 +1692,31 @@ class Patch:
                         'ctx.attachment.img')
                 updated = True
 
+            # < 2.4.29
+            if old < parse_version("2.4.29"):
+                print("Migrating config from < 2.4.29...")
+                if 'cmd_code_interpreter' in data['plugins'] \
+                        and 'ipython_dockerfile' in data['plugins']['cmd_code_interpreter']:
+                    # remove
+                    del data['plugins']['cmd_code_interpreter']['ipython_dockerfile']
+                updated = True
+
+            # < 2.4.31
+            if old < parse_version("2.4.31"):
+                print("Migrating config from < 2.4.31...")
+                if 'attachments_auto_index' not in data:
+                    data["attachments_auto_index"] = self.window.core.config.get_base(
+                        'attachments_auto_index')
+                updated = True
+
+            # < 2.4.34
+            if old < parse_version("2.4.34"):
+                print("Migrating config from < 2.4.34...")
+                if 'ctx.attachment.query.model' not in data:
+                    data["ctx.attachment.query.model"] = self.window.core.config.get_base(
+                        'ctx.attachment.query.model')
+                updated = True
+
         # update file
         migrated = False
         if updated:

pygpt_net/provider/core/ctx/db_sqlite/storage.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 from datetime import datetime
@@ -718,7 +718,9 @@ class Storage:
                 output_tokens,
                 total_tokens,
                 is_internal,
-                docs_json
+                docs_json,
+                audio_id,
+                audio_expires_ts
             )
             VALUES 
             (
@@ -749,7 +751,9 @@ class Storage:
                 :output_tokens,
                 :total_tokens,
                 :is_internal,
-                :docs_json
+                :docs_json,
+                :audio_id,
+                :audio_expires_ts
             )
         """).bindparams(
             meta_id=int(meta.id),
@@ -780,6 +784,8 @@ class Storage:
             total_tokens=int(item.total_tokens or 0),
             is_internal=int(item.internal),
             docs_json=pack_item_value(item.doc_ids),
+            audio_id=item.audio_id,
+            audio_expires_ts=int(item.audio_expires_ts or 0)
         )
         with db.begin() as conn:
             result = conn.execute(stmt)
@@ -822,7 +828,9 @@ class Storage:
                 output_tokens = :output_tokens,
                 total_tokens = :total_tokens,
                 is_internal = :is_internal,
-                docs_json = :docs_json
+                docs_json = :docs_json,
+                audio_id = :audio_id,
+                audio_expires_ts = :audio_expires_ts
             WHERE id = :id
         """).bindparams(
             id=item.id,
@@ -852,6 +860,8 @@ class Storage:
             total_tokens=int(item.total_tokens or 0),
             is_internal=int(item.internal or 0),
             docs_json=pack_item_value(item.doc_ids),
+            audio_id=item.audio_id,
+            audio_expires_ts=int(item.audio_expires_ts or 0)
         )
         with db.begin() as conn:
             conn.execute(stmt)

pygpt_net/provider/core/ctx/db_sqlite/utils.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 import json
@@ -158,11 +158,28 @@ def unpack_item(item: CtxItem, row: dict) -> CtxItem:
     item.total_tokens = unpack_var(row['total_tokens'], 'int')
     item.internal = unpack_var(row['is_internal'], 'bool')
     item.doc_ids = unpack_item_value(row['docs_json'])
-
+    item.audio_id = row['audio_id']
+    item.audio_expires_ts = row['audio_expires_ts']
+
+    # set defaults
+    if item.cmds is None:
+        item.cmds = []
+    if item.results is None:
+        item.results = []
+    if item.urls is None:
+        item.urls = []
+    if item.images is None:
+        item.images = []
+    if item.files is None:
+        item.files = []
+    if item.attachments is None:
+        item.attachments = []
     if item.additional_ctx is None:
         item.additional_ctx = []
     if item.doc_ids is None:
         item.doc_ids = []
+    if item.extra is None:
+        item.extra = {}
     return item
 
 

pygpt_net/provider/core/model/patch.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.15 00:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 from packaging.version import parse as parse_version, Version
@@ -308,6 +308,12 @@ class Patch:
                             model.mode.append("agent_llama")
                 updated = True
 
+            # < 2.4.34 <--- add gpt-4o-audio-preview, gpt-4o-2024-11-20
+            if old < parse_version("2.4.34"):
+                print("Migrating models from < 2.4.34...")
+                # add missing gpt-4o-audio-preview, gpt-4o-2024-11-20
+                updated = True
+
         # update file
         if updated:
             data = dict(sorted(data.items()))

pygpt_net/provider/core/preset/json_file.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.11.26 19:00:00                  #
 # ================================================== #
 
 import json
@@ -18,6 +18,7 @@ from pygpt_net.core.types import (
     MODE_AGENT,
     MODE_AGENT_LLAMA,
     MODE_ASSISTANT,
+    MODE_AUDIO,
     MODE_CHAT,
     MODE_COMPLETION,
     MODE_EXPERT,
@@ -193,6 +194,7 @@ class JsonFileProvider(BaseProvider):
             MODE_AGENT: item.agent,
             MODE_AGENT_LLAMA: item.agent_llama,
             MODE_EXPERT: item.expert,
+            MODE_AUDIO: item.audio,
             'temperature': item.temperature,
             'filename': item.filename,
             'model': item.model,
@@ -232,6 +234,8 @@ class JsonFileProvider(BaseProvider):
             item.agent_llama = data[MODE_AGENT_LLAMA]
         if MODE_EXPERT in data:
             item.expert = data[MODE_EXPERT]
+        if MODE_AUDIO in data:
+            item.audio = data[MODE_AUDIO]
 
         if 'uuid' in data:
             item.uuid = data['uuid']