Merge pull request #154 from Integration-Automation/dev

JE-Chen · web-flow · commit f804a0ef99e8 · 2025-02-21T04:26:16.000+08:00
Dev
diff --git a/dev.toml b/dev.toml
@@ -6,15 +6,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_editor_dev"
-version = "0.0.214"
+version = "0.0.219"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]
 description = "JEditor is basic but powerful editor include GPT"
 requires-python = ">=3.9"
 license = { text = "MIT" }
 dependencies = [
-    "PySide6==6.7.3", "qt-material", "yapf", "frontengine", "pycodestyle", "jedi", "qtconsole", "re-edge-gpt[gui]"
+    "PySide6==6.8.2.1", "qt-material", "yapf", "frontengine", "pycodestyle", "jedi", "qtconsole"
 ]
 classifiers = [
     "Programming Language :: Python :: 3.9",
diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -1,6 +1,9 @@
-frontengine
-PySide6==6.7.3
+PySide6==6.8.2.1
 sphinx
 twine
 build
-je_editor_dev
+je_editor_dev
+auto-py-to-exe
+twine
+wheel
+build
diff --git a/exe/auto_py_to_exe.json b/exe/auto_py_to_exe.json
@@ -7,7 +7,7 @@
   },
   {
    "optionDest": "filenames",
-   "value": "C:/CodeWorkspace/je_editor/exe/start_editor.py"
+   "value": "C:/CodeWorkspace/Python/JEDITOR/exe/start_editor.py"
   },
   {
    "optionDest": "onefile",
@@ -19,16 +19,12 @@
   },
   {
    "optionDest": "icon_file",
-   "value": "C:/CodeWorkspace/je_editor/exe/je_driver_icon.ico"
+   "value": "C:/CodeWorkspace/Python/JEDITOR/exe/je_driver_icon.ico"
   },
   {
    "optionDest": "name",
    "value": "JEditor"
   },
-  {
-   "optionDest": "ascii",
-   "value": false
-  },
   {
    "optionDest": "clean_build",
    "value": false
@@ -45,10 +41,6 @@
    "optionDest": "disable_windowed_traceback",
    "value": false
   },
-  {
-   "optionDest": "embed_manifest",
-   "value": true
-  },
   {
    "optionDest": "uac_admin",
    "value": false
@@ -58,88 +50,20 @@
    "value": false
   },
   {
-   "optionDest": "win_private_assemblies",
-   "value": false
-  },
-  {
-   "optionDest": "win_no_prefer_redirects",
+   "optionDest": "argv_emulation",
    "value": false
   },
   {
    "optionDest": "bootloader_ignore_signals",
    "value": false
   },
