From 0c21605353092e8777f2da97767eed6c43736147 Mon Sep 17 00:00:00 2001 From: Reggie McLean Date: Wed, 20 Dec 2023 16:33:33 -0500 Subject: [PATCH 01/12] mujoco forward and grasp success --- metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py | 1 + .../envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py b/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py index a0e9c1f5d..891a0a6dc 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py +++ b/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py @@ -524,6 +524,7 @@ def evaluate_state(self, obs, action): def reset(self, seed=None, options=None): self.curr_path_length = 0 obs, info = super().reset() + mujoco.mj_forward(self.model, self.data) self._prev_obs = obs[:18].copy() obs[18:36] = self._prev_obs obs = np.float64(obs) diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py index 20028bc6d..2080b6d50 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py @@ -177,9 +177,11 @@ def compute_reward(self, action, obs): ) reward = reward_utils.hamacher_product(object_grasped, in_place) - near_object = np.linalg.norm(obj - hand) < 0.04 + near_object = np.linalg.norm(obj - hand) < 0.05 pinched_without_obj = obs[3] < 0.43 - lifted = obj[2] - 0.02 > self.obj_init_pos[2] + lifted = obj[2] > self.obj_init_pos[2] + print(near_object, lifted, near_object) + print(np.linalg.norm(obj - hand), obj[2], self.obj_init_pos[2], obs[3]) # Increase reward when properly grabbed obj grasp_success = near_object and lifted and not pinched_without_obj if grasp_success: From 4643d65931e0127615b253282046ce883270c690 Mon Sep 17 00:00:00 2001 From: Reggie McLean Date: Wed, 20 Dec 2023 16:35:15 -0500 Subject: [PATCH 02/12] creating videos --- test.py | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 265 insertions(+) create mode 100644 test.py diff --git a/test.py b/test.py new file mode 100644 index 000000000..fa46f4e02 --- /dev/null +++ b/test.py @@ -0,0 +1,265 @@ +import time + +from metaworld import MT1 +from metaworld.envs.mujoco.env_dict import ALL_V2_ENVIRONMENTS +import importlib +from gymnasium.wrappers.record_video import RecordVideo +import numpy as np +import pickle +from PIL import Image +envs = list(ALL_V2_ENVIRONMENTS.keys()) +''' +envs = ['bin-picking-v2'] +f = open('raw-captions(1).pkl', 'rb') +caption_data = pickle.load(f) +for env in envs: + print(env + ' ', caption_data.get('success_videos__' + env + '_1', [[]])[0]) + +exit(0)''' + +envs = ['bin-picking-v2'] +for e in envs: + parts = e.split('-') + new_parts = [] + for i in range(len(parts)): + new_parts.append(parts[i][0].upper() + parts[i][1:]) + p_name = 'Sawyer' + ''.join(new_parts) + 'Policy' + if e != 'peg-insert-side-v2': + policy_class = importlib.import_module(f'metaworld.policies.sawyer_{e.replace("-", "_")}_policy') + policy = getattr(policy_class, p_name) + else: + from metaworld.policies.sawyer_peg_insertion_side_v2_policy import SawyerPegInsertionSideV2Policy as policy + p = policy() + mt1 = MT1(e, seed=42) + task_num = 0 + current_results = [] + alpha = 0.8 + noisy = True + num_steps = 500 + if noisy: + folder = f'videos/fail_move_videos_all_{alpha}_{num_steps}_steps/{e}/' + else: + folder = f'videos/success_videos/{e}/' + task_rewards = 0.0 + task_success = 0 + grasp_act = None + for idx, task in enumerate(mt1.train_tasks): + env = mt1.train_classes[e](render_mode='rgb_array', ) # reward_func_version='v1' + env.set_task(task) + obs, info = env.reset() + env = RecordVideo(env, video_folder=folder, name_prefix=e + ' ' + str(task_num), video_length=1000) + env.start_video_recorder() + info['success'] = 0.0 + count = 0 + success_count = 0 + success_reward = 0.0 + first_grasp = None + while count < num_steps: + if noisy and first_grasp is not None: + a = p.get_action(obs) + if np.random.random() < alpha: + a = np.random.uniform(-1, 1, 4) + a[-1] = grasp_act[-1] + else: + a = p.get_action(obs) + next_state, reward, terminate, truncate, info = env.step(a) + time.sleep(0.02) + success_reward += reward + obs = next_state + count += 1 + print(count, first_grasp) + if int(info['grasp_success']) == 1: + print('success') + success_count += 1 + if first_grasp is None: + first_grasp = count + grasp_act = a + print(info['success']) + if int(info['success']) == 1: + env = None + break + + print(success_count + first_grasp) + print('after loop') + if env: + env.close() + current_results.append(success_count) + task_num += 1 + if success_count >= 1: + task_rewards += success_reward + task_success += 1 + print(success_reward) + if task_success > 0: + print(e, float(task_rewards) / task_success, task_rewards, task_success) + else: + print(e, ' no successes for this env') + + #with open(folder + 'successes.txt', 'w') as f: + # for s in current_results: + # f.writelines(str(int(s > 1)) + '\n') + + +''' +import re + +def extract_numbers(text): + # Using a regular expression to find all occurrences of the pattern + numbers = re.findall(r'\w+-v2 (\d+\.\d+)', text) + return numbers + +v2 = """assembly-v2 4295.877104694405 214793.85523472022 50 +basketball-v2 4074.675908864069 203733.79544320345 50 +bin-picking-v2 3793.557086152024 189677.8543076012 50 +box-close-v2 3190.2513806720435 153132.0662722581 48 +button-press-topdown-v2 3658.034173893188 182901.7086946594 50 +button-press-topdown-wall-v2 2.1814562201181356 109.07281100590679 50 +button-press-v2 557.2289823205454 27861.449116027266 50 +button-press-wall-v2 2906.7731337862206 142431.8835555248 49 +coffee-button-v2 502.0791243757947 25103.956218789735 50 +coffee-pull-v2 4201.198302424607 210059.91512123038 50 +coffee-push-v2 781.5452731299629 39077.263656498144 50 +dial-turn-v2 3783.657604762353 189182.88023811765 50 +disassemble-v2 3929.333570822413 196466.67854112067 50 +door-close-v2 4486.8303014051435 224341.51507025716 50 +door-lock-v2 3276.632413116681 163831.62065583406 50 +door-open-v2 4462.204559137688 223110.2279568844 50 +door-unlock-v2 3675.2551455808753 183762.75727904376 50 +hand-insert-v2 4373.331826530643 218666.5913265322 50 +drawer-close-v2 4231.674426011076 211583.72130055382 50 +drawer-open-v2 4043.4684949445586 202173.42474722792 50 +faucet-open-v2 4149.168471205682 207458.4235602841 50 +faucet-close-v2 4091.195746293934 204559.7873146967 50 +hammer-v2 1276.0828023960428 63804.140119802134 50 +handle-press-side-v2 969.3445927132926 48467.22963566463 50 +handle-press-v2 1259.357391820331 62967.869591016555 50 +handle-pull-side-v2 3219.7246207429666 160986.23103714833 50 +handle-pull-v2 3946.7587048766964 197337.93524383483 50 +lever-pull-v2 894.8887270326768 44744.43635163384 50 +peg-insert-side-v2 3909.180278988091 183731.47311244026 47 +pick-place-wall-v2 4162.3110434573155 203953.24112940847 49 +pick-out-of-hole-v2 3339.442903196961 166972.14515984806 50 +reach-v2 4835.3356478567885 241766.7823928394 50 +push-back-v2 382.10794520709084 19105.39726035454 50 +push-v2 3558.023228518536 177901.1614259268 50 +pick-place-v2 4272.123546496604 213606.1773248302 50 +plate-slide-v2 4420.695680887148 221034.7840443574 50 +plate-slide-side-v2 4034.975560214308 201748.7780107154 50 +plate-slide-back-v2 1171.0356284218753 58551.781421093765 50 +plate-slide-back-side-v2 1024.5694094900723 51228.470474503614 50 +peg-unplug-side-v2 1229.9545239303345 61497.72619651673 50 +soccer-v2 2798.3474815421946 120328.94170631438 43 +stick-push-v2 1286.714150871722 64335.7075435861 50 +stick-pull-v2 513.1297611247296 24630.22853398702 48 +push-wall-v2 4156.398407806063 207819.92039030316 50 +reach-wall-v2 4800.020615934053 240001.03079670266 50 +shelf-place-v2 2833.0132176530897 141650.66088265448 50 +sweep-into-v2 2489.10602743353 112009.77123450885 45 +sweep-v2 4350.4701424681125 217523.5071234056 50 +window-open-v2 2129.840301628518 106492.0150814259 50 +window-close-v2 3121.984379533082 156099.2189766541 50""" + +v1 = """assembly-v2 2695649.8468503873 134782492.34251937 50 +basketball-v2 39313.77031206153 1965688.5156030767 50 +bin-picking-v2 854410.0949367455 42720504.74683727 50 +box-close-v2 -8.08363446791972 -388.01445446014657 48 +button-press-topdown-v2 896603.3301725581 44830166.50862791 50 +button-press-topdown-wall-v2 34654.30097832585 1732715.0489162926 50 +button-press-v2 -61.12740761922143 -3056.3703809610715 50 +button-press-wall-v2 395866.43165648426 19397455.151167728 49 +coffee-button-v2 -60.548973728438085 -3027.4486864219043 50 +coffee-pull-v2 889007.1071586343 44450355.35793172 50 +coffee-push-v2 163833.84497951748 8191692.248975874 50 +dial-turn-v2 -48.279946162612376 -2413.997308130619 50 +disassemble-v2 13891.207528852232 694560.3764426116 50 +door-close-v2 1876.1579286254907 93807.89643127454 50 +door-lock-v2 65065.90793307598 3253295.396653799 50 +door-open-v2 18714.682853654605 935734.1426827303 50 +door-unlock-v2 -62.50171098557794 -3125.085549278897 50 +hand-insert-v2 843179.2720130624 42158963.60065312 50 +drawer-close-v2 126.67468666471977 6333.734333235989 50 +drawer-open-v2 909.0682114022461 45453.410570112304 50 +faucet-open-v2 234575.05247303846 11728752.623651924 50 +faucet-close-v2 238640.95108399328 11932047.554199664 50 +hammer-v2 195906.22459721135 9795311.229860567 50 +handle-press-side-v2 300978.87250369886 15048943.625184942 50 +handle-press-v2 348365.353399533 17418267.66997665 50 +handle-pull-side-v2 625169.669944944 31258483.4972472 50 +handle-pull-v2 426637.3483238925 21331867.416194625 50 +lever-pull-v2 133057.36609092035 6652868.304546017 50 +peg-insert-side-v2 no successes for this env +pick-place-wall-v2 462800.59681661485 22677229.24401413 49 +pick-out-of-hole-v2 543691.5525289807 27184577.626449034 50 +reach-v2 562053.5460711892 28102677.30355946 50 +push-back-v2 713385.294727087 35669264.73635435 50 +push-v2 655525.6007212544 32776280.036062717 50 +pick-place-v2 467920.668329615 23396033.41648075 50 +plate-slide-v2 855778.55071222 42788927.535611 50 +plate-slide-side-v2 -31.66050331288854 -1583.025165644427 50 +plate-slide-back-v2 -43.542233550480184 -2177.1116775240093 50 +plate-slide-back-side-v2 70839.11542630578 3541955.771315289 50 +peg-unplug-side-v2 113520.93329449503 5676046.664724751 50 +soccer-v2 525865.3739226413 22612211.078673575 43 +stick-push-v2 1567.0385424750339 78351.9271237517 50 +stick-pull-v2 3776.3041622504466 181262.59978802144 48 +push-wall-v2 686300.8988622428 34315044.94311214 50 +reach-wall-v2 588271.3461126653 29413567.305633266 50 +shelf-place-v2 477388.16878640035 23869408.439320017 50 +sweep-into-v2 636069.0637871345 28623107.870421052 45 +sweep-v2 24465.24529702479 1223262.2648512395 50 +window-open-v2 25784.676568253442 1289233.828412672 50 +window-close-v2 53753.62166979801 2687681.0834899005 50""" + +import numpy as np +import matplotlib.pyplot as plt + +def plot_scatter_log_scale(list1, list2, title): + # Assuming list1 and list2 are of the same length, if not, we need to handle it differently + if len(list1) != len(list2): + min_length = min(len(list1), len(list2)) + list1 = list1[:min_length] + list2 = list2[:min_length] + + # Converting string numbers to floats + list1_floats = [float(num) for num in list1] + list2_floats = [float(num) for num in list2] + + # Using log scale due to the wide range of values in list1 + plt.figure(figsize=(10, 6)) + plt.scatter(np.log(list1_floats), list2_floats) + plt.title(title) + plt.xlabel('Log of Reward') + plt.ylabel('Env Num') + plt.grid(True) + plt.show() + + +v1 = np.asarray([float(val) for val in extract_numbers(v1)]) +v2 = np.asarray([float(val) for val in extract_numbers(v2)]) + +import scipy.stats as stats + +def plot_dist(data): + mean, std = np.mean(data), np.std(data) + + # Step 2: Create a range of values for plotting the normal distribution + xmin, xmax = min(data), max(data) + x = np.linspace(xmin, xmax, 50) + + # Step 3: Create the normal distribution with estimated parameters + p = stats.norm.pdf(x, mean, std) + + # Step 4: Plotting + plt.figure(figsize=(10, 6)) + plt.hist(data, bins=10, density=True, alpha=0.9, color='g') + plt.plot(x, p, 'k', linewidth=2) + title = "Fit results: mean = {:.2f}, std = {:.2f}".format(mean, std) + plt.title(title) + plt.show() + +plot_scatter_log_scale(v1, [i for i in range(len(v1))], 'V1') +plot_scatter_log_scale(v2, [i for i in range(len(v2))], 'V2') +print(len(v1)) +print(len(v2))''' + +from metaworld import MT1 +mt1 = MT1('reach-v2') \ No newline at end of file From bf39ddf6cdeff055ca25fce73b74106d3d003692 Mon Sep 17 00:00:00 2001 From: Reginald McLean Date: Wed, 3 Jan 2024 20:28:59 -0500 Subject: [PATCH 03/12] forward in step call --- metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py b/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py index 891a0a6dc..7b8c8ef03 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py +++ b/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py @@ -462,7 +462,7 @@ def step(self, action): raise ValueError("You must reset the env manually once truncate==True") self.do_simulation([action[-1], -action[-1]], n_frames=self.frame_skip) self.curr_path_length += 1 - + # Running the simulator can sometimes mess up site positions, so # re-position them here to make sure they're accurate for site in self._target_site_config: @@ -484,7 +484,7 @@ def step(self, action): "unscaled_reward": 0.0, }, ) - + mujoco.mj_forward(self.model, self.data) self._last_stable_obs = self._get_obs() self._last_stable_obs = np.clip( From 749cea91ad84590a0a7644e30c50633bff43c722 Mon Sep 17 00:00:00 2001 From: Reginald McLean Date: Mon, 8 Jan 2024 10:19:38 -0500 Subject: [PATCH 04/12] success videos file --- test.py | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/test.py b/test.py index fa46f4e02..1fc8c12de 100644 --- a/test.py +++ b/test.py @@ -17,8 +17,7 @@ exit(0)''' -envs = ['bin-picking-v2'] -for e in envs: +for e in ['drawer-close-v2']: parts = e.split('-') new_parts = [] for i in range(len(parts)): @@ -34,10 +33,10 @@ task_num = 0 current_results = [] alpha = 0.8 - noisy = True + noisy = False num_steps = 500 if noisy: - folder = f'videos/fail_move_videos_all_{alpha}_{num_steps}_steps/{e}/' + folder = f'videos//{e}/' else: folder = f'videos/success_videos/{e}/' task_rewards = 0.0 @@ -48,38 +47,19 @@ env.set_task(task) obs, info = env.reset() env = RecordVideo(env, video_folder=folder, name_prefix=e + ' ' + str(task_num), video_length=1000) - env.start_video_recorder() info['success'] = 0.0 count = 0 success_count = 0 success_reward = 0.0 first_grasp = None while count < num_steps: - if noisy and first_grasp is not None: - a = p.get_action(obs) - if np.random.random() < alpha: - a = np.random.uniform(-1, 1, 4) - a[-1] = grasp_act[-1] - else: - a = p.get_action(obs) + a = p.get_action(obs) next_state, reward, terminate, truncate, info = env.step(a) - time.sleep(0.02) success_reward += reward obs = next_state count += 1 - print(count, first_grasp) - if int(info['grasp_success']) == 1: - print('success') - success_count += 1 - if first_grasp is None: - first_grasp = count - grasp_act = a - print(info['success']) if int(info['success']) == 1: - env = None break - - print(success_count + first_grasp) print('after loop') if env: env.close() @@ -261,5 +241,3 @@ def plot_dist(data): print(len(v1)) print(len(v2))''' -from metaworld import MT1 -mt1 = MT1('reach-v2') \ No newline at end of file From 5f9b4622d9151875f26d4ea3b08eb9b2f207082b Mon Sep 17 00:00:00 2001 From: Reginald McLean Date: Mon, 8 Jan 2024 10:20:11 -0500 Subject: [PATCH 05/12] success videos file --- test.py | 162 -------------------------------------------------------- 1 file changed, 162 deletions(-) diff --git a/test.py b/test.py index 1fc8c12de..9ee3abb33 100644 --- a/test.py +++ b/test.py @@ -79,165 +79,3 @@ # f.writelines(str(int(s > 1)) + '\n') -''' -import re - -def extract_numbers(text): - # Using a regular expression to find all occurrences of the pattern - numbers = re.findall(r'\w+-v2 (\d+\.\d+)', text) - return numbers - -v2 = """assembly-v2 4295.877104694405 214793.85523472022 50 -basketball-v2 4074.675908864069 203733.79544320345 50 -bin-picking-v2 3793.557086152024 189677.8543076012 50 -box-close-v2 3190.2513806720435 153132.0662722581 48 -button-press-topdown-v2 3658.034173893188 182901.7086946594 50 -button-press-topdown-wall-v2 2.1814562201181356 109.07281100590679 50 -button-press-v2 557.2289823205454 27861.449116027266 50 -button-press-wall-v2 2906.7731337862206 142431.8835555248 49 -coffee-button-v2 502.0791243757947 25103.956218789735 50 -coffee-pull-v2 4201.198302424607 210059.91512123038 50 -coffee-push-v2 781.5452731299629 39077.263656498144 50 -dial-turn-v2 3783.657604762353 189182.88023811765 50 -disassemble-v2 3929.333570822413 196466.67854112067 50 -door-close-v2 4486.8303014051435 224341.51507025716 50 -door-lock-v2 3276.632413116681 163831.62065583406 50 -door-open-v2 4462.204559137688 223110.2279568844 50 -door-unlock-v2 3675.2551455808753 183762.75727904376 50 -hand-insert-v2 4373.331826530643 218666.5913265322 50 -drawer-close-v2 4231.674426011076 211583.72130055382 50 -drawer-open-v2 4043.4684949445586 202173.42474722792 50 -faucet-open-v2 4149.168471205682 207458.4235602841 50 -faucet-close-v2 4091.195746293934 204559.7873146967 50 -hammer-v2 1276.0828023960428 63804.140119802134 50 -handle-press-side-v2 969.3445927132926 48467.22963566463 50 -handle-press-v2 1259.357391820331 62967.869591016555 50 -handle-pull-side-v2 3219.7246207429666 160986.23103714833 50 -handle-pull-v2 3946.7587048766964 197337.93524383483 50 -lever-pull-v2 894.8887270326768 44744.43635163384 50 -peg-insert-side-v2 3909.180278988091 183731.47311244026 47 -pick-place-wall-v2 4162.3110434573155 203953.24112940847 49 -pick-out-of-hole-v2 3339.442903196961 166972.14515984806 50 -reach-v2 4835.3356478567885 241766.7823928394 50 -push-back-v2 382.10794520709084 19105.39726035454 50 -push-v2 3558.023228518536 177901.1614259268 50 -pick-place-v2 4272.123546496604 213606.1773248302 50 -plate-slide-v2 4420.695680887148 221034.7840443574 50 -plate-slide-side-v2 4034.975560214308 201748.7780107154 50 -plate-slide-back-v2 1171.0356284218753 58551.781421093765 50 -plate-slide-back-side-v2 1024.5694094900723 51228.470474503614 50 -peg-unplug-side-v2 1229.9545239303345 61497.72619651673 50 -soccer-v2 2798.3474815421946 120328.94170631438 43 -stick-push-v2 1286.714150871722 64335.7075435861 50 -stick-pull-v2 513.1297611247296 24630.22853398702 48 -push-wall-v2 4156.398407806063 207819.92039030316 50 -reach-wall-v2 4800.020615934053 240001.03079670266 50 -shelf-place-v2 2833.0132176530897 141650.66088265448 50 -sweep-into-v2 2489.10602743353 112009.77123450885 45 -sweep-v2 4350.4701424681125 217523.5071234056 50 -window-open-v2 2129.840301628518 106492.0150814259 50 -window-close-v2 3121.984379533082 156099.2189766541 50""" - -v1 = """assembly-v2 2695649.8468503873 134782492.34251937 50 -basketball-v2 39313.77031206153 1965688.5156030767 50 -bin-picking-v2 854410.0949367455 42720504.74683727 50 -box-close-v2 -8.08363446791972 -388.01445446014657 48 -button-press-topdown-v2 896603.3301725581 44830166.50862791 50 -button-press-topdown-wall-v2 34654.30097832585 1732715.0489162926 50 -button-press-v2 -61.12740761922143 -3056.3703809610715 50 -button-press-wall-v2 395866.43165648426 19397455.151167728 49 -coffee-button-v2 -60.548973728438085 -3027.4486864219043 50 -coffee-pull-v2 889007.1071586343 44450355.35793172 50 -coffee-push-v2 163833.84497951748 8191692.248975874 50 -dial-turn-v2 -48.279946162612376 -2413.997308130619 50 -disassemble-v2 13891.207528852232 694560.3764426116 50 -door-close-v2 1876.1579286254907 93807.89643127454 50 -door-lock-v2 65065.90793307598 3253295.396653799 50 -door-open-v2 18714.682853654605 935734.1426827303 50 -door-unlock-v2 -62.50171098557794 -3125.085549278897 50 -hand-insert-v2 843179.2720130624 42158963.60065312 50 -drawer-close-v2 126.67468666471977 6333.734333235989 50 -drawer-open-v2 909.0682114022461 45453.410570112304 50 -faucet-open-v2 234575.05247303846 11728752.623651924 50 -faucet-close-v2 238640.95108399328 11932047.554199664 50 -hammer-v2 195906.22459721135 9795311.229860567 50 -handle-press-side-v2 300978.87250369886 15048943.625184942 50 -handle-press-v2 348365.353399533 17418267.66997665 50 -handle-pull-side-v2 625169.669944944 31258483.4972472 50 -handle-pull-v2 426637.3483238925 21331867.416194625 50 -lever-pull-v2 133057.36609092035 6652868.304546017 50 -peg-insert-side-v2 no successes for this env -pick-place-wall-v2 462800.59681661485 22677229.24401413 49 -pick-out-of-hole-v2 543691.5525289807 27184577.626449034 50 -reach-v2 562053.5460711892 28102677.30355946 50 -push-back-v2 713385.294727087 35669264.73635435 50 -push-v2 655525.6007212544 32776280.036062717 50 -pick-place-v2 467920.668329615 23396033.41648075 50 -plate-slide-v2 855778.55071222 42788927.535611 50 -plate-slide-side-v2 -31.66050331288854 -1583.025165644427 50 -plate-slide-back-v2 -43.542233550480184 -2177.1116775240093 50 -plate-slide-back-side-v2 70839.11542630578 3541955.771315289 50 -peg-unplug-side-v2 113520.93329449503 5676046.664724751 50 -soccer-v2 525865.3739226413 22612211.078673575 43 -stick-push-v2 1567.0385424750339 78351.9271237517 50 -stick-pull-v2 3776.3041622504466 181262.59978802144 48 -push-wall-v2 686300.8988622428 34315044.94311214 50 -reach-wall-v2 588271.3461126653 29413567.305633266 50 -shelf-place-v2 477388.16878640035 23869408.439320017 50 -sweep-into-v2 636069.0637871345 28623107.870421052 45 -sweep-v2 24465.24529702479 1223262.2648512395 50 -window-open-v2 25784.676568253442 1289233.828412672 50 -window-close-v2 53753.62166979801 2687681.0834899005 50""" - -import numpy as np -import matplotlib.pyplot as plt - -def plot_scatter_log_scale(list1, list2, title): - # Assuming list1 and list2 are of the same length, if not, we need to handle it differently - if len(list1) != len(list2): - min_length = min(len(list1), len(list2)) - list1 = list1[:min_length] - list2 = list2[:min_length] - - # Converting string numbers to floats - list1_floats = [float(num) for num in list1] - list2_floats = [float(num) for num in list2] - - # Using log scale due to the wide range of values in list1 - plt.figure(figsize=(10, 6)) - plt.scatter(np.log(list1_floats), list2_floats) - plt.title(title) - plt.xlabel('Log of Reward') - plt.ylabel('Env Num') - plt.grid(True) - plt.show() - - -v1 = np.asarray([float(val) for val in extract_numbers(v1)]) -v2 = np.asarray([float(val) for val in extract_numbers(v2)]) - -import scipy.stats as stats - -def plot_dist(data): - mean, std = np.mean(data), np.std(data) - - # Step 2: Create a range of values for plotting the normal distribution - xmin, xmax = min(data), max(data) - x = np.linspace(xmin, xmax, 50) - - # Step 3: Create the normal distribution with estimated parameters - p = stats.norm.pdf(x, mean, std) - - # Step 4: Plotting - plt.figure(figsize=(10, 6)) - plt.hist(data, bins=10, density=True, alpha=0.9, color='g') - plt.plot(x, p, 'k', linewidth=2) - title = "Fit results: mean = {:.2f}, std = {:.2f}".format(mean, std) - plt.title(title) - plt.show() - -plot_scatter_log_scale(v1, [i for i in range(len(v1))], 'V1') -plot_scatter_log_scale(v2, [i for i in range(len(v2))], 'V2') -print(len(v1)) -print(len(v2))''' - From 57d0ec135b5586f492217a235a6585f537240a0d Mon Sep 17 00:00:00 2001 From: Reggie McLean Date: Fri, 12 Jan 2024 21:49:57 -0500 Subject: [PATCH 06/12] removing test.py --- test.py | 81 --------------------------------------------------------- 1 file changed, 81 deletions(-) delete mode 100644 test.py diff --git a/test.py b/test.py deleted file mode 100644 index 9ee3abb33..000000000 --- a/test.py +++ /dev/null @@ -1,81 +0,0 @@ -import time - -from metaworld import MT1 -from metaworld.envs.mujoco.env_dict import ALL_V2_ENVIRONMENTS -import importlib -from gymnasium.wrappers.record_video import RecordVideo -import numpy as np -import pickle -from PIL import Image -envs = list(ALL_V2_ENVIRONMENTS.keys()) -''' -envs = ['bin-picking-v2'] -f = open('raw-captions(1).pkl', 'rb') -caption_data = pickle.load(f) -for env in envs: - print(env + ' ', caption_data.get('success_videos__' + env + '_1', [[]])[0]) - -exit(0)''' - -for e in ['drawer-close-v2']: - parts = e.split('-') - new_parts = [] - for i in range(len(parts)): - new_parts.append(parts[i][0].upper() + parts[i][1:]) - p_name = 'Sawyer' + ''.join(new_parts) + 'Policy' - if e != 'peg-insert-side-v2': - policy_class = importlib.import_module(f'metaworld.policies.sawyer_{e.replace("-", "_")}_policy') - policy = getattr(policy_class, p_name) - else: - from metaworld.policies.sawyer_peg_insertion_side_v2_policy import SawyerPegInsertionSideV2Policy as policy - p = policy() - mt1 = MT1(e, seed=42) - task_num = 0 - current_results = [] - alpha = 0.8 - noisy = False - num_steps = 500 - if noisy: - folder = f'videos//{e}/' - else: - folder = f'videos/success_videos/{e}/' - task_rewards = 0.0 - task_success = 0 - grasp_act = None - for idx, task in enumerate(mt1.train_tasks): - env = mt1.train_classes[e](render_mode='rgb_array', ) # reward_func_version='v1' - env.set_task(task) - obs, info = env.reset() - env = RecordVideo(env, video_folder=folder, name_prefix=e + ' ' + str(task_num), video_length=1000) - info['success'] = 0.0 - count = 0 - success_count = 0 - success_reward = 0.0 - first_grasp = None - while count < num_steps: - a = p.get_action(obs) - next_state, reward, terminate, truncate, info = env.step(a) - success_reward += reward - obs = next_state - count += 1 - if int(info['success']) == 1: - break - print('after loop') - if env: - env.close() - current_results.append(success_count) - task_num += 1 - if success_count >= 1: - task_rewards += success_reward - task_success += 1 - print(success_reward) - if task_success > 0: - print(e, float(task_rewards) / task_success, task_rewards, task_success) - else: - print(e, ' no successes for this env') - - #with open(folder + 'successes.txt', 'w') as f: - # for s in current_results: - # f.writelines(str(int(s > 1)) + '\n') - - From e9da21324bd7132324f9285d906aa453d4969578 Mon Sep 17 00:00:00 2001 From: Reggie McLean Date: Fri, 12 Jan 2024 21:51:39 -0500 Subject: [PATCH 07/12] resetting bin-picking env --- .../envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py index 2080b6d50..20028bc6d 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py @@ -177,11 +177,9 @@ def compute_reward(self, action, obs): ) reward = reward_utils.hamacher_product(object_grasped, in_place) - near_object = np.linalg.norm(obj - hand) < 0.05 + near_object = np.linalg.norm(obj - hand) < 0.04 pinched_without_obj = obs[3] < 0.43 - lifted = obj[2] > self.obj_init_pos[2] - print(near_object, lifted, near_object) - print(np.linalg.norm(obj - hand), obj[2], self.obj_init_pos[2], obs[3]) + lifted = obj[2] - 0.02 > self.obj_init_pos[2] # Increase reward when properly grabbed obj grasp_success = near_object and lifted and not pinched_without_obj if grasp_success: From 6fe01ee497e38b9654f03f5de43d6f9d8bcc0666 Mon Sep 17 00:00:00 2001 From: Reggie McLean Date: Fri, 12 Jan 2024 21:54:37 -0500 Subject: [PATCH 08/12] fixing moving objects --- metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py b/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py index a0e9c1f5d..d06fedaad 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py +++ b/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py @@ -485,6 +485,8 @@ def step(self, action): }, ) + mujoco.mj_forward(self.model, self.data) + self._last_stable_obs = self._get_obs() self._last_stable_obs = np.clip( @@ -524,6 +526,7 @@ def evaluate_state(self, obs, action): def reset(self, seed=None, options=None): self.curr_path_length = 0 obs, info = super().reset() + mujoco.mj_forward(self.model, self.data) self._prev_obs = obs[:18].copy() obs[18:36] = self._prev_obs obs = np.float64(obs) From 979a23a6903158f186d7f5668d014009bcb7b99f Mon Sep 17 00:00:00 2001 From: Reggie McLean Date: Fri, 12 Jan 2024 22:50:33 -0500 Subject: [PATCH 09/12] fixing rendering being selectable via env creation, and objects moving during rendering --- metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py | 8 ++++++-- .../envs/mujoco/sawyer_xyz/v2/sawyer_assembly_peg_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_basketball_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_box_close_v2.py | 7 ++++--- .../sawyer_xyz/v2/sawyer_button_press_topdown_v2.py | 7 ++++--- .../sawyer_xyz/v2/sawyer_button_press_topdown_wall_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_button_press_v2.py | 7 ++++--- .../mujoco/sawyer_xyz/v2/sawyer_button_press_wall_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_coffee_button_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_coffee_pull_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_coffee_push_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_dial_turn_v2.py | 7 ++++--- .../mujoco/sawyer_xyz/v2/sawyer_disassemble_peg_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_door_close_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_door_lock_v2.py | 6 ++++-- .../envs/mujoco/sawyer_xyz/v2/sawyer_door_unlock_v2.py | 7 ++++--- metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_drawer_close_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_drawer_open_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_faucet_close_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_faucet_open_v2.py | 7 ++++--- metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hammer_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_hand_insert_v2.py | 7 ++++--- .../mujoco/sawyer_xyz/v2/sawyer_handle_press_side_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_v2.py | 7 ++++--- .../mujoco/sawyer_xyz/v2/sawyer_handle_pull_side_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_lever_pull_v2.py | 7 ++++--- .../mujoco/sawyer_xyz/v2/sawyer_peg_insertion_side_v2.py | 7 ++++--- .../mujoco/sawyer_xyz/v2/sawyer_peg_unplug_side_v2.py | 7 ++++--- .../mujoco/sawyer_xyz/v2/sawyer_pick_out_of_hole_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_v2.py | 7 ++++--- .../mujoco/sawyer_xyz/v2/sawyer_pick_place_wall_v2.py | 7 ++++--- .../sawyer_xyz/v2/sawyer_plate_slide_back_side_v2.py | 7 ++++--- .../mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_v2.py | 7 ++++--- .../mujoco/sawyer_xyz/v2/sawyer_plate_slide_side_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_push_back_v2.py | 7 ++++--- metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_push_wall_v2.py | 7 ++++--- metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_reach_wall_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_shelf_place_v2.py | 7 ++++--- metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_soccer_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_stick_pull_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_stick_push_v2.py | 7 ++++--- .../mujoco/sawyer_xyz/v2/sawyer_sweep_into_goal_v2.py | 7 ++++--- metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_window_close_v2.py | 7 ++++--- .../envs/mujoco/sawyer_xyz/v2/sawyer_window_open_v2.py | 7 ++++--- 51 files changed, 206 insertions(+), 151 deletions(-) diff --git a/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py b/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py index d06fedaad..b102bf7dd 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py +++ b/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py @@ -26,13 +26,15 @@ class SawyerMocapBase(mjenv_gym): "render_fps": 80, } - def __init__(self, model_name, frame_skip=5, render_mode=None): + def __init__(self, model_name, frame_skip=5, render_mode=None, camera_name=None, camera_id=None): mjenv_gym.__init__( self, model_name, frame_skip=frame_skip, observation_space=self.sawyer_observation_space, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) self.reset_mocap_welds() self.frame_skip = frame_skip @@ -113,6 +115,8 @@ def __init__( action_scale=1.0 / 100, action_rot_scale=1.0, render_mode=None, + camera_id=None, + camera_name=None ): self.action_scale = action_scale self.action_rot_scale = action_rot_scale @@ -140,7 +144,7 @@ def __init__( self._partially_observable = True - super().__init__(model_name, frame_skip=frame_skip, render_mode=render_mode) + super().__init__(model_name, frame_skip=frame_skip, render_mode=render_mode, camera_name=camera_name, camera_id=camera_id) mujoco.mj_forward( self.model, self.data diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_assembly_peg_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_assembly_peg_v2.py index 4f074eb2d..d4be48741 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_assembly_peg_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_assembly_peg_v2.py @@ -13,7 +13,7 @@ class SawyerNutAssemblyEnvV2(SawyerXYZEnv): WRENCH_HANDLE_LENGTH = 0.02 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (0, 0.6, 0.02) @@ -26,9 +26,10 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_basketball_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_basketball_v2.py index f11ed9e7f..e2dc4dac8 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_basketball_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_basketball_v2.py @@ -14,7 +14,7 @@ class SawyerBasketballEnvV2(SawyerXYZEnv): PAD_SUCCESS_MARGIN = 0.06 TARGET_RADIUS = 0.08 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.6, 0.0299) @@ -27,10 +27,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py index 20028bc6d..136063fbb 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py @@ -23,7 +23,7 @@ class SawyerBinPickingEnvV2(SawyerXYZEnv): - (11/23/20) Updated reward function to new pick-place style """ - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.07) hand_high = (0.5, 1, 0.5) obj_low = (-0.21, 0.65, 0.02) @@ -37,9 +37,10 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([-0.12, 0.7, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_box_close_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_box_close_v2.py index 9a764d0c8..15bc23ce8 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_box_close_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_box_close_v2.py @@ -11,7 +11,7 @@ class SawyerBoxCloseEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.05, 0.5, 0.02) @@ -24,9 +24,10 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_v2.py index 8175c148e..68016b987 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_v2.py @@ -11,7 +11,7 @@ class SawyerButtonPressTopdownEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.8, 0.115) @@ -22,9 +22,10 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.8, 0.115], dtype=np.float32), "hand_init_pos": np.array([0, 0.4, 0.2], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_wall_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_wall_v2.py index a10cebb80..08843c60c 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_wall_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_wall_v2.py @@ -11,7 +11,7 @@ class SawyerButtonPressTopdownWallEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.8, 0.115) @@ -22,10 +22,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.8, 0.115], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_v2.py index a62083862..8d3ec84a8 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_v2.py @@ -11,7 +11,7 @@ class SawyerButtonPressEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.85, 0.115) @@ -22,10 +22,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0.0, 0.9, 0.115], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_wall_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_wall_v2.py index 7548dffde..10d06d673 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_wall_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_wall_v2.py @@ -11,7 +11,7 @@ class SawyerButtonPressWallEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.05, 0.85, 0.1149) @@ -22,10 +22,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0.0, 0.9, 0.115], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_button_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_button_v2.py index ab3f36812..93c5dc13a 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_button_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_button_v2.py @@ -11,7 +11,7 @@ class SawyerCoffeeButtonEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): self.max_dist = 0.03 hand_low = (-0.5, 0.4, 0.05) @@ -28,10 +28,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.9, 0.28]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_pull_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_pull_v2.py index 8c3a88c91..21631d621 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_pull_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_pull_v2.py @@ -12,7 +12,7 @@ class SawyerCoffeePullEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.05, 0.7, -0.001) @@ -25,10 +25,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.75, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_push_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_push_v2.py index 271126320..1d8d9c40b 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_push_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_push_v2.py @@ -12,7 +12,7 @@ class SawyerCoffeePushEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.55, -0.001) @@ -25,10 +25,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0.0, 0.6, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_dial_turn_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_dial_turn_v2.py index 86e6071d8..90f7f7984 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_dial_turn_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_dial_turn_v2.py @@ -13,7 +13,7 @@ class SawyerDialTurnEnvV2(SawyerXYZEnv): TARGET_RADIUS = 0.07 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.7, 0.0) @@ -26,10 +26,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.7, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_disassemble_peg_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_disassemble_peg_v2.py index 5b7907e47..a7521b947 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_disassemble_peg_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_disassemble_peg_v2.py @@ -13,7 +13,7 @@ class SawyerNutDisassembleEnvV2(SawyerXYZEnv): WRENCH_HANDLE_LENGTH = 0.02 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (0.0, 0.6, 0.025) @@ -26,10 +26,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_close_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_close_v2.py index e554b1ff6..024a19a47 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_close_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_close_v2.py @@ -11,7 +11,7 @@ class SawyerDoorCloseEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (0.2, 0.65, 0.1499) goal_high = (0.3, 0.75, 0.1501) hand_low = (-0.5, 0.40, 0.05) @@ -24,10 +24,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_lock_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_lock_v2.py index f4b465280..b154ded85 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_lock_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_lock_v2.py @@ -11,7 +11,7 @@ class SawyerDoorLockEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, -0.15) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.8, 0.15) @@ -22,9 +22,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: + def __init__(self, render_mode=None, camera_name=None, camera_id=None): self.tasks = tasks self.init_config = { diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_unlock_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_unlock_v2.py index e8eca0095..3f46d25a2 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_unlock_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_unlock_v2.py @@ -10,7 +10,7 @@ class SawyerDoorUnlockEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, -0.15) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.8, 0.15) @@ -23,10 +23,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.85, 0.15]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_v2.py index a0f4aedce..3429b0a9f 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_v2.py @@ -11,7 +11,7 @@ class SawyerDoorEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (0.0, 0.85, 0.15) @@ -24,10 +24,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": np.array([0.3]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_close_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_close_v2.py index 48bcb30b7..65be711d7 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_close_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_close_v2.py @@ -13,7 +13,7 @@ class SawyerDrawerCloseEnvV2(SawyerXYZEnv): _TARGET_RADIUS = 0.04 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.9, 0.0) @@ -24,10 +24,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": np.array( diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_open_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_open_v2.py index f66b87a72..661fd5186 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_open_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_open_v2.py @@ -11,7 +11,7 @@ class SawyerDrawerOpenEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.9, 0.0) @@ -22,10 +22,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": np.array( diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_close_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_close_v2.py index 432b35131..6b7106b76 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_close_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_close_v2.py @@ -11,7 +11,7 @@ class SawyerFaucetCloseEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, -0.15) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.8, 0.0) @@ -24,10 +24,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.8, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_open_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_open_v2.py index 21ef8d449..68f8960b2 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_open_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_open_v2.py @@ -11,7 +11,7 @@ class SawyerFaucetOpenEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, -0.15) hand_high = (0.5, 1, 0.5) obj_low = (-0.05, 0.8, 0.0) @@ -24,10 +24,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.8, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hammer_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hammer_v2.py index 6ed0e2f55..8582f07fa 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hammer_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hammer_v2.py @@ -13,7 +13,7 @@ class SawyerHammerEnvV2(SawyerXYZEnv): HAMMER_HANDLE_LENGTH = 0.14 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.4, 0.0) @@ -26,10 +26,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "hammer_init_pos": np.array([0, 0.5, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hand_insert_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hand_insert_v2.py index 32ea219f2..7a09a83a5 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hand_insert_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hand_insert_v2.py @@ -12,7 +12,7 @@ class SawyerHandInsertEnvV2(SawyerXYZEnv): TARGET_RADIUS = 0.05 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, -0.15) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.6, 0.05) @@ -25,10 +25,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.6, 0.05]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_side_v2.py index 9ab35aa61..c86421732 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_side_v2.py @@ -26,7 +26,7 @@ class SawyerHandlePressSideEnvV2(SawyerXYZEnv): TARGET_RADIUS = 0.02 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1.0, 0.5) obj_low = (-0.35, 0.65, -0.001) @@ -37,10 +37,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([-0.3, 0.7, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_v2.py index ac77fb84c..d85869d63 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_v2.py @@ -13,7 +13,7 @@ class SawyerHandlePressEnvV2(SawyerXYZEnv): TARGET_RADIUS = 0.02 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1.0, 0.5) obj_low = (-0.1, 0.8, -0.001) @@ -26,10 +26,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.9, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_side_v2.py index fea80b929..f20cb1cea 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_side_v2.py @@ -11,7 +11,7 @@ class SawyerHandlePullSideEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1.0, 0.5) obj_low = (-0.35, 0.65, 0.0) @@ -22,10 +22,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([-0.3, 0.7, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_v2.py index f29df9ca2..178aeba0e 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_v2.py @@ -11,7 +11,7 @@ class SawyerHandlePullEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1.0, 0.5) obj_low = (-0.1, 0.8, -0.001) @@ -24,10 +24,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.9, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_lever_pull_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_lever_pull_v2.py index af67a7ad8..50ab32067 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_lever_pull_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_lever_pull_v2.py @@ -27,7 +27,7 @@ class SawyerLeverPullEnvV2(SawyerXYZEnv): LEVER_RADIUS = 0.2 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, -0.15) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.7, 0.0) @@ -38,10 +38,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.7, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_insertion_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_insertion_side_v2.py index 568457f6f..bf9eaccb6 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_insertion_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_insertion_side_v2.py @@ -30,7 +30,7 @@ class SawyerPegInsertionSideEnvV2(SawyerXYZEnv): the hole's position, as opposed to hand_low and hand_high """ - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_init_pos = (0, 0.6, 0.2) hand_low = (-0.5, 0.40, 0.05) @@ -45,10 +45,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_unplug_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_unplug_side_v2.py index 1b2d776ec..ea4eba885 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_unplug_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_unplug_side_v2.py @@ -11,7 +11,7 @@ class SawyerPegUnplugSideEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.25, 0.6, -0.001) @@ -24,10 +24,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([-0.225, 0.6, 0.05]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_out_of_hole_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_out_of_hole_v2.py index b3ffeb807..01161e8d3 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_out_of_hole_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_out_of_hole_v2.py @@ -12,7 +12,7 @@ class SawyerPickOutOfHoleEnvV2(SawyerXYZEnv): _TARGET_RADIUS = 0.02 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, -0.05) hand_high = (0.5, 1, 0.5) obj_low = (0, 0.75, 0.02) @@ -25,10 +25,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.6, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_v2.py index 5cbbdac9e..a9f15c19b 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_v2.py @@ -25,7 +25,7 @@ class SawyerPickPlaceEnvV2(SawyerXYZEnv): - (6/15/20) Separated reach-push-pick-place into 3 separate envs. """ - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (-0.1, 0.8, 0.05) goal_high = (0.1, 0.9, 0.3) hand_low = (-0.5, 0.40, 0.05) @@ -38,10 +38,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_wall_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_wall_v2.py index b16401988..563c04a13 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_wall_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_wall_v2.py @@ -26,7 +26,7 @@ class SawyerPickPlaceWallEnvV2(SawyerXYZEnv): reach-push-pick-place-wall. """ - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (-0.05, 0.85, 0.05) goal_high = (0.05, 0.9, 0.3) hand_low = (-0.5, 0.40, 0.05) @@ -39,10 +39,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_side_v2.py index 9ae3cef37..0c3000db5 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_side_v2.py @@ -27,7 +27,7 @@ class SawyerPlateSlideBackSideEnvV2(SawyerXYZEnv): - (6/22/20) Cabinet now sits on ground, instead of .02 units above it """ - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (-0.05, 0.6, 0.015) goal_high = (0.15, 0.6, 0.015) hand_low = (-0.5, 0.40, 0.05) @@ -40,10 +40,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_v2.py index 546169115..9a6fd2477 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_v2.py @@ -11,7 +11,7 @@ class SawyerPlateSlideBackEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (-0.1, 0.6, 0.015) goal_high = (0.1, 0.6, 0.015) hand_low = (-0.5, 0.40, 0.05) @@ -24,10 +24,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_side_v2.py index 652ced72d..7fac0b8d8 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_side_v2.py @@ -11,7 +11,7 @@ class SawyerPlateSlideSideEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (-0.3, 0.54, 0.0) goal_high = (-0.25, 0.66, 0.0) hand_low = (-0.5, 0.40, 0.05) @@ -24,10 +24,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_v2.py index 18c0751fa..bd9d8c897 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_v2.py @@ -13,7 +13,7 @@ class SawyerPlateSlideEnvV2(SawyerXYZEnv): OBJ_RADIUS = 0.04 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (-0.1, 0.85, 0.0) goal_high = (0.1, 0.9, 0.0) hand_low = (-0.5, 0.40, 0.05) @@ -26,10 +26,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_back_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_back_v2.py index 1f8373aa8..8cec1716d 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_back_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_back_v2.py @@ -14,7 +14,7 @@ class SawyerPushBackEnvV2(SawyerXYZEnv): OBJ_RADIUS = 0.007 TARGET_RADIUS = 0.05 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (-0.1, 0.6, 0.0199) goal_high = (0.1, 0.7, 0.0201) hand_low = (-0.5, 0.40, 0.05) @@ -27,10 +27,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.8, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_v2.py index 52122c050..f56b31b9d 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_v2.py @@ -27,7 +27,7 @@ class SawyerPushEnvV2(SawyerXYZEnv): TARGET_RADIUS = 0.05 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.6, 0.02) @@ -40,10 +40,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_wall_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_wall_v2.py index d4ee92936..a15887f23 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_wall_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_wall_v2.py @@ -30,7 +30,7 @@ class SawyerPushWallEnvV2(SawyerXYZEnv): OBJ_RADIUS = 0.02 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.05, 0.6, 0.015) @@ -43,10 +43,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_v2.py index 7b3f9cd6a..eb83e2e7f 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_v2.py @@ -26,7 +26,7 @@ class SawyerReachEnvV2(SawyerXYZEnv): - (6/15/20) Separated reach-push-pick-place into 3 separate envs. """ - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (-0.1, 0.8, 0.05) goal_high = (0.1, 0.9, 0.3) hand_low = (-0.5, 0.40, 0.05) @@ -39,10 +39,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_wall_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_wall_v2.py index cf9049049..345961487 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_wall_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_wall_v2.py @@ -25,7 +25,7 @@ class SawyerReachWallEnvV2(SawyerXYZEnv): i.e. (self._target_pos - pos_hand) """ - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (-0.05, 0.85, 0.05) goal_high = (0.05, 0.9, 0.3) hand_low = (-0.5, 0.40, 0.05) @@ -38,10 +38,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_shelf_place_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_shelf_place_v2.py index 9ac7f33de..bb4eccbad 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_shelf_place_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_shelf_place_v2.py @@ -12,7 +12,7 @@ class SawyerShelfPlaceEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (-0.1, 0.8, 0.299) goal_high = (0.1, 0.9, 0.301) hand_low = (-0.5, 0.40, 0.05) @@ -25,10 +25,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_soccer_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_soccer_v2.py index d09c05014..e710653a2 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_soccer_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_soccer_v2.py @@ -15,7 +15,7 @@ class SawyerSoccerEnvV2(SawyerXYZEnv): OBJ_RADIUS = 0.013 TARGET_RADIUS = 0.07 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): goal_low = (-0.1, 0.8, 0.0) goal_high = (0.1, 0.9, 0.0) hand_low = (-0.5, 0.40, 0.05) @@ -28,10 +28,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0, 0.6, 0.03]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_pull_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_pull_v2.py index 8acd36c2d..16f04f7e3 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_pull_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_pull_v2.py @@ -11,7 +11,7 @@ class SawyerStickPullEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.35, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.55, 0.000) @@ -24,10 +24,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "stick_init_pos": np.array([0, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_push_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_push_v2.py index e83c69509..72df30695 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_push_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_push_v2.py @@ -11,7 +11,7 @@ class SawyerStickPushEnvV2(SawyerXYZEnv): - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.08, 0.58, 0.000) @@ -24,10 +24,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "stick_init_pos": np.array([-0.1, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_into_goal_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_into_goal_v2.py index a2075a21a..1b6c05ae3 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_into_goal_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_into_goal_v2.py @@ -13,7 +13,7 @@ class SawyerSweepIntoGoalEnvV2(SawyerXYZEnv): OBJ_RADIUS = 0.02 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.6, 0.02) @@ -26,10 +26,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0.0, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_v2.py index 64e8a0f1e..a67e3dec3 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_v2.py @@ -12,7 +12,7 @@ class SawyerSweepEnvV2(SawyerXYZEnv): OBJ_RADIUS = 0.02 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): init_puck_z = 0.1 hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1.0, 0.5) @@ -26,10 +26,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_pos": np.array([0.0, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_close_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_close_v2.py index c64a046a2..5139c3717 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_close_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_close_v2.py @@ -25,7 +25,7 @@ class SawyerWindowCloseEnvV2(SawyerXYZEnv): TARGET_RADIUS = 0.05 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): liftThresh = 0.02 hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) @@ -37,10 +37,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_open_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_open_v2.py index 7ad337a64..48074bc7a 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_open_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_open_v2.py @@ -24,7 +24,7 @@ class SawyerWindowOpenEnvV2(SawyerXYZEnv): TARGET_RADIUS = 0.05 - def __init__(self, tasks=None, render_mode=None): + def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_low = (-0.5, 0.40, 0.05) hand_high = (0.5, 1, 0.5) obj_low = (-0.1, 0.7, 0.16) @@ -35,10 +35,11 @@ def __init__(self, tasks=None, render_mode=None): hand_low=hand_low, hand_high=hand_high, render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id ) - if tasks is not None: - self.tasks = tasks + self.init_config = { "obj_init_angle": np.array( From 449a9d46d21719f9f1786fe8958af8515cc62a7c Mon Sep 17 00:00:00 2001 From: Reggie McLean Date: Fri, 12 Jan 2024 22:54:42 -0500 Subject: [PATCH 10/12] pre-commit and fixing door env --- .../envs/mujoco/sawyer_xyz/sawyer_xyz_env.py | 23 +++++++++++++++---- .../sawyer_xyz/v2/sawyer_assembly_peg_v2.py | 3 +-- .../sawyer_xyz/v2/sawyer_basketball_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_bin_picking_v2.py | 4 ++-- .../sawyer_xyz/v2/sawyer_box_close_v2.py | 3 +-- .../v2/sawyer_button_press_topdown_v2.py | 4 ++-- .../v2/sawyer_button_press_topdown_wall_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_button_press_v2.py | 4 +--- .../v2/sawyer_button_press_wall_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_coffee_button_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_coffee_pull_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_coffee_push_v2.py | 3 +-- .../sawyer_xyz/v2/sawyer_dial_turn_v2.py | 4 +--- .../v2/sawyer_disassemble_peg_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_door_close_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_door_lock_v2.py | 5 +--- .../sawyer_xyz/v2/sawyer_door_unlock_v2.py | 4 +--- .../mujoco/sawyer_xyz/v2/sawyer_door_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_drawer_close_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_drawer_open_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_faucet_close_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_faucet_open_v2.py | 4 +--- .../mujoco/sawyer_xyz/v2/sawyer_hammer_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_hand_insert_v2.py | 4 +--- .../v2/sawyer_handle_press_side_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_handle_press_v2.py | 4 +--- .../v2/sawyer_handle_pull_side_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_handle_pull_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_lever_pull_v2.py | 4 +--- .../v2/sawyer_peg_insertion_side_v2.py | 4 +--- .../v2/sawyer_peg_unplug_side_v2.py | 4 +--- .../v2/sawyer_pick_out_of_hole_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_pick_place_v2.py | 4 +--- .../v2/sawyer_pick_place_wall_v2.py | 4 +--- .../v2/sawyer_plate_slide_back_side_v2.py | 4 +--- .../v2/sawyer_plate_slide_back_v2.py | 4 +--- .../v2/sawyer_plate_slide_side_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_plate_slide_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_push_back_v2.py | 4 +--- .../mujoco/sawyer_xyz/v2/sawyer_push_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_push_wall_v2.py | 4 +--- .../mujoco/sawyer_xyz/v2/sawyer_reach_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_reach_wall_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_shelf_place_v2.py | 4 +--- .../mujoco/sawyer_xyz/v2/sawyer_soccer_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_stick_pull_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_stick_push_v2.py | 4 +--- .../v2/sawyer_sweep_into_goal_v2.py | 4 +--- .../mujoco/sawyer_xyz/v2/sawyer_sweep_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_window_close_v2.py | 4 +--- .../sawyer_xyz/v2/sawyer_window_open_v2.py | 4 +--- 51 files changed, 70 insertions(+), 151 deletions(-) diff --git a/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py b/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py index 4ec5f4b91..a62e67f3c 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py +++ b/metaworld/envs/mujoco/sawyer_xyz/sawyer_xyz_env.py @@ -26,7 +26,14 @@ class SawyerMocapBase(mjenv_gym): "render_fps": 80, } - def __init__(self, model_name, frame_skip=5, render_mode=None, camera_name=None, camera_id=None): + def __init__( + self, + model_name, + frame_skip=5, + render_mode=None, + camera_name=None, + camera_id=None, + ): mjenv_gym.__init__( self, model_name, @@ -34,7 +41,7 @@ def __init__(self, model_name, frame_skip=5, render_mode=None, camera_name=None, observation_space=self.sawyer_observation_space, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) self.reset_mocap_welds() self.frame_skip = frame_skip @@ -116,7 +123,7 @@ def __init__( action_rot_scale=1.0, render_mode=None, camera_id=None, - camera_name=None + camera_name=None, ): self.action_scale = action_scale self.action_rot_scale = action_rot_scale @@ -144,7 +151,13 @@ def __init__( self._partially_observable = True - super().__init__(model_name, frame_skip=frame_skip, render_mode=render_mode, camera_name=camera_name, camera_id=camera_id) + super().__init__( + model_name, + frame_skip=frame_skip, + render_mode=render_mode, + camera_name=camera_name, + camera_id=camera_id, + ) mujoco.mj_forward( self.model, self.data @@ -466,7 +479,7 @@ def step(self, action): raise ValueError("You must reset the env manually once truncate==True") self.do_simulation([action[-1], -action[-1]], n_frames=self.frame_skip) self.curr_path_length += 1 - + # Running the simulator can sometimes mess up site positions, so # re-position them here to make sure they're accurate for site in self._target_site_config: diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_assembly_peg_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_assembly_peg_v2.py index d4be48741..18e6471f5 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_assembly_peg_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_assembly_peg_v2.py @@ -27,9 +27,8 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_basketball_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_basketball_v2.py index e2dc4dac8..a080ff770 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_basketball_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_basketball_v2.py @@ -28,11 +28,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0, 0.6, 0.03], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py index 136063fbb..9d3bd4fcd 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_bin_picking_v2.py @@ -38,9 +38,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - + self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([-0.12, 0.7, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_box_close_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_box_close_v2.py index 15bc23ce8..73c6477c5 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_box_close_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_box_close_v2.py @@ -25,9 +25,8 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - self.init_config = { "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_v2.py index 68016b987..26971329f 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_v2.py @@ -23,9 +23,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - + self.init_config = { "obj_init_pos": np.array([0, 0.8, 0.115], dtype=np.float32), "hand_init_pos": np.array([0, 0.4, 0.2], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_wall_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_wall_v2.py index 08843c60c..b2d6a18b5 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_wall_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_topdown_wall_v2.py @@ -23,11 +23,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.8, 0.115], dtype=np.float32), "hand_init_pos": np.array([0, 0.4, 0.2], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_v2.py index 8d3ec84a8..456aca468 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_v2.py @@ -23,11 +23,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0.0, 0.9, 0.115], dtype=np.float32), "hand_init_pos": np.array([0, 0.4, 0.2], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_wall_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_wall_v2.py index 10d06d673..a421af5bd 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_wall_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_button_press_wall_v2.py @@ -23,11 +23,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0.0, 0.9, 0.115], dtype=np.float32), "hand_init_pos": np.array([0, 0.4, 0.2], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_button_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_button_v2.py index 93c5dc13a..6e4892422 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_button_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_button_v2.py @@ -29,11 +29,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.9, 0.28]), "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_pull_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_pull_v2.py index 21631d621..71ff93148 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_pull_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_pull_v2.py @@ -26,11 +26,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.75, 0.0]), "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_push_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_push_v2.py index 1d8d9c40b..c312532de 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_push_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_coffee_push_v2.py @@ -26,10 +26,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0.0, 0.6, 0.0]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_dial_turn_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_dial_turn_v2.py index 90f7f7984..37f6fbf7a 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_dial_turn_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_dial_turn_v2.py @@ -27,11 +27,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.7, 0.0]), "hand_init_pos": np.array([0, 0.6, 0.2], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_disassemble_peg_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_disassemble_peg_v2.py index a7521b947..67a034710 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_disassemble_peg_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_disassemble_peg_v2.py @@ -27,11 +27,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0, 0.7, 0.025]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_close_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_close_v2.py index 024a19a47..ca2eee8a7 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_close_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_close_v2.py @@ -25,11 +25,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0.1, 0.95, 0.15], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_lock_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_lock_v2.py index b154ded85..9e2fb5c4a 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_lock_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_lock_v2.py @@ -23,12 +23,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - def __init__(self, render_mode=None, camera_name=None, camera_id=None): - self.tasks = tasks - self.init_config = { "obj_init_pos": np.array([0, 0.85, 0.15], dtype=np.float32), "hand_init_pos": np.array([0, 0.6, 0.2], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_unlock_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_unlock_v2.py index 3f46d25a2..fb6e984ef 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_unlock_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_unlock_v2.py @@ -24,11 +24,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.85, 0.15]), "hand_init_pos": np.array([0, 0.6, 0.2], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_v2.py index 3429b0a9f..f17766ce3 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_door_v2.py @@ -25,11 +25,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": np.array([0.3]), "obj_init_pos": np.array([0.1, 0.95, 0.15]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_close_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_close_v2.py index 65be711d7..f70365a96 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_close_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_close_v2.py @@ -25,11 +25,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": np.array( [ diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_open_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_open_v2.py index 661fd5186..8482ff86e 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_open_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_drawer_open_v2.py @@ -23,11 +23,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": np.array( [ diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_close_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_close_v2.py index 6b7106b76..c62c72e95 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_close_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_close_v2.py @@ -25,11 +25,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.8, 0.0]), "hand_init_pos": np.array([0.0, 0.4, 0.2]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_open_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_open_v2.py index 68f8960b2..85bc75956 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_open_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_faucet_open_v2.py @@ -25,11 +25,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.8, 0.0]), "hand_init_pos": np.array([0.0, 0.4, 0.2]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hammer_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hammer_v2.py index 8582f07fa..129e5ec41 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hammer_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hammer_v2.py @@ -27,11 +27,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "hammer_init_pos": np.array([0, 0.5, 0.0]), "hand_init_pos": np.array([0, 0.4, 0.2]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hand_insert_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hand_insert_v2.py index 7a09a83a5..ec712a81c 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hand_insert_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_hand_insert_v2.py @@ -26,11 +26,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.6, 0.05]), "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_side_v2.py index c86421732..32fe9ad7c 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_side_v2.py @@ -38,11 +38,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([-0.3, 0.7, 0.0]), "hand_init_pos": np.array( diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_v2.py index d85869d63..6f3f2659f 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_press_v2.py @@ -27,11 +27,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.9, 0.0]), "hand_init_pos": np.array( diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_side_v2.py index f20cb1cea..6ca32cfd5 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_side_v2.py @@ -23,11 +23,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([-0.3, 0.7, 0.0]), "hand_init_pos": np.array( diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_v2.py index 178aeba0e..790fa1371 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_handle_pull_v2.py @@ -25,11 +25,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.9, 0.0]), "hand_init_pos": np.array( diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_lever_pull_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_lever_pull_v2.py index 50ab32067..074ef8ceb 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_lever_pull_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_lever_pull_v2.py @@ -39,11 +39,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.7, 0.0]), "hand_init_pos": np.array([0, 0.4, 0.2], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_insertion_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_insertion_side_v2.py index bf9eaccb6..c68a9cad9 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_insertion_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_insertion_side_v2.py @@ -46,11 +46,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.6, 0.02]), "hand_init_pos": np.array([0, 0.6, 0.2]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_unplug_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_unplug_side_v2.py index ea4eba885..9dbec1653 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_unplug_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_peg_unplug_side_v2.py @@ -25,11 +25,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([-0.225, 0.6, 0.05]), "hand_init_pos": np.array((0, 0.6, 0.2)), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_out_of_hole_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_out_of_hole_v2.py index 01161e8d3..ff4c1c3b7 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_out_of_hole_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_out_of_hole_v2.py @@ -26,11 +26,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.6, 0.0]), "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_v2.py index a9f15c19b..2be2710b5 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_v2.py @@ -39,11 +39,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_wall_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_wall_v2.py index 563c04a13..725db8a97 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_wall_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_pick_place_wall_v2.py @@ -40,11 +40,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_side_v2.py index 0c3000db5..cb6392429 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_side_v2.py @@ -41,11 +41,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([-0.25, 0.6, 0.02], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_v2.py index 9a6fd2477..b09cfe186 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_back_v2.py @@ -25,11 +25,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0.0, 0.85, 0.0], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_side_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_side_v2.py index 7fac0b8d8..59ee2686c 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_side_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_side_v2.py @@ -25,11 +25,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0.0, 0.6, 0.0], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_v2.py index bd9d8c897..0cdc46a4f 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_plate_slide_v2.py @@ -27,11 +27,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0.0, 0.6, 0.0], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_back_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_back_v2.py index 8cec1716d..141b60cd8 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_back_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_back_v2.py @@ -28,11 +28,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.8, 0.02]), "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_v2.py index f56b31b9d..d782670fb 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_v2.py @@ -41,11 +41,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0.0, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_wall_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_wall_v2.py index a15887f23..3ad9e97ce 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_wall_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_push_wall_v2.py @@ -44,11 +44,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_v2.py index eb83e2e7f..8ed1716ab 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_v2.py @@ -40,11 +40,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0.0, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_wall_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_wall_v2.py index 345961487..76a954485 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_wall_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_reach_wall_v2.py @@ -39,11 +39,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0, 0.6, 0.02]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_shelf_place_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_shelf_place_v2.py index bb4eccbad..cd873e3b3 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_shelf_place_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_shelf_place_v2.py @@ -26,11 +26,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.6, 0.02]), "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_soccer_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_soccer_v2.py index e710653a2..362b2c0eb 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_soccer_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_soccer_v2.py @@ -29,11 +29,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0, 0.6, 0.03]), "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_pull_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_pull_v2.py index 16f04f7e3..8d6c3fcfa 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_pull_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_pull_v2.py @@ -25,11 +25,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "stick_init_pos": np.array([0, 0.6, 0.02]), "hand_init_pos": np.array([0, 0.6, 0.2]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_push_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_push_v2.py index 72df30695..fd4ab0283 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_push_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_stick_push_v2.py @@ -25,11 +25,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "stick_init_pos": np.array([-0.1, 0.6, 0.02]), "hand_init_pos": np.array([0, 0.6, 0.2]), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_into_goal_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_into_goal_v2.py index 1b6c05ae3..cb62770b0 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_into_goal_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_into_goal_v2.py @@ -27,11 +27,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0.0, 0.6, 0.02]), "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_v2.py index a67e3dec3..54a3f2cf8 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_sweep_v2.py @@ -27,11 +27,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_pos": np.array([0.0, 0.6, 0.02]), "obj_init_angle": 0.3, diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_close_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_close_v2.py index 5139c3717..09c06f119 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_close_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_close_v2.py @@ -38,11 +38,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": 0.3, "obj_init_pos": np.array([0.1, 0.785, 0.16], dtype=np.float32), diff --git a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_open_v2.py b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_open_v2.py index 48074bc7a..7e7c1dd64 100644 --- a/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_open_v2.py +++ b/metaworld/envs/mujoco/sawyer_xyz/v2/sawyer_window_open_v2.py @@ -36,11 +36,9 @@ def __init__(self, render_mode=None, camera_name=None, camera_id=None): hand_high=hand_high, render_mode=render_mode, camera_name=camera_name, - camera_id=camera_id + camera_id=camera_id, ) - - self.init_config = { "obj_init_angle": np.array( [ From 9e7a8b57245ee456efedc614c9fe50f8ce5eddfa Mon Sep 17 00:00:00 2001 From: Reggie McLean Date: Fri, 12 Jan 2024 23:01:02 -0500 Subject: [PATCH 11/12] fixing pre-commit --- docs/_static/img/metaworld-text.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_static/img/metaworld-text.svg b/docs/_static/img/metaworld-text.svg index 9afe04e2b..d6c12d6ec 100644 --- a/docs/_static/img/metaworld-text.svg +++ b/docs/_static/img/metaworld-text.svg @@ -71,7 +71,7 @@ inkscape:groupmode="layer"> - + Date: Wed, 3 Apr 2024 12:18:51 -0400 Subject: [PATCH 12/12] update to use gymnasium1.0.0a1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d8582c321..e8e79653e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ 'Topic :: Scientific/Engineering :: Artificial Intelligence', ] dependencies = [ - "gymnasium>=0.29.0", + "gymnasium@git+https://github.com/Farama-Foundation/Gymnasium.git", "mujoco<3.0.0", "numpy>=1.18", "scipy>=1.4.1",