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

pygpt_net/core/bridge/worker.py

@@ -16,7 +16,8 @@ from pygpt_net.core.types import (
     MODE_LANGCHAIN,
     MODE_LLAMA_INDEX,
 )
-from pygpt_net.core.events import KernelEvent
+from pygpt_net.core.events import KernelEvent, Event
+
 
 class BridgeSignals(QObject):
     """Bridge signals"""
@@ -43,6 +44,9 @@ class BridgeWorker(QObject, QRunnable):
         result = False
 
         try:
+            # POST PROMPT ASYNC: handle post prompt async event
+            self.handle_post_prompt_async()
+
             # ADDITIONAL CONTEXT: append additional context from attachments
             self.handle_additional_context()
 
@@ -109,6 +113,17 @@ class BridgeWorker(QObject, QRunnable):
             })
             self.signals.response.emit(event)
 
+    def handle_post_prompt_async(self):
+        """Handle post prompt async event"""
+        event = Event(Event.POST_PROMPT_ASYNC, {
+            'mode': self.context.mode,
+            'reply': self.context.ctx.reply,
+            'value': self.context.system_prompt,
+        })
+        event.ctx = self.context.ctx
+        self.window.dispatch(event)
+        self.context.system_prompt = event.data['value']
+
     def handle_additional_context(self):
         """Append additional context"""
         ctx = self.context.ctx

pygpt_net/core/ctx/__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.21 20:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 import copy
@@ -19,6 +19,7 @@ from pygpt_net.core.types import (
     MODE_AGENT,
     MODE_AGENT_LLAMA,
     MODE_ASSISTANT,
+    MODE_AUDIO,
     MODE_CHAT,
     MODE_COMPLETION,
     MODE_EXPERT,
@@ -78,6 +79,7 @@ class Ctx:
             MODE_LLAMA_INDEX,
             MODE_AGENT,
             MODE_EXPERT,
+            MODE_AUDIO,
         ]
         self.allowed_modes = {
             MODE_CHAT: self.all_modes,
@@ -89,6 +91,7 @@ class Ctx:
             MODE_LLAMA_INDEX: self.all_modes,
             MODE_AGENT: self.all_modes,
             MODE_EXPERT: self.all_modes,
+            MODE_AUDIO: self.all_modes,
             MODE_AGENT_LLAMA: [MODE_AGENT_LLAMA],
         }
         self.current_sys_prompt = ""

pygpt_net/core/db/__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.23 00:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 import os
@@ -82,6 +82,8 @@ class Database:
             'is_internal',
             'docs_json',
             'external_id',
+            'audio_id',
+            'audio_expires_ts',
         ]
         columns["ctx_meta"] = [
             'id',
@@ -218,7 +220,7 @@ class Database:
                 'columns': columns["ctx_item"],
                 'sort_by': columns["ctx_item"],
                 'search_fields': ['id', 'input', 'output', 'input_name', 'output_name', 'meta_id', 'hidden_input', 'hidden_output'],
-                'timestamp_columns': ['input_ts', 'output_ts'],
+                'timestamp_columns': ['input_ts', 'output_ts', 'audio_expires_ts'],
                 'json_columns': ['cmds_json', 'results_json', 'urls_json', 'images_json', 'files_json', 'attachments_json', 'docs_json', 'additional_ctx_json'],
                 'default_sort': 'id',
                 'default_order': 'DESC',

pygpt_net/core/debug/attachments.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 02:00:00                  #
 # ================================================== #
 
 class AttachmentsDebug:
@@ -36,6 +36,8 @@ class AttachmentsDebug:
                     'send': attachment.send,
                     'key': key,
                     'mode': mode,
+                    'type': attachment.type,
+                    'consumed': attachment.consumed,
                 }
                 self.window.core.debug.add(self.id, attachment.name, str(data))
 

pygpt_net/core/debug/context.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 03:00:00                  #
+# Updated Date: 2024.11.26 04:00:00                  #
 # ================================================== #
 import json
 
