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

Clean on multi_env feat

Browse Source
This commit is contained in:
Timothyxxx
2024-11-03 10:33:04 +08:00
parent 8be2a40967
commit 5bc48e57d5
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
desktop_env/desktop_env.py
View File

@@ -26,7 +26,7 @@ class DesktopEnv(gym.Env):
def __init__( def __init__(
self, self,
provider_name: str = "docker", provider_name: str = "vmware",
region: str = None, region: str = None,
path_to_vm: str = None, path_to_vm: str = None,
snapshot_name: str = "init_state", snapshot_name: str = "init_state",
@@ -36,7 +36,7 @@ class DesktopEnv(gym.Env):
headless: bool = False, headless: bool = False,
require_a11y_tree: bool = True, require_a11y_tree: bool = True,
require_terminal: bool = False, require_terminal: bool = False,
os_type: str = "Windows", os_type: str = "Ubuntu",
): ):
""" """
Args: Args:
@@ -60,18 +60,6 @@ class DesktopEnv(gym.Env):
self.chromium_port = 9222 self.chromium_port = 9222
self.vnc_port = 8006 self.vnc_port = 8006
self.manager, self.provider = create_vm_manager_and_provider(provider_name, region) self.manager, self.provider = create_vm_manager_and_provider(provider_name, region)
# self.server_port = server_port or 5000
# self.chromium_port = chromium_port or 9222
# self.vnc_port = vnc_port or 8006
# # Initialize provider with custom ports
# self.manager, self.provider = create_vm_manager_and_provider(
# provider_name,
# region,
# vnc_port=self.vnc_port,
# server_port=self.server_port,
# chromium_port=self.chromium_port
# )
self.os_type = os_type self.os_type = os_type

3
desktop_env/providers/__init__.py
View File

@@ -1,6 +1,6 @@
from desktop_env.providers.base import VMManager, Provider from desktop_env.providers.base import VMManager, Provider
# def create_vm_manager_and_provider(provider_name: str, region: str, vnc_port: int = None, server_port: int = None, chromium_port: int = None):
def create_vm_manager_and_provider(provider_name: str, region: str): def create_vm_manager_and_provider(provider_name: str, region: str):
""" """
Factory function to get the Virtual Machine Manager and Provider instances based on the provided provider name. Factory function to get the Virtual Machine Manager and Provider instances based on the provided provider name.
@@ -25,7 +25,6 @@ def create_vm_manager_and_provider(provider_name: str, region: str):
elif provider_name == "docker": elif provider_name == "docker":
from desktop_env.providers.docker.manager import DockerVMManager from desktop_env.providers.docker.manager import DockerVMManager
from desktop_env.providers.docker.provider import DockerProvider from desktop_env.providers.docker.provider import DockerProvider
# return DockerVMManager(), DockerProvider(region, vnc_port, server_port, chromium_port)
return DockerVMManager(), DockerProvider(region) return DockerVMManager(), DockerProvider(region)
else: else:
raise NotImplementedError(f"{provider_name} not implemented!") raise NotImplementedError(f"{provider_name} not implemented!")

1
desktop_env/providers/docker/provider.py
View File

@@ -30,7 +30,6 @@ class DockerProvider(Provider):
self.chromium_port = None self.chromium_port = None
self.environment = {"DISK_SIZE": "32G", "RAM_SIZE": "4G", "CPU_CORES": "4"} # Modify if needed self.environment = {"DISK_SIZE": "32G", "RAM_SIZE": "4G", "CPU_CORES": "4"} # Modify if needed
# temp_dir = Path(os.getenv('TEMP' if platform.system() == 'Windows' else '/tmp'))
temp_dir = Path(os.getenv('TEMP') if platform.system() == 'Windows' else '/tmp') temp_dir = Path(os.getenv('TEMP') if platform.system() == 'Windows' else '/tmp')
self.lock_file = temp_dir / "docker_port_allocation.lck" self.lock_file = temp_dir / "docker_port_allocation.lck"
self.lock_file.parent.mkdir(parents=True, exist_ok=True) self.lock_file.parent.mkdir(parents=True, exist_ok=True)