-  {
-   "optionDest": "argv_emulation",
-   "value": false
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/je_driver_icon.ico;."
-  },
   {
    "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/venv/Lib/site-packages/yapf_third_party;yapf_third_party/"
+   "value": "C:/CodeWorkspace/Python/JEDITOR/exe/je_driver_icon.ico;."
   },
   {
    "optionDest": "pathex",
-   "value": "C:/CodeWorkspace/je_editor/venv"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/jupyter_client;jupyter_client/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/jupyter_client-8.3.1.dist-info;jupyter_client-8.3.1.dist-info/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/jupyter_core-5.3.1.dist-info;jupyter_core-5.3.1.dist-info/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/jupyter_core;jupyter_core/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/qtconsole-5.4.4.dist-info;qtconsole-5.4.4.dist-info/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/qtconsole;qtconsole/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/ipython-8.15.0.dist-info;ipython-8.15.0.dist-info/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/IPython;IPython/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/debugpy/_vendored/pydevd/pydev_ipython;pydev_ipython/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/ipython_genutils-0.2.0.dist-info;ipython_genutils-0.2.0.dist-info/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/ipython_genutils;ipython_genutils/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/exe/venv/Lib/site-packages/debugpy;debugpy/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/venv/Lib/site-packages/parso;parso/"
-  },
-  {
-   "optionDest": "datas",
-   "value": "C:/CodeWorkspace/je_editor/venv/Lib/site-packages/jedi;jedi/"
+   "value": "C:/CodeWorkspace/Python/JEDITOR/.venv"
   }
  ],
  "nonPyinstallerOptions": {
diff --git a/je_editor/pyside_ui/browser/browser_view.py b/je_editor/pyside_ui/browser/browser_view.py
@@ -1,6 +1,8 @@
+import pathlib
 from typing import List
 
 from PySide6.QtCore import Qt
+from PySide6.QtNetwork import QNetworkCookie
 from PySide6.QtWebEngineCore import QWebEngineDownloadRequest
 from PySide6.QtWebEngineWidgets import QWebEngineView
 
@@ -18,7 +20,6 @@ def __init__(self, start_url: str = "https://www.google.com/"):
         self.download_list: List[QWebEngineDownloadRequest] = list()
         self.download_window_list: List[BrowserDownloadWindow] = list()
         self.page().profile().downloadRequested.connect(self.download_file)
-        self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
 
     def download_file(self, download_instance: QWebEngineDownloadRequest):
         jeditor_logger.info("Download File "
diff --git a/je_editor/pyside_ui/code/syntax/python_syntax.py b/je_editor/pyside_ui/code/syntax/python_syntax.py
@@ -25,23 +25,25 @@ def __init__(self, parent=None, main_window: CodeEditor = None):
             current_file_suffix = Path(main_window.current_file).suffix
         else:
             current_file_suffix = ".py"
+        # Basic Highlight
+        for rule_variable_dict in syntax_rule_setting_dict.values():
+            color = rule_variable_dict.get("color")
+            text_char_format = QTextCharFormat()
+            text_char_format.setForeground(color)
+            for rule in rule_variable_dict.get("rules"):
+                pattern = QRegularExpression(rule)
+                self.highlight_rules.append((pattern, text_char_format))
         if current_file_suffix == ".py":
-            # Highlight
+            # Python Highlight
             for rule_variable_dict in syntax_word_setting_dict.values():
                 color = rule_variable_dict.get("color")
                 text_char_format = QTextCharFormat()
                 text_char_format.setForeground(color)
                 for word in rule_variable_dict.get("words"):
                     pattern = QRegularExpression(rf"\b{word}\b")
                     self.highlight_rules.append((pattern, text_char_format))
-            for rule_variable_dict in syntax_rule_setting_dict.values():
-                color = rule_variable_dict.get("color")
-                text_char_format = QTextCharFormat()
-                text_char_format.setForeground(color)
-                for rule in rule_variable_dict.get("rules"):
-                    pattern = QRegularExpression(rule)
-                    self.highlight_rules.append((pattern, text_char_format))
         else:
+            # Another Highlight
             if syntax_extend_setting_dict.get(current_file_suffix):
                 for rule_variable_dict in syntax_extend_setting_dict.get(current_file_suffix).values():
                     color = rule_variable_dict.get("color")
diff --git a/je_editor/pyside_ui/main_ui/menu/help_menu/build_help_menu.py b/je_editor/pyside_ui/main_ui/menu/help_menu/build_help_menu.py
@@ -45,32 +45,6 @@ def set_help_menu(ui_we_want_to_set: EditorMain) -> None:
         show_about
     )
     ui_we_want_to_set.help_menu.addAction(ui_we_want_to_set.help_menu.help_about_action)
-    # Open Doc
-    ui_we_want_to_set.help_menu.open_bing_gpt_menu_doc_action = QAction(
-        language_wrapper.language_word_dict.get("help_menu_open_re_edge_gpt_doc_label"))
-    ui_we_want_to_set.help_menu.open_bing_gpt_menu_doc_action.triggered.connect(
-        lambda: open_web_browser(
-            ui_we_want_to_set,
-            "https://reedgegpt.readthedocs.io/en/latest/",
-            "ReEdgeGPT Doc"
-        )
-    )
-    ui_we_want_to_set.help_menu.addAction(
-        ui_we_want_to_set.help_menu.open_bing_gpt_menu_doc_action
-    )
-    # Open Github
-    ui_we_want_to_set.help_menu.open_re_edge_gpt_github_action = QAction(
-        language_wrapper.language_word_dict.get("help_menu_open_re_edge_gpt_github_label"))
-    ui_we_want_to_set.help_menu.open_re_edge_gpt_github_action.triggered.connect(
-        lambda: open_web_browser(
-            ui_we_want_to_set,
-            "https://github.com/Integration-Automation/ReEdgeGPT",
-            "ReEdgeGPT GitHub"
-        )
-    )
-    ui_we_want_to_set.help_menu.addAction(
-        ui_we_want_to_set.help_menu.open_re_edge_gpt_github_action
-    )
 
 
 def open_web_browser(ui_we_want_to_set: EditorMain, url: str, tab_name: str):
diff --git a/je_editor/pyside_ui/main_ui/menu/style_menu/build_style_menu.py b/je_editor/pyside_ui/main_ui/menu/style_menu/build_style_menu.py
@@ -18,12 +18,11 @@ def set_style_menu(ui_we_want_to_set: EditorMain) -> None:
     ui_we_want_to_set.menu.style_menu = ui_we_want_to_set.menu.addMenu(
         language_wrapper.language_word_dict.get("style_menu_label")
     )
-    for style in [
-        'dark_amber.xml', 'dark_blue.xml', 'dark_cyan.xml', 'dark_lightgreen.xml', 'dark_pink.xml',
-        'dark_purple.xml', 'dark_red.xml', 'dark_teal.xml', 'dark_yellow.xml', 'light_amber.xml',
-        'light_blue.xml', 'light_cyan.xml', 'light_cyan_500.xml', 'light_lightgreen.xml',
-        'light_pink.xml', 'light_purple.xml', 'light_red.xml', 'light_teal.xml', 'light_yellow.xml'
-    ]:
+    for style in ['dark_amber.xml', 'dark_blue.xml', 'dark_cyan.xml', 'dark_lightgreen.xml',
+                  'dark_pink.xml', 'dark_purple.xml', 'dark_red.xml', 'dark_teal.xml',
+                  'dark_yellow.xml', 'light_amber.xml', 'light_blue.xml', 'light_cyan.xml',
+                  'light_cyan_500.xml', 'light_lightgreen.xml', 'light_pink.xml', 'light_purple.xml'
+                  ]:
         change_style_action = QAction(style, parent=ui_we_want_to_set.menu.style_menu)
         change_style_action.triggered.connect(
             lambda checked=False, action=change_style_action: set_style(ui_we_want_to_set, action))
diff --git a/je_editor/pyside_ui/main_ui/menu/tab_menu/build_tab_menu.py b/je_editor/pyside_ui/main_ui/menu/tab_menu/build_tab_menu.py
@@ -7,8 +7,6 @@
 from je_editor.pyside_ui.browser.browser_widget import BrowserWidget
 from je_editor.pyside_ui.main_ui.editor.editor_widget import EditorWidget
 from je_editor.pyside_ui.main_ui.ipython_widget.rich_jupyter import IpythonWidget
-from re_edge_gpt.ui.chat.main_ui import ChatMainUI
-
 from je_editor.utils.logging.loggin_instance import jeditor_logger
 
 if TYPE_CHECKING:
@@ -57,13 +55,6 @@ def set_tab_menu(ui_we_want_to_set: EditorMain) -> None:
         lambda: add_ipython_tab(ui_we_want_to_set)
     )
     ui_we_want_to_set.tab_menu.addAction(ui_we_want_to_set.tab_menu.add_ipython_action)
