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

pygpt_net/core/modes.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 22:00:00                  #
 # ================================================== #
 
+from typing import Dict, List
+
 from pygpt_net.provider.core.mode.json_file import JsonFileProvider
 from pygpt_net.core.types import (
     MODE_AGENT,
@@ -51,7 +53,7 @@ class Modes:
         ]
         self.items = {}
 
-    def get_by_idx(self, idx):
+    def get_by_idx(self, idx) -> str:
         """
         Return mode by index
 
@@ -61,7 +63,7 @@ class Modes:
         modes = self.get_all()
         return list(modes.keys())[idx]
 
-    def get_idx_by_name(self, name):
+    def get_idx_by_name(self, name) -> int:
         """
         Return mode index by name
 
@@ -71,7 +73,7 @@ class Modes:
         modes = self.get_all()
         return list(modes.keys()).index(name)
 
-    def get_all(self):
+    def get_all(self) -> Dict[str, List[str]]:
         """
         Return modes
 
@@ -79,7 +81,7 @@ class Modes:
         """
         return self.items
 
-    def get_default(self):
+    def get_default(self) -> str:
         """
         Return default mode name
 
@@ -89,7 +91,7 @@ class Modes:
             if self.items[id].default:
                 return id
 
-    def get_next(self, mode: str):
+    def get_next(self, mode: str) -> str:
         """
         Return next mode
 
@@ -103,7 +105,7 @@ class Modes:
             return keys[idx + 1]
         return keys[0]
 
-    def get_prev(self, mode: str):
+    def get_prev(self, mode: str) -> str:
         """
         Return previous mode
 
@@ -118,13 +120,9 @@ class Modes:
         return keys[-1]
 
     def load(self):
-        """
-        Load modes
-        """
+        """Load modes"""
         self.items = self.provider.load()
 
     def save(self):
-        """
-        Save modes
-        """
+        """Save modes"""
         self.provider.save(self.items)

pygpt_net/core/notepad.py

@@ -6,12 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 00:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import datetime
 import uuid
-from typing import Optional
+from typing import Optional, Dict
 
 from packaging.version import Version
 
@@ -61,7 +61,7 @@ class Notepad:
             return self.items[idx]
         return None
 
-    def get_all(self) -> dict:
+    def get_all(self) -> Dict[int, NotepadItem]:
         """
         Get all notepads
 
@@ -137,7 +137,7 @@ class Notepad:
         """Save all notepads"""
         self.provider.save_all(self.items)
 
-    def import_from_db(self) -> Optional[dict]:
+    def import_from_db(self) -> Optional[Dict[int, dict]]:
         """
         Import notepad tabs from database
 

pygpt_net/core/plugins.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 08:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import copy
@@ -49,7 +49,7 @@ class Plugins:
         """
         return id in self.plugins
 
-    def all(self) -> dict:
+    def all(self) -> Dict[str, BasePlugin]:
         """
         Get all plugins
 
@@ -57,7 +57,7 @@ class Plugins:
         """
         return self.plugins
 
-    def get_ids(self) -> list:
+    def get_ids(self) -> List[str]:
         """
         Get all plugins ids
 
@@ -76,7 +76,7 @@ class Plugins:
             return self.plugins[id]
         return None
 
-    def get_option(self, id: str, key: str) -> any:
+    def get_option(self, id: str, key: str) -> Any:
         """
         Get plugin option
 
@@ -172,7 +172,7 @@ class Plugins:
 
     def enable(self, id: str):
         """
-        Enable plugin
+        Enable plugin by ID
 
         :param id: plugin id
         """
@@ -183,7 +183,7 @@ class Plugins:
 
     def disable(self, id: str):
         """
-        Disable plugin
+        Disable plugin by ID
 
         :param id: plugin id
         """
@@ -318,7 +318,7 @@ class Plugins:
         """
         return id in self.presets
 
-    def get_preset(self, id: str) -> dict:
+    def get_preset(self, id: str) -> Dict[str, Any]:
         """
         Get preset by id
 
@@ -328,7 +328,7 @@ class Plugins:
         if self.has_preset(id):
             return self.presets[id]
 
-    def set_preset(self, id: str, preset: dict):
+    def set_preset(self, id: str, preset: Dict[str, Any]):
         """
         Set config value
 
@@ -337,7 +337,7 @@ class Plugins:
         """
         self.presets[id] = preset
 
-    def replace_presets(self, presets: dict):
+    def replace_presets(self, presets: Dict[str, Any]):
         """
         Replace presets
 
@@ -349,7 +349,7 @@ class Plugins:
         """Load presets"""
         self.presets = self.provider.load()
 
-    def get_presets(self) -> dict:
+    def get_presets(self) -> Dict[str, Any]:
         """
         Return all presets
 
