Merge branch 'Dev'

Author: yjg30737

MANIFEST.in

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

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyqt-openai"
-version = "0.8.2"
+version = "0.9.0"
 description = "PyQt/PySide multipurpose chatbot that user can use GPT, other AI models altogether"
 authors = [{ name = "Jung Gyu Yoon", email = "[email protected]" }]
 license = { text = "MIT" }
@@ -36,14 +36,13 @@ classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Libraries",
-    "License :: OSI Approved :: MIT License",  # Just an example, use your actual license
+    "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",
-    "Framework :: PyQt",
     "Topic :: Software Development :: Libraries :: Application Frameworks",
     "Topic :: Software Development :: User Interfaces"
 ]
@@ -53,42 +52,7 @@ homepage = "https://github.com/yjg30737/pyqt-openai.git"
 
 [tool.setuptools]
 packages = ["pyqt_openai"]
-
-[tool.setuptools.package-data]
-pyqt_openai = [
-    "ico/add.svg",
-    "ico/case.svg",
-    "ico/close.svg",
-    "ico/copy.svg",
-    "ico/customize.svg",
-    "ico/delete.svg",
-    "ico/discord.svg",
-    "ico/export.svg",
-    "ico/favorite_no.svg",
-    "ico/favorite_yes.svg",
-    "ico/fullscreen.svg",
-    "ico/github.svg",
-    "ico/history.svg",
-    "ico/import.svg",
-    "ico/info.svg",
-    "ico/next.svg",
-    "ico/openai.png",
-    "ico/openai.svg",
-    "ico/prev.svg",
-    "ico/prompt.svg",
-    "ico/question.svg",
-    "ico/refresh.svg",
-    "ico/regex.svg",
-    "ico/save.svg",
-    "ico/search.svg",
-    "ico/setting.svg",
-    "ico/sidebar.svg",
-    "ico/stackontop.svg",
-    "ico/user.png",
-    "ico/user.svg",
-    "ico/vertical_three_dots.svg",
-    "ico/word.svg"
-]
+include_package_data = true
 
 [project.gui-scripts]
 pyqt-openai = "pyqt_openai.main:main"

pyqt_openai/__init__.py

@@ -27,15 +27,20 @@
 # APP
 APP_NAME = pyproject_data["project"]["name"]
 CONTACT = pyproject_data["project"]["authors"][0]['email']
-APP_ICON = 'icon.png'
+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'
 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'
