pygpt-net 2.4.41__py3-none-any.whl → 2.4.43__py3-none-any.whl

pygpt_net/controller/chat/attachment.py

@@ -180,7 +180,7 @@ class Attachment(QObject):
             if tmp_path:
                 for root, dirs, files in os.walk(tmp_path):
                     for file in files:
-                        path = os.path.join(root, file)
+                        path = str(os.path.join(root, file))
                         sub_attachment = AttachmentItem()
                         sub_attachment.path = path
                         sub_attachment.name = os.path.basename(path)
@@ -197,11 +197,9 @@ class Attachment(QObject):
                                 auto_index=auto_index,
                             )
                             if item:
-                                item["path"] = os.path.basename(attachment.path) + "/" + path_relative
+                                item["path"] = os.path.basename(attachment.path) + "/" + str(path_relative)
                                 item["size"] = os.path.getsize(path)
-                                if meta.additional_ctx is None:
-                                    meta.additional_ctx = []
-                                meta.additional_ctx.append(item)
+                                self.append_to_meta(meta, item)
                                 uploaded = True
                                 sub_attachment.consumed = True
                                 attachment.consumed = True
@@ -215,14 +213,27 @@ class Attachment(QObject):
                 auto_index=auto_index,
             )
             if item:
-                if meta.additional_ctx is None:
-                    meta.additional_ctx = []
-                meta.additional_ctx.append(item)
+                self.append_to_meta(meta, item)
                 attachment.consumed = True  # allow for deletion
                 uploaded = True
-
         return uploaded
 
+    def append_to_meta(self, meta: CtxMeta, item: Dict[str, Any]):
+        """
+        Append item to meta
+
+        :param meta: CtxMeta instance
+        :param item: Attachment item
+        """
+        if meta.group:
+            if meta.group.additional_ctx is None:
+                meta.group.additional_ctx = []
+            meta.group.additional_ctx.append(item)
+            return
+        if meta.additional_ctx is None:
+            meta.additional_ctx = []
+        meta.additional_ctx.append(item)
+
     def upload_web(
             self,
             attachment: AttachmentItem,
@@ -248,9 +259,9 @@ class Attachment(QObject):
         :param meta: CtxMeta
         :return: True if has context
         """
-        if meta is None or meta.additional_ctx is None:
+        if meta is None:
             return False
-        return len(meta.additional_ctx) > 0
+        return meta.has_additional_ctx()
 
     def current_has_context(self) -> bool:
         """
@@ -334,7 +345,7 @@ class Attachment(QObject):
         :param meta: CtxMeta instance
         """
         # update list of attachments
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             items = []
         else:
             items = self.window.core.attachments.context.get_all(meta)
@@ -347,7 +358,7 @@ class Attachment(QObject):
 
         :param meta: CtxMeta instance
         """
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             num_files = 0
         else:
             num_files = self.window.core.attachments.context.count(meta)
@@ -402,13 +413,14 @@ class Attachment(QObject):
             )
             return
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
             item = items[idx]
             self.window.core.attachments.context.delete(meta, item, delete_files=remove_local)
             self.update_list(meta)
