pygpt-net 2.4.36.post1__py3-none-any.whl → 2.4.38__py3-none-any.whl

pygpt_net/controller/theme/menu.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.05 23:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction
@@ -30,6 +30,18 @@ class Menu:
         # setup themes list menu
         if self.loaded:
             return
+
+        # styles
+        styles = self.window.controller.theme.common.get_styles_list()
+        for style in styles:
+            style_id = style.lower()
+            title = style.replace('_', ' ').title()
+            self.window.ui.menu['theme_style'][style_id] = QAction(title, self.window, checkable=True)
+            self.window.ui.menu['theme_style'][style_id].triggered.connect(
+                lambda checked=None, style=style_id: self.window.controller.theme.toggle_style(style))
+            self.window.ui.menu['theme.style'].addAction(self.window.ui.menu['theme_style'][style_id])
+
+        # color themes
         themes = self.window.controller.theme.common.get_themes_list()
         for theme in themes:
             name = self.window.controller.theme.common.translate(theme)
@@ -42,6 +54,7 @@ class Menu:
                 self.window.ui.menu['theme.dark'].addAction(self.window.ui.menu['theme'][theme])
             elif theme.startswith('light'):
                 self.window.ui.menu['theme.light'].addAction(self.window.ui.menu['theme'][theme])
+
         self.loaded = True
 
     def setup_syntax(self):
@@ -86,14 +99,22 @@ class Menu:
 
     def update_list(self):
         """Update theme list menu"""
-        current = self.window.core.config.get('theme')
+        # styles
+        current_style = self.window.core.config.get('theme.style')
+        for style in self.window.ui.menu['theme_style']:
+            self.window.ui.menu['theme_style'][style].setChecked(False)
+        if current_style in self.window.ui.menu['theme_style']:
+            self.window.ui.menu['theme_style'][current_style].setChecked(True)
+
+        # color themes
+        current_theme = self.window.core.config.get('theme')
         for theme in self.window.ui.menu['theme']:
             self.window.ui.menu['theme'][theme].setChecked(False)
-        if current in self.window.ui.menu['theme']:
-            self.window.ui.menu['theme'][current].setChecked(True)
+        if current_theme in self.window.ui.menu['theme']:
+            self.window.ui.menu['theme'][current_theme].setChecked(True)
 
     def update_syntax(self):
-        """Update syntax menu"""
+        """Update code syntax highlight menu"""
         current = self.window.core.config.get('render.code_syntax')
         for style in self.window.ui.menu['theme_syntax']:
             self.window.ui.menu['theme_syntax'][style].setChecked(False)

pygpt_net/core/attachments/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.26 04:00:00                  #
+# Updated Date: 2024.11.30 04:00:00                  #
 # ================================================== #
 
 import copy
@@ -40,7 +40,7 @@ class Context:
         Summarize the text below by extracting the most important information, 
         especially those that may help answer the question: 
 
-        `{query}`. 
+        `{query}`
 
         If the answer to the question is not in the text to summarize, 
         simply return a summary of the entire content. 
@@ -59,25 +59,49 @@ class Context:
 
         `{content}`
         """
-
-    def get_all(self, meta: CtxMeta) -> list:
-        """
-        Get all attachments for meta
-
-        :param meta: CtxMeta instance
-        :return: list of attachments
-        """
-        return meta.additional_ctx
-
-    def get_dir(self, meta: CtxMeta) -> str:
-        """
-        Get directory for meta
-
-        :param meta: CtxMeta instance
-        :return: directory path
+        self.rag_prompt = """
+        Prepare a question for the RAG engine (vector database) asking for additional context that can help obtain 
+        extra information necessary to answer the user's question. The query should be brief and to the point, 
+        so as to be processed as effectively as possible by the RAG engine. Below is the entire conversation 
+        of the user with the AI assistant, and at the end the current user's question, for which you need to 
+        prepare DIRECT query for the RAG engine for additional context, taking into account the content of the entire 
+        discussion and its context. In your response, return only the DIRECT query for additional context, 
+        do not return anything else besides it. The response should not contain any phrases other than the query itself:
+        
+        # Good RAG query example:
+        
+        `What is the capital of France?`
+        
+        # Bad RAG query example:
+        
+        `Can you tell me the capital of France?`
+
+        # Full conversation:
+        
+        `{history}`
+        
+        # User question:
+        
+        `{query}`
+        """
+
+    def get_context(self, mode: str, ctx: CtxItem, history: list) -> str:
+        """
+        Get context for mode
+
+        :param mode: Context mode
+        :param ctx: CtxItem instance
+        :param history: history
+        :return: context
         """
