pygpt-net 2.4.37__py3-none-any.whl → 2.4.42__py3-none-any.whl

pygpt_net/controller/assistant/files.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import os
+from typing import Optional, Dict, List
 
 from PySide6.QtWidgets import QApplication
 
@@ -50,7 +51,10 @@ class Files:
         file_id = self.window.core.assistants.files.get_file_id_by_idx(idx, assistant.vector_store, thread_id)
         self.window.core.assistants.current_file = file_id
 
-    def count_upload(self, attachments: dict) -> int:
+    def count_upload(
+            self,
+            attachments: Dict[str, AttachmentItem]
+    ) -> int:
         """
         Count attachments for upload
 
@@ -64,7 +68,7 @@ class Files:
                 num += 1  # increment uploaded files counter if file is not uploaded yet
         return num
 
-    def import_files(self, store_id: str = None):
+    def import_files(self, store_id: Optional[str] = None):
         """
         Import assistant files from API
 
@@ -239,11 +243,15 @@ class Files:
         self.window.core.assistants.save()
         self.update()
 
-    def upload(self, mode: str, attachments: dict) -> int:
+    def upload(
+            self,
+            mode: str,
+            attachments: Dict[str, AttachmentItem]
+    ) -> int:
         """
         Upload attachments to assistant
 
-        :param mode: mode
+        :param mode: work mode
         :param attachments: attachments dict
         :return: number of uploaded files
         """
@@ -334,7 +342,11 @@ class Files:
 
         return num
 
-    def append(self, assistant: AssistantItem, attachment: AttachmentItem):
+    def append(
+            self,
+            assistant: AssistantItem,
+            attachment: AttachmentItem
+    ):
         """
         Append attachment to assistant
 
@@ -375,7 +387,11 @@ class Files:
             suffix = f' ({num_files})'
         self.window.ui.tabs['input'].setTabText(2, trans('attachments_uploaded.tab') + suffix)
 
-    def handle_received_ids(self, ids: list, ext: str = None) -> list:
+    def handle_received_ids(
+            self,
+            ids: List[str],
+            ext: Optional[str] = None
+    ) -> list:
         """
         Handle (download) received message files
 

pygpt_net/controller/assistant/store.py

@@ -6,11 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import copy
 import json
+from typing import Optional
 
 from PySide6.QtWidgets import QApplication
 
@@ -65,7 +66,7 @@ class VectorStore:
         """
         return self.options
 
-    def get_option(self, key: str) -> dict or None:
+    def get_option(self, key: str) -> Optional[dict]:
         """
         Get option by key
 
@@ -157,7 +158,11 @@ class VectorStore:
                 self.window.update_status(trans('status.assistant.saved'))
                 self.update()  # update stores list in assistant dialog
 
-    def refresh_store(self, store: AssistantStoreItem, update: bool = True):
+    def refresh_store(
+            self,
+            store: AssistantStoreItem,
+            update: bool = True
+    ):
         """
         Refresh store by ID
 
@@ -301,7 +306,11 @@ class VectorStore:
         self.restore_selection()
         self.refresh_by_store_id(store.id)
 
-    def delete_by_idx(self, idx: int, force: bool = False):
+    def delete_by_idx(
+            self,
+            idx: int,
+            force: bool = False
+    ):
         """
         Delete store by idx
 
@@ -311,7 +320,11 @@ class VectorStore:
         store_id = self.get_by_tab_idx(idx)
         self.delete(store_id, force=force)
 
-    def delete(self, store_id: str = None, force: bool = False):
+    def delete(
+            self,
+            store_id: Optional[str] = None,
+            force: bool = False
+    ):
         """
         Delete store by idx
 
@@ -413,7 +426,7 @@ class VectorStore:
             i += 1
         return idx
 
-    def get_by_tab_idx(self, idx: int) -> str or None:
+    def get_by_tab_idx(self, idx: int) -> Optional[str]:
         """
         Get key by list index (including hidden)
 
@@ -429,7 +442,7 @@ class VectorStore:
             store_idx += 1
         return None
 
