Merge branch 'main' of github.com:ztjhz/DesktopEnv

README.md

@@ -115,6 +115,12 @@ You will see all the logs of the system running normally, including the successf
 ## 🧪 Experiments
 ### Agent Baselines
 If you wish to run the baseline agent used in our paper, you can execute the following command as an example under the GPT-4V pure-screenshot setting:
+
+Set **OPENAI_API_KEY** environment variable with your API key
+```bash
+export OPENAI_API_KEY='changme'
+```
+
 ```bash
 python run.py --path_to_vm Ubuntu/Ubuntu.vmx --headless --observation_type screenshot --model gpt-4-vision-preview --result_dir ./results
 ```

ROADMAP.md

@@ -24,6 +24,7 @@ If you are interested in contributing to the project, please check the [CONTRIBU
 - [ ] VPN setup doc for those who need it
 - [ ] Support running on platforms that have nested virtualization, e.g. Google Cloud, AWS, etc. 
 - [ ] Prepare for the first release of Windows vm image for the environment
+- [ ] Be able to run without virtual machine platform VMware
 
 
 ## Road Map of Annotation Tool

desktop_env/envs/__init__.py

@@ -189,9 +189,12 @@ def _install_virtual_machine(vm_name, working_dir="./vm_data", downloaded_file_n
     os.makedirs(working_dir, exist_ok=True)
     def __download_and_unzip_vm():
         # Determine the platform and CPU architecture to decide the correct VM image to download
-        if platform.machine() == 'arm64':  # macOS with Apple Silicon
-            url = UBUNTU_ARM_URL
-        elif platform.machine().lower() in ['amd64', "x86_64"]:
+        if platform.system() == 'Darwin':  # macOS
+            if os.uname().machine == 'arm64':  # Apple Silicon
+                url = UBUNTU_ARM_URL
+            else:
+                url = UBUNTU_X86_URL
+        elif platform.machine().lower() in ['amd64', 'x86_64']:
             url = UBUNTU_X86_URL
         else:
             raise Exception("Unsupported platform or architecture")