pygpt-net 2.4.39__py3-none-any.whl → 2.4.40__py3-none-any.whl

pygpt_net/core/tabs/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 03:00:00                  #
+# Updated Date: 2024.12.12 01:00:00                  #
 # ================================================== #
 
 import uuid
@@ -15,24 +15,17 @@ from datetime import datetime
 from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QVBoxLayout, QWidget, QLayout
 
-from .tab import Tab
 from pygpt_net.ui.widget.tabs.body import TabBody
 from pygpt_net.utils import trans
 
+from .tab import Tab
+
 
 class Tabs:
 
     # number of columns
     NUM_COLS = 2
 
-    # types
-    TAB_ADD = -1
-    TAB_CHAT = 0
-    TAB_NOTEPAD = 1
-    TAB_FILES = 2
-    TAB_TOOL_PAINTER = 3
-    TAB_TOOL_CALENDAR = 4
-
     def __init__(self, window=None):
         """
         Tabs core
@@ -43,18 +36,20 @@ class Tabs:
         self.last_pid = -1
         self.pids = {}  # pid: Tab data
         self.icons = {
-            self.TAB_CHAT: ":/icons/chat.svg",
-            self.TAB_NOTEPAD: ":/icons/paste.svg",
-            self.TAB_FILES: ":/icons/folder_filled.svg",
-            self.TAB_TOOL_PAINTER: ":/icons/brush.svg",
-            self.TAB_TOOL_CALENDAR: ":/icons/calendar.svg",
+            Tab.TAB_CHAT: ":/icons/chat.svg",
+            Tab.TAB_NOTEPAD: ":/icons/paste.svg",
+            Tab.TAB_FILES: ":/icons/folder_filled.svg",
+            Tab.TAB_TOOL_PAINTER: ":/icons/brush.svg",
+            Tab.TAB_TOOL_CALENDAR: ":/icons/calendar.svg",
+            Tab.TAB_TOOL: ":/icons/build.svg",
         }
         self.titles = {
-            self.TAB_CHAT: "output.tab.chat",
-            self.TAB_NOTEPAD: "output.tab.notepad",
-            self.TAB_FILES: "output.tab.files",
-            self.TAB_TOOL_PAINTER: "output.tab.painter",
-            self.TAB_TOOL_CALENDAR: "output.tab.calendar",
+            Tab.TAB_CHAT: "output.tab.chat",
+            Tab.TAB_NOTEPAD: "output.tab.notepad",
+            Tab.TAB_FILES: "output.tab.files",
+            Tab.TAB_TOOL_PAINTER: "output.tab.painter",
+            Tab.TAB_TOOL_CALENDAR: "output.tab.calendar",
+            Tab.TAB_TOOL: "output.tab.tool",
         }
 
     def get_tab_by_index(self, idx: int, column_idx: int = 0) -> Tab or None:
@@ -113,7 +108,8 @@ class Tabs:
             title: str,
             icon=None,
             child=None,
-            data_id=None
+            data_id=None,
+            tool_id=None
     ) -> Tab:
         """
         Add tab
@@ -123,6 +119,7 @@ class Tabs:
         :param icon: Tab icon
         :param child: Tab child
         :param data_id: Tab data ID
