lzy/sci-gui-agent-benchmark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: enhance setup method with retry logic and return status

Browse Source
This commit is contained in:
adlsdztony
2025-06-09 16:07:13 +00:00
parent 630f92fd7c
commit bfae51d74d
2 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
desktop_env/controllers/setup.py
View File

@@ -49,7 +49,7 @@ class SetupController:
def reset_cache_dir(self, cache_dir: str): def reset_cache_dir(self, cache_dir: str):
self.cache_dir = cache_dir self.cache_dir = cache_dir
def setup(self, config: List[Dict[str, Any]]): def setup(self, config: List[Dict[str, Any]])-> bool:
""" """
Args: Args:
config (List[Dict[str, Any]]): list of dict like {str: Any}. each config (List[Dict[str, Any]]): list of dict like {str: Any}. each
@@ -64,13 +64,18 @@ class SetupController:
# make sure connection can be established # make sure connection can be established
logger.info(f"try to connect {self.http_server}") logger.info(f"try to connect {self.http_server}")
retry = 0 retry = 0
while retry < 30: while retry < 50:
try: try:
_ = requests.get(self.http_server + "/terminal") _ = requests.get(self.http_server + "/terminal")
break break
except: except:
time.sleep(5) time.sleep(5)
retry += 1 retry += 1
logger.info(f"retry: {retry}/50")
if retry == 50:
return False
for cfg in config: for cfg in config:
config_type: str = cfg["type"] config_type: str = cfg["type"]
@@ -84,6 +89,8 @@ class SetupController:
getattr(self, setup_function)(**parameters) getattr(self, setup_function)(**parameters)
logger.info("SETUP: %s(%s)", setup_function, str(parameters)) logger.info("SETUP: %s(%s)", setup_function, str(parameters))
return True
def _download_setup(self, files: List[Dict[str, str]]): def _download_setup(self, files: List[Dict[str, str]]):
""" """

90
desktop_env/desktop_env.py
View File

@@ -145,6 +145,7 @@ class DesktopEnv(gym.Env):
self.provider.stop_emulator(self.path_to_vm) self.provider.stop_emulator(self.path_to_vm)
def reset(self, task_config: Optional[Dict[str, Any]] = None, seed=None, options=None) -> Dict[str, Any]: def reset(self, task_config: Optional[Dict[str, Any]] = None, seed=None, options=None) -> Dict[str, Any]:
retry = 0
# Reset to certain task in OSWorld # Reset to certain task in OSWorld
logger.info("Resetting environment...") logger.info("Resetting environment...")
logger.info("Switching task...") logger.info("Switching task...")
@@ -152,49 +153,58 @@ class DesktopEnv(gym.Env):
self._traj_no += 1 self._traj_no += 1
self._step_no = 0 self._step_no = 0
self.action_history.clear() self.action_history.clear()
while retry < 5:
# Check and handle proxy requirement changes BEFORE starting emulator # Check and handle proxy requirement changes BEFORE starting emulator
if task_config is not None: if task_config is not None:
task_use_proxy = task_config.get("proxy", False) task_use_proxy = task_config.get("proxy", False)
if task_use_proxy != self.current_use_proxy: if task_use_proxy != self.current_use_proxy:
logger.info(f"Task proxy requirement changed: {self.current_use_proxy} -> {task_use_proxy}") logger.info(f"Task proxy requirement changed: {self.current_use_proxy} -> {task_use_proxy}")
# Close current provider if it exists # Close current provider if it exists
if hasattr(self, 'provider') and self.provider: if hasattr(self, 'provider') and self.provider:
try: try:
self.provider.stop_emulator(self.path_to_vm) self.provider.stop_emulator(self.path_to_vm)
except Exception as e: except Exception as e:
logger.warning(f"Failed to stop current provider: {e}") logger.warning(f"Failed to stop current provider: {e}")
# Create new provider with appropriate proxy setting # Create new provider with appropriate proxy setting
self.current_use_proxy = task_use_proxy self.current_use_proxy = task_use_proxy
self.manager, self.provider = create_vm_manager_and_provider( self.manager, self.provider = create_vm_manager_and_provider(
self.provider_name, self.provider_name,
self.region, self.region,
use_proxy=task_use_proxy use_proxy=task_use_proxy
) )
if task_use_proxy: if task_use_proxy:
logger.info("Using proxy-enabled AWS provider.") logger.info("Using proxy-enabled AWS provider.")
else: else:
logger.info("Using regular AWS provider.") logger.info("Using regular AWS provider.")
logger.info("Reverting to snapshot to {}...".format(self.snapshot_name))
self._revert_to_snapshot()
logger.info("Starting emulator...")
self._start_emulator()
logger.info("Emulator started.")
if task_config is not None:
self._set_task_info(task_config)
self.setup_controller.reset_cache_dir(self.cache_dir)
logger.info("Setting up environment...")
self.setup_controller.setup(self.config)
logger.info("Environment setup complete.")
if task_config.get("proxy", False): logger.info("Reverting to snapshot to {}...".format(self.snapshot_name))
# If using proxy, set up the proxy configuration self._revert_to_snapshot()
self.setup_controller._proxy_setup() logger.info("Starting emulator...")
self._start_emulator()
logger.info("Emulator started.")
if task_config is not None:
self._set_task_info(task_config)
self.setup_controller.reset_cache_dir(self.cache_dir)
logger.info("Setting up environment...")
success = self.setup_controller.setup(self.config)
if success:
break
else:
logger.error("Environment setup failed, retrying...")
retry += 1
time.sleep(5)
logger.info("Environment setup complete.")
if task_config.get("proxy", False):
# If using proxy, set up the proxy configuration
self.setup_controller._proxy_setup()
observation = self._get_obs() observation = self._get_obs()
return observation return observation