From c346b4379de295732bd8cf07a7556ece0aafceba Mon Sep 17 00:00:00 2001 From: Timothyxxx <384084775@qq.com> Date: Fri, 26 Jan 2024 20:33:24 +0800 Subject: [PATCH] Make up one OS example --- desktop_env/evaluators/getters/__init__.py | 2 +- desktop_env/evaluators/getters/general.py | 4 ++ .../13584542-872b-42d8-b299-866967b5c3ef.json | 55 ++++++++++++++----- 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/desktop_env/evaluators/getters/__init__.py b/desktop_env/evaluators/getters/__init__.py index faa9f2e..4f4b43f 100644 --- a/desktop_env/evaluators/getters/__init__.py +++ b/desktop_env/evaluators/getters/__init__.py @@ -2,7 +2,7 @@ from .chrome import get_default_search_engine, get_cookie_data, get_bookmarks, g get_shortcuts_on_desktop, get_history, get_enabled_experiments, get_chrome_language, get_chrome_font_size, \ get_profile_name, get_number_of_search_results, get_googledrive_file, get_active_tab_info from .file import get_cloud_file, get_vm_file, get_cache_file -from .general import get_vm_command_line +from .general import get_vm_command_line, get_vm_terminal_output from .impress import get_audio_in_slide from .info import get_vm_screen_size, get_vm_window_size, get_vm_wallpaper, get_list_directory from .misc import get_rule, get_accessibility_tree diff --git a/desktop_env/evaluators/getters/general.py b/desktop_env/evaluators/getters/general.py index c94654e..b694167 100644 --- a/desktop_env/evaluators/getters/general.py +++ b/desktop_env/evaluators/getters/general.py @@ -18,3 +18,7 @@ def get_vm_command_line(env, config: Dict[str, str]): else: logger.error("Failed to get vm command line. Status code: %d", response.status_code) return None + + +def get_vm_terminal_output(env, config: Dict[str, str]): + return env.controller.get_terminal_output() diff --git a/evaluation_examples/examples/os/13584542-872b-42d8-b299-866967b5c3ef.json b/evaluation_examples/examples/os/13584542-872b-42d8-b299-866967b5c3ef.json index 3abbd63..4e08188 100644 --- a/evaluation_examples/examples/os/13584542-872b-42d8-b299-866967b5c3ef.json +++ b/evaluation_examples/examples/os/13584542-872b-42d8-b299-866967b5c3ef.json @@ -1,17 +1,46 @@ { - "id": "13584542-872b-42d8-b299-866967b5c3ef", - "snapshot": "os", - "instruction": "Set the default terminal size and screen x,y coordinates in order to make the terminal window always open at the same location and with the same size.", - "source": "https://superuser.com/questions/72176/linux-set-default-terminal-size-and-screen-position", - "trajectory": "trajectories/", - "related_apps": [ - "os" - ], - "evaluator": { - "func": "", - "result": { + "id": "13584542-872b-42d8-b299-866967b5c3ef", + "snapshot": "os", + "instruction": "I click in terminal: terminal->132x43 to change terminal size but after each reboot terminal size is set to default setting and I have to change it again. Help me set it permanently", + "source": "https://superuser.com/questions/72176/linux-set-default-terminal-size-and-screen-position", + "trajectory": "trajectories/", + "config": [ + ], + "related_apps": [ + "os" + ], + "evaluator": { + "postconfig": [ + { + "type": "sleep", + "parameters": { + "seconds": 1 + } }, - "expected": { + { + "type": "execute", + "parameters": { + "command": [ + "python", + "-c", + "import pyautogui; import time; time.sleep(0.5); pyautogui.hotkey('ctrl', 'alt', 't'); time.sleep(0.5); pyautogui.write('stty size'); time.sleep(0.5); pyautogui.press('enter')" + ] + } + } + ], + "func": "check_include_exclude", + "result": { + "type": "vm_terminal_output" + }, + "expected": { + "type": "rule", + "rules": { + "include": [ + "43 132" + ], + "exclude": [ + ] } } - } \ No newline at end of file + } +} \ No newline at end of file