+        :param tool_id: Tool ID
         :return: Tab
         """
         self.last_pid += 1  # PID++, start from 0
@@ -135,6 +132,7 @@ class Tabs:
         tab.icon = icon
         tab.child = child
         tab.data_id = data_id
+        tab.tool_id = tool_id
 
         if type == Tab.TAB_CHAT:
             self.add_chat(tab)
@@ -146,6 +144,8 @@ class Tabs:
             self.add_tool_painter(tab)
         elif type == Tab.TAB_TOOL_CALENDAR:
             self.add_tool_calendar(tab)
+        elif type == Tab.TAB_TOOL:
+            self.add_tool(tab)
 
         self.pids[tab.pid] = tab
         return tab
@@ -153,6 +153,7 @@ class Tabs:
     def append(
             self,
             type: int,
+            tool_id: str,
             idx: int,
             column_idx: int = 0
     ) -> Tab:
@@ -160,6 +161,7 @@ class Tabs:
         Append tab to the right side of the tab with the specified index
 
         :param type: tab type
+        :param tool_id: tool ID
         :param idx: index of the tab to the right of which the new tab will be added
         :param column_idx: index of the column in which the tab will be added
         :return: Tab
@@ -167,9 +169,9 @@ class Tabs:
         self.last_pid += 1  # PID++, start from 0
         title = ""
         icon = self.icons[type]
-        if type == self.TAB_CHAT:
+        if type == Tab.TAB_CHAT:
             title = trans('output.tab.chat') + " {}".format(self.count_by_type(type) + 1)
-        elif type == self.TAB_NOTEPAD:
+        elif type == Tab.TAB_NOTEPAD:
             title = trans('output.tab.notepad') + " {}".format(self.count_by_type(type) + 1)
 
         tab = Tab()
@@ -180,11 +182,14 @@ class Tabs:
         tab.icon = icon
         tab.new_idx = idx + 1  # place on right side
         tab.column_idx = column_idx
+        tab.tool_id = tool_id
 
         if type == Tab.TAB_CHAT:
             self.add_chat(tab)
         elif type == Tab.TAB_NOTEPAD:
             self.add_notepad(tab)
+        elif type == Tab.TAB_TOOL:
+            self.add_tool(tab)
 
         self.pids[tab.pid] = tab
         self.update()
@@ -217,6 +222,9 @@ class Tabs:
         if 'column_idx' in data and data['column_idx'] is not None:
             tab.column_idx = data['column_idx']
 
+        if 'tool_id' in data and data['tool_id'] is not None:
+            tab.tool_id = data['tool_id']
+
         if tab.type in self.icons:
             tab.icon = self.icons[tab.type]
 
@@ -233,6 +241,8 @@ class Tabs:
             self.add_tool_painter(tab)
         elif tab.type == Tab.TAB_TOOL_CALENDAR:  # calendar
             self.add_tool_calendar(tab)
+        elif tab.type == Tab.TAB_TOOL:  # custom tools, id 100+
+            self.add_tool(tab)
 
         self.pids[tab.pid] = tab
         self.last_pid = self.get_max_pid()
@@ -279,7 +289,7 @@ class Tabs:
         for pid in list(self.pids):
             tab = self.pids[pid]
             if tab.type == type and tab.column_idx == column_idx:
-                if type == self.TAB_CHAT:
+                if type == Tab.TAB_CHAT:
                     if self.count_by_type(type) == 1:
                         continue  # do not remove last chat tab
                 self.remove(pid)
@@ -341,6 +351,20 @@ class Tabs:
                 count += 1
         return count
 
+    def get_max_data_id_by_type(self, type: int) -> int:
+        """
+        Get max data ID by type
+
+        :param type: Tab type
+        :return: Max data ID
+        """
+        max = 0
+        for pid in self.pids:
+            tab = self.pids[pid]
+            if tab.type == type and tab.data_id > max:
+                max = tab.data_id
+        return max
+
     def get_order_by_idx_and_type(
             self,
             idx: int,
@@ -430,8 +454,8 @@ class Tabs:
         tab.parent = tabs.get_column()
         if tab.data_id is not None:
             idx = tab.data_id  # restore prev idx
-        tab.child, idx = self.window.controller.notepad.create(idx)
-        tab.data_id = idx  # notepad idx in db, enumerated from 1
+        tab.child, idx, data_id = self.window.controller.notepad.create(idx)
+        tab.data_id = data_id  # notepad idx in db, enumerated from 1
         if tab.new_idx is not None:
             tab.idx = tabs.insertTab(tab.new_idx, tab.child, tab.title)
         else:
@@ -489,6 +513,30 @@ class Tabs:
         if tab.tooltip is not None:
             tabs.setTabToolTip(tab.idx, tab.tooltip)
 
+    def add_tool(self, tab: Tab):
+        """
+        Add custom tool tab
+
+        :param tab: Tab instance
+        """
+        column = self.window.ui.layout.get_column_by_idx(tab.column_idx)
+        tabs = column.get_tabs()
+        tool = self.window.tools.get(tab.tool_id)
+        if tool is None:
+            raise Exception("Tool not found: {}".format(tab.tool_id))
+        widget = tool.as_tab(tab)
+        if widget is None:
+            raise Exception("Tool widget not found: {}".format(tab.tool_id))
+        tab.icon = tool.tab_icon
+        tab.title = trans(tool.tab_title)
+        tab.parent = column
+        tab.child = self.from_widget(widget)
+        tab.idx = tabs.addTab(tab.child, tab.title)
+        tab.child.setOwner(tab)
+        tabs.setTabIcon(tab.idx, QIcon(tab.icon))
+        if tab.tooltip is not None:
+            tabs.setTabToolTip(tab.idx, tab.tooltip)
+
     def move_tab(self, tab: Tab, column_idx: int):
         """
         Move tab to column
