Updated version to 2.0.139

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+# 2.0.139 (2024-02-01)
+
+- Improved the generation of names for preset duplicates.
+- Added background updates check (with an option in settings to disable it).
+- Added dialog to accept license terms at the first launch.
+- Fixed calendar content save on month change.
+- Small UI improvements.
+
 # 2.0.138 (2024-02-01)
 
 - Added "Duplicate" option to current * (default) presets

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Marcin Szczygliński
+Copyright (c) 2024 Marcin Szczygliński
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

PyGPT_Linux_PAD_File.xml

@@ -2,13 +2,13 @@
 <PAD>
 <PAD_Version>4.0</PAD_Version>
 <Program_Name>PyGPT - Desktop AI Assistant</Program_Name>
-<Program_Version>2.0.138</Program_Version>
+<Program_Version>2.0.139</Program_Version>
 <Program_Release_Month>02</Program_Release_Month>
 <Program_Release_Day>01</Program_Release_Day>
 <Program_Release_Year>2024</Program_Release_Year>
 <Program_Cost_Dollars>0</Program_Cost_Dollars>
 <Program_Type>Open Source</Program_Type>
-<Download_URL>https://pygpt.net/download/2.0.138/pygpt-2.0.138.tar.gz</Download_URL>
+<Download_URL>https://pygpt.net/download/2.0.139/pygpt-2.0.139.tar.gz</Download_URL>
 <Application_OS_Support>Linux 64 bit</Application_OS_Support>
 <Program_Specific_Category>Generative AI Tools</Program_Specific_Category>
 <Program_Language>English, Polish</Program_Language>

PyGPT_Windows_PAD_File.xml

@@ -2,13 +2,13 @@
 <PAD>
 <PAD_Version>4.0</PAD_Version>
 <Program_Name>PyGPT - Desktop AI Assistant</Program_Name>
-<Program_Version>2.0.138</Program_Version>
+<Program_Version>2.0.139</Program_Version>
 <Program_Release_Month>02</Program_Release_Month>
 <Program_Release_Day>01</Program_Release_Day>
 <Program_Release_Year>2024</Program_Release_Year>
 <Program_Cost_Dollars>0</Program_Cost_Dollars>
 <Program_Type>Open Source</Program_Type>
-<Download_URL>https://pygpt.net/download/2.0.138/pygpt-2.0.138.msi</Download_URL>
+<Download_URL>https://pygpt.net/download/2.0.139/pygpt-2.0.139.msi</Download_URL>
 <Application_OS_Support>Windows 10 64 bit, Windows 11 64 bit</Application_OS_Support>
 <Program_Specific_Category>Generative AI Tools</Program_Specific_Category>
 <Program_Language>English, Polish</Program_Language>

README.md

@@ -2,7 +2,7 @@
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.0.138** | build: **2024.02.01** | Python: **3.10+**
+Release: **2.0.139** | build: **2024.02.01** | Python: **3.10+**
 
 Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 
@@ -1982,6 +1982,14 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+# 2.0.139 (2024-02-01)
+
+- Improved the generation of names for preset duplicates.
+- Added background updates check (with an option in settings to disable it).
+- Added dialog to accept license terms at the first launch.
+- Fixed calendar content save on month change.
+- Small UI improvements.
+
 # 2.0.138 (2024-02-01)
 
 - Added "Duplicate" option to current * (default) presets

docs/source/conf.py

@@ -9,7 +9,7 @@
 project = 'PyGPT'
 copyright = '2024, pygpt.net'
 author = 'szczyglis-dev, Marcin Szczygliński'
-release = '2.0.138'
+release = '2.0.139'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/source/index.rst

@@ -6,12 +6,12 @@
 PyGPT - pygpt.net
 ====================
 
-| **Last update:** 2024-02-01 00:00
+| **Last update:** 2024-02-01 18:00
 | **Project website:** https://pygpt.net
 | **GitHub:** https://github.com/szczyglis-dev/py-gpt
 | **Snap Store:** https://snapcraft.io/pygpt
 | **PyPI:** https://pypi.org/project/pygpt-net
