From 857f73f61d6fdbb011510474d8e070c635517b68 Mon Sep 17 00:00:00 2001
From: David Chang <zdy004007@126.com>
Date: Thu, 23 Nov 2023 22:25:32 +0800
Subject: [PATCH] ver Nov23rd

trying to set up the environment
---
 .gitignore                      |  4 +++-
 desktop_env/envs/desktop_env.py | 12 +++++++-----
 main.py                         | 17 ++++++++++-------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3945ef..591df91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,4 +160,6 @@ instructor-embedding
 # frontend cache
 frontend/node_modules/
 frontend/.next/
-frontend/.idea
\ No newline at end of file
+frontend/.idea
+
+tags
diff --git a/desktop_env/envs/desktop_env.py b/desktop_env/envs/desktop_env.py
index 8b51c5b..3293440 100644
--- a/desktop_env/envs/desktop_env.py
+++ b/desktop_env/envs/desktop_env.py
@@ -74,7 +74,7 @@ class DesktopEnv(gym.Env):
     def _wait_for_emulator_load(self):
         while True:
             try:
-                output = subprocess.check_output(f"vmrun -T ws list", shell=True, stderr=subprocess.STDOUT)
+                output = subprocess.check_output("vmrun -T ws list", shell=True, stderr=subprocess.STDOUT)
                 output = output.decode()
                 if self.path_to_vm.lstrip("~/") in output:
                     print("VM is running.")
@@ -127,16 +127,18 @@ class DesktopEnv(gym.Env):
         return image_path
     
     def _get_obs(self):
+        print("OBS 1")
         screenshot_image_path = self._get_screenshot()
+        print("OBS 2")
         with Image.open(screenshot_image_path) as img:
             return np.array(img)
 
     def reset(self):
-        input()
-        self._execute_command(["vmrun", "-T", "ws", "revertToSnapshot", self.path_to_vm, self.snapshot_path])
-        input()
+        input("Reset #1 PE")
+        #self._execute_command(["vmrun", "-T", "ws", "revertToSnapshot", self.path_to_vm, self.snapshot_path])
+        input("Revert to snapshot #2 PE")
         self._start_emulator()
-        input()
+        input("Started emulator #3 PE")
         self._wait_for_emulator_load()
         observation = self._get_obs()
 
diff --git a/main.py b/main.py
index 2cbcd18..a18cbc3 100644
--- a/main.py
+++ b/main.py
@@ -1,4 +1,4 @@
-from pprint import pprint
+#from pprint import pprint
 from desktop_env.envs.desktop_env import DesktopEnv, Action, MouseClick
 
 def get_human_action():
@@ -38,13 +38,16 @@ def human_agent():
     """
     Runs the Gym environment with human input.
     """
-    env = DesktopEnv(path_to_vm="/home/yuri/vmware/Windows 10 x64/Windows 10 x64.vmx",
+    #env = DesktopEnv( path_to_vm="/home/yuri/vmware/Windows 10 x64/Windows 10 x64.vmx"
                     #  path_to_vm="/home/yuri/vmware/Ubuntu 64-bit/Ubuntu 64-bit.vmx",
-                 username="user",
-                 password="password",
-                #  host="192.168.7.128",
-                 host="http://192.168.7.129:5000",
-                 vm_os="windows")
+    env = DesktopEnv( path_to_vm="/home/david/vmware/KUbuntu 64-bit/KUbuntu 64-bit.vmx"
+                    , username="david"
+                    , password="123456"
+                    , host="192.168.174.129"
+                     #host="http://192.168.7.129:5000",
+                     #vm_os="windows")
+                    , vm_os="ubuntu"
+                    )
     observation = env.reset()
     done = False