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

pygpt_net/core/debug/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 03:00:00                  #
+# Updated Date: 2024.12.14 00:00:00                  #
 # ================================================== #
 
 import os
@@ -16,6 +16,7 @@ import traceback
 import logging
 
 from pathlib import Path
+from typing import Any, Tuple
 
 from pygpt_net.config import Config
 
@@ -125,7 +126,7 @@ class Debug:
         else:
             return "unknown"
 
-    def info(self, message: any = None, console: bool = True):
+    def info(self, message: Any = None, console: bool = True):
         """
         Handle info message
 
@@ -139,7 +140,7 @@ class Debug:
             console=console,
         )
 
-    def debug(self, message: any = None, console: bool = True):
+    def debug(self, message: Any = None, console: bool = True):
         """
         Handle debug message
 
@@ -152,7 +153,7 @@ class Debug:
             console=console,
         )
 
-    def warning(self, message: any = None, console: bool = True):
+    def warning(self, message: Any = None, console: bool = True):
         """
         Handle warning message
 
@@ -165,7 +166,7 @@ class Debug:
             console=console,
         )
 
-    def error(self, message: any = None, console: bool = True):
+    def error(self, message: Any = None, console: bool = True):
         """
         Handle error message
 
@@ -178,7 +179,7 @@ class Debug:
             console=console,
         )
 
-    def log(self, message: any = None, level: int = logging.ERROR, console: bool = True):
+    def log(self, message: Any = None, level: int = logging.ERROR, console: bool = True):
         """
         Handle logger message (by level), default level is ERROR
 
@@ -227,7 +228,7 @@ class Debug:
         except Exception as e:
             pass
 
-    def parse_exception(self, e = None, limit: int = 4) -> (bool, str):
+    def parse_exception(self, e: Any = None, limit: int = 4) -> Tuple[bool, str]:
         """
         Parse exception traceback
 
@@ -268,7 +269,7 @@ class Debug:
 
         return is_sys, data
 
-    def parse_alert(self, msg: any) -> str:
+    def parse_alert(self, msg: Any) -> str:
         """
         Parse alert message
 
@@ -317,7 +318,7 @@ class Debug:
         """
         self.window.controller.dialogs.debug.end(id)
 
-    def add(self, id: str, k: str, v: any):
+    def add(self, id: str, k: str, v: Any):
         """
         Append debug entry (debug window)
 

pygpt_net/core/debug/tabs.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.07 23:00:00                  #
+# Updated Date: 2024.12.12 01:00:00                  #
 # ================================================== #
 
 class TabsDebug:
@@ -25,7 +25,10 @@ class TabsDebug:
         self.window.core.debug.add(self.id, 'current PID', str(self.window.controller.ui.tabs.get_current_pid()))
         self.window.core.debug.add(self.id, 'current IDX', str(self.window.controller.ui.tabs.get_current_idx()))
         self.window.core.debug.add(self.id, 'current Type', str(self.window.controller.ui.tabs.get_current_type()))
+        self.window.core.debug.add(self.id, 'current Column', str(self.window.controller.ui.tabs.get_current_column_idx()))
         self.window.core.debug.add(self.id, 'last_pid', str(self.window.core.tabs.last_pid))
+        self.window.core.debug.add(self.id, 'locked', str(self.window.controller.ui.tabs.locked))
+        self.window.core.debug.add(self.id, 'col', str(self.window.controller.ui.tabs.col))
         self.window.core.debug.add(self.id, 'count(pids)', str(len(self.window.core.tabs.pids)))
         self.window.core.debug.add(self.id, 'count(ctx bags)', str(len(self.window.core.ctx.container.bags)))
         self.window.core.debug.add(self.id, '----', '')
@@ -38,6 +41,6 @@ class TabsDebug:
 
         # mapping PID => meta.id
         self.window.core.debug.add(self.id, 'PID => meta.id', str(self.window.core.ctx.output.mapping))
-        self.window.core.debug.add(self.id, '(last) PID => meta.id', str(self.window.core.ctx.output.last_pids))
+        self.window.core.debug.add(self.id, '(last) meta.id => PID', str(self.window.core.ctx.output.last_pids))
         self.window.core.debug.add(self.id, '(last) PID', str(self.window.core.ctx.output.last_pid))
         self.window.core.debug.end(self.id)

pygpt_net/core/docker/__init__.py

@@ -6,10 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.24 22:00:00                  #
+# Updated Date: 2024.12.14 00:00:00                  #
 # ================================================== #
 
 import os
+from typing import Optional, Any
+
 import docker
 import io
 import tarfile
@@ -65,8 +67,12 @@ class Docker:
         tar_stream.seek(0)
         return tar_stream
 
-    def is_image(self):
-        """Check if the Docker image exists."""
+    def is_image(self) -> bool:
+        """
+        Check if the Docker image exists.
+
+        :return: True if the image exists.
+        """
         client = self.get_docker_client()
         try:
             client.images.get(self.get_image_name())
@@ -334,7 +340,7 @@ class Docker:
         """
         return self.plugin.get_option_value('docker_entrypoint')
 
-    def execute(self, cmd: str) -> bytes or None:
+    def execute(self, cmd: str) -> Optional[bytes]:
         """
         Execute command in Docker container.
 
@@ -394,7 +400,7 @@ class Docker:
         """
         self.signals = signals
 