@@ -500,16 +548,16 @@ class Tabs:
             return
         if tab.column_idx == column_idx:
             return
-        tab.column_idx = column_idx
+
         old_column = self.window.ui.layout.get_column_by_idx(tab.column_idx)
         old_tabs = old_column.get_tabs()
         old_tabs.removeTab(tab.idx)
         new_column = self.window.ui.layout.get_column_by_idx(column_idx)
         new_tabs = new_column.get_tabs()
-        tab.idx = new_tabs.addTab(tab.child, tab.title)
+        tab.idx = new_tabs.addTab(tab.child, QIcon(tab.icon), tab.title)
         tab.parent = new_column
+        tab.column_idx = column_idx
         self.update()
-        self.window.core.tabs.reload_titles()
 
     def get_first_by_type(self, type: int) -> Tab or None:
         """
@@ -535,7 +583,7 @@ class Tabs:
             "uuid": uuid.uuid4(),
             "pid": 0,
             "idx": 0,
-            "type": self.TAB_CHAT,
+            "type": Tab.TAB_CHAT,
             "data_id": None,
             "title": "Chat",
             "tooltip": "Chat",
@@ -545,31 +593,34 @@ class Tabs:
             "uuid": uuid.uuid4(),
             "pid": 1,
             "idx": 1,
-            "type": self.TAB_FILES,
+            "type": Tab.TAB_FILES,
             "data_id": None,
             "title": "Files",
             "tooltip": "Files",
             "column_idx": 0,
+            "tool_id": "explorer",
         }
         data[2] = {
             "uuid": uuid.uuid4(),
             "pid": 2,
             "idx": 2,
-            "type": self.TAB_TOOL_CALENDAR,
+            "type": Tab.TAB_TOOL_CALENDAR,
             "data_id": None,
             "title": "Calendar",
             "tooltip": "Calendar",
             "column_idx": 0,
+            "tool_id": "calendar",
         }
         data[3] = {
             "uuid": uuid.uuid4(),
             "pid": 3,
             "idx": 3,
-            "type": self.TAB_TOOL_PAINTER,
+            "type": Tab.TAB_TOOL_PAINTER,
             "data_id": None,
             "title": "Painter",
             "tooltip": "Painter",
             "column_idx": 0,
+            "tool_id": "painter",
         }
         """
         data[4] = {
@@ -581,6 +632,7 @@ class Tabs:
             "title": "Notepad",
             "tooltip": "Notepad",
             "column_idx": 0,
+            "tool_id": "notepad",
         }
         """
         # load notepads from db
@@ -593,11 +645,12 @@ class Tabs:
                     "uuid": uuid.uuid4(),
                     "pid": next_idx,
                     "idx": next_idx,
-                    "type": self.TAB_NOTEPAD,
+                    "type": Tab.TAB_NOTEPAD,
                     "data_id": item['data_id'],
                     "title": item['title'],
                     "tooltip": item['title'],
                     "column_idx": 0,
+                    "tool_id": "notepad",
                 }
                 next_idx += 1
         return data
@@ -628,6 +681,7 @@ class Tabs:
                     "tooltip": trans(self.titles[type]),
                     "custom_name": False,
                     "column_idx": 0,
+                    "tool_id": None,
                 }
                 tmp_pid += 1
 
@@ -657,6 +711,7 @@ class Tabs:
                 "tooltip": tab.tooltip,
                 "custom_name": tab.custom_name,
                 "column_idx": tab.column_idx,
+                "tool_id": tab.tool_id,
             }
         opened_tabs = {}
         for column_idx in range(0, self.NUM_COLS):
@@ -694,28 +749,34 @@ class Tabs:
 
     def reload_titles(self):
         """Reload default tab titles"""
+        return
+        processed = []
         for column_idx in range(0, self.NUM_COLS):
             tabs = self.window.ui.layout.get_tabs_by_idx(column_idx)
             counters = {
-                self.TAB_CHAT: 1,
-                self.TAB_NOTEPAD: 1,
-                self.TAB_FILES: 1,
-                self.TAB_TOOL_PAINTER: 1,
-                self.TAB_TOOL_CALENDAR: 1,
+                Tab.TAB_CHAT: 1,
+                Tab.TAB_NOTEPAD: 1,
+                Tab.TAB_FILES: 1,
+                Tab.TAB_TOOL_PAINTER: 1,
+                Tab.TAB_TOOL_CALENDAR: 1,
             }
             for pid in self.pids:
                 tab = self.pids[pid]
-                if tab.column_idx != column_idx:
+                if tab.pid in processed:
                     continue
-                if tab.custom_name:
-                    continue  # leave custom names
+                if tab.custom_name or tab.type == Tab.TAB_TOOL:
+                    continue  # leave custom names and tools
                 tab.title = trans(self.titles[tab.type])
                 num_tabs = self.count_by_type(tab.type)
                 if num_tabs > 1:
-                    tab.title += " {}".format(counters[tab.type])
+                    if tab.type in counters:
+                        tab.title += " {}".format(counters[tab.type])
+                    else:
+                        counters[tab.type] = 1
                     counters[tab.type] += 1
                 tabs.setTabText(tab.idx, tab.title)
                 tabs.setTabToolTip(tab.idx, tab.title)
+                processed.append(pid)
 
     def from_widget(self, widget: QWidget) -> TabBody:
         """

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.09 00:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
 from datetime import datetime