@@ -357,7 +357,11 @@ class Plugins:
         """
         return self.presets
 
-    def reset_options(self, plugin_id: str, keys: List[str]):
+    def reset_options(
+            self,
+            plugin_id: str,
+            keys: List[str]
+    ):
         """
         Reset plugin options
 
@@ -408,7 +412,11 @@ class Plugins:
             self.save_presets()
             print("[FIX] Removed invalid keys from plugin presets.")
 
-    def remove_preset_values(self, plugin_id:str, key: str):
+    def remove_preset_values(
+            self,
+            plugin_id: str,
+            key: str
+    ):
         """
         Update preset value
 
@@ -431,7 +439,12 @@ class Plugins:
         if updated:
             self.save_presets()
 
-    def update_preset_values(self, plugin_id: str, key: str, value: Any):
+    def update_preset_values(
+            self,
+            plugin_id: str,
+            key: str,
+            value: Any
+    ):
         """
         Update preset value
 
@@ -471,9 +484,7 @@ class Plugins:
             self.dump_locale(self.plugins[id], path)
 
     def dump_locales(self):
-        """
-        Dump all locales
-        """
+        """Dump all locales"""
         langs = ['en', 'pl']
         for id in self.plugins:
             domain = 'plugin.' + id

pygpt_net/core/presets.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 08:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import copy
@@ -193,6 +193,7 @@ class Presets:
         """
         if id in self.items:
             self.items[id].enabled = True
+
     def disable(self, id: str):
         """
         Disable preset
@@ -366,7 +367,11 @@ class Presets:
         self.sort_by_name()
         return id
 
-    def remove(self, id: str, remove_file: bool = True):
+    def remove(
+            self,
+            id: str,
+            remove_file: bool = True
+    ):
         """
         Delete preset
 
@@ -381,9 +386,7 @@ class Presets:
             # self.load_presets()
 
     def sort_by_name(self):
-        """
-        Sort presets by name
-        """
+        """Sort presets by name"""
         self.items = dict(
             sorted(
                 self.items.items(),
@@ -408,7 +411,7 @@ class Presets:
         self.items[preset.filename] = preset
         self.save(preset.filename)
 
-    def get_all(self) -> dict:
+    def get_all(self) -> Dict[str, PresetItem]:
         """
         Return all presets
 
@@ -428,7 +431,7 @@ class Presets:
             self.items[id] = base[id]
             self.save(id)
 
-    def load_base(self) -> dict:
+    def load_base(self) -> Dict[str, PresetItem]:
         """
         Load base presets
 
@@ -460,7 +463,11 @@ class Presets:
         """Save all presets"""
         self.provider.save_all(self.items)
 
-    def add_expert(self, agent_uuid: str, expert_uuid: str):
+    def add_expert(
+            self,
+            agent_uuid: str,
+            expert_uuid: str
+    ):
         """
         Add expert to agent
 
@@ -474,7 +481,11 @@ class Presets:
             agent.experts.append(expert_uuid)
         self.save(agent.filename)
 
-    def remove_expert(self, agent_uuid: str, expert_uuid: str):
+    def remove_expert(
+            self,
+            agent_uuid: str,
+            expert_uuid: str
+    ):
         """
         Remove expert from agent
         :param agent_uuid: agent uuid

pygpt_net/core/profile.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 08:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import json
@@ -120,7 +120,11 @@ class Profile:
         with open(f, 'w', encoding='utf-8') as f:
             f.write(json_data)
 
-    def add(self, name: str, workdir: str) -> str:
+    def add(
+            self,
+            name: str,
+            workdir: str
+    ) -> str:
         """
         Add new profile
 
@@ -228,7 +232,11 @@ class Profile:
                 return tmp_dir
         return self.base_workdir
 
-    def append(self, uuid: str, profile: Dict):
+    def append(
+            self,
+            uuid: str,
+            profile: Dict
+    ):
         """
         Append profile
 

pygpt_net/core/render/web/parser.py

@@ -37,7 +37,9 @@ class Parser:
         """
         if self.md is None:
             self.md = markdown.Markdown(extensions=[
-                'fenced_code',  # code blocks
+                'fenced_code',
+                'tables',
+                'sane_lists',
                 MathExtension(enable_dollar_delimiter=True)  # math formulas
             ])
 

pygpt_net/core/settings.py

@@ -6,14 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 00:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import copy
 import json
 import os
 import shutil
-from typing import Optional
+from typing import Optional, Dict, Any, List
 
 from pygpt_net.core.events import RenderEvent
 
@@ -38,7 +38,7 @@ class Settings:
         for id in self.ids:
             self.active[id] = False
 
-    def get_options(self, id: Optional[str] = None) -> dict:
+    def get_options(self, id: Optional[str] = None) -> Dict[str, Any]:
         """
         Return options for given id
 
@@ -52,7 +52,7 @@ class Settings:
         if id in self.options:
             return self.options[id]
 
-    def get_sections(self, id: Optional[str] = None) -> dict:
+    def get_sections(self, id: Optional[str] = None) -> Dict[str, Any]:
         """
         Return sections for given id
 