-        meta_uuid = str(meta.uuid)
-        return os.path.join(self.window.core.config.get_user_dir("ctx_idx"), meta_uuid)
+        content = ""
+        if mode == self.window.controller.chat.attachment.MODE_FULL_CONTEXT:
+            content = self.get_context_text(ctx, filename=True)
+        elif mode == self.window.controller.chat.attachment.MODE_QUERY_CONTEXT:
+            content = self.query_context(ctx, history)
+        elif mode == self.window.controller.chat.attachment.MODE_QUERY_CONTEXT_SUMMARY:
+            content = self.summary_context(ctx, history)
+        return content
 
     def get_context_text(self, ctx: CtxItem, filename: bool = False) -> str:
         """
@@ -95,6 +119,8 @@ class Context:
                 if ("type" not in file
                         or file["type"] not in ["local_file", "url"]):
                     continue
+                if not "uuid" in file:
+                    continue
                 file_id = file["uuid"]
                 file_idx_path = os.path.join(meta_path, file_id)
                 text_path = os.path.join(file_idx_path, file_id + ".txt")
@@ -126,15 +152,17 @@ class Context:
         self.last_used_context = context
         return context
 
-    def query_context(self, meta: CtxMeta, query: str) -> str:
+    def query_context(self, ctx: CtxItem, history: list) -> str:
         """
         Query the index for context
 
-        :param meta : CtxMeta instance
-        :param query: query string
+        :param ctx: CtxItem instance
+        :param history: history
         :return: query result
         """
+        meta = ctx.meta
         meta_path = self.get_dir(meta)
+        query = str(ctx.input)
         if not os.path.exists(meta_path) or not os.path.isdir(meta_path):
             return ""
         idx_path = os.path.join(self.get_dir(meta), self.dir_index)
@@ -162,8 +190,21 @@ class Context:
             self.window.core.ctx.replace(meta)
             self.window.core.ctx.save(meta.id)
 
+        history_data = self.prepare_context_history(history)
         model, model_item = self.get_selected_model("query")
-        result = self.window.core.idx.chat.query_attachment(query, idx_path, model_item)
+
+        verbose = False
+        if self.is_verbose():
+            verbose = True
+            print("Attachments: using query model: {}".format(model))
+
+        result = self.window.core.idx.chat.query_attachment(
+            query=query,
+            path=idx_path,
+            model=model_item,
+            history=history_data,
+            verbose=verbose,
+        )
         self.last_used_context = result
 
         if self.is_verbose():
@@ -171,28 +212,12 @@ class Context:
 
         return result
 
-    def get_selected_model(self, mode: str = "summary"):
-        """
-        Get selected model for attachments
-
-        :return: model name, model item
-        """
-        model_item = None
-        model = None
-        if mode == "summary":
-            model = self.window.core.config.get("ctx.attachment.summary.model", "gpt-4o-mini")
-        elif mode == "query":
-            model = self.window.core.config.get("ctx.attachment.query.model", "gpt-4o-mini")
-        if model:
-            model_item = self.window.core.models.get(model)
-        return model, model_item
-
-    def summary_context(self, ctx: CtxItem, query: str) -> str:
+    def summary_context(self, ctx: CtxItem, history: list) -> str:
         """
         Get summary of the context
 
         :param ctx: CtxItem instance
