pygpt-net 2.5.6__tar.gz → 2.5.7__tar.gz

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 2.5.7 (2025-02-26)
+
+- Steam mode has been enabled in o1 models.
+- CSS styling for <think> tags (reasoning models) has been added.
+- The search input has been moved to the top.
+- The ChatGPT-based style is now set as default.
+- Fix: Display of max tokens in models with a context window greater than 128k.
+
 ## 2.5.6 (2025-02-03)
 
 - Fix: disabled index initialization if embedding provider is OpenAI and no API KEY is provided.

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygpt-net
-Version: 2.5.6
+Version: 2.5.7
 Summary: Desktop AI Assistant powered by models: OpenAI o1, GPT-4o, GPT-4, GPT-4 Vision, GPT-3.5, DALL-E 3, Llama 3, Mistral, Gemini, Claude, DeepSeek, Bielik, and other models supported by Langchain, Llama Index, and Ollama. Features include chatbot, text completion, image generation, vision analysis, speech-to-text, internet access, file handling, command execution and more.
 Home-page: https://pygpt.net
 License: MIT
@@ -94,7 +94,7 @@ Description-Content-Type: text/markdown
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.5.6** | build: **2025.02.03** | Python: **>=3.10, <3.13**
+Release: **2.5.7** | build: **2025.02.26** | Python: **>=3.10, <3.13**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -4056,6 +4056,14 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.5.7 (2025-02-26)**
+
+- Steam mode has been enabled in o1 models.
+- CSS styling for <think> tags (reasoning models) has been added.
+- The search input has been moved to the top.
+- The ChatGPT-based style is now set as default.
+- Fix: Display of max tokens in models with a context window greater than 128k.
+
 **2.5.6 (2025-02-03)**
 
 - Fix: disabled index initialization if embedding provider is OpenAI and no API KEY is provided.

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/README.md

@@ -2,7 +2,7 @@
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.5.6** | build: **2025.02.03** | Python: **>=3.10, <3.13**
+Release: **2.5.7** | build: **2025.02.26** | Python: **>=3.10, <3.13**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -3964,6 +3964,14 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.5.7 (2025-02-26)**
+
+- Steam mode has been enabled in o1 models.
+- CSS styling for <think> tags (reasoning models) has been added.
+- The search input has been moved to the top.
+- The ChatGPT-based style is now set as default.
+- Fix: Display of max tokens in models with a context window greater than 128k.
+
 **2.5.6 (2025-02-03)**
 
 - Fix: disabled index initialization if embedding provider is OpenAI and no API KEY is provided.

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pygpt-net"
-version = "2.5.6"
+version = "2.5.7"
 description = "Desktop AI Assistant powered by models: OpenAI o1, GPT-4o, GPT-4, GPT-4 Vision, GPT-3.5, DALL-E 3, Llama 3, Mistral, Gemini, Claude, DeepSeek, Bielik, and other models supported by Langchain, Llama Index, and Ollama. Features include chatbot, text completion, image generation, vision analysis, speech-to-text, internet access, file handling, command execution and more."
 authors = ["Marcin Szczyglinski <info@pygpt.net>"]
 license = "MIT"

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/CHANGELOG.txt

@@ -1,3 +1,11 @@
+2.5.7 (2025-02-26)
+
+- Steam mode has been enabled in o1 models.
+- CSS styling for <think> tags (reasoning models) has been added.
+- The search input has been moved to the top.
+- The ChatGPT-based style is now set as default.
+- Fix: Display of max tokens in models with a context window greater than 128k.
+
 2.5.6 (2025-02-03)
 
 - Fix: disabled index initialization if embedding provider is OpenAI and no API KEY is provided.

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/__init__.py

@@ -6,15 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.02.03 02:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.5.6"
-__build__ = "2025.02.03"
+__version__ = "2.5.7"
+__build__ = "2025.02.26"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __report__ = "https://github.com/szczyglis-dev/py-gpt/issues"

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/controller/chat/text.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.16 20:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 from typing import Optional
@@ -86,7 +86,7 @@ class Text:
         idx_mode = self.window.core.config.get('llama.idx.mode')
 
         # o1 models: disable stream mode
-        if model.startswith("o1") or mode in [MODE_AGENT_LLAMA, MODE_AUDIO]:
+        if mode in [MODE_AGENT_LLAMA, MODE_AUDIO]:
             stream_mode = False
         if mode in [MODE_LLAMA_INDEX] and idx_mode == "retrieval":
             stream_mode = False

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/controller/config/placeholder.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.02.01 11:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, List
@@ -325,7 +325,8 @@ class Placeholder:
         styles.sort()
         data = []
         for id in styles:
-            data.append({id: id})
+            name = id
+            data.append({id: name})
         return data
 
     def get_keys(self) -> List[Dict[str, str]]:

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/controller/notepad/__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.14 08:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 from typing import Optional, Tuple
@@ -283,6 +283,6 @@ class Notepad:
         if tab.type == Tab.TAB_NOTEPAD:
             idx = tab.data_id
             if idx in self.window.ui.notepad:
