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

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

pygpt_net/core/{web.py → web/helpers.py}

@@ -6,90 +6,116 @@
 # 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.15 01:00:00                  #
 # ================================================== #
 
 import os
 import uuid
-from typing import Optional, List, Dict
+from typing import Optional, List, Dict, Tuple, Union
 
 import requests
 
 from bs4 import BeautifulSoup
 from urllib.parse import urljoin
 
-from pygpt_net.provider.web.base import BaseProvider
 
-
-class Web:
+class Helpers:
     def __init__(self, window=None):
         """
-        Web access core
+        Web helpers core
 
         :param window: Window instance
         """
         self.window = window
-        self.providers = {
-            "search_engine": {},
-        }
-
-    def is_registered(self, id: str, type: str = "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 = "search_engine") -> dict:
-        """
-        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 = "search_engine") -> list:
-        """
-        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 = "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
+    def request(
+            self,
+            url: str = "",
+            method: str = "GET",
+            headers: Optional[dict] = None,
+            params: Optional[dict] = None,
+            data: Optional[Union[str, dict]] = None,
+            json: Optional[dict] = None,
+            files: Optional[dict] = None,
+            cookies: Optional[dict] = None,
+            timeout: int = 10,
+            disable_ssl_verify: bool = False,
+            allow_redirects: bool = True,
+            stream: bool = False,
+            user_agent: Optional[str] = None,
+    ) -> Tuple[Optional[int], Optional[str]]:
+        """
+        Make HTTP request
+
+        :param url: URL
+        :param method: HTTP method
+        :param headers: Headers
+        :param params: GET parameters
+        :param data: POST data
+        :param json: JSON data
+        :param files: Files
+        :param cookies: Cookies
+        :param timeout: Timeout
+        :param disable_ssl_verify: Disable SSL verification
+        :param allow_redirects: Allow redirects
+        :param stream: Stream
+        :param user_agent: User agent
+        :return: status code, response text
+        """
+        upload = {}
+        try:
+            method = method.upper()
+            session = requests.Session()
+            args = {}
+
+            if data:
+                args['data'] = data
+            if json:
+                args['json'] = json
+            if cookies:
+                args['cookies'] = cookies
+            if params:
+                args['params'] = params
+            if headers:
+                args['headers'] = headers
+
+            args['timeout'] = timeout
+            if disable_ssl_verify:
+                args['verify'] = False
+            if not allow_redirects:
+                args['allow_redirects'] = False
+            if stream:
+                args['stream'] = True
+            if user_agent:
+                if 'headers' not in args:
+                    args['headers'] = {}
+                args['headers']['User-Agent'] = user_agent
+
+            if files:
+                for key, value in files.items():
+                    if os.path.exists(value) and os.path.isfile(value):
+                        upload[key] = open(value, 'rb')
+                args['files'] = upload
+
+            if method == 'GET':
+                response = session.get(url, **args)
+            elif method == 'POST':
+                response = session.post(url, **args)
+            elif method == 'PUT':
+                response = session.put(url, **args)
+            elif method == 'DELETE':
+                response = session.delete(url, **args)
+            elif method == 'PATCH':
+                response = session.patch(url, **args)
+            else:
+                return None, f'Invalid HTTP method: {method}'
+            for k in upload:
+                upload[k].close()  # close files if opened
+            return response.status_code, response.text
+        except Exception as e:
+            for k in upload:
+                upload[k].close()  # close files if opened
+            return None, f'Error: {e}'
 
     def get_main_image(self, url: str) -> Optional[str]:
         """
@@ -208,4 +234,4 @@ class Web:
         download_path = os.path.join(dir, name)
         with open(download_path, 'wb', ) as f:
             f.write(response.content)
-        return self.window.core.filesystem.make_local(download_path)
+        return self.window.core.filesystem.make_local(download_path)

pygpt_net/data/config/config.json

@@ -1,8 +1,8 @@
 {
   "__meta__": {
-    "version": "2.4.41",
-    "app.version": "2.4.41",
-    "updated_at": "2024-12-14T00:00:00"
+    "version": "2.4.43",
+    "app.version": "2.4.43",
+    "updated_at": "2024-12-15T00:00:00"
   },
   "access.audio.event.speech": false,
   "access.audio.event.speech.disabled": [],

pygpt_net/data/config/models.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.4.41",
-        "app.version": "2.4.41",
-        "updated_at": "2024-12-14T00:00:00"
+        "version": "2.4.43",
+        "app.version": "2.4.43",
+        "updated_at": "2024-12-15T00:00:00"
     },
     "items": {
         "claude-3-5-sonnet-20240620": {

pygpt_net/data/config/modes.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.4.41",
-        "app.version": "2.4.41",
-        "updated_at": "2024-12-13T00:00:00"
+        "version": "2.4.43",
+        "app.version": "2.4.43",
+        "updated_at": "2024-12-15T00:00:00"
     },
     "items": {
         "chat": {

pygpt_net/data/locale/locale.en.ini

@@ -683,6 +683,7 @@ menu.audio.control.global = Voice control (global)
 menu.audio.control.plugin = Voice control (inline)
 menu.audio.input = Input: Speech recognition
 menu.audio.output = Output: Speech synthesis
+menu.audio.stop = Stop audio playback
 menu.config = Config
 menu.config.access = Accessibility
 menu.config.change_dir = Change working directory...

pygpt_net/data/locale/plugin.cmd_web.en.ini

@@ -17,6 +17,8 @@ cmd.web_index_query.description = Enable `web_index_query` command execution.\nI
 cmd.web_index_query.label = Enable: quick query the Web and external content
 cmd.web_index_query.tooltip = Example prompt: Query the Website http://example.com about (question).
 cmd.web_index.tooltip = Example prompt: Index the Website http://example.com.
+cmd.web_request.description = Enable `web_request` command execution.\nIf enabled, model will be able to send any HTTP request to specified URL or API endpoint.
+cmd.web_request.label = Enable: sending any HTTP requests
 cmd.web_search.description = Enable `web_search` command execution.\nIf enabled, the model will be able to search the Web.
 cmd.web_search.label = Enable: search the Web
 cmd.web_search.tooltip = Example prompt: Search the Web for (question).

pygpt_net/data/locale/plugin.mailer.en.ini

@@ -0,0 +1,21 @@
+[LOCALE]
+cmd.send_mail.label = Enable: send email
+cmd.send_mail.description = Allows for sending emails.
+cmd.receive_emails.label = Enable: receive emails
+cmd.receive_emails.description = Allows for receiving emails.
+cmd.get_email_body.label = Enable: get email body
+cmd.get_email_body.description = Allows for receive email body.
+plugin.description = Provides the ability to send, receive and read emails.
+plugin.name = Mailer
+smtp_host.description = SMTP Host, e.g. smtp.domain.com
+smtp_host.label = Host
+smtp_port_inbox.description = SMTP Port (Inbox), default: 995
+smtp_port_inbox.label = Port (Inbox)
+smtp_port_outbox.description = SMTP Port (Outbox), default: 465
+smtp_port_outbox.label = Port (Outbox)
+smtp_user.description = SMTP User, e.g. user@domain.com
+smtp_user.label = User
+smtp_password.description = SMTP Password
+smtp_password.label = Password
+from_email.description = From (email), e.g. me@domain.com
+from_email.label = From (email)

pygpt_net/item/ctx.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.13 19:00:00                  #
+# Updated Date: 2024.12.14 18:00:00                  #
 # ================================================== #
 
 import copy
@@ -20,7 +20,7 @@ class CtxItem:
         """
         Context item
 
-        :param mode: Mode (completion, chat, img, vision, langchain, assistant, llama_index, agent)
+        :param mode: Mode (completion, chat, img, vision, langchain, assistant, llama_index, agent, expert)
         """
         self.id = None
         self.meta = None  # CtxMeta object
@@ -137,6 +137,17 @@ class CtxItem:
         """
         return len(self.cmds) > 0 or len(self.tool_calls) > 0
 
+    def audio_read_allowed(self) -> bool:
+        """
+        Check if audio read allowed
+
+        :return: True if audio read allowed
+        """
+        allowed = True
+        if self.has_commands() or '~###~{"cmd":' in self.output:
+            allowed = False
+        return allowed
+
     def add_doc_meta(self, meta: dict):
         """
         Add document meta
@@ -351,18 +362,65 @@ class CtxMeta:
         self.label = 0  # label color
         self.indexes = {}  # indexes data
         self.additional_ctx = [] # additional context data
+        self.group = None  # parent group
         self.group_id = None
         self.root_id = None
         self.parent_id = None
         self.owner_uuid = None
 
+    def has_additional_ctx(self) -> bool:
+        """
+        Check if additional context data is attached
+
+        :return: True if additional context data is present
+        """
+        if self.additional_ctx is not None and len(self.additional_ctx) > 0:
+            return True
+        if self.group:
+            if self.group.additional_ctx is not None and len(self.group.additional_ctx) > 0:
+                return True
+        return False
+
+    def get_additional_ctx(self) -> list:
+        """
+        Get additional context data
+
+        :return: list
+        """
+        if self.group:
+            if self.group.additional_ctx:
+                return self.group.additional_ctx
+        if self.additional_ctx:
+            return self.additional_ctx
+        return []
+
+    def reset_additional_ctx(self):
+        """Delete additional context data"""
+        if self.group:
+            self.group.additional_ctx = []
+        else:
+            self.additional_ctx = []
+
+    def remove_additional_ctx(self, item: dict):
+        """
+        Remove additional context data item
+
+        :param item: dict
+        """
+        if self.group:
+            if item in self.group.additional_ctx:
+                self.group.additional_ctx.remove(item)
+        else:
+            if item in self.additional_ctx:
+                self.additional_ctx.remove(item)
+
     def to_dict(self) -> dict:
         """
         Dump context meta to dict
 
         :return: dict
         """
-        return {
+        data = {
             "id": self.id,
             "external_id": self.external_id,
             "uuid": self.uuid,
@@ -393,6 +451,9 @@ class CtxMeta:
             "parent_id": self.parent_id,
             "owner_uuid": self.owner_uuid,
         }
+        if self.group:
+            data["__group__"] = self.group.to_dict()
+        return data
 
     def from_dict(self, data: dict):
         """
@@ -447,6 +508,7 @@ class CtxGroup:
         self.items = []
         self.created = int(time.time())
         self.updated = int(time.time())
+        self.additional_ctx = []
         self.count = 0
 
     def to_dict(self) -> dict:
@@ -460,6 +522,7 @@ class CtxGroup:
             "uuid": self.uuid,
             "name": self.name,
             "items": self.items,
+            "additional_ctx": self.additional_ctx,
             "created": self.created,
             "updated": self.updated,
             "count": self.count,

pygpt_net/migrations/Version20241215110000.py

@@ -0,0 +1,25 @@
+#!/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.11.23 00:00:00                  #
+# ================================================== #
+
+from sqlalchemy import text
+
+from .base import BaseMigration
+
+
+class Version20241215110000(BaseMigration):
+    def __init__(self, window=None):
+        super(Version20241215110000, self).__init__(window)
+        self.window = window
+
+    def up(self, conn):
+        conn.execute(text("""
+        ALTER TABLE ctx_group ADD COLUMN additional_ctx_json TEXT;
+        """))

pygpt_net/migrations/__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.26 19:00:00                  #
+# Updated Date: 2024.12.15 11:00:00                  #
 # ================================================== #
 
 from .Version20231227152900 import Version20231227152900  # 2.0.59
@@ -22,6 +22,7 @@ from .Version20240426050000 import Version20240426050000  # 2.1.79
 from .Version20240501030000 import Version20240501030000  # 2.2.7
 from .Version20241122130000 import Version20241122130000  # 2.4.21
 from .Version20241126170000 import Version20241126170000  # 2.4.34
+from .Version20241215110000 import Version20241215110000  # 2.4.43
 
 class Migrations:
     def __init__(self):
@@ -48,4 +49,5 @@ class Migrations:
             Version20240501030000(),  # 2.2.7
             Version20241122130000(),  # 2.4.21
             Version20241126170000(),  # 2.4.34
+            Version20241215110000(),  # 2.4.43
         ]