-    def get_first_visible(self) -> str or None:
+    def get_first_visible(self) -> Optional[str]:
         """
         Get first visible store ID (including hidden)
 

pygpt_net/controller/assistant/threads.py

@@ -6,11 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.24 00:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import json
 import time
+from typing import Optional, Any, List, Dict
 
 from PySide6.QtCore import QObject, Signal, Slot, QRunnable
 
@@ -46,7 +47,11 @@ class Threads(QObject):
         self.window.core.ctx.append_thread(thread_id)
         return thread_id
 
-    def handle_output_message(self, ctx: CtxItem, stream: bool = False):
+    def handle_output_message(
+            self,
+            ctx: CtxItem,
+            stream: bool = False
+    ):
         """
         Handle output message (not stream ONLY)
 
@@ -92,7 +97,12 @@ class Threads(QObject):
 
         self.log("Handled output message.")
 
-    def handle_message_data(self, ctx: CtxItem, msg, stream: bool = False):
+    def handle_message_data(
+            self,
+            ctx: CtxItem,
+            msg,
+            stream: bool = False
+    ):
         """
         Handle message data (files, images, text) - stream and not-stream
 
@@ -286,7 +296,10 @@ class Threads(QObject):
             })
             self.window.dispatch(event)
 
-    def handle_tool_outputs(self, ctx: CtxItem) -> list:
+    def handle_tool_outputs(
+            self,
+            ctx: CtxItem
+    ) -> List[Dict[str, Any]]:
         """
         Handle tool outputs
 
@@ -304,7 +317,10 @@ class Threads(QObject):
         return tools_outputs
 
 
-    def apply_outputs(self, ctx: CtxItem) -> list:
+    def apply_outputs(
+            self,
+            ctx: CtxItem
+    ) -> List[Dict[str, Any]]:
         """
         Apply tool call outputs
 
@@ -316,7 +332,12 @@ class Threads(QObject):
         ctx.tool_calls = self.tool_calls  # set previous tool calls
         return self.window.core.command.get_tool_calls_outputs(ctx)
 
-    def handle_run_created(self, ctx: CtxItem, run, stream: bool = False):
+    def handle_run_created(
+            self,
+            ctx: CtxItem,
+            run,
+            stream: bool = False
+    ):
         """
         Handle run created (stream and not stream)
 
@@ -330,7 +351,7 @@ class Threads(QObject):
         self.window.core.ctx.append_run(ctx.run_id)  # get run ID and store in ctx
         self.handle_run(ctx, run, stream)  # handle assistant run
 
-    def handle_run_error(self, ctx: CtxItem, err):
+    def handle_run_error(self, ctx: CtxItem, err: Any):
         """
         Handle run created (stream and not stream)
 
@@ -354,7 +375,12 @@ class Threads(QObject):
         self.window.controller.chat.common.unlock_input()  # unlock input
         # self.handle_stream_end(ctx)
 
-    def handle_run(self, ctx: CtxItem, run, stream: bool = False):
+    def handle_run(
+            self,
+            ctx: CtxItem,
+            run,
+            stream: bool = False
+    ):
         """
         Handle assistant's run (not stream ONLY)
 

pygpt_net/controller/attachment.py

@@ -6,11 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 02:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import os
 from datetime import datetime
+from typing import Optional
 from urllib.parse import urlparse
 
 from PySide6.QtGui import QImage
@@ -112,7 +113,12 @@ class Attachment:
         # TODO: implement this
         pass
 
-    def delete(self, idx: int, force: bool = False, remove_local: bool = False):
+    def delete(
+            self,
+            idx: int,
+            force: bool = False,
+            remove_local: bool = False
+    ):
         """
         Delete attachment
 
@@ -196,7 +202,11 @@ class Attachment:
         self.window.ui.dialog['rename'].close()
         self.update()
 
-    def add(self, mode: str, attachment: AttachmentItem):
+    def add(
+            self,
+            mode: str,
+            attachment: AttachmentItem
+    ):
         """
         Add attachment item to list
 
@@ -210,7 +220,12 @@ class Attachment:
         self.is_consumed = False  # reset consumed flag
         self.update()
 
-    def clear(self, force: bool = False, remove_local=False, auto: bool = False):
+    def clear(
+            self,
+            force: bool = False,
+            remove_local: bool = False,
+            auto: bool = False
+    ):
         """
         Clear attachments list
 
@@ -240,9 +255,7 @@ class Attachment:
             self.window.dispatch(AppEvent(AppEvent.CTX_ATTACHMENTS_CLEAR))
 
     def clear_silent(self):
-        """
-        Clear attachments list
-        """
+        """Clear attachments list without confirmation"""
         # delete all from attachments for current mode
         mode = self.window.core.config.get('mode')
         self.window.core.attachments.delete_all(
@@ -407,9 +420,13 @@ class Attachment:
                 self.window.core.config.get_user_dir('data'),
                 file_name,
             )
-        return path
+        return str(path)
 
-    def download(self, file_id: str, ext: str = None) -> str or None:
+    def download(
+            self,
+            file_id: str,
+            ext: Optional[str] = None
+    ) -> Optional[str]:
         """
         Download file
 