@@ -66,7 +66,7 @@ class Settings:
         if id in self.sections:
             return self.sections[id]
 
-    def get_persist_options(self) -> list:
+    def get_persist_options(self) -> List[str]:
         """
         Return persist options keys (options that should be persisted when loading defaults)
 

pygpt_net/core/tabs/tab.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 08:00:00                  #
+# Updated Date: 2024.12.14 17:00:00                  #
 # ================================================== #
 
 from datetime import datetime
@@ -70,4 +70,12 @@ class Tab:
             "updated_at": str(self.updated_at),
             "column_idx": self.column_idx,
             "tool_id": self.tool_id,
-        }
+        }
+
+    def __str__(self) -> str:
+        """
+        String representation
+
+        :return: str
+        """
+        return str(self.to_dict())

pygpt_net/core/tokens.py

@@ -6,13 +6,16 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 08:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
-from typing import Tuple
+from typing import Tuple, List
 
 import tiktoken
 
+from langchain_core.messages import ChatMessage as ChatMessageLangchain
+from llama_index.core.base.llms.types import ChatMessage as ChatMessageLlama
+
 from pygpt_net.core.types import (
     MODE_AGENT,
     MODE_AGENT_LLAMA,
@@ -39,7 +42,6 @@ CHAT_MODES = [
     MODE_AUDIO,
 ]
 
-
 class Tokens:
     def __init__(self, window=None):
         """
@@ -151,7 +153,7 @@ class Tokens:
 
     @staticmethod
     def from_messages(
-            messages: list,
+            messages: List[dict],
             model: str = "gpt-4"
     ) -> int:
         """
@@ -182,7 +184,7 @@ class Tokens:
 
     @staticmethod
     def from_langchain_messages(
-            messages: list,
+            messages: List[ChatMessageLangchain],
             model: str = "gpt-4"
     ) -> int:
         """
@@ -203,7 +205,7 @@ class Tokens:
     @staticmethod
     def from_llama_messages(
             query: str,
-            messages: list,
+            messages: List[ChatMessageLlama],
             model: str = "gpt-4"
     ) -> int:
         """

pygpt_net/core/web/__init__.py

@@ -0,0 +1,105 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ================================================== #
+# This file is a part of PYGPT package               #
+# Website: https://pygpt.net                         #
+# GitHub:  https://github.com/szczyglis-dev/py-gpt   #
+# MIT License                                        #
+# Created By  : Marcin Szczygliński                  #
+# Updated Date: 2024.12.14 19:00:00                  #
+# ================================================== #
+
+from typing import Optional, List, Dict
+
+from pygpt_net.provider.web.base import BaseProvider
+
+from .helpers import Helpers
+
+
+class Web:
+
+    PROVIDER_SEARCH_ENGINE = "search_engine"
+
+    def __init__(self, window=None):
+        """
+        Web core
+
+        :param window: Window instance
+        """
+        self.window = window
+        self.helpers = Helpers(window)
+        self.providers = {
+            self.PROVIDER_SEARCH_ENGINE: {},
+        }
+
+    def is_registered(
+            self,
+            id: str,
+            type: str = PROVIDER_SEARCH_ENGINE
+    ) -> bool:
+        """
+        Check if provider is registered
+
+        :param id: provider id
+        :param type: provider type
+        :return: True if registered
+        """
+        if type in self.providers:
+            return id in self.providers[type]
+        return False
+
+    def get_providers(
+            self,
+            type: str = PROVIDER_SEARCH_ENGINE
+    ) -> Dict[str, BaseProvider]:
+        """
+        Get all providers
+
+        :param type: provider type
+        :return: providers dict
+        """
+        if type in self.providers:
+            return self.providers[type]
+        return {}
+
+    def get_ids(
+            self,
+            type: str = PROVIDER_SEARCH_ENGINE
+    ) -> List[str]:
+        """
+        Get all providers ids
+
+        :param type: provider type
+        :return: providers ids list
+        """
+        if type in self.providers:
+            return list(self.providers[type].keys())
+        return []
+
+    def get(
+            self,
+            id: str,
+            type: str = PROVIDER_SEARCH_ENGINE
+    ) -> Optional[BaseProvider]:
+        """
+        Get provider instance
+
+        :param id: provider id
+        :param type: provider type
+        :return: provider instance
+        """
+        if self.is_registered(id, type):
+            return self.providers[type][id]
+        return None
+
+    def register(self, provider: BaseProvider):
+        """
+        Register provider
+
+        :param provider: provider instance
+        """
+        id = provider.id
+        type = provider.type
+        for t in type:
+            if t in self.providers:
+                self.providers[t][id] = provider