diff --git a/desktop_env/desktop_env.py b/desktop_env/desktop_env.py index d1c9cf3..cf05d03 100644 --- a/desktop_env/desktop_env.py +++ b/desktop_env/desktop_env.py @@ -26,7 +26,7 @@ class DesktopEnv(gym.Env): def __init__( self, - provider_name: str = "docker", + provider_name: str = "vmware", region: str = None, path_to_vm: str = None, snapshot_name: str = "init_state", @@ -36,7 +36,7 @@ class DesktopEnv(gym.Env): headless: bool = False, require_a11y_tree: bool = True, require_terminal: bool = False, - os_type: str = "Windows", + os_type: str = "Ubuntu", ): """ Args: @@ -60,18 +60,6 @@ class DesktopEnv(gym.Env): self.chromium_port = 9222 self.vnc_port = 8006 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 diff --git a/desktop_env/providers/__init__.py b/desktop_env/providers/__init__.py index 5dbde19..d1359a1 100644 --- a/desktop_env/providers/__init__.py +++ b/desktop_env/providers/__init__.py @@ -1,6 +1,6 @@ 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): """ 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": from desktop_env.providers.docker.manager import DockerVMManager from desktop_env.providers.docker.provider import DockerProvider - # return DockerVMManager(), DockerProvider(region, vnc_port, server_port, chromium_port) return DockerVMManager(), DockerProvider(region) else: raise NotImplementedError(f"{provider_name} not implemented!") diff --git a/desktop_env/providers/docker/provider.py b/desktop_env/providers/docker/provider.py index eadfb93..faed091 100644 --- a/desktop_env/providers/docker/provider.py +++ b/desktop_env/providers/docker/provider.py @@ -30,7 +30,6 @@ class DockerProvider(Provider): self.chromium_port = None 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') self.lock_file = temp_dir / "docker_port_allocation.lck" self.lock_file.parent.mkdir(parents=True, exist_ok=True)