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

pygpt_net/core/filesystem/__init__.py

@@ -6,14 +6,14 @@
 # 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 os
 import shutil
 
-from datetime import datetime
 from pathlib import PurePath
+from typing import Tuple, Any, Union, List
 from uuid import uuid4
 
 from PySide6.QtCore import QUrl
@@ -38,18 +38,6 @@ class Filesystem:
         self.types = Types(window)
         self.url = Url(window)
         self.workdir_placeholder = "%workdir%"
-        self.styles = [
-            "style.css",
-            "style.dark.css",
-            "style.light.css",
-            "markdown.css",
-            "markdown.dark.css",
-            "markdown.light.css",
-            "web.css",
-            "web.dark.css",
-            "web.light.css",
-            "fix_windows.css",
-        ]
 
     def install(self):
         """Install provider data"""
@@ -77,9 +65,9 @@ class Filesystem:
 
         src_dir = os.path.join(self.window.core.config.get_app_path(), 'data', 'css')
         dst_dir = os.path.join(self.window.core.config.path, 'css')
-
+        app_styles = os.listdir(src_dir)
         try:
-            for style in self.styles:
+            for style in app_styles:
                 src = os.path.join(src_dir, style)
                 dst = os.path.join(dst_dir, style)
                 if (not os.path.exists(dst) or force) and os.path.exists(src):
@@ -91,7 +79,8 @@ class Filesystem:
         """Backup user custom css styles"""
         css_dir = os.path.join(self.window.core.config.path, 'css')
         backup_file_extension = '.backup'
-        for style in self.styles:
+        user_styles = os.listdir(css_dir)
+        for style in user_styles:
             src = os.path.join(css_dir, style)
             dst = os.path.join(css_dir, style + backup_file_extension)
             if os.path.exists(src):
@@ -118,7 +107,7 @@ class Filesystem:
         """
         return [self.make_local(path) for path in paths]
 
-    def make_local_list_img(self, paths: list) -> list:
+    def make_local_list_img(self, paths: List[str]) -> List[str]:
         """
         Make local placeholder paths for images
 
@@ -132,7 +121,7 @@ class Filesystem:
                 result.append(self.make_local(path))
         return result
 
-    def get_url(self, url) -> QUrl:
+    def get_url(self, url: str) -> QUrl:
         """
         Make current OS-specific URL to open file or directory
 
@@ -146,7 +135,7 @@ class Filesystem:
         else:
             return QUrl.fromLocalFile(url)
 
-    def get_path(self, path) -> str:
+    def get_path(self, path: str) -> str:
         """
         Prepare current OS-specific path from given path
 
@@ -155,10 +144,10 @@ class Filesystem:
         """
         parts = PurePath(path).parts
         if len(parts) > 1:
-            return os.path.join(*parts)  # rebuild OS directory separators
+            return str(os.path.join(*parts))  # rebuild OS directory separators
         return path
 
-    def to_workdir(self, path) -> str:
+    def to_workdir(self, path: str) -> str:
         """
         Replace user path with current workdir
 
@@ -189,7 +178,7 @@ class Filesystem:
         parts = path[dir_index:]
         return os.path.join(work_dir, parts)
 
-    def extract_local_url(self, path) -> (str, str):
+    def extract_local_url(self, path: str) -> Tuple[str, str]:
         """
         Extract local url and path from url
 
@@ -250,7 +239,7 @@ class Filesystem:
         shutil.copyfile(path, upload_path)
         return upload_path
 
-    def remove_upload(self, path: str) -> None:
+    def remove_upload(self, path: str):
         """
         Delete uploaded file
 
@@ -270,7 +259,7 @@ class Filesystem:
         """
         return path.startswith('file://') or path.startswith('http://') or path.startswith('https://')
 
-    def sizeof_fmt(self, num, suffix='B'):
+    def sizeof_fmt(self, num: Any, suffix: str = 'B'):
         """
         Convert numbers to human-readable unit formats.
 
@@ -286,7 +275,11 @@ class Filesystem:
             num /= 1024.0
         return "{:.1f} {}{}".format(num, 'Yi', suffix).replace('.', ',')
 
-    def get_directory_size(self, directory : str, human_readable: bool = True) -> str or int:
+    def get_directory_size(
+            self,
+            directory: str,
+            human_readable: bool = True
+    ) -> Union[str, int]:
         """
         Calculate the total size of the given directory
 
@@ -308,7 +301,11 @@ class Filesystem:
             return self.sizeof_fmt(total_size)
         return total_size
 
-    def get_datadir_size(self, path: str, human_readable: bool = True) -> str or int:
+    def get_datadir_size(
+            self,
+            path: str,
+            human_readable: bool = True
+    ) -> Union[str, int]:
         """
         Calculate the total size of the given data directory
 
@@ -319,7 +316,11 @@ class Filesystem:
         data_dir = os.path.join(path, 'data')
         return self.get_directory_size(data_dir, human_readable)
 
-    def get_db_size(self, path: str, human_readable: bool = True) -> str or int:
+    def get_db_size(
+            self,
+            path: str,
+            human_readable: bool = True
+    ) -> Union[str, int]:
         """
         Calculate the total size of the given database
 
@@ -337,7 +338,11 @@ class Filesystem:
             return self.sizeof_fmt(total_size)
         return total_size
 
-    def get_free_disk_space(self, directory: str, human_readable: bool = True) -> str or int:
+    def get_free_disk_space(
+            self,
+            directory: str,
+            human_readable: bool = True
+    ) -> Union[str, int]:
         """
         Check free disk space in the given directory
 
@@ -350,7 +355,13 @@ class Filesystem:
             return self.sizeof_fmt(free)
         return free
 
-    def copy_workdir(self, path: str, new_path: str, copy_db: bool = True, copy_datadir: bool = True) -> bool:
+    def copy_workdir(
+            self,
+            path: str,
+            new_path: str,
+            copy_db: bool = True,
+            copy_datadir: bool = True
+    ) -> bool:
         """
         Copy working directory
 
@@ -389,7 +400,12 @@ class Filesystem:
             os.remove(profile_file)
         return True
 
-    def clear_workdir(self, path: str, remove_db: bool = True, remove_datadir: bool = True) -> bool:
+    def clear_workdir(
+            self,
+            path: str,
+            remove_db: bool = True,
+            remove_datadir: bool = True
+    ) -> bool:
         """
         Clear working directory
 
@@ -437,7 +453,11 @@ class Filesystem:
         """
         return len(os.listdir(path)) == 0
 
-    def get_files_from_dir(self, path: str, recursive: bool = True) -> list:
+    def get_files_from_dir(
+            self,
+            path: str,
+            recursive: bool = True
+    ) -> list:
         """
         Get files from directory
 
@@ -457,5 +477,3 @@ class Filesystem:
         else:
             files = [os.path.join(path, f) for f in os.listdir(path) if os.path.isfile(os.path.join(path, f))]
         return files
-
-

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/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,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 22: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,16 @@ 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()
@@ -445,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
 
@@ -456,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
 
@@ -508,7 +529,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 +553,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])