@@ -501,6 +518,8 @@ class Attachment:
     def from_clipboard_image(self, image):
         """
         Handle image from clipboard
+
+        :param image: image data
         """
         now = datetime.now()
         dt = now.strftime("%Y-%m-%d_%H-%M-%S")
@@ -509,7 +528,7 @@ class Attachment:
         image.save(path, "PNG")
         self.from_clipboard_url(path)
 
-    def from_clipboard_url(self, url, all: bool = False):
+    def from_clipboard_url(self, url: str, all: bool = False):
         """
         Handle image from clipboard url
 

pygpt_net/controller/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.14 18:00:00                  #
 # ================================================== #
 
 import os
+from typing import Optional
 
 from pygpt_net.core.events import Event, BaseEvent
 from pygpt_net.item.ctx import CtxItem
@@ -29,7 +30,11 @@ class Audio:
         """Setup controller"""
         self.update()
 
-    def toggle_input(self, state: bool, btn: bool = True):
+    def toggle_input(
+            self,
+            state: bool,
+            btn: bool = True
+    ):
         """
         Toggle audio input
 
@@ -155,7 +160,11 @@ class Audio:
         else:
             self.window.ui.menu['audio.control.global'].setChecked(False)
 
-    def read_text(self, text: str, cache_file: str = None):
+    def read_text(
+            self,
+            text: str,
+            cache_file: Optional[str] = None
+    ):
         """
         Read text using audio output plugins
 
@@ -200,17 +209,29 @@ class Audio:
         }
         self.window.dispatch(event, all=True)
 
+    def stop_audio(self):
+        """Stop audio playback"""
+        ctx = CtxItem()
+        event = Event(Event.AUDIO_OUTPUT_STOP)
+        event.ctx = ctx
+        event.data = {}
+        self.window.dispatch(event, all=True)
+
     def play_sound(self, filename: str):
         """
         Play sound
 
-        :param filename
+        :param filename: sound file name
         """
         path = os.path.join(self.window.core.config.get_app_path(), "data", "audio", filename)
         if path:
             self.play_audio(path)
 
-    def play_event(self, text: str, event: BaseEvent = None):
+    def play_event(
+            self,
+            text: str,
+            event: Optional[BaseEvent] = None
+    ):
         """
         Play event (read text or play cached audio file)
 

pygpt_net/controller/calendar/__init__.py

@@ -6,9 +6,11 @@
 # 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.14 08:00:00                  #
 # ================================================== #
 
+from typing import Optional
+
 from pygpt_net.core.tabs.tab import Tab
 
 from .note import Note
@@ -48,6 +50,8 @@ class Calendar:
 
         :param all: reload all notes
         """
+        if not self.is_loaded():
+            return
         year = self.window.ui.calendar['select'].currentYear
         month = self.window.ui.calendar['select'].currentMonth
         self.on_page_changed(year, month, all=all)  # load notes for current month
@@ -77,7 +81,12 @@ class Calendar:
         month = self.window.ui.calendar['select'].currentMonth
         self.window.core.calendar.load_by_month(year, month)
 
-    def on_page_changed(self, year: int, month: int, all: bool = True):
+    def on_page_changed(
+            self,
+            year: int,
+            month: int,
+            all: bool = True
+    ):
         """
         On calendar page changed
 
@@ -90,7 +99,12 @@ class Calendar:
         self.note.refresh_ctx(year, month)
         self.note.refresh_num(year, month)
 
-    def on_day_select(self, year: int, month: int, day: int):
+    def on_day_select(
+            self,
+            year: int,
+            month: int,
+            day: int
+    ):
         """
         On day select
 
@@ -104,7 +118,12 @@ class Calendar:
         self.note.update_content(year, month, day)
         self.note.update_label(year, month, day)
 
-    def on_ctx_select(self, year: int, month: int, day: int):
+    def on_ctx_select(
+            self,
+            year: int,
+            month: int,
+            day: int
+    ):
         """
         On ctx select
 