@@ -45,6 +45,10 @@ class ContextDebug:
         self.window.core.debug.add(self.id, 'CMD (current)', str(self.window.core.ctx.current_cmd))
         self.window.core.debug.add(self.id, 'CMD schema (current)', str(self.window.core.ctx.current_cmd_schema))
         self.window.core.debug.add(self.id, 'FUNCTIONS (current)', str(self.get_functions()))
+        self.window.core.debug.add(self.id, 'Attachments: last used content',
+                                   str(self.window.core.attachments.context.last_used_content))
+        self.window.core.debug.add(self.id, 'Attachments: last used context',
+                                  str(self.window.core.attachments.context.last_used_context))
 
         current = None
         if self.window.core.ctx.get_current() is not None:

pygpt_net/core/debug/presets.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 os
@@ -15,6 +15,7 @@ from pygpt_net.core.types import (
     MODE_AGENT,
     MODE_AGENT_LLAMA,
     MODE_ASSISTANT,
+    MODE_AUDIO,
     MODE_CHAT,
     MODE_COMPLETION,
     MODE_EXPERT,
@@ -64,6 +65,7 @@ class PresetsDebug:
                 MODE_AGENT: preset.agent,
                 MODE_AGENT_LLAMA: preset.agent_llama,
                 MODE_EXPERT: preset.expert,
+                MODE_AUDIO: preset.audio,
                 'temperature': preset.temperature,
                 'version': preset.version,
             }

pygpt_net/core/docker/__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.17 17:00:00                  #
+# Updated Date: 2024.11.24 22:00:00                  #
 # ================================================== #
 
 import os
