diff --git a/.gitignore b/.gitignore index 591df91..184e64e 100644 --- a/.gitignore +++ b/.gitignore @@ -163,3 +163,4 @@ frontend/.next/ frontend/.idea tags +snapshots diff --git a/branch-config/.gitignore b/branch-config/.gitignore new file mode 100644 index 0000000..60c9e47 --- /dev/null +++ b/branch-config/.gitignore @@ -0,0 +1 @@ +comment diff --git a/branch-config/autodelete b/branch-config/autodelete new file mode 100644 index 0000000..573541a --- /dev/null +++ b/branch-config/autodelete @@ -0,0 +1 @@ +0 diff --git a/branch-config/destpath b/branch-config/destpath new file mode 100644 index 0000000..bd01d04 --- /dev/null +++ b/branch-config/destpath @@ -0,0 +1 @@ +snapshots diff --git a/branch-config/filelist b/branch-config/filelist new file mode 100644 index 0000000..eb3b3a1 --- /dev/null +++ b/branch-config/filelist @@ -0,0 +1,4 @@ +desktop_env +main.py +requirements.txt +evaluation_examples diff --git a/branch-config/ignorelist b/branch-config/ignorelist new file mode 100644 index 0000000..e69de29 diff --git a/branch-config/includelist b/branch-config/includelist new file mode 100644 index 0000000..e69de29 diff --git a/branch-config/symlist b/branch-config/symlist new file mode 100644 index 0000000..e69de29 diff --git a/branch_flag b/branch_flag new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/branch_flag @@ -0,0 +1 @@ +test diff --git a/desktop_env/envs/desktop_env.py b/desktop_env/envs/desktop_env.py index 34270c8..93f81b3 100644 --- a/desktop_env/envs/desktop_env.py +++ b/desktop_env/envs/desktop_env.py @@ -154,7 +154,7 @@ class DesktopEnv(gym.Env): _path = os.path.join("tmp", random_uuid, "tmp.xlsx") if _file_info["type"] == "cloud_file": url = _file_info["path"] - response = requests.get(url, stream=True) + response = requests.get(url, stream=True, verify=False) response.raise_for_status() with open(_path, 'wb') as f: diff --git a/desktop_env/server/main.py b/desktop_env/server/main.py index 245054e..e1cb27e 100644 --- a/desktop_env/server/main.py +++ b/desktop_env/server/main.py @@ -151,7 +151,7 @@ def download_file(): max_retries = 3 for i in range(max_retries): try: - response = requests.get(url, stream=True) + response = requests.get(url, stream=True, verify=False) response.raise_for_status() with open(path, 'wb') as f: diff --git a/evaluation_examples/examples/f9584479-3d0d-4c79-affa-9ad7afdd8850.json b/evaluation_examples/examples/f9584479-3d0d-4c79-affa-9ad7afdd8850.json index 5a01d56..ae47d10 100644 --- a/evaluation_examples/examples/f9584479-3d0d-4c79-affa-9ad7afdd8850.json +++ b/evaluation_examples/examples/f9584479-3d0d-4c79-affa-9ad7afdd8850.json @@ -6,12 +6,12 @@ "config": { "download": [ [ - "https://drive.usercontent.google.com/download?id=1rwhniaClEkF8XFzdfaNUA6GmAiy4syMZ&export=download&authuser=0&confirm=t&uuid=6fdd5b04-85f4-45e1-ad74-368f8f2a82ab&at=APZUnTUP-JxPxLfNls6jXWghblQ5:1701766091851", - "C:\\Users\\tianbaox\\Desktop\\Quarterly_Product_Sales_by_Zone.xlsx" + "http://101.43.24.67/s/DbaHsQpPA7dxrA8/download/Quarterly_Product_Sales_by_Zone.xlsx", + "/home/david/Quarterly_Product_Sales_by_Zone.xlsx" ] ], "open": [ - "C:\\Users\\tianbaox\\Desktop\\Quarterly_Product_Sales_by_Zone.xlsx" + "/home/david/Quarterly_Product_Sales_by_Zone.xlsx" ] }, "trajectory": "trajectories/f9584479-3d0d-4c79-affa-9ad7afdd8850", @@ -23,11 +23,11 @@ "paths": { "expected": { "type": "cloud_file", - "path": "https://drive.usercontent.google.com/download?id=17f1wZuJPvUEc5at_Fy3c18VFdOk0x7xz&export=download&authuser=0&confirm=t&uuid=6d2edffd-0ce0-426e-9820-8af25b4667f3&at=APZUnTVh7JS85dwZBaV2hytWQgDK:1702361510956" + "path": "http://101.43.24.67/s/BAfFwa3689XTYoo/download/Quarterly_Product_Sales_by_Zone_gold.xlsx" }, "actual": { "type": "vm_file", - "path": "C:\\Users\\tianbaox\\Desktop\\Quarterly_Product_Sales_by_Zone.xlsx" + "path": "/home/david/Quarterly_Product_Sales_by_Zone.xlsx" } } } diff --git a/main.py b/main.py index b7ed019..a116d59 100644 --- a/main.py +++ b/main.py @@ -7,17 +7,18 @@ def human_agent(): Runs the Gym environment with human input. """ - with open("evaluation_examples/examples/37608790-6147-45d0-9f20-1137bb35703d.json", "r") as f: + with open("evaluation_examples/examples/f9584479-3d0d-4c79-affa-9ad7afdd8850.json", "r") as f: example = json.load(f) #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", env = DesktopEnv( path_to_vm="/home/david/vmware/KUbuntu 64-bit/KUbuntu 64-bit.vmx" , action_space="computer_13" - , snapshot_path="base_setup" + #, snapshot_path="base_setup" + , snapshot_path="Init5" , instruction=example["instruction"] - #, config=example["config"] - #, evaluator=example["evaluator"] + , config=example["config"] + , evaluator=example["evaluator"] ) # reset the environment to certain snapshot