-    # ReEdgeGPT (Need fix it first)
-    # ui_we_want_to_set.tab_menu.add_re_edge_gpt_action = QAction(
-    #     language_wrapper.language_word_dict.get("tab_menu_re_re_edge_gpt_tab_name"))
-    # ui_we_want_to_set.tab_menu.add_re_edge_gpt_action.triggered.connect(
-    #     lambda: add_re_edge_gpt_tab(ui_we_want_to_set)
-    # )
-    # ui_we_want_to_set.tab_menu.addAction(ui_we_want_to_set.tab_menu.add_re_edge_gpt_action)
 
 
 def add_editor_tab(ui_we_want_to_set: EditorMain):
@@ -107,10 +98,3 @@ def add_ipython_tab(ui_we_want_to_set: EditorMain):
         f"{language_wrapper.language_word_dict.get('tab_menu_ipython_tab_name')} "
         f"{ui_we_want_to_set.tab_widget.count()}")
 
-
-def add_re_edge_gpt_tab(ui_we_want_to_set: EditorMain):
-    jeditor_logger.info(f"build_tab_menu.py add_re_edge_gpt_tab ui_we_want_to_set: {ui_we_want_to_set}")
-    ui_we_want_to_set.tab_widget.addTab(
-        ChatMainUI(),
-        f"{language_wrapper.language_word_dict.get('tab_name_re_edge_gpt')} "
-        f"{ui_we_want_to_set.tab_widget.count()}")
diff --git a/je_editor/utils/multi_language/english.py b/je_editor/utils/multi_language/english.py
@@ -5,7 +5,6 @@
     "tab_name_editor": "Editor",
     "tab_name_web_browser": "Web Browser",
     "tab_name_frontengine": "FrontEngine",