@@ -136,8 +136,10 @@ class Docker:
         :param name: Container name.
         """
         client = self.get_docker_client()
-        local_data_dir = self.get_local_data_dir()
         image_name = self.get_image_name()
+        entrypoint = self.get_entrypoint()
+        volumes = self.get_volumes()
+        ports = self.get_ports()
 
         try:
             container = client.containers.get(name)
@@ -150,15 +152,11 @@ class Docker:
                 container = client.containers.create(
                     image=image_name,
                     name=name,
-                    volumes={
-                        local_data_dir: {
-                            'bind': '/data',
-                            'mode': 'rw',
-                        }
-                    },
+                    volumes=volumes,
+                    ports=ports,
                     tty=True,
                     stdin_open=True,
-                    command='tail -f /dev/null'
+                    command=entrypoint,
                 )
                 container.start()
         except docker.errors.NotFound:
@@ -166,20 +164,176 @@ class Docker:
             container = client.containers.create(
                 image=image_name,
                 name=name,
-                volumes={
-                    local_data_dir: {
-                        'bind': '/data',
-                        'mode': 'rw',
-                    }
-                },
+                volumes=volumes,
+                ports=ports,
                 tty=True,
                 stdin_open=True,
-                command='tail -f /dev/null'
+                command=entrypoint,
             )
             container.start()
         except Exception as e:
             self.log(f"Error creating container: {e}")
 
+    def restart_container(self, name: str):
+        """
+        Restart the Docker container.
+
+        :param name: Container name.
+        """
+        client = self.get_docker_client()
+        image_name = self.get_image_name()
+        entrypoint = self.get_entrypoint()
+        volumes = self.get_volumes()
+        ports = self.get_ports()
+
+        try:
+            container = client.containers.get(name)
+            container.reload()
+            status = container.status
+            print(f"Container '{name}' status: {status}")
+
+            if status == 'running':
+                print(f"Stopping and starting container '{name}'...")
+                container.stop()
+                container.wait()
+                container.reload()
+
+            elif status == 'paused':
+                print(f"Resuming and starting container '{name}'...")
+                container.unpause()
+                container.stop()
+                container.wait()
+                container.reload()
+
+            elif status in ['exited', 'created']:
+                print(f"Container '{name}' is in state '{status}'. Starting it.")
+
+            elif status == 'restarting':
+                print(f"Container '{name}' is restarting. Waiting...")
+                container.wait()
+                container.reload()
+
+            elif status == 'removing':
+                print(f"Container '{name}' is being removed. Waiting...")
+                container.wait()
+                container = None
+
+            elif status == 'dead':
+                print(f"Container '{name}' is dead. Removing and creating a new one.")
+                container.remove()
+                container = None
+
+            else:
+                print(f"Unknown container status: {status}. Removing and creating a new one.")
+                container.remove()
+                container = None
+
+            if container:
+                print(f"Starting container '{name}'...")
+                try:
+                    container.start()
+                    container.reload()
+                    if container.status != 'running':
+                        print(f"Container '{name}' did not start correctly. Status: {container.status}")
+                        print(f"Removing and creating a new container '{name}'...")
+                        container.remove()
+                        container = None
+                except Exception as e:
+                    print(f"Error starting container '{name}': {e}")
+                    print(f"Removing and creating a new container '{name}'...")
+                    container.remove()
+                    container = None
+
+            if not container:
+                print(f"Creating a new container '{name}'...")
+                container = client.containers.create(
+                    image=image_name,
+                    name=name,
+                    volumes=volumes,
+                    ports=ports,
+                    tty=True,
+                    stdin_open=True,
+                    command=entrypoint,  # 'running'
+                )
+                container.start()
+                container.reload()
+                if container.status != 'running':
+                    print(f"Container '{name}' did not start correctly. Status: {container.status}")
+                else:
+                    print(f"Container '{name}' started successfully.")
+
+        except docker.errors.NotFound:
+            print(f"Container '{name}' not found. Creating a new one.")
+            container = client.containers.create(
+                image=image_name,
+                name=name,
+                volumes=volumes,
+                ports=ports,
+                tty=True,
+                stdin_open=True,
+                command=entrypoint,  # 'running'
+            )
+            container.start()
+            container.reload()
+            if container.status != 'running':
+                print(f"Container '{name}' did not start correctly. Status: {container.status}")
+            else:
+                print(f"Container '{name}' started successfully.")
+        except Exception as e:
+            print(f"Error restarting container '{name}': {e}")
+
+    def restart(self):
+        """Restart the Docker container."""
+        self.restart_container(self.get_container_name())
+
+    def get_volumes(self) -> dict:
+        """
+        Get the volumes mappings.
+
+        :return: Volumes mappings.
+        """
+        workdir = self.get_local_data_dir()
+        config = self.plugin.get_option_value('docker_volumes')
+        data = {}
+        for item in config:
+            if item['enabled']:
+                host_dir = item['host'].format(workdir=workdir)
+                data[host_dir] = {
+                    'bind': item['docker'],
+                    'mode': 'rw',
+                }
+        return data
+
+    def get_ports(self) -> dict:
+        """
+        Get the ports mappings.
+
+        :return: Ports mappings.
+        """
+        config = self.plugin.get_option_value('docker_ports')
+        data = {}
+        for item in config:
+            if item['enabled']:
+                docker_port = item['docker']
+                try:
+                    host_port = int(item['host'])
+                except ValueError:
+                    print("WARNING: Invalid host port number: {}. "
+                          "Please provide a valid port number as integer value".format(item['host']))
+                    continue
+                if "/" not in docker_port:
+                    docker_port = f"{docker_port}/tcp"
+                data[docker_port] = host_port
+        return data
+
+    def get_entrypoint(self) -> str:
+        """
+        Get the Docker entrypoint.
+
+        :return: Docker entrypoint command.
+        """
+        return self.plugin.get_option_value('docker_entrypoint')
+
     def execute(self, cmd: str) -> bytes or None:
         """
         Execute command in Docker container.

pygpt_net/core/docker/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.17 17:00:00                  #
+# Updated Date: 2024.11.24 22:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Signal, Slot, QObject
@@ -24,12 +24,13 @@ class Builder(QObject):
         self.docker = None
         self.worker = None
 
