fix(desktop_os_symphony):support aws (#406)
* fix(os_symphony) * Update desktop_env_os_symphony.py
This commit is contained in:
@@ -151,10 +151,9 @@ class DesktopEnv(gym.Env):
|
|||||||
|
|
||||||
# Initialize with default (no proxy) provider
|
# Initialize with default (no proxy) provider
|
||||||
self.current_use_proxy = False
|
self.current_use_proxy = False
|
||||||
# self.manager, self.provider = create_vm_manager_and_provider(provider_name, region, use_proxy=False)
|
|
||||||
self.manager, self.provider = None, None
|
self.manager, self.provider = None, None
|
||||||
self.os_type = os_type
|
self.os_type = os_type
|
||||||
|
self.path_to_vm = path_to_vm
|
||||||
# Track whether environment has been used (step/setup) to optimize snapshot revert
|
# Track whether environment has been used (step/setup) to optimize snapshot revert
|
||||||
# docker, aws, gcp, azure are always unused as the emulator starts from a clean state
|
# docker, aws, gcp, azure are always unused as the emulator starts from a clean state
|
||||||
# vmware, virtualbox are always used as the emulator starts from a dirty state
|
# vmware, virtualbox are always used as the emulator starts from a dirty state
|
||||||
@@ -165,24 +164,12 @@ class DesktopEnv(gym.Env):
|
|||||||
else:
|
else:
|
||||||
raise ValueError(f"Invalid provider name: {self.provider_name}")
|
raise ValueError(f"Invalid provider name: {self.provider_name}")
|
||||||
|
|
||||||
# Initialize environment variables
|
|
||||||
if path_to_vm:
|
|
||||||
self.path_to_vm = os.path.abspath(os.path.expandvars(os.path.expanduser(path_to_vm))) \
|
|
||||||
if provider_name in {"vmware", "virtualbox"} else path_to_vm
|
|
||||||
else:
|
|
||||||
self.path_to_vm = self.manager.get_vm_path(os_type=self.os_type, region=region, screen_size=(self.screen_width, self.screen_height))
|
|
||||||
|
|
||||||
self.snapshot_name = snapshot_name
|
self.snapshot_name = snapshot_name
|
||||||
self.cache_dir_base: str = cache_dir
|
self.cache_dir_base: str = cache_dir
|
||||||
# todo: add the logic to get the screen size from the VM
|
|
||||||
self.headless = headless
|
self.headless = headless
|
||||||
self.require_a11y_tree = require_a11y_tree
|
self.require_a11y_tree = require_a11y_tree
|
||||||
self.require_terminal = require_terminal
|
self.require_terminal = require_terminal
|
||||||
|
|
||||||
# Initialize emulator and controller
|
|
||||||
# logger.info("Initializing...")
|
|
||||||
# self._start_emulator()
|
|
||||||
|
|
||||||
# mode: human or machine
|
# mode: human or machine
|
||||||
self.instruction = None
|
self.instruction = None
|
||||||
assert action_space in ["computer_13", "pyautogui", "claude_computer_use", "autoglm_computer_use"]
|
assert action_space in ["computer_13", "pyautogui", "claude_computer_use", "autoglm_computer_use"]
|
||||||
@@ -199,11 +186,13 @@ class DesktopEnv(gym.Env):
|
|||||||
if not self.manager and not self.provider:
|
if not self.manager and not self.provider:
|
||||||
logger.info("Initializing...")
|
logger.info("Initializing...")
|
||||||
self.manager, self.provider = create_vm_manager_and_provider(self.provider_name, self.region, use_proxy=False)
|
self.manager, self.provider = create_vm_manager_and_provider(self.provider_name, self.region, use_proxy=False)
|
||||||
|
|
||||||
if self.path_to_vm:
|
if self.path_to_vm:
|
||||||
self.path_to_vm = os.path.abspath(os.path.expandvars(os.path.expanduser(self.path_to_vm))) \
|
self.path_to_vm = os.path.abspath(os.path.expandvars(os.path.expanduser(self.path_to_vm))) \
|
||||||
if self.provider_name in {"vmware", "virtualbox"} else self.path_to_vm
|
if self.provider_name in {"vmware", "virtualbox"} else self.path_to_vm
|
||||||
else:
|
else:
|
||||||
self.path_to_vm = self.manager.get_vm_path(os_type=self.os_type, region=self.region, screen_size=(self.screen_width, self.screen_height))
|
self.path_to_vm = self.manager.get_vm_path(os_type=self.os_type, region=self.region, screen_size=(self.screen_width, self.screen_height))
|
||||||
|
|
||||||
self._start_emulator()
|
self._start_emulator()
|
||||||
|
|
||||||
def _start_emulator(self):
|
def _start_emulator(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user