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

pygpt_net/controller/camera.py

@@ -19,9 +19,6 @@ import cv2
 from PySide6.QtCore import Slot, QObject
 from PySide6.QtGui import QImage, QPixmap, Qt
 
-from pygpt_net.core.types import (
-    MODE_VISION,
-)
 from pygpt_net.core.events import AppEvent, KernelEvent
 from pygpt_net.core.camera import CaptureWorker
 from pygpt_net.utils import trans
@@ -508,15 +505,9 @@ class Camera(QObject):
 
         :return: True if capture is allowed
         """
-        mode = self.window.core.config.get('mode')
         if self.window.controller.painter.is_active():
             return True
-        if (mode != MODE_VISION
-                and mode not in self.window.controller.chat.vision.allowed_modes):
-            return False
-        if self.window.controller.plugins.is_type_enabled('vision'):
-            return True
-        if self.window.controller.ui.vision.is_vision_model():
+        if self.window.controller.ui.vision.has_vision():
             return True
         return False
 

pygpt_net/controller/chat/attachment.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.16 01:00:00                  #
 # ================================================== #
 
 import os
@@ -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:
         """
@@ -306,18 +317,6 @@ class Attachment(QObject):
             return "====================================\nADDITIONAL CONTEXT FROM ATTACHMENT(s): {}".format(content)
         return ""
 
-    def get_uploaded_attachments(
-            self,
-            meta: CtxMeta
-    ) -> List[Dict[str, Any]]:
-        """
-        Get uploaded attachments for meta
-
-        :param meta: CtxMeta instance
-        :return: List of attachments
-        """
-        return meta.additional_ctx
-
     def update(self):
         """Update attachments list"""
         mode = self.window.core.config.get("mode")
@@ -334,7 +333,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 +346,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 +401,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 +432,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 +453,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 +472,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 +492,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 +511,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 +530,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 +550,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 +571,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.16 01: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
@@ -265,7 +279,8 @@ class Placeholder:
         modes = self.window.core.agents.legacy.get_allowed_modes()
         data = []
         for id in modes:
-            data.append({id: id})  # TODO: name
+            name = trans(f"mode.{id}")
+            data.append({id: name})
         return data
 
     def get_idx(self) -> List[Dict[str, str]]:
@@ -277,8 +292,9 @@ class Placeholder:
         indexes = self.window.core.idx.get_idx_ids()
         data = []
         data.append({'_': '---'})
-        for id in indexes:
-            data.append({id: id})
+        for item in indexes:
+            for k, v in item.items():
+                data.append({k: v})
         return data
 
     def get_syntax_styles(self) -> List[Dict[str, str]]:

pygpt_net/controller/idx/common.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.16 01:00:00                  #
 # ================================================== #
 
 from typing import List, Dict
@@ -50,13 +50,17 @@ class Common:
                     ext_str = " (" + ", ".join(loader.extensions) + ")"
                 # name = "(File) " + loader.name + ext_str  # TODO: implement option names
                 data.append({
-                    id: id
+                    id: loader.name
                 })
+                # sort by name
+                data = sorted(data, key=lambda x: list(x.values())[0])
             # web
             if "web" in loader.type:
                 id = "web_" + id
                 # name = "(Web) " + loader.name  # TODO: implement option names
                 data.append({
-                    id: id
+                    id: loader.name
                 })
+                # sort by name
+                data = sorted(data, key=lambda x: list(x.values())[0])
         return data

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

@@ -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.16 01:00:00                  #
 # ================================================== #
 
 import copy
@@ -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
@@ -187,6 +187,7 @@ class Attachments:
             path: Optional[str] = None,
             auto_save: bool = True,
             type: str = AttachmentItem.TYPE_FILE,
+            extra: Optional[dict] = None
     ) -> AttachmentItem:
         """
         Create new attachment
@@ -196,6 +197,7 @@ class Attachments:
         :param path: path
         :param auto_save: auto_save
         :param type: type
+        :param extra: extra data
         :return: AttachmentItem
         """
         # make local copy of external attachment if enabled
@@ -209,6 +211,9 @@ class Attachments:
         attachment.path = path
         attachment.type = type
 
+        if extra is not None:
+            attachment.extra = extra
+
         if mode not in self.items:
             self.items[mode] = {}