-        :param query: query string
+        :param history: history
         :return: query result
         """
         model, model_item = self.get_selected_model("summary")
@@ -202,6 +227,7 @@ class Context:
         if self.is_verbose():
             print("Attachments: using summary model: {}".format(model))
 
+        query = str(ctx.input)
         content = self.get_context_text(ctx, filename=True)
         prompt = self.summary_prompt.format(
             query=str(query).strip(),
@@ -210,12 +236,14 @@ class Context:
         if self.is_verbose():
             print("Attachments: summary prompt: {}".format(prompt))
 
+        history_data = self.prepare_context_history(history)
         ctx = CtxItem()
         bridge_context = BridgeContext(
             ctx=ctx,
             prompt=prompt,
             stream=False,
             model=model_item,
+            history=history_data,
         )
         event = KernelEvent(KernelEvent.CALL, {
             'context': bridge_context,
@@ -228,6 +256,35 @@ class Context:
             print("Attachments: summary received: {}".format(response))
         return response
 
+    def prepare_context_history(self, history: list) -> list:
+        """
+        Prepare context history
+
+        :param history: history
+        :return: history data
+        """
+        use_history = self.window.core.config.get("ctx.attachment.rag.history", True)
+        history_data = []
+        if use_history:
+            if self.is_verbose():
+                print("Attachments: using history for query prepare...")
+
+            # use only last X items from history
+            num_items = self.window.core.config.get("ctx.attachment.rag.history.max_items", 3)
+            history_data = []
+            for item in history:
+                history_data.append(item)
+
+            # 0 = unlimited
+            if num_items > 0:
+                if self.is_verbose():
+                    print("Attachments: using last {} items from history...".format(num_items))
+                if len(history_data) < num_items:
+                    num_items = len(history_data)
+                history_data = history_data[-num_items:]
+
+        return history_data
+
     def upload(
             self,
             meta: CtxMeta,
@@ -396,6 +453,41 @@ class Context:
             print("Attachments: indexed. Doc IDs: {}".format(doc_ids))
         return doc_ids
 
+    def get_all(self, meta: CtxMeta) -> list:
+        """
+        Get all attachments for meta
+
+        :param meta: CtxMeta instance
+        :return: list of attachments
+        """
+        return meta.additional_ctx
+
+    def get_dir(self, meta: CtxMeta) -> str:
+        """
+        Get directory for meta
+
+        :param meta: CtxMeta instance
+        :return: directory path
+        """
+        meta_uuid = str(meta.uuid)
+        return os.path.join(self.window.core.config.get_user_dir("ctx_idx"), meta_uuid)
+
+    def get_selected_model(self, mode: str = "summary"):
+        """
+        Get selected model for attachments
+
+        :return: model name, model item
+        """
+        model_item = None
+        model = None
+        if mode == "summary":
+            model = self.window.core.config.get("ctx.attachment.summary.model", "gpt-4o-mini")
+        elif mode == "query":
+            model = self.window.core.config.get("ctx.attachment.query.model", "gpt-4o-mini")
+        if model:
+            model_item = self.window.core.models.get(model)
+        return model, model_item
+
     def duplicate(self, from_meta_id: int, to_meta_id: int) -> bool:
         """
         Duplicate attachments from one meta to another
@@ -465,17 +557,6 @@ class Context:
         if meta is not None:
             self.delete_index(meta)
 
-    def reset_by_meta_id(self, meta_id: int, delete_files: bool = False):
-        """
-        Delete all attachments for meta by id
-
-        :param meta_id: Meta id
-        :param delete_files: delete files
-        """
-        meta = self.window.core.ctx.get_meta_by_id(meta_id)
-        if meta is not None:
-            self.reset_by_meta(meta, delete_files)
-
     def reset_by_meta(self, meta: CtxMeta, delete_files: bool = False):
         """
         Delete all attachments for meta
@@ -488,6 +569,17 @@ class Context:
         if delete_files:
             self.delete_index(meta)
 
+    def reset_by_meta_id(self, meta_id: int, delete_files: bool = False):
+        """
+        Delete all attachments for meta by id
+
+        :param meta_id: Meta id
+        :param delete_files: delete files
+        """
+        meta = self.window.core.ctx.get_meta_by_id(meta_id)
+        if meta is not None:
+            self.reset_by_meta(meta, delete_files)
+
     def clear(self, meta: CtxMeta, delete_files: bool = False):
         """
         Clear all attachments by ctx meta