-| **Release:** 2.0.138 (2024-02-01)
+| **Release:** 2.0.139 (2024-02-01)
 
 .. toctree::
    :maxdepth: 3

linux.spec

@@ -28,6 +28,7 @@ a = Analysis(
         ('src/pygpt_net/data/icon_tray_busy.ico', 'data'),
         ('src/pygpt_net/data/icon_tray_error.ico', 'data'),
         ('src/pygpt_net/CHANGELOG.txt', '.'),
+        ('src/pygpt_net/LICENSE', '.'),
         ('README.md', '.'),
         ('src/pygpt_net/__init__.py', '.'),
         ('venv/lib/python3.10/site-packages/llama_index/VERSION', 'llama_index/'),  # llama-index hack

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pygpt-net"
-version = "2.0.138"
+version = "2.0.139"
 description = "Desktop AI Assistant powered by GPT-4, GPT-4V, GPT-3.5, DALL-E 3, Langchain LLMs, Llama-index, Whisper and more with chatbot, assistant, text completion, vision and image generation, internet access, chat with files, commands and code execution, file upload and download and more"
 readme = "README.md"
 authors = [{ name = "Marcin Szczygliński", email = "info@pygpt.net" }]

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '2.0.138'
+VERSION = '2.0.139'
 DESCRIPTION = 'Desktop AI Assistant powered by GPT-4, GPT-4V, GPT-3.5, DALL-E 3, Langchain LLMs, Llama-index, ' \
               'Whisper and more with chatbot, assistant, text completion, vision and image generation, ' \
               'internet access, chat with files, commands and code execution, file upload and download and more'
@@ -23,6 +23,7 @@
     package_dir={'': 'src'},
     package_data={'': [
         'CHANGELOG.txt',
+        'LICENSE',
         'data/*',
         'data/css/*',
         'data/fonts/*',

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: pygpt
 base: core22  # Ubuntu 22.04
-version: '2.0.138'
+version: '2.0.139'
 summary: Desktop AI Assistant - GPT-4, GPT-4V, GPT-3, DALL-E 3, chat, assistant, vision
 description: |
   **PyGPT** is **all-in-one** Desktop AI Assistant that provides direct interaction with OpenAI language models, including GPT-4, GPT-4 Vision, and GPT-3.5, through the OpenAI API. The application also integrates with alternative LLMs, like those available on HuggingFace, by utilizing Langchain.

src/pygpt_net/CHANGELOG.txt

@@ -1,3 +1,11 @@
+2.0.139 (2024-02-01)
+
+- Improved the generation of names for preset duplicates.
+- Added background updates check (with an option in settings to disable it).
+- Added dialog to accept license terms at the first launch.
+- Fixed calendar content save on month change.
+- Small UI improvements.
+
 2.0.138 (2024-02-01)
 
 - Added "Duplicate" option to current * (default) presets

src/pygpt_net/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Marcin Szczygliński
+Copyright (c) 2024 Marcin Szczygliński
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

src/pygpt_net/__init__.py

@@ -6,14 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.02.01 00:00:00                  #
+# Updated Date: 2024.02.01 18:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2024, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.0.138"
+__version__ = "2.0.139"
 __build__ = "2024.02.01"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"

src/pygpt_net/controller/lang/mapping.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.01.16 06:00:00                  #
+# Updated Date: 2024.02.01 18:00:00                  #
 # ================================================== #
 
 from pygpt_net.utils import trans
@@ -173,6 +173,10 @@ def get_mapping(self) -> dict:
         # dialog: changelog
         nodes['dialog.changelog.label'] = 'dialog.changelog.title'
 
+        # dialog: license
+        nodes['dialog.license.label'] = 'dialog.license.label'
+        nodes['dialog.license.accept'] = 'dialog.license.accept'
+
         # help tips
         nodes['tip.output.tab.files'] = 'tip.output.tab.files'
         nodes['tip.output.tab.draw'] = 'tip.output.tab.draw'
@@ -241,6 +245,7 @@ def get_mapping(self) -> dict:
         dialog_title = {}
         dialog_title['info.about'] = 'dialog.about.title'
         dialog_title['info.changelog'] = 'dialog.changelog.title'
+        dialog_title['info.license'] = 'dialog.license.title'
         dialog_title['config.editor'] = 'dialog.editor.title'
         dialog_title['config.settings'] = 'dialog.settings'
         dialog_title['editor.assistants'] = 'dialog.assistant'

src/pygpt_net/data/config/config.json

@@ -1,7 +1,7 @@
 {
   "__meta__": {
-    "version": "2.0.138",
-    "app.version": "2.0.138",
+    "version": "2.0.139",
+    "app.version": "2.0.139",
     "updated_at": "2024-02-01T00:00:00"
   },
   "agent.auto_stop" : true,
@@ -152,9 +152,9 @@
   "upload.store": true,
   "upload.data_dir": false,
   "updater.check.launch": true,
-  "updater.check.bg": false,
-  "updater.check.bg.last_time": false,
-  "updater.check.bg.last_version": false,
+  "updater.check.bg": true,
+  "updater.check.bg.last_time": "",
+  "updater.check.bg.last_version": "",
   "use_context": true,
   "user_name": "",
   "vision.capture.auto": false,

src/pygpt_net/data/config/models.json

@@ -1,7 +1,7 @@
 {
     "__meta__": {
-        "version": "2.0.138",
-        "app.version": "2.0.138",
+        "version": "2.0.139",
+        "app.version": "2.0.139",
         "updated_at": "2024-02-01T03:53:56"
     },
     "items": {

src/pygpt_net/data/config/modes.json

@@ -1,7 +1,7 @@
 {
     "__meta__": {
-        "version": "2.0.138",
-        "app.version": "2.0.138",
+        "version": "2.0.139",
+        "app.version": "2.0.139",
         "updated_at": "2024-02-01T00:00:00"
     },
     "items": {

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: 2024.02.01 00:00:00                  #
+# Updated Date: 2024.02.01 18:00:00                  #
 # ================================================== #
 
 import os
@@ -702,6 +702,18 @@ def execute(self, version: Version) -> bool:
                     data['layout.tray.minimize'] = False
                 updated = True
 
+            # < 2.0.139
+            if old < parse_version("2.0.139"):
+                print("Migrating config from < 2.0.139...")
+                data['updater.check.bg'] = True
+                if 'license.accepted' not in data:
+                    data['license.accepted'] = False
+                if 'updater.check.bg.last_time' not in data:
+                    data['updater.check.bg.last_time'] = None
+                if 'updater.check.bg.last_version' not in data:
+                    data['updater.check.bg.last_version'] = None
+                updated = True
+
         # update file
         migrated = False
         if updated:

src/pygpt_net/ui/dialog/license.py

@@ -45,15 +45,15 @@ def setup(self):
         textarea.setReadOnly(True)
         textarea.setPlainText(txt)
 
-        accept_btn = QPushButton(trans("dialog.license.accept"))
-        accept_btn.clicked.connect(self.accept)
+        self.window.ui.nodes['dialog.license.accept'] = QPushButton(trans("dialog.license.accept"))
+        self.window.ui.nodes['dialog.license.accept'].clicked.connect(self.accept)
 
         self.window.ui.nodes['dialog.license.label'] = QLabel(trans("dialog.license.label"))
 
         layout = QVBoxLayout()
         layout.addWidget(self.window.ui.nodes['dialog.license.label'])
         layout.addWidget(textarea)
-        layout.addWidget(accept_btn)
+        layout.addWidget(self.window.ui.nodes['dialog.license.accept'])
 
         self.window.ui.dialog['info.' + id] = LicenseDialog(self.window, id)
         self.window.ui.dialog['info.' + id].setLayout(layout)

tests/controller/presets/test_presets_init.py

@@ -260,9 +260,9 @@ def test_validate_filename(mock_window):
     presets = Presets(mock_window)
     assert presets.validate_filename("Test") == "Test"
     assert presets.validate_filename("Test 1") == "Test 1"
-    assert presets.validate_filename("Test 1.2") == "Test 12"
-    assert presets.validate_filename("Test 1.2.3") == "Test 123"
-    assert presets.validate_filename("Test/\\$1.2.3") == "Test123"
+    assert presets.validate_filename("Test 1.2") == "Test 1.2"
+    assert presets.validate_filename("Test 1.2.3") == "Test 1.2.3"
+    assert presets.validate_filename("Test/\\$1.2.3") == "Test1.2.3"
 
 
 def test_preset_change_locked(mock_window):

tests/core/test_presets_core.py

@@ -146,22 +146,22 @@ def test_get_duplicate_name(mock_window):
     presets.items = {
         'test': preset1,
     }
-    assert presets.get_duplicate_name('test') == ('test_1', 'test (1)')
+    assert presets.get_duplicate_name('test') == ('test_copy', 'test copy')
     preset2 = PresetItem()
     preset2.name = 'test (1)'
     presets.items = {
         'test': preset1,
         'test_1': preset2,
     }
-    assert presets.get_duplicate_name('test') == ('test_2', 'test (2)')
+    assert presets.get_duplicate_name('test') == ('test_copy', 'test copy')
     preset3 = PresetItem()
     preset3.name = 'test (2)'
     presets.items = {
         'test': preset1,
         'test_1': preset2,
         'test_2': preset3,
     }
-    assert presets.get_duplicate_name('test') == ('test_3', 'test (3)')
+    assert presets.get_duplicate_name('test') == ('test_copy', 'test copy')
 
 
 def test_duplicate(mock_window):

version.rc

@@ -1,7 +1,7 @@
 VSVersionInfo(
 		ffi=FixedFileInfo(
-		filevers=(2, 0, 138, 0),
-		prodvers=(2, 0, 138, 0),
+		filevers=(2, 0, 139, 0),
+		prodvers=(2, 0, 139, 0),
 		mask=0x3f,
 		flags=0x0,
 		OS=0x4,
@@ -16,12 +16,12 @@ StringFileInfo(
     u'040904B0',
     [StringStruct(u'CompanyName', u'pygpt.net'),
     StringStruct(u'FileDescription', u'Desktop AI Assistant powered by GPT-4, GPT-3 and DALL-E 3: assistant, chatbot, text completion, image generation, vision and more.'),
-    StringStruct(u'FileVersion', u'2.0.138'),
+    StringStruct(u'FileVersion', u'2.0.139'),
     StringStruct(u'InternalName', u'pygpt'),
     StringStruct(u'LegalCopyright', u'(c) 2024 pygpt.net, Marcin Szczygliński'),
     StringStruct(u'OriginalFilename', u'pygpt.exe'),
     StringStruct(u'ProductName', u'pygpt.net'),
-    StringStruct(u'ProductVersion', u'2.0.138')])
+    StringStruct(u'ProductVersion', u'2.0.139')])
   ]), 
 VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]

windows.spec

@@ -29,6 +29,7 @@ a = Analysis(
         ('src\\pygpt_net\\data\\icon_tray_busy.ico', 'data'),
         ('src\\pygpt_net\\data\\icon_tray_error.ico', 'data'),
         ('src\\pygpt_net\\CHANGELOG.txt', '.'),
+        ('src\\pygpt_net\\LICENSE', '.'),
         ('README.md', '.'),
         ('src\\pygpt_net\\__init__.py', '.'),
         ('venv\\Lib\\site-packages\\llama_index\\VERSION', 'llama_index\\'),  # llama-index hack