From 611241acfdb4dea7ef7be11afdbe6d72e4a42321 Mon Sep 17 00:00:00 2001 From: JE-Chen <33644111+JE-Chen@users.noreply.github.com> Date: Mon, 14 Oct 2024 15:46:03 +0800 Subject: [PATCH 1/3] Refactor and fixed Pyside6 version Refactor and fixed Pyside6 version --- automation_editor/__init__.py | 7 ---- .../update_language_dict.py | 8 ---- .../menu/build_menubar.py | 42 ------------------- automation_ide/__init__.py | 7 ++++ .../__main__.py | 0 .../automation_editor_ui/__init__.py | 0 .../editor_main/__init__.py | 0 .../editor_main/main_ui.py | 13 +++--- .../extend_multi_language/__init__.py | 0 .../extend_multi_language/extend_english.py | 0 .../extend_traditional_chinese.py | 0 .../update_language_dict.py | 8 ++++ .../automation_editor_ui/menu/__init__.py | 0 .../menu/automation_menu/__init__.py | 0 .../api_testka_menu/__init__.py | 0 .../api_testka_menu/build_api_testka_menu.py | 6 +-- .../auto_control_menu/__init__.py | 0 .../build_autocontrol_menu.py | 6 +-- .../automation_file_menu/__init__.py | 0 .../build_automation_file_menu.py | 6 +-- .../load_density_menu/__init__.py | 0 .../build_load_density_menu.py | 6 +-- .../mail_thunder_menu/__init__.py | 0 .../build_mail_thunder_menu.py | 6 +-- .../web_runner_menu/__init__.py | 0 .../web_runner_menu/build_webrunner_menu.py | 6 +-- .../menu/build_menubar.py | 42 +++++++++++++++++++ .../menu/install_menu/__init__.py | 0 .../install_menu/automation_menu/__init__.py | 0 .../build_automation_install_menu.py | 4 +- .../menu/install_menu/install_utils.py | 2 +- .../menu/install_menu/tools_menu/__init__.py | 0 .../tools_menu/build_tool_install_menu.py | 4 +- .../automation_editor_ui/menu/menu_utils.py | 2 +- .../menu/tools_menu/__init__.py | 0 .../menu/tools_menu/bing_gpt_menu/__init__.py | 0 .../bing_gpt_menu/build_bing_gpt_menu.py | 4 +- .../show_code_window/__init__.py | 0 .../show_code_window/code_window.py | 0 .../automation_editor_ui/syntax/__init__.py | 0 .../syntax/syntax_extend.py | 6 +-- .../syntax/syntax_keyword.py | 0 .../extend/__init__.py | 0 .../extend/mail_thunder_extend/__init__.py | 0 .../mail_thunder_setting.py | 8 ++-- .../extend/process_executor/__init__.py | 0 .../process_executor/api_testka/__init__.py | 0 .../api_testka/api_testka_process.py | 6 +-- .../process_executor/auto_control/__init__.py | 0 .../auto_control/auto_control_process.py | 6 +-- .../file_automation/__init__.py | 0 .../file_automation_process.py | 6 +-- .../process_executor/load_density/__init__.py | 0 .../load_density/load_density_process.py | 6 +-- .../process_executor/mail_thunder/__init__.py | 0 .../mail_thunder/mail_thunder_process.py | 4 +- .../process_executor_utils.py | 12 +++--- .../process_executor/task_process_manager.py | 2 +- .../process_executor/web_runner/__init__.py | 0 .../web_runner/web_runner_process.py | 6 +-- .../utils/__init__.py | 0 .../utils/exception/__init__.py | 0 .../utils/exception/exception_tags.py | 0 .../utils/exception/exceptions.py | 0 .../utils/file_process/__init__.py | 0 .../utils/file_process/get_dir_file_list.py | 0 .../utils/json_format/__init__.py | 0 .../utils/json_format/json_process.py | 6 +-- .../utils/manager/__init__.py | 0 .../utils/manager/package_manager/__init__.py | 0 .../package_manager/package_manager_class.py | 0 dev_requirements.txt | 6 +-- exe/start_automation_editor.py | 3 +- pyproject.toml | 2 +- requirements.txt | 5 ++- stable.toml | 2 +- .../extend_automation_test.py | 2 +- .../start_automation/start_automation_test.py | 2 +- 78 files changed, 136 insertions(+), 133 deletions(-) delete mode 100644 automation_editor/__init__.py delete mode 100644 automation_editor/automation_editor_ui/extend_multi_language/update_language_dict.py delete mode 100644 automation_editor/automation_editor_ui/menu/build_menubar.py create mode 100644 automation_ide/__init__.py rename {automation_editor => automation_ide}/__main__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/editor_main/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/editor_main/main_ui.py (82%) rename {automation_editor => automation_ide}/automation_editor_ui/extend_multi_language/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/extend_multi_language/extend_english.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/extend_multi_language/extend_traditional_chinese.py (100%) create mode 100644 automation_ide/automation_editor_ui/extend_multi_language/update_language_dict.py rename {automation_editor => automation_ide}/automation_editor_ui/menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/api_testka_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/api_testka_menu/build_api_testka_menu.py (94%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/auto_control_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/auto_control_menu/build_autocontrol_menu.py (95%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/automation_file_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/automation_file_menu/build_automation_file_menu.py (94%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/load_density_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/load_density_menu/build_load_density_menu.py (94%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/mail_thunder_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/mail_thunder_menu/build_mail_thunder_menu.py (92%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/web_runner_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/automation_menu/web_runner_menu/build_webrunner_menu.py (94%) create mode 100644 automation_ide/automation_editor_ui/menu/build_menubar.py rename {automation_editor => automation_ide}/automation_editor_ui/menu/install_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/install_menu/automation_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/install_menu/automation_menu/build_automation_install_menu.py (94%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/install_menu/install_utils.py (89%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/install_menu/tools_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/install_menu/tools_menu/build_tool_install_menu.py (84%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/menu_utils.py (80%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/tools_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/tools_menu/bing_gpt_menu/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/menu/tools_menu/bing_gpt_menu/build_bing_gpt_menu.py (91%) rename {automation_editor => automation_ide}/automation_editor_ui/show_code_window/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/show_code_window/code_window.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/syntax/__init__.py (100%) rename {automation_editor => automation_ide}/automation_editor_ui/syntax/syntax_extend.py (81%) rename {automation_editor => automation_ide}/automation_editor_ui/syntax/syntax_keyword.py (100%) rename {automation_editor => automation_ide}/extend/__init__.py (100%) rename {automation_editor => automation_ide}/extend/mail_thunder_extend/__init__.py (100%) rename {automation_editor => automation_ide}/extend/mail_thunder_extend/mail_thunder_setting.py (80%) rename {automation_editor => automation_ide}/extend/process_executor/__init__.py (100%) rename {automation_editor => automation_ide}/extend/process_executor/api_testka/__init__.py (100%) rename {automation_editor => automation_ide}/extend/process_executor/api_testka/api_testka_process.py (87%) rename {automation_editor => automation_ide}/extend/process_executor/auto_control/__init__.py (100%) rename {automation_editor => automation_ide}/extend/process_executor/auto_control/auto_control_process.py (87%) rename {automation_editor => automation_ide}/extend/process_executor/file_automation/__init__.py (100%) rename {automation_editor => automation_ide}/extend/process_executor/file_automation/file_automation_process.py (88%) rename {automation_editor => automation_ide}/extend/process_executor/load_density/__init__.py (100%) rename {automation_editor => automation_ide}/extend/process_executor/load_density/load_density_process.py (87%) rename {automation_editor => automation_ide}/extend/process_executor/mail_thunder/__init__.py (100%) rename {automation_editor => automation_ide}/extend/process_executor/mail_thunder/mail_thunder_process.py (64%) rename {automation_editor => automation_ide}/extend/process_executor/process_executor_utils.py (77%) rename {automation_editor => automation_ide}/extend/process_executor/task_process_manager.py (98%) rename {automation_editor => automation_ide}/extend/process_executor/web_runner/__init__.py (100%) rename {automation_editor => automation_ide}/extend/process_executor/web_runner/web_runner_process.py (88%) rename {automation_editor => automation_ide}/utils/__init__.py (100%) rename {automation_editor => automation_ide}/utils/exception/__init__.py (100%) rename {automation_editor => automation_ide}/utils/exception/exception_tags.py (100%) rename {automation_editor => automation_ide}/utils/exception/exceptions.py (100%) rename {automation_editor => automation_ide}/utils/file_process/__init__.py (100%) rename {automation_editor => automation_ide}/utils/file_process/get_dir_file_list.py (100%) rename {automation_editor => automation_ide}/utils/json_format/__init__.py (100%) rename {automation_editor => automation_ide}/utils/json_format/json_process.py (75%) rename {automation_editor => automation_ide}/utils/manager/__init__.py (100%) rename {automation_editor => automation_ide}/utils/manager/package_manager/__init__.py (100%) rename {automation_editor => automation_ide}/utils/manager/package_manager/package_manager_class.py (100%) diff --git a/automation_editor/__init__.py b/automation_editor/__init__.py deleted file mode 100644 index b154fc4..0000000 --- a/automation_editor/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor -from automation_editor.automation_editor_ui.editor_main.main_ui import EDITOR_EXTEND_TAB -from automation_editor.automation_editor_ui.editor_main.main_ui import start_editor - -__all__ = [ - "start_editor", "AutomationEditor", "EDITOR_EXTEND_TAB" -] diff --git a/automation_editor/automation_editor_ui/extend_multi_language/update_language_dict.py b/automation_editor/automation_editor_ui/extend_multi_language/update_language_dict.py deleted file mode 100644 index c35bb1f..0000000 --- a/automation_editor/automation_editor_ui/extend_multi_language/update_language_dict.py +++ /dev/null @@ -1,8 +0,0 @@ -from automation_editor.automation_editor_ui.extend_multi_language.extend_english import update_english_word_dict -from automation_editor.automation_editor_ui.extend_multi_language.extend_traditional_chinese import \ - update_traditional_chinese_word_dict - - -def update_language_dict(): - update_traditional_chinese_word_dict() - update_english_word_dict() diff --git a/automation_editor/automation_editor_ui/menu/build_menubar.py b/automation_editor/automation_editor_ui/menu/build_menubar.py deleted file mode 100644 index 95e5b78..0000000 --- a/automation_editor/automation_editor_ui/menu/build_menubar.py +++ /dev/null @@ -1,42 +0,0 @@ -from __future__ import annotations - -from typing import TYPE_CHECKING - -from automation_editor.automation_editor_ui.menu.automation_menu.api_testka_menu.build_api_testka_menu import \ - set_apitestka_menu -from automation_editor.automation_editor_ui.menu.automation_menu.auto_control_menu.build_autocontrol_menu import \ - set_autocontrol_menu -from automation_editor.automation_editor_ui.menu.automation_menu.automation_file_menu.build_automation_file_menu import \ - set_automation_file_menu -from automation_editor.automation_editor_ui.menu.automation_menu.load_density_menu.build_load_density_menu import \ - set_load_density_menu -from automation_editor.automation_editor_ui.menu.automation_menu.mail_thunder_menu.build_mail_thunder_menu import \ - set_mail_thunder_menu -from automation_editor.automation_editor_ui.menu.automation_menu.web_runner_menu.build_webrunner_menu import \ - set_web_runner_menu -from automation_editor.automation_editor_ui.menu.install_menu.automation_menu.build_automation_install_menu import \ - build_automation_install_menu -from automation_editor.automation_editor_ui.menu.install_menu.tools_menu.build_tool_install_menu import \ - build_tool_install_menu -from automation_editor.automation_editor_ui.menu.tools_menu.bing_gpt_menu.build_bing_gpt_menu import set_bing_gpt_menu - -if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor - -from je_editor import language_wrapper - - -def add_menu_to_menubar(ui_we_want_to_set: AutomationEditor): - ui_we_want_to_set.automation_menu = ui_we_want_to_set.menu.addMenu( - language_wrapper.language_word_dict.get("automation_menu_label")) - ui_we_want_to_set.install_menu = ui_we_want_to_set.menu.addMenu( - language_wrapper.language_word_dict.get("install_menu_label")) - set_apitestka_menu(ui_we_want_to_set) - set_autocontrol_menu(ui_we_want_to_set) - set_automation_file_menu(ui_we_want_to_set) - set_load_density_menu(ui_we_want_to_set) - set_mail_thunder_menu(ui_we_want_to_set) - set_web_runner_menu(ui_we_want_to_set) - build_automation_install_menu(ui_we_want_to_set) - build_tool_install_menu(ui_we_want_to_set) - set_bing_gpt_menu(ui_we_want_to_set) diff --git a/automation_ide/__init__.py b/automation_ide/__init__.py new file mode 100644 index 0000000..6d845ce --- /dev/null +++ b/automation_ide/__init__.py @@ -0,0 +1,7 @@ +from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor +from automation_ide.automation_editor_ui.editor_main.main_ui import EDITOR_EXTEND_TAB +from automation_ide.automation_editor_ui.editor_main.main_ui import start_editor + +__all__ = [ + "start_editor", "AutomationEditor", "EDITOR_EXTEND_TAB" +] diff --git a/automation_editor/__main__.py b/automation_ide/__main__.py similarity index 100% rename from automation_editor/__main__.py rename to automation_ide/__main__.py diff --git a/automation_editor/automation_editor_ui/__init__.py b/automation_ide/automation_editor_ui/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/__init__.py rename to automation_ide/automation_editor_ui/__init__.py diff --git a/automation_editor/automation_editor_ui/editor_main/__init__.py b/automation_ide/automation_editor_ui/editor_main/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/editor_main/__init__.py rename to automation_ide/automation_editor_ui/editor_main/__init__.py diff --git a/automation_editor/automation_editor_ui/editor_main/main_ui.py b/automation_ide/automation_editor_ui/editor_main/main_ui.py similarity index 82% rename from automation_editor/automation_editor_ui/editor_main/main_ui.py rename to automation_ide/automation_editor_ui/editor_main/main_ui.py index 34b81ee..e3dd75f 100644 --- a/automation_editor/automation_editor_ui/editor_main/main_ui.py +++ b/automation_ide/automation_editor_ui/editor_main/main_ui.py @@ -6,9 +6,9 @@ from je_editor import EditorMain, language_wrapper from qt_material import apply_stylesheet -from automation_editor.automation_editor_ui.extend_multi_language.update_language_dict import update_language_dict -from automation_editor.automation_editor_ui.menu.build_menubar import add_menu_to_menubar -from automation_editor.automation_editor_ui.syntax.syntax_extend import \ +from automation_ide.automation_editor_ui.extend_multi_language.update_language_dict import update_language_dict +from automation_ide.automation_editor_ui.menu.build_menubar import add_menu_to_menubar +from automation_ide.automation_editor_ui.syntax.syntax_extend import \ syntax_extend_package EDITOR_EXTEND_TAB: Dict[str, Type[QWidget]] = {} @@ -17,12 +17,13 @@ class AutomationEditor(EditorMain): def __init__(self, debug_mode: bool = False, show_system_tray_ray: bool = False): - super().__init__(show_system_tray_ray=show_system_tray_ray) + super().__init__(debug_mode, show_system_tray_ray) self.current_run_code_window: List[QWidget] = list() # Project compiler if user not choose this will use which to find self.python_compiler = None # Delete JEditor help - self.help_menu.deleteLater() + if self.help_menu: + self.help_menu.deleteLater() # System tray change if self.show_system_tray_ray: self.system_tray.main_window = self @@ -65,7 +66,7 @@ def start_editor(debug_mode: bool = False, **kwargs) -> None: new_editor = QCoreApplication.instance() if new_editor is None: new_editor = QApplication(sys.argv) - window = AutomationEditor(debug_mode, **kwargs) + window = AutomationEditor(debug_mode=debug_mode, **kwargs) apply_stylesheet(new_editor, theme="dark_amber.xml") window.showMaximized() try: diff --git a/automation_editor/automation_editor_ui/extend_multi_language/__init__.py b/automation_ide/automation_editor_ui/extend_multi_language/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/extend_multi_language/__init__.py rename to automation_ide/automation_editor_ui/extend_multi_language/__init__.py diff --git a/automation_editor/automation_editor_ui/extend_multi_language/extend_english.py b/automation_ide/automation_editor_ui/extend_multi_language/extend_english.py similarity index 100% rename from automation_editor/automation_editor_ui/extend_multi_language/extend_english.py rename to automation_ide/automation_editor_ui/extend_multi_language/extend_english.py diff --git a/automation_editor/automation_editor_ui/extend_multi_language/extend_traditional_chinese.py b/automation_ide/automation_editor_ui/extend_multi_language/extend_traditional_chinese.py similarity index 100% rename from automation_editor/automation_editor_ui/extend_multi_language/extend_traditional_chinese.py rename to automation_ide/automation_editor_ui/extend_multi_language/extend_traditional_chinese.py diff --git a/automation_ide/automation_editor_ui/extend_multi_language/update_language_dict.py b/automation_ide/automation_editor_ui/extend_multi_language/update_language_dict.py new file mode 100644 index 0000000..6ccf732 --- /dev/null +++ b/automation_ide/automation_editor_ui/extend_multi_language/update_language_dict.py @@ -0,0 +1,8 @@ +from automation_ide.automation_editor_ui.extend_multi_language.extend_english import update_english_word_dict +from automation_ide.automation_editor_ui.extend_multi_language.extend_traditional_chinese import \ + update_traditional_chinese_word_dict + + +def update_language_dict(): + update_traditional_chinese_word_dict() + update_english_word_dict() diff --git a/automation_editor/automation_editor_ui/menu/__init__.py b/automation_ide/automation_editor_ui/menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/__init__.py rename to automation_ide/automation_editor_ui/menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/__init__.py b/automation_ide/automation_editor_ui/menu/automation_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/automation_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/automation_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/api_testka_menu/__init__.py b/automation_ide/automation_editor_ui/menu/automation_menu/api_testka_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/automation_menu/api_testka_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/automation_menu/api_testka_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/api_testka_menu/build_api_testka_menu.py b/automation_ide/automation_editor_ui/menu/automation_menu/api_testka_menu/build_api_testka_menu.py similarity index 94% rename from automation_editor/automation_editor_ui/menu/automation_menu/api_testka_menu/build_api_testka_menu.py rename to automation_ide/automation_editor_ui/menu/automation_menu/api_testka_menu/build_api_testka_menu.py index fb462d1..506cfda 100644 --- a/automation_editor/automation_editor_ui/menu/automation_menu/api_testka_menu/build_api_testka_menu.py +++ b/automation_ide/automation_editor_ui/menu/automation_menu/api_testka_menu/build_api_testka_menu.py @@ -4,15 +4,15 @@ from je_editor import language_wrapper -from automation_editor.automation_editor_ui.menu.menu_utils import open_web_browser +from automation_ide.automation_editor_ui.menu.menu_utils import open_web_browser if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor import sys from PySide6.QtGui import QAction -from automation_editor.extend.process_executor.api_testka.api_testka_process import call_api_testka, \ +from automation_ide.extend.process_executor.api_testka.api_testka_process import call_api_testka, \ call_api_testka_with_send, call_api_testka_multi_file, call_api_testka_multi_file_and_send diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/auto_control_menu/__init__.py b/automation_ide/automation_editor_ui/menu/automation_menu/auto_control_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/automation_menu/auto_control_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/automation_menu/auto_control_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/auto_control_menu/build_autocontrol_menu.py b/automation_ide/automation_editor_ui/menu/automation_menu/auto_control_menu/build_autocontrol_menu.py similarity index 95% rename from automation_editor/automation_editor_ui/menu/automation_menu/auto_control_menu/build_autocontrol_menu.py rename to automation_ide/automation_editor_ui/menu/automation_menu/auto_control_menu/build_autocontrol_menu.py index bfd6cfc..9d1c25a 100644 --- a/automation_editor/automation_editor_ui/menu/automation_menu/auto_control_menu/build_autocontrol_menu.py +++ b/automation_ide/automation_editor_ui/menu/automation_menu/auto_control_menu/build_autocontrol_menu.py @@ -4,16 +4,16 @@ from je_editor import EditorWidget, language_wrapper -from automation_editor.automation_editor_ui.menu.menu_utils import open_web_browser +from automation_ide.automation_editor_ui.menu.menu_utils import open_web_browser if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor import sys import je_auto_control from PySide6.QtGui import QAction -from automation_editor.extend.process_executor.auto_control.auto_control_process import \ +from automation_ide.extend.process_executor.auto_control.auto_control_process import \ call_auto_control, call_auto_control_with_send, call_auto_control_multi_file, \ call_auto_control_multi_file_and_send diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/automation_file_menu/__init__.py b/automation_ide/automation_editor_ui/menu/automation_menu/automation_file_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/automation_menu/automation_file_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/automation_menu/automation_file_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/automation_file_menu/build_automation_file_menu.py b/automation_ide/automation_editor_ui/menu/automation_menu/automation_file_menu/build_automation_file_menu.py similarity index 94% rename from automation_editor/automation_editor_ui/menu/automation_menu/automation_file_menu/build_automation_file_menu.py rename to automation_ide/automation_editor_ui/menu/automation_menu/automation_file_menu/build_automation_file_menu.py index be03386..4ea65e8 100644 --- a/automation_editor/automation_editor_ui/menu/automation_menu/automation_file_menu/build_automation_file_menu.py +++ b/automation_ide/automation_editor_ui/menu/automation_menu/automation_file_menu/build_automation_file_menu.py @@ -4,15 +4,15 @@ from je_editor import language_wrapper -from automation_editor.automation_editor_ui.menu.menu_utils import open_web_browser +from automation_ide.automation_editor_ui.menu.menu_utils import open_web_browser if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor import sys from PySide6.QtGui import QAction -from automation_editor.extend.process_executor.file_automation.file_automation_process import call_file_automation_test, \ +from automation_ide.extend.process_executor.file_automation.file_automation_process import call_file_automation_test, \ call_file_automation_test_with_send, call_file_automation_test_multi_file, \ call_file_automation_test_multi_file_and_send diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/load_density_menu/__init__.py b/automation_ide/automation_editor_ui/menu/automation_menu/load_density_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/automation_menu/load_density_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/automation_menu/load_density_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/load_density_menu/build_load_density_menu.py b/automation_ide/automation_editor_ui/menu/automation_menu/load_density_menu/build_load_density_menu.py similarity index 94% rename from automation_editor/automation_editor_ui/menu/automation_menu/load_density_menu/build_load_density_menu.py rename to automation_ide/automation_editor_ui/menu/automation_menu/load_density_menu/build_load_density_menu.py index fa8cf98..b38b214 100644 --- a/automation_editor/automation_editor_ui/menu/automation_menu/load_density_menu/build_load_density_menu.py +++ b/automation_ide/automation_editor_ui/menu/automation_menu/load_density_menu/build_load_density_menu.py @@ -4,15 +4,15 @@ from je_editor import language_wrapper -from automation_editor.automation_editor_ui.menu.menu_utils import open_web_browser +from automation_ide.automation_editor_ui.menu.menu_utils import open_web_browser if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor import sys from PySide6.QtGui import QAction -from automation_editor.extend.process_executor.load_density.load_density_process import \ +from automation_ide.extend.process_executor.load_density.load_density_process import \ call_load_density, call_load_density_with_send, call_load_density_multi_file, \ call_load_density_multi_file_and_send diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/mail_thunder_menu/__init__.py b/automation_ide/automation_editor_ui/menu/automation_menu/mail_thunder_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/automation_menu/mail_thunder_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/automation_menu/mail_thunder_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/mail_thunder_menu/build_mail_thunder_menu.py b/automation_ide/automation_editor_ui/menu/automation_menu/mail_thunder_menu/build_mail_thunder_menu.py similarity index 92% rename from automation_editor/automation_editor_ui/menu/automation_menu/mail_thunder_menu/build_mail_thunder_menu.py rename to automation_ide/automation_editor_ui/menu/automation_menu/mail_thunder_menu/build_mail_thunder_menu.py index d170d95..1a1a570 100644 --- a/automation_editor/automation_editor_ui/menu/automation_menu/mail_thunder_menu/build_mail_thunder_menu.py +++ b/automation_ide/automation_editor_ui/menu/automation_menu/mail_thunder_menu/build_mail_thunder_menu.py @@ -4,15 +4,15 @@ from je_editor import language_wrapper -from automation_editor.automation_editor_ui.menu.menu_utils import open_web_browser +from automation_ide.automation_editor_ui.menu.menu_utils import open_web_browser if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor import sys from PySide6.QtGui import QAction -from automation_editor.extend.process_executor.mail_thunder.mail_thunder_process import call_mail_thunder +from automation_ide.extend.process_executor.mail_thunder.mail_thunder_process import call_mail_thunder def set_mail_thunder_menu(ui_we_want_to_set: AutomationEditor): diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/web_runner_menu/__init__.py b/automation_ide/automation_editor_ui/menu/automation_menu/web_runner_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/automation_menu/web_runner_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/automation_menu/web_runner_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/automation_menu/web_runner_menu/build_webrunner_menu.py b/automation_ide/automation_editor_ui/menu/automation_menu/web_runner_menu/build_webrunner_menu.py similarity index 94% rename from automation_editor/automation_editor_ui/menu/automation_menu/web_runner_menu/build_webrunner_menu.py rename to automation_ide/automation_editor_ui/menu/automation_menu/web_runner_menu/build_webrunner_menu.py index 61fc8ad..8f51a6d 100644 --- a/automation_editor/automation_editor_ui/menu/automation_menu/web_runner_menu/build_webrunner_menu.py +++ b/automation_ide/automation_editor_ui/menu/automation_menu/web_runner_menu/build_webrunner_menu.py @@ -4,15 +4,15 @@ from je_editor import language_wrapper -from automation_editor.automation_editor_ui.menu.menu_utils import open_web_browser +from automation_ide.automation_editor_ui.menu.menu_utils import open_web_browser if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor import sys from PySide6.QtGui import QAction -from automation_editor.extend.process_executor.web_runner.web_runner_process import call_web_runner_test, \ +from automation_ide.extend.process_executor.web_runner.web_runner_process import call_web_runner_test, \ call_web_runner_test_with_send, call_web_runner_test_multi_file, call_web_runner_test_multi_file_and_send diff --git a/automation_ide/automation_editor_ui/menu/build_menubar.py b/automation_ide/automation_editor_ui/menu/build_menubar.py new file mode 100644 index 0000000..ed94523 --- /dev/null +++ b/automation_ide/automation_editor_ui/menu/build_menubar.py @@ -0,0 +1,42 @@ +from __future__ import annotations + +from typing import TYPE_CHECKING + +from automation_ide.automation_editor_ui.menu.automation_menu.api_testka_menu.build_api_testka_menu import \ + set_apitestka_menu +from automation_ide.automation_editor_ui.menu.automation_menu.auto_control_menu.build_autocontrol_menu import \ + set_autocontrol_menu +from automation_ide.automation_editor_ui.menu.automation_menu.automation_file_menu.build_automation_file_menu import \ + set_automation_file_menu +from automation_ide.automation_editor_ui.menu.automation_menu.load_density_menu.build_load_density_menu import \ + set_load_density_menu +from automation_ide.automation_editor_ui.menu.automation_menu.mail_thunder_menu.build_mail_thunder_menu import \ + set_mail_thunder_menu +from automation_ide.automation_editor_ui.menu.automation_menu.web_runner_menu.build_webrunner_menu import \ + set_web_runner_menu +from automation_ide.automation_editor_ui.menu.install_menu.automation_menu.build_automation_install_menu import \ + build_automation_install_menu +from automation_ide.automation_editor_ui.menu.install_menu.tools_menu.build_tool_install_menu import \ + build_tool_install_menu +from automation_ide.automation_editor_ui.menu.tools_menu.bing_gpt_menu.build_bing_gpt_menu import set_bing_gpt_menu + +if TYPE_CHECKING: + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor + +from je_editor import language_wrapper + + +def add_menu_to_menubar(ui_we_want_to_set: AutomationEditor): + ui_we_want_to_set.automation_menu = ui_we_want_to_set.menu.addMenu( + language_wrapper.language_word_dict.get("automation_menu_label")) + ui_we_want_to_set.install_menu = ui_we_want_to_set.menu.addMenu( + language_wrapper.language_word_dict.get("install_menu_label")) + set_apitestka_menu(ui_we_want_to_set) + set_autocontrol_menu(ui_we_want_to_set) + set_automation_file_menu(ui_we_want_to_set) + set_load_density_menu(ui_we_want_to_set) + set_mail_thunder_menu(ui_we_want_to_set) + set_web_runner_menu(ui_we_want_to_set) + build_automation_install_menu(ui_we_want_to_set) + build_tool_install_menu(ui_we_want_to_set) + set_bing_gpt_menu(ui_we_want_to_set) diff --git a/automation_editor/automation_editor_ui/menu/install_menu/__init__.py b/automation_ide/automation_editor_ui/menu/install_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/install_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/install_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/install_menu/automation_menu/__init__.py b/automation_ide/automation_editor_ui/menu/install_menu/automation_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/install_menu/automation_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/install_menu/automation_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/install_menu/automation_menu/build_automation_install_menu.py b/automation_ide/automation_editor_ui/menu/install_menu/automation_menu/build_automation_install_menu.py similarity index 94% rename from automation_editor/automation_editor_ui/menu/install_menu/automation_menu/build_automation_install_menu.py rename to automation_ide/automation_editor_ui/menu/install_menu/automation_menu/build_automation_install_menu.py index 06fc043..4711c03 100644 --- a/automation_editor/automation_editor_ui/menu/install_menu/automation_menu/build_automation_install_menu.py +++ b/automation_ide/automation_editor_ui/menu/install_menu/automation_menu/build_automation_install_menu.py @@ -5,10 +5,10 @@ from PySide6.QtGui import QAction from je_editor import language_wrapper -from automation_editor.automation_editor_ui.menu.install_menu.install_utils import install_package +from automation_ide.automation_editor_ui.menu.install_menu.install_utils import install_package if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor def build_automation_install_menu(ui_we_want_to_set: AutomationEditor): diff --git a/automation_editor/automation_editor_ui/menu/install_menu/install_utils.py b/automation_ide/automation_editor_ui/menu/install_menu/install_utils.py similarity index 89% rename from automation_editor/automation_editor_ui/menu/install_menu/install_utils.py rename to automation_ide/automation_editor_ui/menu/install_menu/install_utils.py index af07dc6..b730899 100644 --- a/automation_editor/automation_editor_ui/menu/install_menu/install_utils.py +++ b/automation_ide/automation_editor_ui/menu/install_menu/install_utils.py @@ -5,7 +5,7 @@ from je_editor import EditorWidget, ShellManager if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor def install_package(package_text: str, ui_we_want_to_set: AutomationEditor) -> None: diff --git a/automation_editor/automation_editor_ui/menu/install_menu/tools_menu/__init__.py b/automation_ide/automation_editor_ui/menu/install_menu/tools_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/install_menu/tools_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/install_menu/tools_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/install_menu/tools_menu/build_tool_install_menu.py b/automation_ide/automation_editor_ui/menu/install_menu/tools_menu/build_tool_install_menu.py similarity index 84% rename from automation_editor/automation_editor_ui/menu/install_menu/tools_menu/build_tool_install_menu.py rename to automation_ide/automation_editor_ui/menu/install_menu/tools_menu/build_tool_install_menu.py index 896da3c..370bf26 100644 --- a/automation_editor/automation_editor_ui/menu/install_menu/tools_menu/build_tool_install_menu.py +++ b/automation_ide/automation_editor_ui/menu/install_menu/tools_menu/build_tool_install_menu.py @@ -5,10 +5,10 @@ from PySide6.QtGui import QAction from je_editor import language_wrapper -from automation_editor.automation_editor_ui.menu.install_menu.install_utils import install_package +from automation_ide.automation_editor_ui.menu.install_menu.install_utils import install_package if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor def build_tool_install_menu(ui_we_want_to_set: AutomationEditor): diff --git a/automation_editor/automation_editor_ui/menu/menu_utils.py b/automation_ide/automation_editor_ui/menu/menu_utils.py similarity index 80% rename from automation_editor/automation_editor_ui/menu/menu_utils.py rename to automation_ide/automation_editor_ui/menu/menu_utils.py index 75e4138..071433c 100644 --- a/automation_editor/automation_editor_ui/menu/menu_utils.py +++ b/automation_ide/automation_editor_ui/menu/menu_utils.py @@ -5,7 +5,7 @@ from je_editor import JEBrowser if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor def open_web_browser( diff --git a/automation_editor/automation_editor_ui/menu/tools_menu/__init__.py b/automation_ide/automation_editor_ui/menu/tools_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/tools_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/tools_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/tools_menu/bing_gpt_menu/__init__.py b/automation_ide/automation_editor_ui/menu/tools_menu/bing_gpt_menu/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/menu/tools_menu/bing_gpt_menu/__init__.py rename to automation_ide/automation_editor_ui/menu/tools_menu/bing_gpt_menu/__init__.py diff --git a/automation_editor/automation_editor_ui/menu/tools_menu/bing_gpt_menu/build_bing_gpt_menu.py b/automation_ide/automation_editor_ui/menu/tools_menu/bing_gpt_menu/build_bing_gpt_menu.py similarity index 91% rename from automation_editor/automation_editor_ui/menu/tools_menu/bing_gpt_menu/build_bing_gpt_menu.py rename to automation_ide/automation_editor_ui/menu/tools_menu/bing_gpt_menu/build_bing_gpt_menu.py index 4dd6262..c8a2959 100644 --- a/automation_editor/automation_editor_ui/menu/tools_menu/bing_gpt_menu/build_bing_gpt_menu.py +++ b/automation_ide/automation_editor_ui/menu/tools_menu/bing_gpt_menu/build_bing_gpt_menu.py @@ -5,10 +5,10 @@ from PySide6.QtGui import QAction from je_editor import language_wrapper -from automation_editor.automation_editor_ui.menu.menu_utils import open_web_browser +from automation_ide.automation_editor_ui.menu.menu_utils import open_web_browser if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor def set_bing_gpt_menu(ui_we_want_to_set: AutomationEditor): diff --git a/automation_editor/automation_editor_ui/show_code_window/__init__.py b/automation_ide/automation_editor_ui/show_code_window/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/show_code_window/__init__.py rename to automation_ide/automation_editor_ui/show_code_window/__init__.py diff --git a/automation_editor/automation_editor_ui/show_code_window/code_window.py b/automation_ide/automation_editor_ui/show_code_window/code_window.py similarity index 100% rename from automation_editor/automation_editor_ui/show_code_window/code_window.py rename to automation_ide/automation_editor_ui/show_code_window/code_window.py diff --git a/automation_editor/automation_editor_ui/syntax/__init__.py b/automation_ide/automation_editor_ui/syntax/__init__.py similarity index 100% rename from automation_editor/automation_editor_ui/syntax/__init__.py rename to automation_ide/automation_editor_ui/syntax/__init__.py diff --git a/automation_editor/automation_editor_ui/syntax/syntax_extend.py b/automation_ide/automation_editor_ui/syntax/syntax_extend.py similarity index 81% rename from automation_editor/automation_editor_ui/syntax/syntax_extend.py rename to automation_ide/automation_editor_ui/syntax/syntax_extend.py index 1c837a0..432ecc6 100644 --- a/automation_editor/automation_editor_ui/syntax/syntax_extend.py +++ b/automation_ide/automation_editor_ui/syntax/syntax_extend.py @@ -5,13 +5,13 @@ from je_editor import EditorWidget if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor from PySide6.QtCore import QRegularExpression from PySide6.QtGui import QTextCharFormat, QColor -from automation_editor.automation_editor_ui.syntax.syntax_keyword import \ +from automation_ide.automation_editor_ui.syntax.syntax_keyword import \ package_keyword_list -from automation_editor.utils.manager.package_manager.package_manager_class import package_manager +from automation_ide.utils.manager.package_manager.package_manager_class import package_manager from je_editor import syntax_word_setting_dict diff --git a/automation_editor/automation_editor_ui/syntax/syntax_keyword.py b/automation_ide/automation_editor_ui/syntax/syntax_keyword.py similarity index 100% rename from automation_editor/automation_editor_ui/syntax/syntax_keyword.py rename to automation_ide/automation_editor_ui/syntax/syntax_keyword.py diff --git a/automation_editor/extend/__init__.py b/automation_ide/extend/__init__.py similarity index 100% rename from automation_editor/extend/__init__.py rename to automation_ide/extend/__init__.py diff --git a/automation_editor/extend/mail_thunder_extend/__init__.py b/automation_ide/extend/mail_thunder_extend/__init__.py similarity index 100% rename from automation_editor/extend/mail_thunder_extend/__init__.py rename to automation_ide/extend/mail_thunder_extend/__init__.py diff --git a/automation_editor/extend/mail_thunder_extend/mail_thunder_setting.py b/automation_ide/extend/mail_thunder_extend/mail_thunder_setting.py similarity index 80% rename from automation_editor/extend/mail_thunder_extend/mail_thunder_setting.py rename to automation_ide/extend/mail_thunder_extend/mail_thunder_setting.py index 8d453c6..970003a 100644 --- a/automation_editor/extend/mail_thunder_extend/mail_thunder_setting.py +++ b/automation_ide/extend/mail_thunder_extend/mail_thunder_setting.py @@ -1,8 +1,8 @@ import sys from email.mime.multipart import MIMEMultipart -from automation_editor.utils.exception.exception_tags import send_html_exception_tag -from automation_editor.utils.exception.exceptions import ITESendHtmlReportException +from automation_ide.utils.exception.exception_tags import send_html_exception_tag +from automation_ide.utils.exception.exceptions import ITESendHtmlReportException def send_after_test(html_report_path: str = None) -> None: @@ -13,7 +13,7 @@ def send_after_test(html_report_path: str = None) -> None: user: str = mail_thunder_smtp.user with open("default_name.html", "r+") as file: html_string: str = file.read() - message = mail_thunder_smtp.smtp_create_message_with_attach( + message = mail_thunder_smtp.create_message_with_attach( html_string, {"Subject": "Test Report", "To": user, "From": user}, "default_name.html", use_html=True) @@ -23,7 +23,7 @@ def send_after_test(html_report_path: str = None) -> None: user: str = mail_thunder_smtp.user with open(html_report_path, "r+") as file: html_string: str = file.read() - message: MIMEMultipart = mail_thunder_smtp.smtp_create_message_with_attach( + message: MIMEMultipart = mail_thunder_smtp.create_message_with_attach( html_string, {"Subject": "Test Report", "To": user, "From": user}, html_report_path, use_html=True) diff --git a/automation_editor/extend/process_executor/__init__.py b/automation_ide/extend/process_executor/__init__.py similarity index 100% rename from automation_editor/extend/process_executor/__init__.py rename to automation_ide/extend/process_executor/__init__.py diff --git a/automation_editor/extend/process_executor/api_testka/__init__.py b/automation_ide/extend/process_executor/api_testka/__init__.py similarity index 100% rename from automation_editor/extend/process_executor/api_testka/__init__.py rename to automation_ide/extend/process_executor/api_testka/__init__.py diff --git a/automation_editor/extend/process_executor/api_testka/api_testka_process.py b/automation_ide/extend/process_executor/api_testka/api_testka_process.py similarity index 87% rename from automation_editor/extend/process_executor/api_testka/api_testka_process.py rename to automation_ide/extend/process_executor/api_testka/api_testka_process.py index d178bf0..bbee5c0 100644 --- a/automation_editor/extend/process_executor/api_testka/api_testka_process.py +++ b/automation_ide/extend/process_executor/api_testka/api_testka_process.py @@ -2,13 +2,13 @@ from typing import TYPE_CHECKING, Union -from automation_editor.extend.process_executor.process_executor_utils import build_process +from automation_ide.extend.process_executor.process_executor_utils import build_process if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor import sys -from automation_editor.utils.file_process.get_dir_file_list import ask_and_get_dir_files_as_list +from automation_ide.utils.file_process.get_dir_file_list import ask_and_get_dir_files_as_list def call_api_testka( diff --git a/automation_editor/extend/process_executor/auto_control/__init__.py b/automation_ide/extend/process_executor/auto_control/__init__.py similarity index 100% rename from automation_editor/extend/process_executor/auto_control/__init__.py rename to automation_ide/extend/process_executor/auto_control/__init__.py diff --git a/automation_editor/extend/process_executor/auto_control/auto_control_process.py b/automation_ide/extend/process_executor/auto_control/auto_control_process.py similarity index 87% rename from automation_editor/extend/process_executor/auto_control/auto_control_process.py rename to automation_ide/extend/process_executor/auto_control/auto_control_process.py index 291264d..115c6a2 100644 --- a/automation_editor/extend/process_executor/auto_control/auto_control_process.py +++ b/automation_ide/extend/process_executor/auto_control/auto_control_process.py @@ -2,13 +2,13 @@ from typing import TYPE_CHECKING, Union -from automation_editor.extend.process_executor.process_executor_utils import build_process +from automation_ide.extend.process_executor.process_executor_utils import build_process if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor import sys -from automation_editor.utils.file_process.get_dir_file_list import ask_and_get_dir_files_as_list +from automation_ide.utils.file_process.get_dir_file_list import ask_and_get_dir_files_as_list def call_auto_control( diff --git a/automation_editor/extend/process_executor/file_automation/__init__.py b/automation_ide/extend/process_executor/file_automation/__init__.py similarity index 100% rename from automation_editor/extend/process_executor/file_automation/__init__.py rename to automation_ide/extend/process_executor/file_automation/__init__.py diff --git a/automation_editor/extend/process_executor/file_automation/file_automation_process.py b/automation_ide/extend/process_executor/file_automation/file_automation_process.py similarity index 88% rename from automation_editor/extend/process_executor/file_automation/file_automation_process.py rename to automation_ide/extend/process_executor/file_automation/file_automation_process.py index c8454b2..cb47efc 100644 --- a/automation_editor/extend/process_executor/file_automation/file_automation_process.py +++ b/automation_ide/extend/process_executor/file_automation/file_automation_process.py @@ -2,13 +2,13 @@ from typing import TYPE_CHECKING, Union -from automation_editor.extend.process_executor.process_executor_utils import build_process +from automation_ide.extend.process_executor.process_executor_utils import build_process if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor import sys -from automation_editor.utils.file_process.get_dir_file_list import ask_and_get_dir_files_as_list +from automation_ide.utils.file_process.get_dir_file_list import ask_and_get_dir_files_as_list def call_file_automation_test( diff --git a/automation_editor/extend/process_executor/load_density/__init__.py b/automation_ide/extend/process_executor/load_density/__init__.py similarity index 100% rename from automation_editor/extend/process_executor/load_density/__init__.py rename to automation_ide/extend/process_executor/load_density/__init__.py diff --git a/automation_editor/extend/process_executor/load_density/load_density_process.py b/automation_ide/extend/process_executor/load_density/load_density_process.py similarity index 87% rename from automation_editor/extend/process_executor/load_density/load_density_process.py rename to automation_ide/extend/process_executor/load_density/load_density_process.py index 691bddd..91c05c4 100644 --- a/automation_editor/extend/process_executor/load_density/load_density_process.py +++ b/automation_ide/extend/process_executor/load_density/load_density_process.py @@ -2,13 +2,13 @@ from typing import TYPE_CHECKING, Union -from automation_editor.extend.process_executor.process_executor_utils import build_process +from automation_ide.extend.process_executor.process_executor_utils import build_process if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor import sys -from automation_editor.utils.file_process.get_dir_file_list import ask_and_get_dir_files_as_list +from automation_ide.utils.file_process.get_dir_file_list import ask_and_get_dir_files_as_list def call_load_density( diff --git a/automation_editor/extend/process_executor/mail_thunder/__init__.py b/automation_ide/extend/process_executor/mail_thunder/__init__.py similarity index 100% rename from automation_editor/extend/process_executor/mail_thunder/__init__.py rename to automation_ide/extend/process_executor/mail_thunder/__init__.py diff --git a/automation_editor/extend/process_executor/mail_thunder/mail_thunder_process.py b/automation_ide/extend/process_executor/mail_thunder/mail_thunder_process.py similarity index 64% rename from automation_editor/extend/process_executor/mail_thunder/mail_thunder_process.py rename to automation_ide/extend/process_executor/mail_thunder/mail_thunder_process.py index c627e5d..e566777 100644 --- a/automation_editor/extend/process_executor/mail_thunder/mail_thunder_process.py +++ b/automation_ide/extend/process_executor/mail_thunder/mail_thunder_process.py @@ -2,10 +2,10 @@ from typing import TYPE_CHECKING, Union -from automation_editor.extend.process_executor.process_executor_utils import build_process +from automation_ide.extend.process_executor.process_executor_utils import build_process if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor def call_mail_thunder( diff --git a/automation_editor/extend/process_executor/process_executor_utils.py b/automation_ide/extend/process_executor/process_executor_utils.py similarity index 77% rename from automation_editor/extend/process_executor/process_executor_utils.py rename to automation_ide/extend/process_executor/process_executor_utils.py index fe960c5..13bbb42 100644 --- a/automation_editor/extend/process_executor/process_executor_utils.py +++ b/automation_ide/extend/process_executor/process_executor_utils.py @@ -6,14 +6,14 @@ from je_editor import EditorWidget -from automation_editor.automation_editor_ui.show_code_window.code_window import CodeWindow -from automation_editor.extend.mail_thunder_extend.mail_thunder_setting import send_after_test -from automation_editor.extend.process_executor.task_process_manager import TaskProcessManager -from automation_editor.utils.exception.exception_tags import wrong_test_data_format_exception_tag -from automation_editor.utils.exception.exceptions import ITETestExecutorException +from automation_ide.automation_editor_ui.show_code_window.code_window import CodeWindow +from automation_ide.extend.mail_thunder_extend.mail_thunder_setting import send_after_test +from automation_ide.extend.process_executor.task_process_manager import TaskProcessManager +from automation_ide.utils.exception.exception_tags import wrong_test_data_format_exception_tag +from automation_ide.utils.exception.exceptions import ITETestExecutorException if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor def build_process( diff --git a/automation_editor/extend/process_executor/task_process_manager.py b/automation_ide/extend/process_executor/task_process_manager.py similarity index 98% rename from automation_editor/extend/process_executor/task_process_manager.py rename to automation_ide/extend/process_executor/task_process_manager.py index 084f0b2..5061f94 100644 --- a/automation_editor/extend/process_executor/task_process_manager.py +++ b/automation_ide/extend/process_executor/task_process_manager.py @@ -12,7 +12,7 @@ from je_editor.pyside_ui.main_ui.save_settings.user_color_setting_file import actually_color_dict from je_editor.utils.venv_check.check_venv import check_and_choose_venv -from automation_editor.automation_editor_ui.show_code_window.code_window import CodeWindow +from automation_ide.automation_editor_ui.show_code_window.code_window import CodeWindow class TaskProcessManager(object): diff --git a/automation_editor/extend/process_executor/web_runner/__init__.py b/automation_ide/extend/process_executor/web_runner/__init__.py similarity index 100% rename from automation_editor/extend/process_executor/web_runner/__init__.py rename to automation_ide/extend/process_executor/web_runner/__init__.py diff --git a/automation_editor/extend/process_executor/web_runner/web_runner_process.py b/automation_ide/extend/process_executor/web_runner/web_runner_process.py similarity index 88% rename from automation_editor/extend/process_executor/web_runner/web_runner_process.py rename to automation_ide/extend/process_executor/web_runner/web_runner_process.py index f2fb13b..6778119 100644 --- a/automation_editor/extend/process_executor/web_runner/web_runner_process.py +++ b/automation_ide/extend/process_executor/web_runner/web_runner_process.py @@ -2,13 +2,13 @@ from typing import TYPE_CHECKING, Union -from automation_editor.extend.process_executor.process_executor_utils import build_process +from automation_ide.extend.process_executor.process_executor_utils import build_process if TYPE_CHECKING: - from automation_editor.automation_editor_ui.editor_main.main_ui import AutomationEditor + from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor import sys -from automation_editor.utils.file_process.get_dir_file_list import ask_and_get_dir_files_as_list +from automation_ide.utils.file_process.get_dir_file_list import ask_and_get_dir_files_as_list def call_web_runner_test( diff --git a/automation_editor/utils/__init__.py b/automation_ide/utils/__init__.py similarity index 100% rename from automation_editor/utils/__init__.py rename to automation_ide/utils/__init__.py diff --git a/automation_editor/utils/exception/__init__.py b/automation_ide/utils/exception/__init__.py similarity index 100% rename from automation_editor/utils/exception/__init__.py rename to automation_ide/utils/exception/__init__.py diff --git a/automation_editor/utils/exception/exception_tags.py b/automation_ide/utils/exception/exception_tags.py similarity index 100% rename from automation_editor/utils/exception/exception_tags.py rename to automation_ide/utils/exception/exception_tags.py diff --git a/automation_editor/utils/exception/exceptions.py b/automation_ide/utils/exception/exceptions.py similarity index 100% rename from automation_editor/utils/exception/exceptions.py rename to automation_ide/utils/exception/exceptions.py diff --git a/automation_editor/utils/file_process/__init__.py b/automation_ide/utils/file_process/__init__.py similarity index 100% rename from automation_editor/utils/file_process/__init__.py rename to automation_ide/utils/file_process/__init__.py diff --git a/automation_editor/utils/file_process/get_dir_file_list.py b/automation_ide/utils/file_process/get_dir_file_list.py similarity index 100% rename from automation_editor/utils/file_process/get_dir_file_list.py rename to automation_ide/utils/file_process/get_dir_file_list.py diff --git a/automation_editor/utils/json_format/__init__.py b/automation_ide/utils/json_format/__init__.py similarity index 100% rename from automation_editor/utils/json_format/__init__.py rename to automation_ide/utils/json_format/__init__.py diff --git a/automation_editor/utils/json_format/json_process.py b/automation_ide/utils/json_format/json_process.py similarity index 75% rename from automation_editor/utils/json_format/json_process.py rename to automation_ide/utils/json_format/json_process.py index 86a7999..2fc23d8 100644 --- a/automation_editor/utils/json_format/json_process.py +++ b/automation_ide/utils/json_format/json_process.py @@ -3,9 +3,9 @@ from json import dumps from json import loads -from automation_editor.utils.exception.exception_tags import cant_reformat_json_error -from automation_editor.utils.exception.exception_tags import wrong_json_data_error -from automation_editor.utils.exception.exceptions import ITEJsonException +from automation_ide.utils.exception.exception_tags import cant_reformat_json_error +from automation_ide.utils.exception.exception_tags import wrong_json_data_error +from automation_ide.utils.exception.exceptions import ITEJsonException def __process_json(json_string: str, **kwargs) -> str: diff --git a/automation_editor/utils/manager/__init__.py b/automation_ide/utils/manager/__init__.py similarity index 100% rename from automation_editor/utils/manager/__init__.py rename to automation_ide/utils/manager/__init__.py diff --git a/automation_editor/utils/manager/package_manager/__init__.py b/automation_ide/utils/manager/package_manager/__init__.py similarity index 100% rename from automation_editor/utils/manager/package_manager/__init__.py rename to automation_ide/utils/manager/package_manager/__init__.py diff --git a/automation_editor/utils/manager/package_manager/package_manager_class.py b/automation_ide/utils/manager/package_manager/package_manager_class.py similarity index 100% rename from automation_editor/utils/manager/package_manager/package_manager_class.py rename to automation_ide/utils/manager/package_manager/package_manager_class.py diff --git a/dev_requirements.txt b/dev_requirements.txt index 7d2dfb9..bc274da 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,11 +1,11 @@ build twine -sphinx -sphinx-rtd-theme -PySide6 je-api-testka je-load-density je-auto-control je-web-runner je-mail-thunder automation_editor_dev +sphinx +sphinx-rtd-theme +PySide6==6.7.3 diff --git a/exe/start_automation_editor.py b/exe/start_automation_editor.py index b13e41e..801c962 100644 --- a/exe/start_automation_editor.py +++ b/exe/start_automation_editor.py @@ -1,4 +1,3 @@ -from automation_editor import start_editor - +from automation_ide import start_editor start_editor() diff --git a/pyproject.toml b/pyproject.toml index cae78ba..71e5a7b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "automation_editor_dev" +name = "automation_ide_dev" version = "0.0.34" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, diff --git a/requirements.txt b/requirements.txt index 414063d..a747261 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,4 @@ -automation_editor \ No newline at end of file +automation_editor +PySide6==6.7.3 +je_editor +je_auto_control \ No newline at end of file diff --git a/stable.toml b/stable.toml index 659ea56..37d4d2e 100644 --- a/stable.toml +++ b/stable.toml @@ -5,7 +5,7 @@ requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "automation_editor" +name = "automation_ide" version = "0.0.34" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, diff --git a/test/unit_test/start_automation/extend_automation_test.py b/test/unit_test/start_automation/extend_automation_test.py index 4d35b65..a0e0a3c 100644 --- a/test/unit_test/start_automation/extend_automation_test.py +++ b/test/unit_test/start_automation/extend_automation_test.py @@ -1,6 +1,6 @@ from PySide6.QtWidgets import QWidget, QGridLayout, QLineEdit, QPushButton, QLabel -from automation_editor import start_editor, EDITOR_EXTEND_TAB +from automation_ide import start_editor, EDITOR_EXTEND_TAB # You can use you own QWidget diff --git a/test/unit_test/start_automation/start_automation_test.py b/test/unit_test/start_automation/start_automation_test.py index 4749c9b..c23b8e3 100644 --- a/test/unit_test/start_automation/start_automation_test.py +++ b/test/unit_test/start_automation/start_automation_test.py @@ -1,2 +1,2 @@ -from automation_editor import start_editor +from automation_ide import start_editor start_editor(debug_mode=True) From 21109f262bc34950f67be6c3717c407e54d8992e Mon Sep 17 00:00:00 2001 From: JE-Chen <33644111+JE-Chen@users.noreply.github.com> Date: Mon, 14 Oct 2024 20:52:42 +0800 Subject: [PATCH 2/3] Update dependcy Update dependcy --- stable.toml => dev.toml | 10 +++++----- pyproject.toml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) rename stable.toml => dev.toml (88%) diff --git a/stable.toml b/dev.toml similarity index 88% rename from stable.toml rename to dev.toml index 37d4d2e..2022da4 100644 --- a/stable.toml +++ b/dev.toml @@ -1,12 +1,12 @@ -# Rename to build stable version -# This is stable version +# Rename to dev version +# This is dev version [build-system] requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "automation_ide" -version = "0.0.34" +name = "automation_ide_dev" +version = "0.0.35" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ] @@ -16,7 +16,7 @@ license = { text = "MIT" } dependencies = [ "je-editor", "je_auto_control", "je_web_runner", "je_load_density", "je_api_testka", "je-mail-thunder", - "automation-file" + "automation-file", "PySide6==6.7.3" ] classifiers = [ "Programming Language :: Python :: 3.9", diff --git a/pyproject.toml b/pyproject.toml index 71e5a7b..bf4ef78 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,12 @@ -# Rename to dev version -# This is dev version +# Rename to build stable version +# This is stable version [build-system] requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "automation_ide_dev" -version = "0.0.34" +name = "automation_ide" +version = "0.0.35" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ] @@ -16,7 +16,7 @@ license = { text = "MIT" } dependencies = [ "je-editor", "je_auto_control", "je_web_runner", "je_load_density", "je_api_testka", "je-mail-thunder", - "automation-file" + "automation-file", "PySide6==6.7.3" ] classifiers = [ "Programming Language :: Python :: 3.9", From fcee98f0ef9d575cd9fd9aa550fb3b1020eaea8c Mon Sep 17 00:00:00 2001 From: JE-Chen <33644111+JE-Chen@users.noreply.github.com> Date: Mon, 14 Oct 2024 21:05:42 +0800 Subject: [PATCH 3/3] Update requirements Update requirements --- dev_requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index bc274da..d42d74e 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -5,7 +5,7 @@ je-load-density je-auto-control je-web-runner je-mail-thunder -automation_editor_dev +automation_ide_dev sphinx sphinx-rtd-theme PySide6==6.7.3 diff --git a/requirements.txt b/requirements.txt index a747261..773af27 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -automation_editor +automation_ide PySide6==6.7.3 je_editor je_auto_control \ No newline at end of file