pygpt-net 2.4.36.post1__py3-none-any.whl → 2.4.41__py3-none-any.whl

pygpt_net/core/tabs/tab.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.08 17:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 from datetime import datetime
+from typing import Dict, Any
 
 
 class Tab:
@@ -21,6 +22,7 @@ class Tab:
     TAB_FILES = 2
     TAB_TOOL_PAINTER = 3
     TAB_TOOL_CALENDAR = 4
+    TAB_TOOL = 100
 
     def __init__(self):
         """
@@ -34,15 +36,23 @@ class Tab:
         self.icon = None
         self.tooltip = None
         self.data_id = None
-        self.reference = None
         self.new_idx = None
         self.custom_name = False
+        self.child = None
+        self.parent = None
+        self.column_idx = 0
+        self.tool_id = None
 
         dt = datetime.now()
         self.created_at = dt
         self.updated_at = dt
 
-    def to_dict(self):
+    def to_dict(self) -> Dict[str, Any]:
+        """
+        Convert to dict
+
+        :return: dict
+        """
         return {
             "uuid": str(self.uuid),
             "pid": self.pid,
@@ -52,9 +62,12 @@ class Tab:
             "icon": self.icon,
             "tooltip": self.tooltip,
             "data_id": self.data_id,
-            "reference": str(self.reference),
+            "child": str(self.child),  # child widget
+            "parent": str(self.parent),  # parent column
             "custom_name": self.custom_name,
             "custom_idx": self.new_idx,
             "created_at": str(self.created_at),
             "updated_at": str(self.updated_at),
+            "column_idx": self.column_idx,
+            "tool_id": self.tool_id,
         }

pygpt_net/core/tokens.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 08:00:00                  #
 # ================================================== #
 
+from typing import Tuple
+
 import tiktoken
 
 from pygpt_net.core.types import (
@@ -48,7 +50,10 @@ class Tokens:
         self.window = window
 
     @staticmethod
-    def from_str(string: str, model: str = "gpt-4") -> int:
+    def from_str(
+            string: str,
+            model: str = "gpt-4"
+    ) -> int:
         """
         Return number of tokens from string
 
@@ -91,7 +96,11 @@ class Tokens:
         return 3
 
     @staticmethod
-    def from_prompt(text: str, name: str, model: str = "gpt-4") -> int:
+    def from_prompt(
+            text: str,
+            name: str,
+            model: str = "gpt-4"
+    ) -> int:
         """
         Return number of tokens from prompt
 
@@ -116,7 +125,10 @@ class Tokens:
         return num
 
     @staticmethod
-    def from_text(text: str, model: str = "gpt-4") -> int:
+    def from_text(
+            text: str,
+            model: str = "gpt-4"
+    ) -> int:
         """
         Return number of tokens from text, without any extra tokens
 
@@ -138,7 +150,10 @@ class Tokens:
         return num
 
     @staticmethod
-    def from_messages(messages: list, model: str = "gpt-4") -> int:
+    def from_messages(
+            messages: list,
+            model: str = "gpt-4"
+    ) -> int:
         """
         Return number of tokens from messages list
 
@@ -166,7 +181,10 @@ class Tokens:
         return num
 
     @staticmethod
-    def from_langchain_messages(messages: list, model: str = "gpt-4") -> int:
+    def from_langchain_messages(
+            messages: list,
+            model: str = "gpt-4"
+    ) -> int:
         """
         Return number of tokens from prompt
 
@@ -183,7 +201,11 @@ class Tokens:
         return num
 
     @staticmethod
-    def from_llama_messages(query: str, messages: list, model: str = "gpt-4") -> int:
+    def from_llama_messages(
+            query: str,
+            messages: list,
+            model: str = "gpt-4"
+    ) -> int:
         """
         Return number of tokens from prompt
 
@@ -202,7 +224,11 @@ class Tokens:
         return num
 
     @staticmethod
-    def from_ctx(ctx: CtxItem, mode: str = MODE_CHAT, model: str = "gpt-4") -> int:
+    def from_ctx(
+            ctx: CtxItem,
+            mode: str = MODE_CHAT,
+            model: str = "gpt-4"
+    ) -> int:
         """
         Return number of tokens from context ctx
 