-    def log(self, msg):
+    def log(self, msg: Any):
         """
         Log the message.
 

pygpt_net/core/docker/builder.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.24 22:00:00                  #
+# Updated Date: 2024.12.14 00:00:00                  #
 # ================================================== #
 
+from typing import Any
+
 from PySide6.QtCore import Signal, Slot, QObject
 
 from pygpt_net.core.events import RenderEvent
@@ -48,13 +50,19 @@ class Builder(QObject):
 
 
     @Slot(object)
-    def handle_build_failed(self, error):
-        """Handle build failed"""
+    def handle_build_failed(self, error: Any):
+        """
+        Handle build failed
+
+        :param error: error
+        """
         self.plugin.window.ui.dialogs.alert(str(error))
         self.plugin.window.update_status(str(error))
         self.plugin.window.controller.kernel.stop()
         event = RenderEvent(RenderEvent.END)
         self.plugin.window.dispatch(event)
+
+
 class WorkerSignals(BaseSignals):
     build_finished = Signal()
 

pygpt_net/core/events/app.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 03:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Optional
+
 from .base import BaseEvent
 
 class AppEvent(BaseEvent):
@@ -39,8 +41,8 @@ class AppEvent(BaseEvent):
 
     def __init__(
             self,
-            name: str = None,
-            data: dict = None,
+            name: Optional[str] = None,
+            data: Optional[dict] = None,
     ):
         """
         Event object class

pygpt_net/core/events/base.py

@@ -6,17 +6,19 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 03:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
+
 import json
+from typing import Optional, Dict, Any
 
 from pygpt_net.item.ctx import CtxItem
 
 class BaseEvent:
     def __init__(
             self,
-            name: str = None,
-            data: dict = None,
+            name: Optional[str] = None,
+            data: Optional[dict] = None,
             ctx: CtxItem = None
     ):
         """
@@ -39,10 +41,14 @@ class BaseEvent:
 
     @property
     def full_name(self) -> str:
-        """Get full event name"""
+        """
+        Get full event name
+
+        :return: Full event name
+        """
         return self.id + ": " + self.name
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> Dict[str, Any]:
         """Dump event to dict"""
         return {
             'name': self.name,

pygpt_net/core/events/control.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 03:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Optional
+
 from .base import BaseEvent
 
 
@@ -73,8 +75,8 @@ class ControlEvent(BaseEvent):
 
     def __init__(
             self,
-            name: str = None,
-            data: dict = None,
+            name: Optional[str] = None,
+            data: Optional[dict] = None,
     ):
         """
         Event object class

pygpt_net/core/events/event.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.29 23:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import json
+from typing import Optional, Dict, Any
 
 from pygpt_net.item.ctx import CtxItem
 from .base import BaseEvent
@@ -61,9 +62,9 @@ class Event(BaseEvent):
 
     def __init__(
             self,
-            name: str = None,
-            data: dict = None,
-            ctx: CtxItem = None
+            name: Optional[str] = None,
+            data: Optional[dict] = None,
+            ctx: Optional[CtxItem] = None
     ):
         """
         Event object class
@@ -84,8 +85,12 @@ class Event(BaseEvent):
         # internal event, not called from user
         # internal event is handled synchronously, ctx item has internal flag
 
-    def to_dict(self) -> dict:
-        """Dump event to dict"""
+    def to_dict(self) -> Dict[str, Any]:
+        """
+        Dump event to dict
+
+        :return: Event dict
+        """
         return {
             'name': self.name,
             'data': self.data,
@@ -106,5 +111,10 @@ class Event(BaseEvent):
             pass
         return ""
 
-    def __str__(self):
+    def __str__(self) -> str:
+        """
+        String representation of event
+
+        :return: Event string
+        """
         return self.dump()

pygpt_net/core/events/kernel.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 17:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Optional
+
 from .base import BaseEvent
 
 
@@ -52,8 +54,8 @@ class KernelEvent(BaseEvent):
 
     def __init__(
             self,
-            name: str = None,
-            data: dict = None,
+            name: Optional[str] = None,
+            data: Optional[dict] = None,
     ):
         """
         Event object class

pygpt_net/core/events/render.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 03:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Optional
+
 from .base import BaseEvent
 
 
@@ -56,8 +58,8 @@ class RenderEvent(BaseEvent):
 
     def __init__(
             self,
-            name: str = None,
-            data: dict = None,
+            name: Optional[str] = None,
+            data: Optional[dict] = None,
     ):
         """
         Event object class

pygpt_net/core/experts/__init__.py

@@ -6,9 +6,10 @@
 # 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 Dict, List
 
 from pygpt_net.core.types import (
     MODE_AGENT,
@@ -90,7 +91,7 @@ class Experts:
         """
         return self.window.core.presets.get_by_id(MODE_EXPERT, id)
 
-    def get_experts(self) -> dict:
+    def get_experts(self) -> Dict[str, str]:
         """
         Get experts names with keys
 
@@ -191,7 +192,7 @@ class Experts:
         prompt = prompt.replace("{presets}", "\n".join(experts_list))
         return prompt
 
-    def extract_calls(self, ctx: CtxItem) -> dict:
+    def extract_calls(self, ctx: CtxItem) -> Dict[str, str]:
         """
         Extract expert calls from context output
 
@@ -456,7 +457,7 @@ class Experts:
         })
         self.window.dispatch(event)
 
-    def get_functions(self) -> list:
+    def get_functions(self) -> List[Dict[str, str]]:
         """
         Append call the expert commands
 

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
-
-