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

pygpt_net/core/filesystem/actions.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.25 10:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import os
+from typing import List
 
 from PySide6.QtGui import QAction, QIcon
 from PySide6.QtWidgets import QWidget
@@ -45,9 +46,10 @@ class Actions:
         :param path: path to file
         :return: True if file has preview
         """
-        return self.window.core.filesystem.types.is_image(path) or self.window.core.filesystem.types.is_video(path)
+        return (self.window.core.filesystem.types.is_image(path)
+                or self.window.core.filesystem.types.is_video(path))
 
-    def get_preview(self, parent: QWidget, path: str) -> list:
+    def get_preview(self, parent: QWidget, path: str) -> List[QAction]:
         """
         Get preview actions for context menu
 
@@ -56,7 +58,8 @@ class Actions:
         :return: list of context menu actions
         """
         actions = []
-        if self.window.core.filesystem.types.is_video(path) or self.window.core.filesystem.types.is_audio(path):
+        if (self.window.core.filesystem.types.is_video(path)
+                or self.window.core.filesystem.types.is_audio(path)):
             action = QAction(
                 QIcon(":/icons/video.svg"),
                 trans('action.video.play'),
@@ -100,7 +103,7 @@ class Actions:
                 actions.append(action)
         return actions
 
-    def get_use(self, parent: QWidget, path: str) -> list:
+    def get_use(self, parent: QWidget, path: str) -> List[QAction]:
         """
         Get use actions for context menu
 

pygpt_net/core/filesystem/editor.py

@@ -6,13 +6,15 @@
 # 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
 import os
 
+from typing import Optional
+
 
 class Editor:
     def __init__(self, window=None):
@@ -63,7 +65,11 @@ class Editor:
         """
         return self.window.ui.dialog[dialog_id].is_changed()
 
-    def load(self, dialog_id: str, file: str = None):
+    def load(
+            self,
+            dialog_id: str,
+            file: Optional[str] = None
+    ):
         """
         Load file to editor
 
@@ -87,7 +93,11 @@ class Editor:
             self.window.core.debug.log(e)
             self.window.update_status("Error loading file: {}".format(e))
 
-    def save(self, dialog_id: str, path: str = None):
+    def save(
+            self,
+            dialog_id: str,
+            path: Optional[str] = None
+    ):
         """
         Save file to disk
 

pygpt_net/core/filesystem/types.py

@@ -6,9 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.19 01:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import List
+
+
 class Types:
     def __init__(self, window=None):
         """
@@ -45,7 +48,7 @@ class Types:
         """
         return str(path).lower().endswith(tuple(self.get_audio_ext()))
 
-    def get_img_ext(self) -> list:
+    def get_img_ext(self) -> List[str]:
         """
         Get image extensions
 
@@ -53,23 +56,25 @@ class Types:
         """
         return ['.png', '.jpg', '.jpeg', '.gif', '.bmp', '.tiff', '.webp']
 
-    def get_video_ext(self) -> list:
+    def get_video_ext(self) -> List[str]:
         """
         Get video extensions
 
         :return: list with video extensions
         """
-        return ['.mp4', '.avi', '.mkv', '.webm', '.mov', '.flv', '.wmv', '.3gp', '.ogg', '.ogv', '.mpg', '.mpeg', '.m4v']
+        return ['.mp4', '.avi', '.mkv', '.webm', '.mov', '.flv', '.wmv',
+                '.3gp', '.ogg', '.ogv', '.mpg', '.mpeg', '.m4v']
 
-    def get_audio_ext(self) -> list:
+    def get_audio_ext(self) -> List[str]:
         """
         Get audio extensions
 
         :return: list with audio extensions
         """
-        return ['.mp3', '.wav', '.flac', '.ogg', '.m4a', '.wma', '.aac', '.aiff', '.alac', '.dsd', '.pcm', '.mpc']
+        return ['.mp3', '.wav', '.flac', '.ogg', '.m4a', '.wma', '.aac',
+                '.aiff', '.alac', '.dsd', '.pcm', '.mpc']
 
-    def get_excluded_extensions(self) -> list[str]:
+    def get_excluded_extensions(self) -> List[str]:
         """
         Get excluded extensions if no loader is available
 

pygpt_net/core/filesystem/url.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.08 06:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import QUrl
@@ -38,14 +38,18 @@ class Url:
         ]
 
         # JS bridge
-        if url.toString() == 'bridge://open_find':
-            pid = self.window.controller.ui.tabs.get_current_pid()
+        if url.toString().startswith('bridge://open_find'):
+            pid = int(url.toString().split(':')[2])
             if pid in self.window.ui.nodes['output']:
                 self.window.ui.nodes['output'][pid].find_open()
             return
         elif url.toString() == 'bridge://escape':
             self.window.controller.access.on_escape()
             return
+        elif url.toString() == 'bridge://focus':
+            pid = self.window.controller.ui.tabs.get_current_pid()
+            if pid in self.window.ui.nodes['output']:
+                self.window.ui.nodes['output'][pid].on_focus_js()
 
         # -------------
 

pygpt_net/core/idx/__init__.py