@@ -280,7 +306,10 @@ class Tokens:
 
         return num
 
-    def get_current(self, input_prompt: str) -> (int, int, int, int, int, int, int, int, int):
+    def get_current(
+            self,
+            input_prompt: str
+    ) -> Tuple[int, int, int, int, int, int, int, int, int]:
         """
         Return current number of used tokens
 
@@ -364,7 +393,11 @@ class Tokens:
         return input_tokens, system_tokens, extra_tokens, ctx_tokens, ctx_len, ctx_len_all, \
                sum_tokens, max_current, threshold
 
-    def from_user(self, system_prompt: str, input_prompt: str) -> int:
+    def from_user(
+            self,
+            system_prompt: str,
+            input_prompt: str
+    ) -> int:
         """
         Count per-user used tokens
 
@@ -390,7 +423,7 @@ class Tokens:
         return tokens
 
     @staticmethod
-    def get_config(model: str) -> (str, int, int):
+    def get_config(model: str) -> Tuple[str, int, int]:
         """
         Return tokens config values
 

pygpt_net/core/updater/__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.15 02:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import copy
@@ -15,6 +15,7 @@ import shutil
 import json
 import ssl
 import time
+from typing import Tuple
 
 from urllib.request import urlopen, Request
 
@@ -134,7 +135,11 @@ class Updater:
         if self.window.core.notepad.patch(version):
             print("Migrated notepad. [OK]")
 
-    def patch_dir(self, dir_name: str = "", force: bool = False):
+    def patch_dir(
+            self,
+            dir_name: str = "",
+            force: bool = False
+    ):
         """
         Patch directory (replace all files)
 
@@ -154,7 +159,11 @@ class Updater:
         except Exception as e:
             self.window.core.debug.log(e)
 
-    def patch_file(self, filename: str = "", force: bool = False):
+    def patch_file(
+            self,
+            filename: str = "",
+            force: bool = False
+    ):
         """
         Patch file
 
@@ -175,7 +184,11 @@ class Updater:
         except Exception as e:
             self.window.core.debug.log(e)
 
-    def patch_css(self, filename: str = "", force: bool = False):
+    def patch_css(
+            self,
+            filename: str = "",
+            force: bool = False
+    ):
         """
         Patch css file
 
@@ -212,7 +225,7 @@ class Updater:
         """
         return self.window.meta['website'] + "/api/version?v=" + str(self.window.meta['version'])
 
-    def get_thanks(self) -> (str, str, str):
+    def get_thanks(self) -> Tuple[str, str, str]:
         """
         Get contributors, donates and sponsors
 
@@ -237,7 +250,7 @@ class Updater:
 
         return self.thanks
 
-    def get_fetch_thanks(self) -> (str, str, str):
+    def get_fetch_thanks(self) -> Tuple[str, str, str]:
         """
         Get contributors, donates and sponsors
 
@@ -247,7 +260,7 @@ class Updater:
             return self.get_thanks()
         return self.thanks
 
-    def check_silent(self) -> (bool, str, str, str, str, str):
+    def check_silent(self) -> Tuple[bool, str, str, str, str, str]:
         """
         Check version in background
 

pygpt_net/core/vision/analyzer.py

@@ -6,8 +6,9 @@
 # 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 00:00:00                  #
 # ================================================== #
+
 import os
 
 from pygpt_net.core.bridge.context import BridgeContext
@@ -24,7 +25,12 @@ class Analyzer:
         """
         self.window = window
 
-    def send(self, ctx: CtxItem, prompt: str, files: dict) -> str:
+    def send(
+            self,
+            ctx: CtxItem,
+            prompt: str,
+            files: dict
+    ) -> str:
         """
         Send text from user input (called from UI)
 