@@ -21,6 +21,7 @@ class Tab:
     TAB_FILES = 2
     TAB_TOOL_PAINTER = 3
     TAB_TOOL_CALENDAR = 4
+    TAB_TOOL = 100
 
     def __init__(self):
         """
@@ -39,6 +40,7 @@ class Tab:
         self.child = None
         self.parent = None
         self.column_idx = 0
+        self.tool_id = None
 
         dt = datetime.now()
         self.created_at = dt
@@ -66,4 +68,5 @@ class Tab:
             "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/web.py

@@ -6,8 +6,15 @@
 # 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.13 00:00:00                  #
 # ================================================== #
+import os
+import uuid
+
+import requests
+
+from bs4 import BeautifulSoup
+from urllib.parse import urljoin
 
 from pygpt_net.provider.web.base import BaseProvider
 
@@ -81,3 +88,122 @@ class Web:
         for t in type:
             if t in self.providers:
                 self.providers[t][id] = provider
+
+    def get_main_image(self, url: str) -> str or None:
+        """
+        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:
+        """
+        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:
+        """
+        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.39",
-    "app.version": "2.4.39",
-    "updated_at": "2024-12-09T00:00:00"
+    "version": "2.4.40",
+    "app.version": "2.4.40",
+    "updated_at": "2024-12-12T00:00:00"
   },
   "access.audio.event.speech": false,
   "access.audio.event.speech.disabled": [],