@@ -6,10 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.17 01:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import datetime
+from typing import Optional, Tuple, List, Dict, Any
+
 from packaging.version import Version
 
 from pygpt_net.item.index import IndexItem
@@ -98,7 +100,11 @@ class Idx:
         """
         self.storage.store(idx)
 
-    def remove_index(self, idx: str = "base", truncate: bool = False) -> bool:
+    def remove_index(
+            self,
+            idx: str = "base",
+            truncate: bool = False
+    ) -> bool:
         """
         Truncate index
 
@@ -125,10 +131,10 @@ class Idx:
     def index_files(
             self,
             idx: str = "base",
-            path: str = None,
-            replace: bool = None,
-            recursive: bool = None,
-    ) -> (dict, list):
+            path: Optional[str] = None,
+            replace: Optional[bool] = None,
+            recursive: Optional[bool] = None,
+    ) -> Tuple[Dict, List[str]]:
         """
         Index file or directory of files
 
@@ -165,7 +171,7 @@ class Idx:
             idx: str = "base",
             id: int = 0,
             from_ts: int = 0
-    ) -> (int, list):
+    ) -> Tuple[int, List[str]]:
         """
         Index records from db by meta id
 
@@ -199,7 +205,7 @@ class Idx:
             self,
             idx: str = "base",
             from_ts: int = 0
-    ) -> (int, list):
+    ) -> Tuple[int, List[str]]:
         """
         Index records from db by meta id
 
@@ -230,10 +236,10 @@ class Idx:
     def index_urls(
             self,
             idx: str = "base",
-            urls: list = None,
+            urls: Optional[List[str]] = None,
             type: str = "webpage",
-            extra_args: dict = None
-    ) -> (dict, list):
+            extra_args: Optional[Dict[str, Any]] = None
+    ) -> Tuple[int, List[str]]:
         """
         Index URLs
 
@@ -269,10 +275,10 @@ class Idx:
             self,
             idx: str = "base",
             type: str = "webpage",
-            params: dict = None,
-            config: dict = None,
-            replace: bool = None,
-    ) -> (dict, list):
+            params: Optional[Dict[str, Any]] = None,
+            config: Optional[Dict[str, Any]] = None,
+            replace: Optional[bool] = None,
+    ) -> Tuple[int, list]:
         """
         Index URLs
 
@@ -310,7 +316,10 @@ class Idx:
             self.log("Error: " + str(errors))
         return n, errors
 
-    def get_idx_data(self, idx: str = None) -> dict:
+    def get_idx_data(
+            self,
+            idx: Optional[str] = None
+    ) -> Dict[str, Dict]:
         """
         Get indexed files data
 
@@ -329,7 +338,7 @@ class Idx:
                     indexes[idx] = self.items[store_id][idx].items
         return indexes
 
-    def get_by_idx(self, idx: int) -> str:
+    def get_by_idx(self, idx: int) -> Optional[str]:
         """
         Return idx by list index
 
@@ -341,7 +350,7 @@ class Idx:
             if idx < len(items):
                 return items[idx]['id']
 
-    def get_idx_by_name(self, name: str) -> int:
+    def get_idx_by_name(self, name: str) -> Optional[int]:
         """
         Return idx on list by name
 
@@ -354,7 +363,7 @@ class Idx:
                 if item['id'] == name:
                     return idx
 
-    def get_default_idx(self) -> str:
+    def get_default_idx(self) -> Optional[str]:
         """
         Return default idx
 
@@ -375,7 +384,7 @@ class Idx:
             return idx in self.items[store_id]
         return False
 
-    def get(self, idx: str) -> IndexItem:
+    def get(self, idx: str) -> Optional[IndexItem]:
         """
         Return index data from current storage
 
@@ -386,7 +395,7 @@ class Idx:
         if store_id in self.items and idx in self.items[store_id]:
             return self.items[store_id][idx]
 
-    def get_all(self) -> dict:
+    def get_all(self) -> Dict[str, IndexItem]:
         """
         Return all indexes in current store
 
@@ -397,12 +406,12 @@ class Idx:
             return self.items[store_id]
         return {}
 
-    def append(self, idx: str, files: dict):
+    def append(self, idx: str, files: Dict[str, str]):
         """
         Append indexed files to index
 
         :param idx: index name
-        :param files: dict of indexed files
+        :param files: dict of indexed files (path -> doc_id)
         """
         # create store if not exists
         store_id = self.get_current_store()
@@ -508,7 +517,7 @@ class Idx:
                     self.items[store_id][idx].id = idx
                     self.items[store_id][idx].name = idx
 
-    def get_idx_ids(self) -> list:
+    def get_idx_ids(self) -> List[str]:
         """
         Get list of indexes
 
@@ -532,7 +541,7 @@ class Idx:
             self.items[store_id][idx].items = {}
         self.get_provider().truncate(store_id, idx)
 