-    def build_image(self):
+    def build_image(self, restart: bool = False):
         """Run image build"""
         try:
             self.worker = Worker()
             self.worker.plugin = self.plugin
             self.worker.docker = self.docker
+            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)
@@ -65,11 +66,14 @@ class Worker(BaseWorker):
         self.kwargs = kwargs
         self.docker = None
         self.plugin = None
+        self.restart = False
 
     @Slot()
     def run(self):
         try:
             self.docker.build_image()
             self.signals.build_finished.emit()
+            if self.restart:
+                self.docker.restart()
         except Exception as e:
             self.signals.error.emit(e)

pygpt_net/core/events/event.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 03:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 import json
@@ -27,6 +27,7 @@ class Event(BaseEvent):
     AUDIO_INPUT_TOGGLE = "audio.input.toggle"
     AUDIO_OUTPUT_STOP = "audio.output.stop"
     AUDIO_OUTPUT_TOGGLE = "audio.output.toggle"
+    AUDIO_PLAYBACK = "audio.playback"
     AUDIO_READ_TEXT = "audio.read_text"
     CMD_EXECUTE = "cmd.execute"
     CMD_INLINE = "cmd.inline"
@@ -48,6 +49,7 @@ class Event(BaseEvent):
     PLUGIN_SETTINGS_CHANGED = "plugin.settings.changed"
     PLUGIN_OPTION_GET = "plugin.option.get"
     POST_PROMPT = "post.prompt"
+    POST_PROMPT_ASYNC = "post.prompt.async"
     PRE_PROMPT = "pre.prompt"
     SYSTEM_PROMPT = "system.prompt"
     TOOL_OUTPUT_RENDER = "tool.output.render"

pygpt_net/core/experts/__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.21 20:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 
@@ -18,6 +18,7 @@ from pygpt_net.core.types import (
     MODE_LANGCHAIN,
     MODE_LLAMA_INDEX,
     MODE_VISION,
+    MODE_AUDIO,
 )
 from pygpt_net.core.bridge.context import BridgeContext
 from pygpt_net.core.events import Event, KernelEvent, RenderEvent
@@ -39,6 +40,7 @@ class Experts:
             MODE_VISION,
             MODE_LANGCHAIN,
             MODE_LLAMA_INDEX,
+            MODE_AUDIO,
         ]
         self.allowed_cmds = ["expert_call"]
 
@@ -60,7 +62,7 @@ class Experts:
 
         :return: True if stopped
         """
-        return self.window.controller.agent.experts.stopped()
+        return self.window.controller.kernel.stopped()
 
     def agent_enabled(self) -> bool:
         """
@@ -235,14 +237,20 @@ class Experts:
         """
         Re-send response from commands to master expert
 
+        If command has been called by expert then response for command is send here to parent
+
         :param ctx: context item
         """
         if self.stopped():
             return
 
+        # master meta is here, ctx.meta = MASTER META ID here!
+
         # make copy of ctx for reply, and change input name to expert name
         reply_ctx = CtxItem()
         reply_ctx.from_dict(ctx.to_dict())
+
+        # reply ctx has no meta here!!!!
         reply_ctx.input_name = "Expert"
         reply_ctx.output_name = ""
         reply_ctx.sub_call = True  # this flag is not copied in to_dict
@@ -327,6 +335,7 @@ class Experts:
         ctx.set_input(query, str(ai_name))
         ctx.set_output(None, expert_name)
         ctx.sub_call = True  # mark as sub-call
