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

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 08: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,6 +209,14 @@ 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
@@ -210,7 +227,11 @@ class Audio:
         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,12 +6,13 @@
 # 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
 
@@ -464,7 +465,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
 

pygpt_net/controller/chat/__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.26 19:00:00                  #
+# Updated Date: 2024.12.14 00:00:00                  #
 # ================================================== #
 
+from typing import Any
+
 from pygpt_net.core.events import AppEvent
 from pygpt_net.item.ctx import CtxItem
 
@@ -64,7 +66,7 @@ class Chat:
         self.render.reload()
         self.attachment.reload()
 
-    def handle_error(self, err: any):
+    def handle_error(self, err: Any):
         """
         Handle error
 
@@ -93,7 +95,7 @@ class Chat:
         else:
             self.log("[ctx] {}.".format(mode.upper()))
 
-    def log(self, data: any):
+    def log(self, data: Any):
         """
         Log data to debug
 

pygpt_net/controller/chat/attachment.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 04:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import os
+from typing import List, Dict, Any
 
 from PySide6.QtCore import Slot, QObject
 
@@ -74,7 +75,11 @@ class Attachment(QObject):
         """Reload attachments"""
         self.setup()
 
-    def handle(self, mode: str, text: str):
+    def handle(
+            self,
+            mode: str,
+            text: str
+    ):
         """
         Handle attachment upload
 
@@ -104,7 +109,12 @@ class Attachment(QObject):
                 return True
         return False
 
-    def upload(self, meta: CtxMeta, mode: str, prompt: str) -> bool:
+    def upload(
+            self,
+            meta: CtxMeta,
+            mode: str,
+            prompt: str
+    ) -> bool:
         """
         Upload attachments for meta
 
@@ -261,26 +271,26 @@ class Attachment(QObject):
         """
         return self.mode
 
-    def get_context(self, ctx: CtxItem) -> str:
+    def get_context(
+            self,
+            ctx: CtxItem,
+            history: List[CtxItem]
+    ) -> str:
         """
         Get additional context for attachment
 
         :param ctx: CtxItem instance
+        :param history Context items (history)
         :return: Additional context
         """
-        content = ""
-        meta = ctx.meta
         if self.mode != self.MODE_DISABLED:
             if self.is_verbose():
                 print("\nPreparing additional context...\nContext Mode: {}".format(self.mode))
 
-        self.window.core.attachments.context.reset()
-        if self.mode == self.MODE_FULL_CONTEXT:
-            content = self.get_full_context(ctx)
-        elif self.mode == self.MODE_QUERY_CONTEXT:
-            content = self.get_query_context(meta, str(ctx.input))
-        elif self.mode == self.MODE_QUERY_CONTEXT_SUMMARY:
-            content = self.get_context_summary(ctx)
+        self.window.core.attachments.context.reset()  # reset used files and urls
+
+        # get additional context from attachments
+        content = self.window.core.attachments.context.get_context(self.mode, ctx, history)
 
         # append used files and urls to context
         files = self.window.core.attachments.context.get_used_files()
@@ -296,35 +306,10 @@ class Attachment(QObject):
             return "====================================\nADDITIONAL CONTEXT FROM ATTACHMENT(s): {}".format(content)
         return ""
 
-    def get_full_context(self, ctx: CtxItem) -> str:
-        """
-        Get full context for attachment
-
-        :param ctx: CtxItem instance
-        :return: Full context
-        """
-        return self.window.core.attachments.context.get_context_text(ctx, filename=True)
-
-    def get_query_context(self, meta: CtxMeta, query: str) -> str:
-        """
-        Get query context for attachment
-
-        :param meta: CtxMeta instance
-        :param query: Query string
-        :return: Query context
-        """
-        return self.window.core.attachments.context.query_context(meta, query)
-
-    def get_context_summary(self, ctx: CtxItem) -> str:
-        """
-        Get context summary
-
-        :param ctx: CtxItem instance
-        :return: Context summary
-        """
-        return self.window.core.attachments.context.summary_context(ctx, ctx.input)
-
-    def get_uploaded_attachments(self, meta: CtxMeta) -> list:
+    def get_uploaded_attachments(
+            self,
+            meta: CtxMeta
+    ) -> List[Dict[str, Any]]:
         """
         Get uploaded attachments for meta
 
@@ -396,7 +381,12 @@ class Attachment(QObject):
         """Hide uploaded attachments"""
         self.window.ui.tabs['input'].setTabVisible(self.uploaded_tab_idx, False)
 
-    def delete_by_idx(self, idx: int, force: bool = False, remove_local=True):
+    def delete_by_idx(
+            self,
+            idx: int,
+            force: bool = False,
+            remove_local: bool = True
+    ):
         """
         Delete attachment by index
 
@@ -420,7 +410,12 @@ class Attachment(QObject):
             self.window.core.attachments.context.delete(meta, item, delete_files=remove_local)
             self.update_list(meta)
 
-    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
 

pygpt_net/controller/chat/command.py

@@ -6,9 +6,11 @@
 # 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.12.14 00:00:00                  #
 # ================================================== #
 
+from typing import Any
+
 from pygpt_net.core.types import (
     MODE_AGENT,
 )
@@ -79,7 +81,7 @@ class Command:
             })
             self.window.dispatch(event)
 
-    def log(self, data: any):
+    def log(self, data: Any):
         """
         Log data to debug
 