-    def get_counters(self, type: str) -> dict:
+    def get_counters(self, type: str) -> Dict[str, Dict[str, int]]:
         """
         Get counters (stats, count items by type [file, ctx, external])
 

pygpt_net/core/idx/chat.py

@@ -6,10 +6,11 @@
 # 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.14 08:00:00                  #
 # ================================================== #
 
 import json
+from typing import Optional, Dict, Any, List
 
 from llama_index.core.llms import ChatMessage, MessageRole
 from llama_index.core.prompts import ChatPromptTemplate
@@ -37,7 +38,11 @@ class Chat:
         self.storage = storage
         self.context = Context(window)
 
-    def call(self, context: BridgeContext, extra: dict = None) -> bool:
+    def call(
+            self,
+            context: BridgeContext,
+            extra: Optional[Dict[str, Any]] = None
+    ) -> bool:
         """
         Call chat, complete or query mode
 
@@ -69,7 +74,11 @@ class Chat:
                 extra=extra,
             )  # if not, use query mode
 
-    def raw_query(self, context: BridgeContext, extra: dict = None) -> bool:
+    def raw_query(
+            self,
+            context: BridgeContext,
+            extra: Optional[Dict[str, Any]] = None
+    ) -> bool:
         """
         Raw query mode
 
@@ -82,7 +91,11 @@ class Chat:
             extra=extra,
         )
 
-    def query(self, context: BridgeContext, extra: dict = None) -> bool:
+    def query(
+            self,
+            context: BridgeContext,
+            extra: Optional[Dict[str, Any]] = None
+    ) -> bool:
         """
         Query index mode (no chat, only single query) and append results to context
 
@@ -150,7 +163,11 @@ class Chat:
             return True
         return False
 
-    def chat(self, context: BridgeContext, extra: dict = None) -> bool:
+    def chat(
+            self,
+            context: BridgeContext,
+            extra: Optional[Dict[str, Any]] = None
+    ) -> bool:
         """
         Chat mode (conversation, using context from index) and append result to the context
 
@@ -291,7 +308,7 @@ class Chat:
             ctx: CtxItem,
             path: str,
             query: str,
-            model: ModelItem = None
+            model: Optional[ModelItem] = None
     ) -> str:
         """
         Query file using temp index (created on the fly)
@@ -345,7 +362,7 @@ class Chat:
             url: str,
             args: dict,
             query: str,
-            model: ModelItem = None
+            model: Optional[ModelItem] = None
     ) -> str:
         """
         Query web using temp index (created on the fly)
@@ -405,8 +422,8 @@ class Chat:
             self,
             query: str,
             path: str,
-            model: ModelItem = None,
-            history: list = None,
+            model: Optional[ModelItem] = None,
+            history: Optional[List[CtxItem]] = None,
             verbose: bool = False,
     ) -> str:
         """
@@ -461,7 +478,7 @@ class Chat:
             self,
             query: str,
             idx: str,
-            model: ModelItem = None
+            model: Optional[ModelItem] = None
     ) -> str:
         """
         Query attachment
@@ -486,7 +503,11 @@ class Chat:
             output = str(response)
         return output
 
-    def get_memory_buffer(self, history: list, llm = None) -> ChatMemoryBuffer:
+    def get_memory_buffer(
+            self,
+            history: List[ChatMessage],
+            llm = None
+    ) -> ChatMemoryBuffer:
         """
         Get memory buffer
 
@@ -499,7 +520,10 @@ class Chat:
             llm=llm,
         )
 
-    def get_custom_prompt(self, prompt: str = None) -> ChatPromptTemplate or None:
+    def get_custom_prompt(
+            self,
+            prompt: Optional[str] = None
+    ) -> Optional[ChatPromptTemplate]:
         """
         Get custom prompt template if sys prompt is not empty
 
@@ -528,12 +552,12 @@ class Chat:
         ]
         return ChatPromptTemplate(qa_msgs)
 
-    def get_index(self, idx, model):
+    def get_index(self, idx: str, model: ModelItem):
         """
         Get index instance
 
         :param idx: idx name (id)
-        :param model: model name
+        :param model: model instance
         :return:
         """
         # check if index exists
@@ -549,7 +573,7 @@ class Chat:
         index = self.storage.get(idx, service_context=service_context)  # get index
         return index, service_context
 
-    def get_metadata(self, source_nodes: list):
+    def get_metadata(self, source_nodes: Optional[list]) -> Dict[str, Any]:
         """
         Get metadata from source nodes
 
@@ -577,7 +601,7 @@ class Chat:
                             break
         return metadata
 
-    def parse_metadata(self, metadata: dict):
+    def parse_metadata(self, metadata: Optional[Dict]) -> Dict[str, Any]:
         """
         Parse metadata
 

pygpt_net/core/idx/context.py

@@ -6,11 +6,15 @@
 # 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 Optional, List
+
 from llama_index.core.llms import ChatMessage, MessageRole
 
+from pygpt_net.item.ctx import CtxItem
+
 
 class Context:
     def __init__(self, window=None):
@@ -25,7 +29,7 @@ class Context:
             self,
             input_prompt: str,
             system_prompt: str,
-            history: list = None,
+            history: Optional[List[CtxItem]] = None,
             multimodal: bool = False
     ):
         """