+                self.window.ui.notepad[idx].scroll_to_bottom()
                 if not self.window.ui.notepad[idx].opened:
-                    self.window.ui.notepad[idx].scroll_to_bottom()
                     self.window.ui.notepad[idx].opened = True

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/controller/theme/menu.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.07 21:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction
@@ -36,6 +36,10 @@ class Menu:
         for style in styles:
             style_id = style.lower()
             title = style.replace('_', ' ').title()
+            if title == "Chatgpt":
+                title = "ChatGPT"
+            elif title == "Chatgpt Wide":
+                title = "ChatGPT (wide)"
             self.window.ui.menu['theme_style'][style_id] = QAction(title, self.window, checkable=True)
             self.window.ui.menu['theme_style'][style_id].triggered.connect(
                 lambda checked=None, style=style_id: self.window.controller.theme.toggle_style(style))

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/controller/ui/__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.14 00:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 from typing import Optional
@@ -95,6 +95,20 @@ class UI:
         self.window.controller.assistant.refresh()
         self.window.controller.idx.refresh()
 
+    def format_tokens(self, num: int) -> str:
+        """
+        Format tokens
+        :param num: number of tokens
+        :return: formatted string
+        """
+        num = int(num)
+        if num >= 1_000_000:
+            return f"{num // 1_000_000}M"
+        elif num >= 1_000:
+            return f"{num // 1_000}k"
+        else:
+            return str(num)
+
     def update_tokens(self):
         """Update tokens counter in real-time"""
         prompt = str(self.window.ui.nodes['input'].toPlainText().strip())
@@ -112,12 +126,8 @@ class UI:
         )
         self.window.ui.nodes['prompt.context'].setText(ctx_string)
 