@@ -56,7 +62,11 @@ class Analyzer:
         self.window.controller.attachment.unlock()
         return output
 
-    def from_screenshot(self, ctx: CtxItem, prompt: str) -> str:
+    def from_screenshot(
+            self,
+            ctx: CtxItem,
+            prompt: str
+    ) -> str:
         """
         Image analysis from screenshot
 
@@ -75,7 +85,11 @@ class Analyzer:
         }
         return self.send(ctx, prompt, files)
 
-    def from_camera(self, ctx: CtxItem, prompt: str) -> str:
+    def from_camera(
+            self,
+            ctx: CtxItem,
+            prompt: str
+    ) -> str:
         """
         Image analysis from camera
 
@@ -94,7 +108,12 @@ class Analyzer:
         else:
             return "FAILED: There was a problem with capturing the image."
 
-    def from_path(self, ctx: CtxItem, prompt: str, path: str) -> str:
+    def from_path(
+            self,
+            ctx: CtxItem,
+            prompt: str,
+            path: str
+    ) -> str:
         """
         Image analysis from path
 
@@ -116,7 +135,11 @@ class Analyzer:
         }
         return self.send(ctx, prompt, files)
 
-    def from_current_attachments(self, ctx: CtxItem, prompt: str) -> str:
+    def from_current_attachments(
+            self,
+            ctx: CtxItem,
+            prompt: str
+    ) -> str:
         """
         Image analysis from current attachments
 

pygpt_net/core/web.py

@@ -6,9 +6,18 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.02.24 00:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+import os
+import uuid
+from typing import Optional, List, Dict
+
+import requests
+
+from bs4 import BeautifulSoup
+from urllib.parse import urljoin
+
 from pygpt_net.provider.web.base import BaseProvider
 
 
@@ -58,7 +67,7 @@ class Web:
             return list(self.providers[type].keys())
         return []
 