pygpt_net/controller/chat/common.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.12.14 08:00:00                  #
 # ================================================== #
 
 import os
@@ -113,7 +113,11 @@ class Common:
         self.window.ui.nodes['input'].setFocus()
         self.initialized = True
 
-    def append_to_input(self, text: str, separator: str = "\n"):
+    def append_to_input(
+            self,
+            text: str,
+            separator: str = "\n"
+    ):
         """
         Append text to input
 
@@ -223,7 +227,6 @@ class Common:
             unlock = False
         return unlock
 
-
     def stop(self, exit: bool = False):
         """
         Stop all
@@ -358,7 +361,11 @@ class Common:
         else:
             self.img_enable_raw()
 
-    def save_text(self, text: str, type: str = "txt"):
+    def save_text(
+            self,
+            text: str,
+            type: str = "txt"
+    ):
         """
         Save text to file
 

pygpt_net/controller/chat/files.py

@@ -6,9 +6,12 @@
 # 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 08:00:00                  #
 # ================================================== #
 
+from typing import Dict
+
+from pygpt_net.item.attachment import AttachmentItem
 from pygpt_net.item.ctx import CtxItem
 from pygpt_net.utils import trans
 
@@ -22,7 +25,11 @@ class Files:
         """
         self.window = window
 
-    def send(self, mode: str, ctx: CtxItem):
+    def send(
+            self,
+            mode: str,
+            ctx: CtxItem
+    ):
         """
         Send attachments
 
@@ -37,7 +44,7 @@ class Files:
             self.window.controller.chat.log("Uploaded attachments (Assistant): {}".format(len(attachments)))
         return attachments
 
-    def upload(self, mode: str) -> dict:
+    def upload(self, mode: str) -> Dict[str, AttachmentItem]:
         """
         Upload attachments
 

pygpt_net/controller/chat/image.py

@@ -6,9 +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                  #
 # ================================================== #
 
+from typing import Optional, List
+
 from PySide6.QtCore import Slot
 
 from pygpt_net.core.bridge.context import BridgeContext
@@ -30,8 +32,8 @@ class Image:
     def send(
             self,
             text: str,
-            prev_ctx: CtxItem = None,
-            parent_id: int = None,
+            prev_ctx: Optional[CtxItem] = None,
+            parent_id: Optional[int] = None,
     ) -> CtxItem:
         """
         Send prompt for image generate
@@ -116,7 +118,12 @@ class Image:
         return ctx
 
     @Slot(object, list, str)
-    def handle_response(self, ctx: CtxItem, paths: list, prompt: str):
+    def handle_response(
+            self,
+            ctx: CtxItem,
+            paths: List[str],
+            prompt: str
+    ):
         """
         Handle response
 
@@ -161,7 +168,12 @@ class Image:
         self.window.controller.chat.common.unlock_input()  # unlock input
 
     @Slot(object, list, str)
-    def handle_response_inline(self, ctx: CtxItem, paths: list, prompt: str):
+    def handle_response_inline(
+            self,
+            ctx: CtxItem,
+            paths: List[str],
+            prompt: str
+    ):
         """
         Handle inline response
 

pygpt_net/controller/chat/input.py

@@ -6,9 +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 08:00:00                  #
 # ================================================== #
 
+from typing import Optional, Any, Dict
+
 from pygpt_net.core.bridge import BridgeContext
 from pygpt_net.core.bridge.context import MultimodalContext
 from pygpt_net.core.events import Event, AppEvent, KernelEvent, RenderEvent
@@ -52,6 +54,7 @@ class Input:
         """
         self.window.controller.agent.experts.unlock()  # unlock experts
         self.window.controller.agent.llama.reset_eval_step()  # reset evaluation steps
+        self.window.controller.ui.tabs.switch_to_first_chat()  # switch to first active chat tab
 
         # get text from input
         text = self.window.ui.nodes['input'].toPlainText().strip()
@@ -121,7 +124,7 @@ class Input:
     def send(
             self,
             context: BridgeContext,
-            extra: dict,
+            extra: Dict[str, Any],
     ):
         """
         Send input wrapper
@@ -148,13 +151,13 @@ class Input:
 
     def execute(
             self,
-            text: str = None,
+            text: str,
             force: bool = False,
             reply: bool = False,
             internal: bool = False,
-            prev_ctx: CtxItem = None,
-            parent_id: int = None,
-            multimodal_ctx: MultimodalContext = None,
+            prev_ctx: Optional[CtxItem] = None,
+            parent_id: Optional[int] = None,
+            multimodal_ctx: Optional[MultimodalContext] = None,
     ):
         """
         Execute send input text to API
@@ -265,7 +268,7 @@ class Input:
                 multimodal_ctx=multimodal_ctx,
             )  # text mode: OpenAI, Langchain, Llama, etc.
 
-    def log(self, data: any):
+    def log(self, data: Any):
         """
         Log data to debug