+            self.window.controller.ctx.update()
 
     def clear(
             self,
@@ -432,10 +444,11 @@ class Attachment(QObject):
             return
 
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return
         self.window.core.attachments.context.clear(meta, delete_files=remove_local)
         self.update_list(meta)
+        self.window.controller.ctx.update()
 
     def select(self, idx: int):
         """
@@ -452,7 +465,7 @@ class Attachment(QObject):
         :param idx: Index on list
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -471,7 +484,7 @@ class Attachment(QObject):
         :param idx: Index on list
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -491,7 +504,7 @@ class Attachment(QObject):
         :param idx: Index on list
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -510,7 +523,7 @@ class Attachment(QObject):
         :return: True if has file
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return False
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -529,7 +542,7 @@ class Attachment(QObject):
         :return: True if has source directory
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return False
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -549,7 +562,7 @@ class Attachment(QObject):
         :return: True if has destination directory
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return False
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -570,10 +583,10 @@ class Attachment(QObject):
         meta = self.window.core.ctx.get_current_meta()
         if meta is None:
             return 0
-        if meta.additional_ctx is None:
+        if not meta.has_additional_ctx():
             return 0
         tokens = 0
-        for item in meta.additional_ctx:
+        for item in meta.get_additional_ctx():
             if "tokens" in item:
                 try:
                     tokens += int(item["tokens"])

pygpt_net/controller/chat/audio.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 19:00:00                  #
+# Updated Date: 2024.12.14 18:00:00                  #
 # ================================================== #
 
 import base64
@@ -63,7 +63,7 @@ class Audio:
         :param ctx: Context item
         """
         wav_path = os.path.join(self.window.core.config.get_user_path(), self.audio_file)
-        if ctx.is_audio and ctx.audio_output:
+        if ctx.is_audio and ctx.audio_output and ctx.audio_read_allowed():
             wav_bytes = base64.b64decode(ctx.audio_output)
             with open(wav_path, "wb") as f:
                 f.write(wav_bytes)

pygpt_net/controller/config/placeholder.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 08:00:00                  #
+# Updated Date: 2024.12.14 18:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, List
@@ -104,9 +104,23 @@ class Placeholder:
             return self.get_voice_control_actions()
         elif id == "audio_input_devices":
             return self.get_audio_input_devices()
+        elif id == "audio_tts_whisper_voices":
+            return self.get_audio_tts_whisper_voices()
         else:
             return []
 
+    def get_audio_tts_whisper_voices(self) -> List[Dict[str, str]]:
+        """
+        Get audio TTS whisper voices list
+
+        :return: placeholders list
+        """
+        voices = self.window.core.audio.whisper.get_voices()
+        data = []
+        for voice in voices:
+            data.append({voice: voice})
+        return data
+
     def get_audio_input_devices(self) -> List[Dict[str, str]]:
         """
         Get audio input devices list

pygpt_net/controller/ui/mode.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.12.14 19:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.types import (
@@ -189,8 +189,12 @@ class Mode:
                 self.window.ui.tabs['input'].setTabVisible(2, False)
                 self.window.ui.tabs['input'].setTabVisible(3, False)
 
-        # toggle chat footer
-        if not self.is_chat_tab():
+        # chat footer
+        self.toggle_chat_footer()
+
+    def toggle_chat_footer(self):
+        """Toggle chat footer"""
+        if self.window.controller.ui.tabs.get_current_type() != Tab.TAB_CHAT:
             self.hide_chat_footer()
         else:
             self.show_chat_footer()
@@ -200,18 +204,12 @@ class Mode:
         Check if vision is allowed
 
         :param mode: current mode
+        :return: True if vision is allowed
         """
-        if mode == MODE_VISION:
-            return True
-
-        allowed = self.window.controller.painter.is_active()
-        if allowed:
+        if self.window.controller.ui.vision.has_vision():
             return True
 
-        if mode in [MODE_IMAGE, MODE_ASSISTANT]:
-            return False
-
-        if self.window.controller.ui.vision.is_vision_model():
+        if self.window.controller.painter.is_active():
             return True
 
         # event: UI: vision
@@ -224,7 +222,12 @@ class Mode:
         return event.data['value']
 
     def are_attachments(self, mode: str) -> bool:
-        """Check if attachments are allowed"""
+        """
+        Check if attachments are allowed
+
+        :param mode: current mode
+        :return: True if attachments are allowed
+        """
         if mode in [MODE_VISION, MODE_ASSISTANT]:
             return True
 
@@ -243,14 +246,6 @@ class Mode:
         self.window.dispatch(event)
         return event.data['value']
 
-    def is_chat_tab(self) -> bool:
-        """
-        Check if current tab is chat
-
-        :return: True if chat tab
-        """
-        return self.window.controller.ui.tabs.get_current_type() == Tab.TAB_CHAT
-
     def show_chat_footer(self):
         """Show chat footer"""
         self.window.ui.nodes['chat.footer'].setVisible(True)

pygpt_net/core/attachments/__init__.py

@@ -161,7 +161,7 @@ class Attachments:
         if meta is None:
             return []
         attachments = []
-        for attachment in meta.additional_ctx:
+        for attachment in meta.get_additional_ctx():
             item = AttachmentItem()
             if 'uuid' not in attachment:
                 continue

pygpt_net/core/attachments/context.py

@@ -125,7 +125,7 @@ class Context:
         meta_path = self.get_dir(meta)
         context = ""
         if os.path.exists(meta_path) and os.path.isdir(meta_path):
-            for file in meta.additional_ctx:
+            for file in meta.get_additional_ctx():
                 if ("type" not in file
                         or file["type"] not in ["local_file", "url"]):
                     continue
@@ -183,7 +183,7 @@ class Context:
 
         indexed = False
         # index files if not indexed by auto_index
-        for i, file in enumerate(meta.additional_ctx):
+        for i, file in enumerate(meta.get_additional_ctx()):
             if "indexed" not in file or not file["indexed"]:
                 file_id = file["uuid"]
                 file_idx_path = os.path.join(meta_path, file_id)
@@ -496,7 +496,7 @@ class Context:
         :param meta: CtxMeta instance
         :return: list of attachments
         """
-        return meta.additional_ctx
+        return meta.get_additional_ctx()
 
     def get_dir(self, meta: CtxMeta) -> str:
         """
@@ -506,6 +506,8 @@ class Context:
         :return: directory path
         """
         meta_uuid = str(meta.uuid)
+        if meta.group:
+            meta_uuid = str(meta.group.uuid)
         return os.path.join(self.window.core.config.get_user_dir("ctx_idx"), meta_uuid)
 
     def get_selected_model(self, mode: str = "summary"):
@@ -562,7 +564,7 @@ class Context:
         :param meta: CtxMeta instance
         :return: number of attachments
         """
-        return len(meta.additional_ctx)
+        return len(meta.get_additional_ctx())
 
     def delete(
             self,
@@ -577,11 +579,11 @@ class Context:
         :param item: Attachment item dict
         :param delete_files: delete files
         """
-        meta.additional_ctx.remove(item)
+        meta.remove_additional_ctx(item)
         self.window.core.ctx.save(meta.id)
         if delete_files:
             self.delete_local(meta, item)
-        if len(meta.additional_ctx) == 0:
+        if len(meta.get_additional_ctx()) == 0:
             self.delete_index(meta)
 
     def delete_by_meta(self, meta: CtxMeta):
@@ -613,7 +615,7 @@ class Context:
         :param meta: CtxMeta instance
         :param delete_files: delete files
         """
-        meta.additional_ctx = []
+        meta.reset_additional_ctx()
         self.window.core.ctx.save(meta.id)
         if delete_files:
             self.delete_index(meta)
@@ -644,7 +646,7 @@ class Context:
         :param meta: CtxMeta instance
         :param delete_files: delete files
         """
-        meta.additional_ctx = []
+        meta.reset_additional_ctx()
         self.window.core.ctx.save(meta.id)
         if delete_files:
             self.delete_index(meta)

pygpt_net/core/audio/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 08:00:00                  #
+# Updated Date: 2024.12.14 18:00:00                  #
 # ================================================== #
 
 import re
@@ -17,6 +17,8 @@ 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
 
+from .whisper import Whisper
+
 
 class Audio:
     def __init__(self, window=None):
@@ -26,6 +28,7 @@ class Audio:
         :param window: Window instance
         """
         self.window = window
+        self.whisper = Whisper(window)
         self.providers = {
             "input": {},
             "output": {},

pygpt_net/core/audio/whisper.py

@@ -0,0 +1,37 @@
+#!/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.12.14 18:00:00                  #
+# ================================================== #
+
+from typing import List
+
+class Whisper:
+    def __init__(self, window=None):
+        """
+        Whisper core
+
+        :param window: Window instance
+        """
+        self.window = window
+        self.voices = [
+            "alloy",
+            "echo",
+            "fable",
+            "onyx",
+            "nova",
+            "shimmer",
+        ]
+
+    def get_voices(self) -> List[str]:
+        """
+        Get whisper voices
+
+        :return: whisper voice name
+        """
+        return self.voices

pygpt_net/core/bridge/worker.py

@@ -60,14 +60,14 @@ class BridgeWorker(QObject, QRunnable):
                     extra=self.extra,
                 )
 
-            # Llama-index: chat with files
+            # LlamaIndex: chat with files
             elif self.mode == MODE_LLAMA_INDEX:
                 result = self.window.core.idx.chat.call(
                     context=self.context,
                     extra=self.extra,
                 )
 
-            # Llama-index: agents
+            # LlamaIndex: agents
             elif self.mode == MODE_AGENT_LLAMA:
                 result = self.window.core.agents.runner.call(
                     context=self.context,

pygpt_net/core/db/__init__.py

@@ -122,6 +122,7 @@ class Database:
             'updated_ts',
             'created_ts',
             'uuid',
+            'additional_ctx_json',
         ]
         columns["idx_ctx"] = [
             'id',
@@ -242,7 +243,7 @@ class Database:
                 'sort_by': columns["ctx_group"],
                 'search_fields': ['id', 'name'],
                 'timestamp_columns': ['created_ts', 'updated_ts'],
-                'json_columns': [],
+                'json_columns': ['additional_ctx_json'],
                 'default_sort': 'id',
                 'default_order': 'DESC',
                 'primary_key': 'id',

pygpt_net/core/debug/events.py

@@ -6,10 +6,17 @@
 # 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.12.14 19:00:00                  #
 # ================================================== #
 
-from pygpt_net.core.events import ControlEvent, AppEvent, Event, KernelEvent, RenderEvent
+from pygpt_net.core.events import (
+    ControlEvent,
+    AppEvent,
+    Event,
+    KernelEvent,
+    RenderEvent,
+    BaseEvent
+)
 
 
 class EventsDebug:
@@ -25,19 +32,24 @@ class EventsDebug:
     def update(self):
         """Update debug window."""
         self.window.core.debug.begin(self.id)
-        self.window.core.debug.add(self.id, 'App Events:', str(AppEvent.__dict__))
-        self.window.core.debug.add(self.id, 'Control Events:', str(ControlEvent.__dict__))
-        self.window.core.debug.add(self.id, 'Kernel Events:', str(KernelEvent.__dict__))
-        self.window.core.debug.add(self.id, 'Render Events:', str(RenderEvent.__dict__))
-        self.window.core.debug.add(self.id, 'Plugin Events:', str(self.extract_plugins()))
+        self.window.core.debug.add(self.id, 'App Events:', str(self.extract_events(AppEvent)))
+        self.window.core.debug.add(self.id, 'Control Events:', str(self.extract_events(ControlEvent)))
+        self.window.core.debug.add(self.id, 'Kernel Events:', str(self.extract_events(KernelEvent)))
+        self.window.core.debug.add(self.id, 'Render Events:', str(self.extract_events(RenderEvent)))
+        self.window.core.debug.add(self.id, 'Plugin Events:', str(self.extract_events(Event)))
+        self.window.core.debug.add(self.id, '----', '')
         self.window.core.debug.add(self.id, 'Voice Cmds (all):', str(self.window.core.access.voice.commands))
         self.window.core.debug.add(self.id, 'Voice Cmds (allowed):', str(self.window.core.access.voice.get_commands()))
         self.window.core.debug.end(self.id)
 
-    def extract_plugins(self) -> dict:
-        """Extract plugin events"""
+    def extract_events(self, events: BaseEvent) -> dict:
+        """
+        Extract events
+
+        :param events: Events class
+        """
         result = {}
-        for property, value in vars(Event).items():
+        for property, value in vars(events).items():
             if (isinstance(value, str)
                     or isinstance(value, int)
                     or isinstance(value, float)

pygpt_net/core/debug/tabs.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.12 01:00:00                  #
+# Updated Date: 2024.12.14 17:00:00                  #
 # ================================================== #
 
 class TabsDebug:
@@ -22,10 +22,12 @@ class TabsDebug:
     def update(self):
         """Update debug window."""
         self.window.core.debug.begin(self.id)
-        self.window.core.debug.add(self.id, 'current PID', str(self.window.controller.ui.tabs.get_current_pid()))
+        self.window.core.debug.add(self.id, 'current Col', str(self.window.controller.ui.tabs.get_current_column_idx()))
         self.window.core.debug.add(self.id, 'current IDX', str(self.window.controller.ui.tabs.get_current_idx()))
+        self.window.core.debug.add(self.id, 'current Tab', str(self.window.controller.ui.tabs.get_current_tab()))
+        self.window.core.debug.add(self.id, 'current PID', str(self.window.controller.ui.tabs.get_current_pid()))
         self.window.core.debug.add(self.id, 'current Type', str(self.window.controller.ui.tabs.get_current_type()))
-        self.window.core.debug.add(self.id, 'current Column', str(self.window.controller.ui.tabs.get_current_column_idx()))
+        self.window.core.debug.add(self.id, '----', '')
         self.window.core.debug.add(self.id, 'last_pid', str(self.window.core.tabs.last_pid))
         self.window.core.debug.add(self.id, 'locked', str(self.window.controller.ui.tabs.locked))
         self.window.core.debug.add(self.id, 'col', str(self.window.controller.ui.tabs.col))
@@ -40,6 +42,7 @@ class TabsDebug:
             self.window.core.debug.add(self.id, "PID ["+str(pid)+"]", str(data))
 
         # mapping PID => meta.id
+        self.window.core.debug.add(self.id, '----', '')
         self.window.core.debug.add(self.id, 'PID => meta.id', str(self.window.core.ctx.output.mapping))
         self.window.core.debug.add(self.id, '(last) meta.id => PID', str(self.window.core.ctx.output.last_pids))
         self.window.core.debug.add(self.id, '(last) PID', str(self.window.core.ctx.output.last_pid))

pygpt_net/core/history.py

@@ -6,11 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.01.19 05:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import datetime
 import os
+from typing import List
 
 from pygpt_net.item.ctx import CtxItem
 from pygpt_net.provider.core.history.txt_file import TxtFileProvider
@@ -46,7 +47,7 @@ class History:
         # delete all txt history files from history dir
         self.provider.truncate()
 
-    def remove_items(self, items: list):
+    def remove_items(self, items: List[CtxItem]):
         """
         Remove items from history (txt files)
 

pygpt_net/core/idx/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 08:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import datetime
@@ -406,7 +406,11 @@ class Idx:
             return self.items[store_id]
         return {}
 
-    def append(self, idx: str, files: Dict[str, str]):
+    def append(
+            self,
+            idx: str,
+            files: Dict[str, str]
+    ):
         """
         Append indexed files to index
 
@@ -454,7 +458,11 @@ class Idx:
                 self.items[store_id][idx].items[file_id]["id"] = doc_id
                 self.items[store_id][idx].items[file_id]["indexed_ts"] = ts
 
-    def remove_doc(self, idx: str, doc_id: str):
+    def remove_doc(
+            self,
+            idx: str,
+            doc_id: str
+    ):
         """
         Remove document from index
 
@@ -465,7 +473,11 @@ class Idx:
         if self.storage.remove_document(idx, doc_id):
             self.log("Removed document from index: " + idx + " - " + doc_id)
 
-    def remove_file(self, idx: str, file: str):
+    def remove_file(
+            self,
+            idx: str,
+            file: str
+    ):
         """
         Remove file from index