+        ctx.pid = master_ctx.pid  # copy PID from parent to allow reply
 
         # render: begin
         event = RenderEvent(RenderEvent.BEGIN, {
@@ -380,11 +389,12 @@ class Experts:
         )
         self.window.controller.chat.common.lock_input()  # lock input
         event = KernelEvent(KernelEvent.CALL, {
-            'context': bridge_context,
+            'context': bridge_context,  # call using slave ctx history
             'extra': {},
         })
         self.window.dispatch(event)
         result = event.data.get("response")
+
         if not result:  # abort if bridge call failed
             return
 
@@ -395,26 +405,34 @@ class Experts:
         self.window.core.ctx.update_item(ctx)
 
         ctx.from_previous()  # append previous result if exists
+
+        # tmp switch meta for render purposes
+        ctx.meta = master_ctx.meta
         self.window.controller.chat.output.handle(
             ctx=ctx,
             mode=mode,
             stream_mode=False,
         )
         ctx.clear_reply()  # reset results
+        ctx.meta = slave  # restore before cmd execute
+
         self.window.controller.chat.command.handle(ctx)  # handle cmds
         self.window.controller.kernel.stack.handle()  # handle command queue
 
+        # if command to execute then end here, and reply is returned to reply() above from stack, and ctx.reply = TRUE here
+        # 
         ctx.from_previous()  # append previous result again before save
         self.window.core.ctx.update_item(ctx)  # update ctx in DB
 
-        # if commands reply after bridge call, then stop (already handled in dispatcher)
+        # if commands reply after bridge call, then stop (already handled in sync dispatcher)
         if ctx.reply:
             return
 
         # make copy of ctx for reply, and change input name to expert name
         reply_ctx = CtxItem()
-        reply_ctx.meta = master_ctx.meta
+        
         reply_ctx.from_dict(ctx.to_dict())
+        reply_ctx.meta = master_ctx.meta
 
         # assign expert output
         reply_ctx.output = result
@@ -423,7 +441,7 @@ class Experts:
         reply_ctx.cmds = []  # clear cmds
         reply_ctx.sub_call = True  # this flag is not copied in to_dict
 
-        # send slave expert response to master expert
+        # only if no command call, return final result to main
         context = BridgeContext()
         context.ctx = reply_ctx
         context.prompt = "@"+expert_id+" says:\n\n" + str(reply_ctx.output)

pygpt_net/core/idx/chat.py

@@ -419,12 +419,63 @@ class Chat:
             model = self.window.core.models.from_defaults()
         service_context = self.window.core.idx.llm.get_service_context(model=model)
         index = self.storage.get_ctx_idx(path, service_context=service_context)
+
+        # 1. try to retrieve directly from index
+        retriever = index.as_retriever()
+        nodes = retriever.retrieve(query)
+        response = ""
+        for node in nodes:
+            if node.score > 0.5:
+                response = node.text
+                break
+        output = ""
+        if response:
+            output = str(response)
+        else:
+            # 2. try with prepared prompt
+            prompt = """
+            # Task
+            Translate the below user prompt into a suitable, short query for the RAG engine, so it can fetch the context 
+            related to the query from the vector database. 
+            
+            # Important rules
+            1. Edit the user prompt in a way that allows for the best possible result. 
+            2. In your response, give me only the reworded query, without any additional information from yourself. 
+            
+            # User prompt:
+            ```{prompt}```
+            """.format(prompt=query)
+            response_prepare = index.as_query_engine(
+                llm=service_context.llm,
+                streaming=False,
+            ).query(prompt)
+            if response_prepare:
+                # try the final query with prepared prompt
+                final_response = index.as_query_engine(
+                    llm=service_context.llm,
+                    streaming=False,
+                ).query(response_prepare.response)
+                if final_response:
+                    output = str(final_response.response)
+        return output
+
+    def query_retrieval(
+            self,
+            query: str,
+            idx: str,
+            model: ModelItem = None
+    ) -> str:
         """
-        response = index.as_query_engine(
-            llm=llm,
-            streaming=False,
-        ).query(query)
+        Query attachment
+
+        :param query: query
+        :param idx: index id
+        :param model: model
+        :return: response
         """
+        if model is None:
+            model = self.window.core.models.from_defaults()
+        index, service_context = self.get_index(idx, model)
         retriever = index.as_retriever()
         nodes = retriever.retrieve(query)
         response = ""