-        # input tokens
-        parsed_sum = str(int(sum_tokens))
-        parsed_sum = parsed_sum.replace("000000", "M").replace("000", "k")
-
-        parsed_max_current = str(int(max_current))
-        parsed_max_current = parsed_max_current.replace("000000", "M").replace("000", "k")
+        parsed_sum = self.format_tokens(sum_tokens)
+        parsed_max_current = self.format_tokens(max_current)
 
         input_string = "{} + {} + {} + {} + {} = {} / {}".format(
             input_tokens,

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/core/render/web/helpers.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.11 23:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 import re
@@ -48,6 +48,13 @@ class Helpers:
         text = text.replace("#~###~", "~###~")  # fix for #~###~ in text (previous versions)
         text = text.replace("# ~###~", "~###~")  # fix for # ~###~ in text (previous versions)
 
+        #text = text.replace("<think>", "{{{{think}}}}")
+        #text = text.replace("</think>", "{{{{/think}}}}")
+        #text = text.replace("<", "&lt;")
+        #text = text.replace(">", "&gt;")
+        #text = text.replace("{{{{think}}}}", "<think>")
+        #text = text.replace("{{{{/think}}}}", "</think>")
+
         # replace cmd tags
         text = self.replace_code_tags(text)
 

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/core/tokens/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.31 22:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 from typing import Tuple, List
@@ -375,7 +375,7 @@ class Tokens:
 
         # check model max allowed ctx tokens
         max_current = max_total_tokens
-        model_ctx = self.window.core.models.get_num_ctx(model_id)
+        model_ctx = self.window.core.models.get_num_ctx(model)
         if max_current > model_ctx:
             max_current = model_ctx
 

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/data/config/config.json

@@ -1,8 +1,8 @@
 {
   "__meta__": {
-    "version": "2.5.6",
-    "app.version": "2.5.6",
-    "updated_at": "2025-02-03T00:00:00"
+    "version": "2.5.7",
+    "app.version": "2.5.7",
+    "updated_at": "2025-02-26T00:00:00"
   },
   "access.audio.event.speech": false,
   "access.audio.event.speech.disabled": [],
@@ -355,7 +355,7 @@
   "temperature": 1.0,
   "theme": "dark_cyan",
   "theme.markdown": true,
-  "theme.style": "blocks",
+  "theme.style": "chatgpt",
   "top_p": 1.0,
   "upload.store": true,
   "upload.data_dir": false,

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/data/config/models.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.5.6",
-        "app.version": "2.5.6",
-        "updated_at": "2025-02-03T00:00:00"
+        "version": "2.5.7",
+        "app.version": "2.5.7",
+        "updated_at": "2025-02-26T00:00:00"
     },
     "items": {
         "claude-3-5-sonnet-20240620": {

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/data/config/modes.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.5.6",
-        "app.version": "2.5.6",
-        "updated_at": "2025-02-03T00:00:00"
+        "version": "2.5.7",
+        "app.version": "2.5.7",
+        "updated_at": "2025-02-26T00:00:00"
     },
     "items": {
         "chat": {

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/data/css/web-blocks.css

@@ -319,6 +319,14 @@ code {{
   width: 100% !important;
   height: 100% !important;
 }}
+think {{
+  border-left: 4px solid silver;
+  display: block;
+  padding-left: 1rem;
+  margin-top: 0;
+  padding-top: 0;
+  font-size: 0.8rem;
+}}
 
 /* anims */
 @keyframes spin {{

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/data/css/web-chatgpt.css

@@ -330,6 +330,14 @@ code {{
   width: 100% !important;
   height: 100% !important;
 }}
+think {{
+  border-left: 4px solid silver;
+  display: block;
+  padding-left: 1rem;
+  margin-top: 0;
+  padding-top: 0;
+  font-size: 0.8rem;
+}}
 
 /* anims */
 @keyframes spin {{

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/data/css/web-chatgpt_wide.css

@@ -330,6 +330,14 @@ code {{
   width: 100% !important;
   height: 100% !important;
 }}
+think {{
+  border-left: 4px solid silver;
+  display: block;
+  padding-left: 1rem;
+  margin-top: 0;
+  padding-top: 0;
+  font-size: 0.8rem;
+}}
 
 /* anims */
 @keyframes spin {{

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/provider/core/config/patch.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.31 19:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 import copy
@@ -1838,6 +1838,14 @@ class Patch:
                     data["api_key_deepseek"] = ""
                 updated = True
 
+            # < 2.5.7
+            if old < parse_version("2.5.7"):
+                print("Migrating config from < 2.5.7...")
+                self.window.core.updater.patch_css('web-blocks.css', True)  # force update
+                self.window.core.updater.patch_css('web-chatgpt.css', True)  # force update
+                self.window.core.updater.patch_css('web-chatgpt_wide.css', True)  # force update
+                updated = True
+
         # update file
         migrated = False
         if updated:

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/provider/gpt/chat.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.02.02 02:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 import json
@@ -135,8 +135,8 @@ class Chat:
                 response_kwargs['max_completion_tokens'] = max_tokens
 
         # o1 models do not support streaming
-        if model.id is not None and model.id.startswith("o1"):
-            stream = False
+        if model.id is not None and model.id.startswith("o1-preview"):
+            streams = False
 
         # audio mode
         if mode in [MODE_AUDIO]:

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/ui/layout/ctx/__init__.py

@@ -6,13 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 02:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QVBoxLayout, QWidget
 
-from pygpt_net.ui.layout.ctx.search_input import SearchInput
 from pygpt_net.ui.layout.ctx.ctx_list import CtxList
 from pygpt_net.ui.layout.ctx.video import Video
 from pygpt_net.ui.widget.element.labels import HelpLabel
@@ -27,7 +26,6 @@ class CtxMain:
         :param window: Window instance
         """
         self.window = window
-        self.search_input = SearchInput(window)
         self.ctx_list = CtxList(window)
         self.video = Video(window)
 
@@ -39,7 +37,6 @@ class CtxMain:
         """
         ctx = self.ctx_list.setup()
         video = self.video.setup()
-        search_input = self.search_input.setup()
 
         self.window.ui.nodes['tip.toolbox.ctx'] = HelpLabel(trans('tip.toolbox.ctx'), self.window)
         self.window.ui.nodes['tip.toolbox.ctx'].setAlignment(Qt.AlignCenter)
@@ -48,7 +45,6 @@ class CtxMain:
         layout.addWidget(ctx)
 
         layout.addWidget(self.window.ui.nodes['tip.toolbox.ctx'])
-        layout.addWidget(search_input)
         layout.addWidget(video)
         layout.setContentsMargins(5, 5, 2, 5)
 

{pygpt_net-2.5.6 → pygpt_net-2.5.7}/src/pygpt_net/ui/layout/ctx/ctx_list.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.16 01:00:00                  #
+# Updated Date: 2025.02.26 23:00:00                  #
 # ================================================== #
 
 from PySide6 import QtCore
@@ -15,6 +15,7 @@ from PySide6.QtWidgets import QVBoxLayout, QWidget
 from datetime import datetime, timedelta
 
 from pygpt_net.item.ctx import CtxMeta
+from pygpt_net.ui.layout.ctx.search_input import SearchInput
 from pygpt_net.ui.widget.element.button import NewCtxButton
 from pygpt_net.ui.widget.element.labels import TitleLabel
 from pygpt_net.ui.widget.lists.context import ContextList, Item, GroupItem, SectionItem
@@ -30,6 +31,7 @@ class CtxList:
         :param window: Window instance
         """
         self.window = window
+        self.search_input = SearchInput(window)
 
     def setup(self) -> QWidget:
         """
@@ -42,9 +44,12 @@ class CtxList:
         self.window.ui.nodes[id] = ContextList(self.window, id)
         self.window.ui.nodes[id].selection_locked = self.window.controller.ctx.context_change_locked
         self.window.ui.nodes['ctx.label'] = TitleLabel(trans("ctx.list.label"))
+        self.window.ui.nodes['ctx.new'].setContentsMargins(0,0,0,0)
+        search_input = self.search_input.setup()
 
         layout = QVBoxLayout()
         layout.addWidget(self.window.ui.nodes['ctx.new'])
+        layout.addWidget(search_input)
         layout.addWidget(self.window.ui.nodes[id])
         layout.setContentsMargins(0, 0, 0, 0)