-    "tab_name_re_edge_gpt": "Re-EdgeGPT",
     # Browser
     "browser_download_detail": "Download Detail",
     "browser_find_text": "Find Text",
@@ -53,8 +52,6 @@
     "help_menu_open_github_label": "GitHub",
     "help_menu_open_doc_label": "Doc",
     "help_menu_open_about_label": "About",
-    "help_menu_open_re_edge_gpt_doc_label": "Open ReEdgeGPT Doc",
-    "help_menu_open_re_edge_gpt_github_label": "Open ReEdgeGPT GitHub",
     # Python Env Menu
     "python_env_menu_label": "Python Env",
     "python_env_menu_create_venv_label": "Create venv",
@@ -109,7 +106,6 @@
     "tab_menu_web_tab_name": "WEB Browser",
     "tab_menu_stackoverflow_tab_name": "Stackoverflow",
     "tab_menu_ipython_tab_name": "IPython(Jupyter)",
-    "tab_menu_re_re_edge_gpt_tab_name": "ReEdgeGPT",
     # Text Menu
     "text_menu_label": "Text",
     "text_menu_label_font": "Font",
diff --git a/je_editor/utils/multi_language/traditional_chinese.py b/je_editor/utils/multi_language/traditional_chinese.py
@@ -5,7 +5,6 @@
     "tab_name_editor": "編輯器",
     "tab_name_web_browser": "網頁瀏覽器",
     "tab_name_frontengine": "前景引擎",
-    "tab_name_re_edge_gpt": "Re-EdgeGPT",
     # Browser
     "browser_download_detail": "下載資訊",
     "browser_find_text": "搜尋文字",
@@ -53,8 +52,6 @@
     "help_menu_open_github_label": "GitHub",
     "help_menu_open_doc_label": "文件",
     "help_menu_open_about_label": "關於",
-    "help_menu_open_re_edge_gpt_doc_label": "開啟 ReEdgeGPT 文件",
-    "help_menu_open_re_edge_gpt_github_label": "開啟 ReEdgeGPT GitHub",
     # Python Env Menu
     "python_env_menu_label": "Python 環境",
     "python_env_menu_create_venv_label": "建立 venv 虛擬環境",
@@ -107,7 +104,6 @@
     "tab_menu_web_tab_name": "瀏覽器",
     "tab_menu_stackoverflow_tab_name": "Stackoverflow",
     "tab_menu_ipython_tab_name": "IPython(Jupyter)",
-    "tab_menu_re_re_edge_gpt_tab_name": "ReEdgeGPT",
     # Text Menu
     "text_menu_label": "文字",
     "text_menu_label_font": "字體",
diff --git a/requirements.txt b/requirements.txt
@@ -1,19 +1,9 @@
-frontengine
-PySide6==6.7.3
+PySide6
 sphinx
 auto-py-to-exe
-twine
-yapf
 pycodestyle
 jedi
-attrs
-wheel
-build
-setuptools
-pyinstaller
-requests
-gevent
-je_editor
-Ipython
-ipykernel
+frontengine
+yapf
+ipython
 qtconsole
diff --git a/stable.toml b/stable.toml
@@ -6,15 +6,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_editor"
-version = "0.0.194"
+version = "0.0.199"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]
 description = "JEditor is basic but powerful editor include GPT"
 requires-python = ">=3.9"
 license = { text = "MIT" }
 dependencies = [
-    "PySide6==6.7.3", "qt-material", "yapf", "frontengine", "pycodestyle", "jedi", "qtconsole", "re-edge-gpt[gui]"
+    "PySide6==6.8.2.1", "qt-material", "yapf", "frontengine", "pycodestyle", "jedi", "qtconsole"
 ]
 classifiers = [
     "Programming Language :: Python :: 3.9",