pygpt_net/core/audio/__init__.py

@@ -6,10 +6,11 @@
 # 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.08 00:00:00                  #
 # ================================================== #
 
 import re
+from bs4 import UnicodeDammit
 
 from pygpt_net.provider.audio_input.base import BaseProvider as InputBaseProvider
 from pygpt_net.provider.audio_output.base import BaseProvider as OutputBaseProvider
@@ -27,6 +28,55 @@ class Audio:
             "input": {},
             "output": {},
         }
+        self.last_error = None
+
+    def get_input_devices(self) -> list:
+        """
+        Get input devices
+
+        :return devices list: [(id, name)]
+        """
+        import pyaudio
+        devices = []
+        try:
+            p = pyaudio.PyAudio()
+            num_devices = p.get_device_count()
+            for i in range(num_devices):
+                info = p.get_device_info_by_index(i)
+                if info["maxInputChannels"] > 0:
+                    dammit = UnicodeDammit(info["name"])
+                    devices.append((i, dammit.unicode_markup))
+                    # print(f"Device ID {i}: {info['name']}")
+            p.terminate()
+        except Exception as e:
+            print(f"Audio input devices receive error: {e}")
+        return devices
+
+    def is_device_compatible(self, device_index) -> bool:
+        """
+        Check if device is compatible
+
+        :param device_index: device index
+        :return: True if compatible
+        """
+        import pyaudio
+        rate = int(self.window.core.config.get('audio.input.rate', 44100))
+        channels = int(self.window.core.config.get('audio.input.channels', 1))
+        p = pyaudio.PyAudio()
+        info = p.get_device_info_by_index(device_index)
+        supported = False
+        try:
+            p.is_format_supported(
+                rate=rate,
+                input_device=info['index'],
+                input_channels=channels,
+                input_format=pyaudio.paInt16)
+            supported = True
+        except ValueError as e:
+            self.last_error = str(e)
+            supported = False
+        p.terminate()
+        return supported
 
     def is_registered(self, id: str, type: str = "output") -> bool:
         """
@@ -92,3 +142,11 @@ class Audio:
         :return: cleaned text
         """
         return re.sub(r'~###~.*?~###~', '', str(text))
+
+    def get_last_error(self) -> str:
+        """
+        Return last error
+
+        :return: Error
+        """
+        return self.last_error

pygpt_net/core/bridge/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.23 21:00:00                  #
+# Updated Date: 2024.11.29 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import QObject, Signal, QRunnable, Slot
@@ -50,6 +50,9 @@ class BridgeWorker(QObject, QRunnable):
             # ADDITIONAL CONTEXT: append additional context from attachments
             self.handle_additional_context()
 
