Merge pull request #142 from yjg30737/Dev

v1.0.0

Author: yjg30737

.gitignore

@@ -134,4 +134,5 @@ dmypy.json
 # pyqt_openai
 pyqt_openai/pyqt_openai.ini
 pyqt_openai/*.db
-pyqt_openai/test/
+pyqt_openai/test/
+pyqt_openai/config.yaml

MANIFEST.in

@@ -1,6 +1,5 @@
 include pyqt_openai/ico/*
 include pyqt_openai/prompt_res/*
 include pyqt_openai/lang/*
-include pyqt_openai/images/*
 
 include pyqt_openai/icon.ico

pyproject.toml

@@ -5,30 +5,22 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "pyqt-openai"
 version = "0.9.0"
-description = "PyQt/PySide multipurpose chatbot that user can use GPT, other AI models altogether"
+description = "Python multipurpose chatbot that user can use GPT, other AI models altogether"
 authors = [{ name = "Jung Gyu Yoon", email = "[email protected]" }]
 license = { text = "MIT" }
 readme = "README.md"
 dependencies = [
-    "PyQt5 >= 5.14",
-    "PyQt6",
-    "qtpy",
-    "aiohttp",
+    "PySide6",
     "openai",
     "pyperclip",
     "jinja2",
     "llama-index",
     "requests",
-    "langchain",
-    "pillow",
-    "replicate",
-    "toml"
+    "replicate"
 ]
 keywords = ['openai', 'pyqt', 'pyqt5', 'pyqt6', 'pyside6', 'chatbot', 'gpt', 'replicate']
 
-requires-python = ">= 3.9"
-# 3.9
-# 3.10
+requires-python = ">= 3.11"
 # 3.11
 # 3.12
 
@@ -39,8 +31,6 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Topic :: Software Development :: Libraries :: Application Frameworks",
@@ -52,7 +42,6 @@ homepage = "https://github.com/yjg30737/pyqt-openai.git"
 
 [tool.setuptools]
 packages = ["pyqt_openai"]
-include_package_data = true
 
 [project.gui-scripts]
 pyqt-openai = "pyqt_openai.main:main"

pyqt_openai/__init__.py

@@ -4,17 +4,18 @@
 
 import json
 import os
-from pathlib import Path
 
-import toml
+import tomllib  # Python 3.11 built-in module
+from pathlib import Path
 
 # Load the pyproject.toml file
 SRC_DIR = Path(__file__).resolve().parent
 ROOT_DIR = SRC_DIR.parent
 SETUP_FILENAME = ROOT_DIR / "pyproject.toml"
 
-with open(SETUP_FILENAME, "r") as file:
-    pyproject_data = toml.load(file)
+# Read the TOML file using tomllib (Python 3.11+)
+with open(SETUP_FILENAME, "rb") as file:
+    pyproject_data = tomllib.load(file)
 
 # For the sake of following the PEP8 standard, we will declare module-level dunder names.
 # PEP8 standard about dunder names: https://peps.python.org/pep-0008/#module-level-dunder-names
@@ -25,24 +26,29 @@
 # Constants
 # ----------------------------
 # APP
-APP_NAME = pyproject_data["project"]["name"]
+DEFAULT_APP_NAME = 'VividNode'
 CONTACT = pyproject_data["project"]["authors"][0]['email']
-APP_ICON = 'icon.ico'
+DEFAULT_APP_ICON = 'icon.ico'
 APP_INITIAL_WINDOW_SIZE = (1280, 768)
 
 TRANSPARENT_RANGE = 20, 100
 TRANSPARENT_INIT_VAL = 100
 
 LICENSE = pyproject_data["project"]["license"]['text']
 LICENSE_URL = 'https://github.com/yjg30737/pyqt-openai/blob/main/LICENSE'
+KOFI_URL = 'https://ko-fi.com/junggyuyoon'
 PAYPAL_URL = 'https://paypal.me/yjg30737'
-BUYMEACOFFEE_URL = 'https://www.buymeacoffee.com/yjg30737'
 GITHUB_URL = 'https://github.com/yjg30737/pyqt-openai'
 DISCORD_URL = 'https://discord.gg/cHekprskVE'
+
+HOW_TO_GET_OPENAI_API_KEY_URL = 'https://medium.com/@yjg30737/how-to-get-your-openai-api-key-e2193850932e'
+HOW_TO_EXPORT_CHATGPT_CONVERSATION_HISTORY_URL = 'https://medium.com/@yjg30737/how-to-export-your-chatgpt-conversation-history-caa0946d6349'
+HOW_TO_REPLICATE = 'https://medium.com/@yjg30737/10a2cb983ceb'
+
 COLUMN_TO_EXCLUDE_FROM_SHOW_HIDE_CHAT = ['id']
 COLUMN_TO_EXCLUDE_FROM_SHOW_HIDE_IMAGE = ['id', 'data']
 DEFAULT_LANGUAGE = 'en_US'
-LANGUAGE_FILE = 'translations.json'
+LANGUAGE_FILE = 'lang/translations.json'
 LANGUAGE_DICT = {
     "English": "en_US",
     "Spanish": "es_ES",
@@ -61,16 +67,19 @@
     "Portuguese": "pt_BR"
 }
 
-MESSAGE_ADDITIONAL_HEIGHT = 40
 MESSAGE_PADDING = 16
 MESSAGE_MAXIMUM_HEIGHT = 800
 MAXIMUM_MESSAGES_IN_PARAMETER = 20
 MESSAGE_MAXIMUM_HEIGHT_RANGE = 300, 1000
 MAXIMUM_MESSAGES_IN_PARAMETER_RANGE = 2, 1000
 
+CONTEXT_DELIMITER = '\n'*2
 PROMPT_IMAGE_SCALE = 200, 200
 TOAST_DURATION = 3
 
+## OPENAI
+OPENAI_REQUEST_URL = 'https://api.openai.com/v1/models'
+
 ## PARAMETER - OPENAI CHAT
 OPENAI_TEMPERATURE_RANGE = 0, 2
 OPENAI_TEMPERATURE_STEP = 0.01
@@ -97,6 +106,7 @@
 ICON_EXPORT = 'ico/export.svg'
 ICON_FAVORITE_NO = 'ico/favorite_no.svg'
 ICON_FAVORITE_YES = 'ico/favorite_yes.svg'
+ICON_FOCUS_MODE = 'ico/focus_mode.svg'
 ICON_FULLSCREEN = 'ico/fullscreen.svg'
 ICON_GITHUB = 'ico/github.svg'
 ICON_HELP = 'ico/help.svg'
@@ -135,28 +145,49 @@
 DEFAULT_FOUND_TEXT_COLOR = '#00A2E8'
 DEFAULT_FOUND_TEXT_BG_COLOR = '#FFF200'
 
+DEFAULT_LINK_COLOR = '#4F93FF'
+DEFAULT_LINK_HOVER_COLOR = '#FF0000'
+
+DEFAULT_TOAST_BACKGROUND_COLOR = '#444444'
+DEFAULT_TOAST_FOREGROUND_COLOR = '#EEEEEE'
+
+## MARKDOWN
+# I am not planning to use it at the moment.
+# DEFAULT_MARKDOWN_span_font = 'Courier New'
+# DEFAULT_MARKDOWN_span_color = '#000'
+# DEFAULT_MARKDOWN_ul_color = '#000'
+# DEFAULT_MARKDOWN_h1_color = '#000'
+# DEFAULT_MARKDOWN_h2_color = '#000'
+# DEFAULT_MARKDOWN_h3_color = '#000'
+# DEFAULT_MARKDOWN_h4_color = '#000'
+# DEFAULT_MARKDOWN_h5_color = '#000'
+# DEFAULT_MARKDOWN_h6_color = '#000'
+# DEFAULT_MARKDOWN_a_color = '#000'
+
 ## SHORTCUT
-DEFAULT_SHORTCUT_GENERAL_ACTION = 'Enter'
+DEFAULT_SHORTCUT_GENERAL_ACTION = 'Return'
 DEFAULT_SHORTCUT_FIND_PREV = 'Ctrl+Shift+D'
 DEFAULT_SHORTCUT_FIND_NEXT = 'Ctrl+D'
 DEFAULT_SHORTCUT_FIND_CLOSE = 'Escape'
 DEFAULT_SHORTCUT_PROMPT_BEGINNING = 'Ctrl+B'
 DEFAULT_SHORTCUT_PROMPT_ENDING = 'Ctrl+E'
 DEFAULT_SHORTCUT_SUPPORT_PROMPT_COMMAND = 'Ctrl+Shift+P'
+DEFAULT_SHORTCUT_SHOW_TOOLBAR = 'Ctrl+T'
+DEFAULT_SHORTCUT_SHOW_SECONDARY_TOOLBAR = 'Ctrl+Shift+T'
+DEFAULT_SHORTCUT_FOCUS_MODE = 'F10'
 DEFAULT_SHORTCUT_FULL_SCREEN = 'F11'
 DEFAULT_SHORTCUT_FIND = 'Ctrl+F'
 DEFAULT_SHORTCUT_JSON_MODE = 'Ctrl+J'
 DEFAULT_SHORTCUT_LEFT_SIDEBAR_WINDOW = 'Ctrl+L'
 DEFAULT_SHORTCUT_RIGHT_SIDEBAR_WINDOW = 'Ctrl+R'
 DEFAULT_SHORTCUT_CONTROL_PROMPT_WINDOW = 'Ctrl+Shift+C'
 DEFAULT_SHORTCUT_SETTING = 'Ctrl+Alt+S'
-DEFAULT_SHORTCUT_SEND = 'Ctrl+Enter'
+DEFAULT_SHORTCUT_SEND = 'Ctrl+Return'
 
 ## DIRECTORY PATH & FILE'S NAME
 MAIN_INDEX = 'main.py'
 IMAGE_DEFAULT_SAVE_DIRECTORY = 'image_result'
-LLAMA_INDEX_DEFAULT_READ_DIRECTORY = './example'
-INI_FILE_NAME = 'pyqt_openai.ini'
+INI_FILE_NAME = 'config.yaml'
 DB_FILE_NAME = 'conv'
 FILE_NAME_LENGTH = 32
 QFILEDIALOG_DEFAULT_DIRECTORY = os.path.expanduser('~')
@@ -179,6 +210,7 @@
 PROMPT_END_KEY_NAME = 'prompt_ending'
 PROMPT_NAME_REGEX = '^[a-zA-Z_0-9]+$'
 INDENT_SIZE = 4
+NOTIFIER_MAX_CHAR = 100
 
 # DB
 DB_NAME_REGEX = '[a-zA-Z0-9]{1,20}'
@@ -264,6 +296,83 @@
 if os.path.exists(ALEX_BROGAN_PROMPT_FILENAME):
     ALEX_BROGAN_PROMPT = json.load(open(ALEX_BROGAN_PROMPT_FILENAME))[0]
 
+# DEFAULT Configuration data for the application settings
+# Initialize here to avoid circular import
+# ----------------------------
+CONFIG_DATA = {
+    'General': {
+        'TAB_IDX': 0,
+        'lang': 'English',
+        'show_chat_list': True,
+        'stream': True,
+        'db': 'conv',
+        'model': 'gpt-4o',
+        'show_setting': True,
+        'use_llama_index': False,
+        'do_not_ask_again': False,
+        'show_prompt': True,
+        'system': 'You are a helpful assistant.',
+        'notify_finish': True,
+        'temperature': 1,
+        'max_tokens': -1,
+        'show_toolbar': True,
+        'show_secondary_toolbar': True,
+        'top_p': 1,
+        'chat_column_to_show': ['id', 'name', 'insert_dt', 'update_dt'],
+        'frequency_penalty': 0,
+        'image_column_to_show': ['id', 'model', 'width', 'height', 'prompt', 'negative_prompt', 'n', 'quality', 'data', 'style', 'revised_prompt', 'update_dt', 'insert_dt'],
+        'presence_penalty': 0,
+        'json_object': False,
+        'maximum_messages_in_parameter': MAXIMUM_MESSAGES_IN_PARAMETER,
+        'show_as_markdown': True,
+        'use_max_tokens': False,
+        'background_image': '',
+        'user_image': DEFAULT_USER_IMAGE_PATH,
+        'ai_image': DEFAULT_AI_IMAGE_PATH,
+        'font_size': DEFAULT_FONT_SIZE,
+        'font_family': DEFAULT_FONT_FAMILY,
+        'API_KEY': '',
+        'llama_index_directory': '',
+        'apply_user_defined_styles': False,
+        'focus_mode': False,
+    },
+    'DALLE': {
+        'quality': 'standard',
+        'show_history': True,
+        'n': 1,
+        'show_setting': True,
+        'size': '1024x1024',
+        'directory': QFILEDIALOG_DEFAULT_DIRECTORY,
+        'is_save': True,
+        'continue_generation': False,
+        'number_of_images_to_create': 2,
+        'style': 'vivid',
+        'response_format': 'b64_json',
+        'save_prompt_as_text': True,
+        'show_prompt_on_image': False,
+        'prompt_type': 1,
+        'width': 1024,
+        'height': 1024,
+        'prompt': "Astronaut in a jungle, cold color palette, muted colors, detailed, 8k"
+    },
+    'REPLICATE': {
+        'REPLICATE_API_TOKEN': '',
+        'show_history': True,
+        'model': 'stability-ai/sdxl:39ed52f2a78e934b3ba6e2a89f5b1c712de7dfea535525255b1aa35c5565e08b',
+        'show_setting': True,
+        'width': 768,
+        'height': 768,
+        'prompt': "Astronaut in a jungle, cold color palette, muted colors, detailed, 8k",
+        'negative_prompt': "ugly, deformed, noisy, blurry, distorted",
+        'directory': QFILEDIALOG_DEFAULT_DIRECTORY,
+        'is_save': True,
+        'continue_generation': False,
+        'number_of_images_to_create': 2,
+        'save_prompt_as_text': True,
+        'show_prompt_on_image': False
+    }
+}
+
 # Update the __all__ list with the PEP8 standard dunder names
 __all__ = ['__version__',
            '__author__']

pyqt_openai/aboutDialog.py

@@ -1,11 +1,11 @@
 import datetime
-import pyqt_openai
 
-from qtpy.QtCore import Qt
-from qtpy.QtGui import QPixmap
-from qtpy.QtWidgets import QDialog, QPushButton, QHBoxLayout, QWidget, QVBoxLayout, QLabel
+from PySide6.QtCore import Qt
+from PySide6.QtGui import QPixmap
+from PySide6.QtWidgets import QDialog, QPushButton, QHBoxLayout, QWidget, QVBoxLayout, QLabel
 
-from pyqt_openai import APP_ICON, LICENSE_URL, GITHUB_URL, DISCORD_URL, APP_NAME, CONTACT
+import pyqt_openai
+from pyqt_openai import DEFAULT_APP_ICON, LICENSE_URL, DEFAULT_APP_NAME, CONTACT
 from pyqt_openai.lang.translations import LangClass
 from pyqt_openai.widgets.linkLabel import LinkLabel
 
@@ -22,13 +22,13 @@ def __initUi(self):
         self.__okBtn = QPushButton(LangClass.TRANSLATIONS['OK'])
         self.__okBtn.clicked.connect(self.accept)
 
-        p = QPixmap(APP_ICON)
+        p = QPixmap(DEFAULT_APP_ICON)
         logoLbl = QLabel()
         logoLbl.setPixmap(p)
 
         descWidget1 = QLabel()
         descWidget1.setText(f'''
-        <h1>{APP_NAME}</h1>
+        <h1>{DEFAULT_APP_NAME}</h1>
         Software Version {pyqt_openai.__version__}<br/><br/>
         © 2023 {datetime.datetime.now().year}. Used under the {pyqt_openai.LICENSE} License.<br/>
         Copyright (c) {datetime.datetime.now().year} {pyqt_openai.__author__}<br/>
@@ -41,36 +41,17 @@ def __initUi(self):
         descWidget3 = QLabel()
         descWidget3.setText(f'''
         <br/><br/>Contact: {CONTACT}<br/>
-        <p>Powered by qtpy</p>
+        <p>Powered by PySide6</p>
         ''')
 
         descWidget1.setAlignment(Qt.AlignmentFlag.AlignTop)
         descWidget2.setAlignment(Qt.AlignmentFlag.AlignTop)
         descWidget3.setAlignment(Qt.AlignmentFlag.AlignTop)
 
-        self.__githubLbl = LinkLabel()
-        self.__githubLbl.setSvgFile(pyqt_openai.ICON_GITHUB)
-        self.__githubLbl.setUrl(GITHUB_URL)
-
-        self.__discordLbl = LinkLabel()
-        self.__discordLbl.setSvgFile(pyqt_openai.ICON_DISCORD)
-        self.__discordLbl.setUrl(DISCORD_URL)
-        self.__discordLbl.setFixedSize(22, 19)
-
-        lay = QHBoxLayout()
-        lay.addWidget(self.__githubLbl)
-        lay.addWidget(self.__discordLbl)
-        lay.setAlignment(Qt.AlignmentFlag.AlignLeft)
-        lay.setContentsMargins(0, 0, 0, 0)
-
-        linkWidget = QWidget()
-        linkWidget.setLayout(lay)
-
         lay = QVBoxLayout()
         lay.addWidget(descWidget1)
         lay.addWidget(descWidget2)
         lay.addWidget(descWidget3)
-        lay.addWidget(linkWidget)
         lay.setAlignment(Qt.AlignmentFlag.AlignTop)
         lay.setContentsMargins(0, 0, 0, 0)