-    def get(self, id: str, type: str = "search_engine") -> BaseProvider or None:
+    def get(self, id: str, type: str = "search_engine") -> Optional[BaseProvider]:
         """
         Get provider instance
 
@@ -81,3 +90,122 @@ class Web:
         for t in type:
             if t in self.providers:
                 self.providers[t][id] = provider
+
+    def get_main_image(self, url: str) -> Optional[str]:
+        """
+        Get main image from URL
+
+        :param url: URL to get image from
+        :return: image URL
+        """
+        response = requests.get(url)
+        soup = BeautifulSoup(response.content, 'html.parser')
+
+        og_image = soup.find('meta', property='og:image')
+        if og_image and og_image.get('content'):
+            return og_image['content']
+
+        twitter_image = soup.find('meta', attrs={'name': 'twitter:image'})
+        if twitter_image and twitter_image.get('content'):
+            return twitter_image['content']
+
+        link_image = soup.find('link', rel='image_src')
+        if link_image and link_image.get('href'):
+            return link_image['href']
+
+        images = soup.find_all('img')
+        if images:
+            images = [img for img in images if 'logo' not in (img.get('src') or '').lower()]
+            largest_image = None
+            max_area = 0
+            for img in images:
+                src = img.get('src')
+                if not src:
+                    continue
+                src = requests.compat.urljoin(url, src)
+                try:
+                    img_response = requests.get(src, stream=True, timeout=5)
+                    img_response.raw.decode_content = True
+
+                    from PIL import Image
+                    image = Image.open(img_response.raw)
+                    width, height = image.size
+                    area = width * height
+                    if area > max_area:
+                        max_area = area
+                        largest_image = src
+                except:
+                    continue
+            if largest_image:
+                return largest_image
+        return None
+
+    def get_links(self, url: str) -> List[Dict[str, str]]:
+        """
+        Get links from URL
+
+        :param url: URL to get links from
+        :return: links list
+        """
+        response = requests.get(url)
+        soup = BeautifulSoup(response.content, 'html.parser')
+        links = []
+        urls = []
+        for link in soup.find_all('a'):
+            try:
+                name = link.get_text(strip=True)
+                address = link.get('href')
+                if address:
+                    address = urljoin(url, address)
+                    if not name:
+                        title = link.get('title')
+                        if title:
+                            name = title
+                        else:
+                            name = address
+                    if address not in urls:
+                        urls.append(address)
+                        links.append({name: address})
+            except:
+                continue
+        return links
+
+
+    def get_images(self, url: str) -> List[str]:
+        """
+        Get images from URL
+
+        :param url: URL to get images from
+        :return: images list
+        """
+        response = requests.get(url)
+        soup = BeautifulSoup(response.content, 'html.parser')
+        images = []
+        for img in soup.find_all('img'):
+            try:
+                address = img.get('src')
+                if address:
+                    address = urljoin(url, address)
+                    if address not in images:
+                        images.append(address)
+            except:
+                continue
+        return images
+
+    def download_image(self, img: str) -> str:
+        """
+        Download image from URL
+
+        :param img: URL to download image from
+        :return: local path to image
+        """
+        dir = self.window.core.config.get_user_dir("img")
+        response = requests.get(img, stream=True)
+        name = img.replace("http://", "").replace("https://", "").replace("/", "_")
+        path = os.path.join(dir, name)
+        if os.path.exists(path):
+            name = name + uuid.uuid4().hex[:6].upper()
+        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)

pygpt_net/data/config/config.json

@@ -1,8 +1,8 @@
 {
   "__meta__": {
-    "version": "2.4.36",
-    "app.version": "2.4.36",
-    "updated_at": "2024-11-28T00:00:00"
+    "version": "2.4.41",
+    "app.version": "2.4.41",
+    "updated_at": "2024-12-14T00:00:00"
   },
   "access.audio.event.speech": false,
   "access.audio.event.speech.disabled": [],
@@ -65,15 +65,20 @@
   "assistant": "",
   "assistant_thread": "",
   "assistant.store.hide_threads": true,
-  "attachments_auto_index": false,
+  "attachments_auto_index": true,
   "attachments_send_clear": true,
   "attachments_capture_clear": true,
+  "audio.input.channels": 1,
+  "audio.input.device": "0",
+  "audio.input.rate": 44100,
   "audio.transcribe.convert_video": true,
   "context_threshold": 200,
   "cmd": false,
   "ctx": "",
   "ctx.attachment.img": false,
-  "ctx.attachment.mode": "full",
+  "ctx.attachment.mode": "query",
+  "ctx.attachment.rag.history": true,
+  "ctx.attachment.rag.history.max_items": 3,
   "ctx.attachment.summary.model": "gpt-4o-mini",
   "ctx.attachment.query.model": "gpt-4o-mini",
   "ctx.attachment.verbose": false,
@@ -129,6 +134,7 @@
     "expert": ""
   },
   "debug": false,
+  "debug.render": false,
   "download.dir": "download",
   "experts.mode": "chat",
   "font_size": 12,
@@ -156,7 +162,13 @@
   "layout.dpi.scaling": true,
   "layout.dpi.factor": 1.0,
   "layout.groups": {},
-  "layout.splitters": {},
+  "layout.splitters": {
+        "columns": [
+            1,
+            0
+        ]
+    },
+  "layout.split": false,
   "layout.tabs": {},
   "layout.tooltips": true,
   "layout.tray": true,
@@ -333,6 +345,7 @@
   "temperature": 1.0,
   "theme": "dark_cyan",
   "theme.markdown": true,
+  "theme.style": "blocks",
   "top_p": 1.0,
   "upload.store": true,
   "upload.data_dir": false,

pygpt_net/data/config/models.json

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

pygpt_net/data/config/modes.json

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