-COLUMN_TO_EXCLUDE_FROM_SHOW_HIDE = ['id']
+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_DICT = {
@@ -56,6 +61,31 @@
     "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
+
+PROMPT_IMAGE_SCALE = 200, 200
+TOAST_DURATION = 3
+
+## PARAMETER - OPENAI CHAT
+OPENAI_TEMPERATURE_RANGE = 0, 2
+OPENAI_TEMPERATURE_STEP = 0.01
+
+MAX_TOKENS_RANGE = 512, 128000
+
+TOP_P_RANGE = 0, 1
+TOP_P_STEP = 0.01
+
+FREQUENCY_PENALTY_RANGE = 0, 2
+FREQUENCY_PENALTY_STEP = 0.01
+
+PRESENCE_PENALTY_RANGE = 0, 2
+PRESENCE_PENALTY_STEP = 0.01
+
 ## ICONS
 ICON_ADD = 'ico/add.svg'
 ICON_CASE = 'ico/case.svg'
@@ -88,41 +118,59 @@
 ICON_USER = 'ico/user.png'
 ICON_VERTICAL_THREE_DOTS = 'ico/vertical_three_dots.svg'
 ICON_WORD = 'ico/word.svg'
+ICON_SEND = 'ico/send.svg'
 
 ## CUSTOMIZE
 DEFAULT_ICON_SIZE = (24, 24)
 DEFAULT_USER_IMAGE_PATH = ICON_USER
 DEFAULT_AI_IMAGE_PATH = ICON_OPENAI
 DEFAULT_FONT_SIZE = 12
 DEFAULT_FONT_FAMILY = 'Arial'
-FONT_FAMILY_FOR_SOURCE = 'Courier'
+
+DEFAULT_BUTTON_HOVER_COLOR = '#A2D0DD'
+DEFAULT_BUTTON_PRESSED_COLOR = '#B3E0FF'
+DEFAULT_BUTTON_CHECKED_COLOR = '#B3E0FF'
+DEFAULT_SOURCE_HIGHLIGHT_COLOR = '#CCB500'
+DEFAULT_SOURCE_ERROR_COLOR = '#FF0000'
+DEFAULT_FOUND_TEXT_COLOR = '#00A2E8'
+DEFAULT_FOUND_TEXT_BG_COLOR = '#FFF200'
 
 ## SHORTCUT
-SHORTCUT_GENERAL_ACTION = 'Enter'
-SHORTCUT_FIND_PREV = 'Ctrl+Shift+D'
-SHORTCUT_FIND_NEXT = 'Ctrl+D'
-SHORTCUT_FIND_CLOSE = 'Escape'
-SHORTCUT_PROMPT_BEGINNING = 'Ctrl+B'
-SHORTCUT_PROMPT_ENDING = 'Ctrl+E'
-SHORTCUT_SUPPORT_PROMPT_COMMAND = 'Ctrl+Shift+P'
-SHORTCUT_FULL_SCREEN = 'F11'
+DEFAULT_SHORTCUT_GENERAL_ACTION = 'Enter'
+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_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'
 
 ## 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'
 DB_FILE_NAME = 'conv'
+FILE_NAME_LENGTH = 32
+QFILEDIALOG_DEFAULT_DIRECTORY = os.path.expanduser('~')
 
 ## EXTENSIONS
-IMAGE_FILE_EXT = 'Image File (*.jpg *.png)'
-TEXT_FILE_EXT = 'Text File (*.txt)'
-JSON_FILE_EXT = 'JSON File (*.json)'
-READ_FILE_EXT = f'{TEXT_FILE_EXT};;{IMAGE_FILE_EXT}'
+TEXT_FILE_EXT_LIST = ['.txt']
+IMAGE_FILE_EXT_LIST = ['.png', '.jpg', '.jpeg', '.gif', '.bmp']
+IMAGE_FILE_EXT_LIST_STR = 'Image File (*.png *.jpg *.jpeg *.gif *.bmp)'
+TEXT_FILE_EXT_LIST_STR = 'Text File (*.txt)'
+JSON_FILE_EXT_LIST_STR = 'JSON File (*.json)'
+READ_FILE_EXT_LIST_STR = f'{TEXT_FILE_EXT_LIST_STR};;{IMAGE_FILE_EXT_LIST_STR}'
 
-## LINK
-CHATGPT_IMPORT_MANUAL_LINK_1 = 'https://cdn.discordapp.com/attachments/1089739277379846226/1259834113884557362/image.png?ex=66a6d4b3&is=66a58333&hm=3544e9a6ec1610bc552f93b794e113c48c1505d5ba820628b9cd68876597f7dc&'
-CHATGPT_IMPORT_MANUAL_LINK_2 = 'https://cdn.discordapp.com/attachments/1089739277379846226/1265952420773498880/image.png?ex=66a6ad51&is=66a55bd1&hm=0279112be31354eb1a45f1d72d28363285dd6b640854b6dc98e58de98f4fc349&'
+## IMAGE
+IMAGE_CHATGPT_IMPORT_MANUAL = 'images/import_from_chatgpt.png'
 
 ## PROMPT
 PROMPT_BEGINNING_KEY_NAME = 'prompt_beginning'
@@ -179,7 +227,7 @@
         "name": 'Default',
         "data": PROPERTY_PROMPT_UNIT_DEFAULT_VALUE
     }
-], indent=4)
+], indent=INDENT_SIZE)
 
 SENTENCE_PROMPT_GROUP_SAMPLE = '''[
     {

pyqt_openai/aboutDialog.py

@@ -11,8 +11,8 @@
 
 
 class AboutDialog(QDialog):
-    def __init__(self):
-        super().__init__()
+    def __init__(self, parent=None):
+        super().__init__(parent)
         self.__initUi()
 
     def __initUi(self):