Merge pull request #147 from Integration-Automation/dev

Dev

Author: JE-Chen

.github/workflows/dev_python3_10.yml

@@ -87,11 +87,6 @@ jobs:
       - name: Test Create Project Function
         run: python ./test/unit_test/create_project_file/create_project_test.py
 
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
-
       - name: Test Get Mouse Info
         run: python ./test/unit_test/get_info/mouse_info.py
       - name: Test Get Special Info

.github/workflows/dev_python3_11.yml

@@ -87,11 +87,6 @@ jobs:
       - name: Test Create Project Function
         run: python ./test/unit_test/create_project_file/create_project_test.py
 
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
-
       - name: Test Get Mouse Info
         run: python ./test/unit_test/get_info/mouse_info.py
       - name: Test Get Special Info

.github/workflows/dev_python3_9.yml

@@ -87,11 +87,6 @@ jobs:
       - name: Test Create Project Function
         run: python ./test/unit_test/create_project_file/create_project_test.py
 
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
-
       - name: Test Get Mouse Info
         run: python ./test/unit_test/get_info/mouse_info.py
       - name: Test Get Special Info

.github/workflows/stable_python3_10.yml

@@ -87,11 +87,6 @@ jobs:
       - name: Test Create Project Function
         run: python ./test/unit_test/create_project_file/create_project_test.py
 
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
-
       - name: Test Get Mouse Info
         run: python ./test/unit_test/get_info/mouse_info.py
       - name: Test Get Special Info

.github/workflows/stable_python3_11.yml

@@ -87,11 +87,6 @@ jobs:
       - name: Test Create Project Function
         run: python ./test/unit_test/create_project_file/create_project_test.py
 
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
-
       - name: Test Get Mouse Info
         run: python ./test/unit_test/get_info/mouse_info.py
       - name: Test Get Special Info

.github/workflows/stable_python3_9.yml

@@ -87,11 +87,6 @@ jobs:
       - name: Test Create Project Function
         run: python ./test/unit_test/create_project_file/create_project_test.py
 
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
-
       - name: Test Get Mouse Info
         run: python ./test/unit_test/get_info/mouse_info.py
       - name: Test Get Special Info

.idea/workspace.xml

@@ -6,18 +6,17 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_auto_control_dev"
-version = "0.0.106"
+version = "0.0.107"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]
 description = "GUI Automation Framework"
 requires-python = ">=3.9"
-license = { text = "MIT" }
+license-files = ["LICENSE"]
 dependencies = [
     "je_open_cv",
     "pillow",
-    "APScheduler",
-    "Pyside6",
+    "Pyside6==6.8.2.1",
     "pyobjc-core;platform_system=='Darwin'",
     "pyobjc;platform_system=='Darwin'",
     "python-Xlib;platform_system=='Linux'",
@@ -29,7 +28,6 @@ classifiers = [
     "Environment :: Win32 (MS Windows)",
     "Environment :: MacOS X",
     "Environment :: X11 Applications",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent"
 ]
 
@@ -42,9 +40,6 @@ Code = "https://github.com/Intergration-Automation-Testing/AutoControl"
 file = "README.md"
 content-type = "text/markdown"
 
-[tool.setuptools]
-license-files = ["LICENSE"]
-
 [tool.setuptools.packages]
 find = { namespaces = false }
 

dev.toml

@@ -60,8 +60,6 @@
     package_manager
 from je_auto_control.utils.project.create_project_structure import \
     create_project_dir
-# Scheduler
-from je_auto_control.utils.scheduler.extend_apscheduler import SchedulerManager
 # Shell command
 from je_auto_control.utils.shell_process.shell_exec import ShellManager
 from je_auto_control.utils.shell_process.shell_exec import default_shell_manager
@@ -104,6 +102,8 @@
 # import screen
 from je_auto_control.wrapper.auto_control_screen import screen_size
 from je_auto_control.wrapper.auto_control_screen import screenshot
+# Recording
+from je_auto_control.utils.cv2_utils.video_recording import RecordingThread
 
 __all__ = [
     "click_mouse", "mouse_keys_table", "get_mouse_position", "press_mouse", "release_mouse",
@@ -120,5 +120,5 @@
     "generate_html", "generate_html_report", "generate_json", "generate_json_report", "generate_xml",
     "generate_xml_report", "get_dir_files_as_list", "create_project_dir", "start_autocontrol_socket_server",
     "callback_executor", "package_manager", "get_special_table", "ShellManager", "default_shell_manager",
-    "SchedulerManager"
+    "RecordingThread"
 ]

je_auto_control/__init__.py

@@ -18,7 +18,6 @@
 from je_auto_control.utils.logging.loggin_instance import autocontrol_logger
 from je_auto_control.utils.package_manager.package_manager_class import package_manager
 from je_auto_control.utils.project.create_project_structure import create_project_dir
-from je_auto_control.utils.scheduler.extend_apscheduler import scheduler_manager
 from je_auto_control.utils.shell_process.shell_exec import ShellManager
 from je_auto_control.utils.start_exe.start_another_process import start_exe
 from je_auto_control.utils.test_record.record_test_class import record_action_to_list, test_record_instance
@@ -90,15 +89,6 @@ def __init__(self):
             "AC_shell_command": ShellManager().exec_shell,
             # Another process
             "AC_execute_process": start_exe,
-            # Scheduler
-            "AC_scheduler_event_trigger": self.scheduler_event_trigger,
-            "AC_remove_blocking_scheduler_job": scheduler_manager.remove_blocking_job,
-            "AC_remove_nonblocking_scheduler_job": scheduler_manager.remove_nonblocking_job,
-            "AC_start_blocking_scheduler": scheduler_manager.start_block_scheduler,
-            "AC_start_nonblocking_scheduler": scheduler_manager.start_nonblocking_scheduler,
-            "AC_start_all_scheduler": scheduler_manager.start_all_scheduler,
-            "AC_shutdown_blocking_scheduler": scheduler_manager.shutdown_blocking_scheduler,
-            "AC_shutdown_nonblocking_scheduler": scheduler_manager.shutdown_nonblocking_scheduler,
         }
         # get all builtin function and add to event dict
         for function in getmembers(builtins, isbuiltin):
@@ -164,15 +154,6 @@ def execute_files(self, execute_files_list: list) -> List[Dict[str, str]]:
             execute_detail_list.append(self.execute_action(read_action_json(file)))
         return execute_detail_list
 
-    def scheduler_event_trigger(
-            self, function: str, scheduler_id: str = None, args: Union[list, tuple] = None,
-            kwargs: dict = None, scheduler_type: str = "nonblocking", wait_type: str = "secondly",
-            wait_value: int = 1, **trigger_args: Any) -> None:
-        if scheduler_type == "nonblocking":
-            scheduler_event = scheduler_manager.nonblocking_scheduler_event_dict.get(wait_type)
-        else:
-            scheduler_event = scheduler_manager.blocking_scheduler_event_dict.get(wait_type)
-        scheduler_event(self.event_dict.get(function), scheduler_id, args, kwargs, wait_value, **trigger_args)
 
 
 executor = Executor()