pygpt_net/controller/calendar/note.py

@@ -6,10 +6,11 @@
 # 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.14 08:00:00                  #
 # ================================================== #
 
 import datetime
+from typing import Dict
 
 from PySide6.QtGui import QTextCursor
 
@@ -55,7 +56,12 @@ class Note:
 
         self.refresh_num(year, month)  # update note cells when note is changed
 
-    def update_content(self, year: int, month: int, day: int):
+    def update_content(
+            self,
+            year: int,
+            month: int,
+            day: int
+    ):
         """
         Update content
 
@@ -71,7 +77,12 @@ class Note:
             self.window.ui.calendar['note'].setPlainText(note.content)
             self.window.ui.calendar['note'].on_update()
 
-    def update_label(self, year: int, month: int, day: int):
+    def update_label(
+            self,
+            year: int,
+            month: int,
+            day: int
+    ):
         """
         Update label
 
@@ -89,7 +100,13 @@ class Note:
         day = self.window.ui.calendar['select'].currentDay
         self.update_label(year, month, day)
 
-    def update_status(self, status: str, year: int, month: int, day: int):
+    def update_status(
+            self,
+            status: str,
+            year: int,
+            month: int,
+            day: int
+    ):
         """
         Update status label
 
@@ -109,7 +126,11 @@ class Note:
 
         self.refresh_num(year, month)  # update note cells when note is changed
 
-    def get_counts_around_month(self, year: int, month: int) -> dict:
+    def get_counts_around_month(
+            self,
+            year: int,
+            month: int
+    ) -> Dict[str, int]:
         """
         Get counts around month
 
@@ -139,7 +160,11 @@ class Note:
         )
         return {**last, **current, **next}  # combine counters
 
-    def get_labels_counts_around_month(self, year: int, month: int) -> dict:
+    def get_labels_counts_around_month(
+            self,
+            year: int,
+            month: int
+    ) -> Dict[str, Dict[int, int]]:
         """
         Get counts around month
 
@@ -169,7 +194,11 @@ class Note:
         )
         return {**last, **current, **next}  # combine counters
 
-    def get_ctx_counters(self, year: int, month: int) -> dict:
+    def get_ctx_counters(
+            self,
+            year: int,
+            month: int
+    ) -> Dict[str, int]:
         """
         Get ctx counters
 
@@ -197,7 +226,11 @@ class Note:
             search_content=search_content,
         )
 
-    def get_ctx_labels_counters(self, year: int, month: int) -> dict:
+    def get_ctx_labels_counters(
+            self,
+            year: int,
+            month: int
+    ) -> Dict[str, Dict[int, int]]:
         """
         Get ctx labels counters
 
@@ -225,7 +258,11 @@ class Note:
             search_content=search_content,
         )
 
-    def refresh_ctx(self, year: int, month: int):
+    def refresh_ctx(
+            self,
+            year: int,
+            month: int
+    ):
         """
         Update calendar ctx cells
 
@@ -236,7 +273,12 @@ class Note:
         labels = self.get_labels_counts_around_month(year, month)
         self.window.ui.calendar['select'].update_ctx(count, labels)
 
-    def create(self, year: int, month: int, day: int) -> CalendarNoteItem:
+    def create(
+            self,
+            year: int,
+            month: int,
+            day: int
+    ) -> CalendarNoteItem:
         """
         Create empty note
 
@@ -251,7 +293,11 @@ class Note:
         note.day = day
         return note
 
-    def get_notes_existence_around_month(self, year: int, month: int) -> dict:
+    def get_notes_existence_around_month(
+            self,
+            year: int,
+            month: int
+    ) -> Dict[str, Dict[int, int]]:
         """
         Get notes existence around month
 

pygpt_net/controller/camera.py

@@ -6,21 +6,19 @@
 # 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 00:00:00                  #
 # ================================================== #
 
 import datetime
 import os
 import time
+from typing import Any
 
 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
@@ -464,7 +462,7 @@ class Camera(QObject):
         self.window.dispatch(AppEvent(AppEvent.CAMERA_DISABLED))  # app event
 
     @Slot(object)
-    def handle_error(self, err):
+    def handle_error(self, err: Any):
         """
         Handle thread error signal
 
@@ -507,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