@@ -134,6 +134,7 @@
     "expert": ""
   },
   "debug": false,
+  "debug.render": false,
   "download.dir": "download",
   "experts.mode": "chat",
   "font_size": 12,

pygpt_net/data/config/models.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.4.39",
-        "app.version": "2.4.39",
-        "updated_at": "2024-12-09T00:00:00"
+        "version": "2.4.40",
+        "app.version": "2.4.40",
+        "updated_at": "2024-12-12T00:00:00"
     },
     "items": {
         "claude-3-5-sonnet-20240620": {

pygpt_net/data/config/modes.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.4.39",
-        "app.version": "2.4.39",
-        "updated_at": "2024-12-09T00:00:00"
+        "version": "2.4.40",
+        "app.version": "2.4.40",
+        "updated_at": "2024-12-12T00:00:00"
     },
     "items": {
         "chat": {

pygpt_net/data/css/web-blocks.css

@@ -54,6 +54,7 @@ p {{
     font-family: 'Lato';
     text-decoration: none;
     padding-bottom: 0px;
+    font-size: 0.9rem;
 }}
 
 /* lists, code */
@@ -89,6 +90,7 @@ code {{
 .code-header-lang {{
     float: left;
     padding-left: .25rem;
+    padding-top: 4px;
 }}
 .code-header-copy {{
     text-align: right;
@@ -102,6 +104,13 @@ code {{
     vertical-align: middle;
     padding-right: 5px;
 }}
+.code-header-copy:hover {{
+    text-decoration: none;
+    cursor: pointer;
+}}
+.code-header-copy:hover img {{
+    filter: brightness(130%);
+}}
 .code-wrapper {{
     padding: 0px;
     margin: 0px;
@@ -209,6 +218,7 @@ code {{
 .tool-output .content {{
     padding: 10px;
     color: gray !important;
+    font-size: 0.9rem;
 }}
 .tool-output .toggle-cmd-output {{
     cursor: pointer;
@@ -318,4 +328,12 @@ code {{
   to {{
     transform: rotate(360deg);
   }}
+}}
+
+/* debug */
+.debug {{
+    color: orange !important;
+    background: #0d1117;
+    padding: 10px;
+    font-size: 0.9rem;
 }}

pygpt_net/data/css/web-blocks.light.css

@@ -72,4 +72,11 @@ code {{
 }}
 .display-blocks .name-user::before {{
     background-color: silver;
+}}
+.msg-extra a {{
+    color: #4d4d4d !important;
+}}
+.msg-extra a:hover {{
+    text-decoration: none;
+    color: #000 !important;
 }}

pygpt_net/data/css/web-chatgpt.css

@@ -339,4 +339,12 @@ code {{
   to {{
     transform: rotate(360deg);
   }}
+}}
+
+/* debug */
+.debug {{
+    color: orange !important;
+    background: #0d1117;
+    padding: 10px;
+    font-size: 0.9rem;
 }}

pygpt_net/data/css/web-chatgpt_wide.css

@@ -339,4 +339,12 @@ code {{
   to {{
     transform: rotate(360deg);
   }}
+}}
+
+/* debug */
+.debug {{
+    color: orange !important;
+    background: #0d1117;
+    padding: 10px;
+    font-size: 0.9rem;
 }}

pygpt_net/data/icons/split_screen.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#686868"><path d="M520-320h200v-320H520v320Zm-280 0h200v-320H240v320Zm-80 160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm640-560H160v480h640v-480Zm-640 0v480-480Z"/></svg>