+            # POST PROMPT END: handle post prompt end event
+            self.handle_post_prompt_end()
+
             # Langchain
             if self.mode == MODE_LANGCHAIN:
                 result = self.window.core.chain.call(
@@ -124,6 +127,17 @@ class BridgeWorker(QObject, QRunnable):
         self.window.dispatch(event)
         self.context.system_prompt = event.data['value']
 
+    def handle_post_prompt_end(self):
+        """Handle post prompt end event"""
+        event = Event(Event.POST_PROMPT_END, {
+            '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
@@ -133,7 +147,7 @@ class BridgeWorker(QObject, QRunnable):
             return
         if not self.window.controller.chat.attachment.has_context(ctx.meta):
             return
-        ad_context = self.window.controller.chat.attachment.get_context(ctx)
+        ad_context = self.window.controller.chat.attachment.get_context(ctx, self.context.history)
         ad_mode = self.window.controller.chat.attachment.get_mode()
         if ad_context:
             self.context.prompt += "\n\n" + ad_context  # append to input text

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.26 19:00:00                  #
+# Updated Date: 2024.11.29 23:00:00                  #
 # ================================================== #
 
 import json
@@ -50,6 +50,7 @@ class Event(BaseEvent):
     PLUGIN_OPTION_GET = "plugin.option.get"
     POST_PROMPT = "post.prompt"
     POST_PROMPT_ASYNC = "post.prompt.async"
+    POST_PROMPT_END = "post.prompt.end"
     PRE_PROMPT = "pre.prompt"
     SYSTEM_PROMPT = "system.prompt"
     TOOL_OUTPUT_RENDER = "tool.output.render"

pygpt_net/core/filesystem/__init__.py

@@ -6,13 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 21:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
 import os
 import shutil
 
-from datetime import datetime
 from pathlib import PurePath
 from uuid import uuid4
 
@@ -38,18 +37,6 @@ class Filesystem:
         self.types = Types(window)
         self.url = Url(window)
         self.workdir_placeholder = "%workdir%"
-        self.styles = [
-            "style.css",
-            "style.dark.css",
-            "style.light.css",
-            "markdown.css",
-            "markdown.dark.css",
-            "markdown.light.css",
-            "web.css",
-            "web.dark.css",
-            "web.light.css",
-            "fix_windows.css",
-        ]
 
     def install(self):
         """Install provider data"""
@@ -77,9 +64,9 @@ class Filesystem:
 
         src_dir = os.path.join(self.window.core.config.get_app_path(), 'data', 'css')
         dst_dir = os.path.join(self.window.core.config.path, 'css')
-
+        app_styles = os.listdir(src_dir)
         try:
-            for style in self.styles:
+            for style in app_styles:
                 src = os.path.join(src_dir, style)
                 dst = os.path.join(dst_dir, style)
                 if (not os.path.exists(dst) or force) and os.path.exists(src):
@@ -91,7 +78,8 @@ class Filesystem:
         """Backup user custom css styles"""
         css_dir = os.path.join(self.window.core.config.path, 'css')
         backup_file_extension = '.backup'
-        for style in self.styles:
+        user_styles = os.listdir(css_dir)
+        for style in user_styles:
             src = os.path.join(css_dir, style)
             dst = os.path.join(css_dir, style + backup_file_extension)
             if os.path.exists(src):
@@ -457,5 +445,3 @@ class Filesystem:
         else:
             files = [os.path.join(path, f) for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
         return files
-
-

pygpt_net/core/idx/chat.py

@@ -405,7 +405,9 @@ class Chat:
             self,
             query: str,
             path: str,
-            model: ModelItem = None
+            model: ModelItem = None,
+            history: list = None,
+            verbose: bool = False,
     ) -> str:
         """
         Query attachment
@@ -413,6 +415,8 @@ class Chat:
         :param query: query
         :param path: path to index
         :param model: model
+        :param history: chat history
+        :param verbose: verbose mode
         :return: response
         """
         if model is None:
@@ -424,39 +428,33 @@ class Chat:
         retriever = index.as_retriever()
         nodes = retriever.retrieve(query)
         response = ""
+        score = 0
         for node in nodes:
             if node.score > 0.5:
+                score = node.score
                 response = node.text
                 break
         output = ""
         if response:
             output = str(response)
+            if verbose:
+                print("Found using retrieval, {} (score: {})".format(output, score))
         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(
+            if verbose:
+                print("Not found using retrieval, trying with query engine...")
+            history = self.context.get_messages(
+                query,
+                "",
+                history,
+            )
+            memory = self.get_memory_buffer(history, service_context.llm)
+            response = index.as_chat_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)
+                memory=memory,
+            ).chat(query)
+            if response:
+                output = str(response.response)
         return output
 
     def query_retrieval(