Merge branch 'master' into newstep

.github/workflows/pre-commit.yml

@@ -1,10 +1,7 @@
 # https://pre-commit.com
 # This GitHub Action assumes that the repo contains a valid .pre-commit-config.yaml file.
 name: pre-commit
-on:
-  pull_request:
-  push:
-    branches: [master]
+on: [pull_request, push]
 jobs:
   pre-commit:
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -40,14 +40,14 @@ repos:
     hooks:
       - id: pyupgrade
         args: ["--py37-plus"]
-#  - repo: local
-#    hooks:
-#      - id: pyright
-#        name: pyright
-#        entry: pyright
-#        language: node
-#        pass_filenames: false
-#        types: [python]
-#        additional_dependencies: ["pyright"]
-#        args:
-#          - --project=pyproject.toml
+  - repo: local
+    hooks:
+      - id: pyright
+        name: pyright
+        entry: pyright
+        language: node
+        pass_filenames: false
+        types: [python]
+        additional_dependencies: ["pyright"]
+        args:
+          - --project=pyproject.toml

gym_minigrid/envs/crossing.py

@@ -1,5 +1,7 @@
 import itertools as itt
 
+import numpy as np
+
 from gym_minigrid.minigrid import Goal, Grid, Lava, MiniGridEnv, Wall
 from gym_minigrid.register import register
 
@@ -30,7 +32,7 @@ class CrossingEnv(MiniGridEnv):
         self.grid.wall_rect(0, 0, width, height)
 
         # Place the agent in the top-left corner
-        self.agent_pos = (1, 1)
+        self.agent_pos = np.array((1, 1))
         self.agent_dir = 0
 
         # Place a goal square in the bottom-right corner

gym_minigrid/envs/fetch.py

@@ -41,6 +41,12 @@ class FetchEnv(MiniGridEnv):
                 obj = Key(objColor)
             elif objType == "ball":
                 obj = Ball(objColor)
+            else:
+                raise ValueError(
+                    "{} object type given. Object type can only be of values key and ball.".format(
+                        objType
+                    )
+                )
 
             self.place_obj(obj)
             objs.append(obj)

gym_minigrid/envs/fourrooms.py

@@ -66,6 +66,13 @@ class FourRoomsEnv(MiniGridEnv):
             self.place_obj(Goal())
 
         self.mission = "reach the goal"
+<<<<<<< HEAD
+=======
+
+    def step(self, action):
+        obs, reward, done, info = MiniGridEnv.step(self, action)
+        return obs, reward, done, info
+>>>>>>> master-upstream
 
 
 register(

gym_minigrid/envs/gotoobject.py

@@ -46,6 +46,12 @@ class GoToObjectEnv(MiniGridEnv):
                 obj = Ball(objColor)
             elif objType == "box":
                 obj = Box(objColor)
+            else:
+                raise ValueError(
+                    "{} object type given. Object type can only be of values key, ball and box.".format(
+                        objType
+                    )
+                )
 
             pos = self.place_obj(obj)
             objs.append((objType, objColor))

gym_minigrid/envs/lavagap.py

@@ -30,7 +30,7 @@ class LavaGapEnv(MiniGridEnv):
         self.grid.wall_rect(0, 0, width, height)
 
         # Place the agent in the top-left corner
-        self.agent_pos = (1, 1)
+        self.agent_pos = np.array((1, 1))
         self.agent_dir = 0
 
         # Place a goal square in the bottom-right corner

gym_minigrid/envs/memory.py

@@ -1,3 +1,5 @@
+import numpy as np
+
 from gym_minigrid.minigrid import Ball, Grid, Key, MiniGridEnv, Wall
 from gym_minigrid.register import register
 
@@ -58,7 +60,7 @@ class MemoryEnv(MiniGridEnv):
             self.grid.set(hallway_end + 2, j, Wall())
 
         # Fix the player's start position and orientation
-        self.agent_pos = (self._rand_int(1, hallway_end + 1), height // 2)
+        self.agent_pos = np.array((self._rand_int(1, hallway_end + 1), height // 2))
         self.agent_dir = 0
 
         # Place objects

gym_minigrid/envs/obstructedmaze.py

@@ -67,13 +67,14 @@ class ObstructedMazeEnv(RoomGrid):
         if blocked:
             vec = DIR_TO_VEC[door_idx]
             blocking_ball = Ball(self.blocking_ball_color) if blocked else None
-            self.grid.set(door_pos[0] - vec[0], door_pos[1] - vec[1], blocking_ball)
+            self.grid.set(door_pos[0] - vec[0],
+                          door_pos[1] - vec[1], blocking_ball)
 
         if locked:
             obj = Key(door.color)
             if key_in_box:
                 box = Box(self.box_color)
-                box.set_contains(obj)
+                box.contains = obj
                 obj = box
             self.place_in_room(i, j, obj)
 
@@ -105,7 +106,8 @@ class ObstructedMaze_1Dlhb(ObstructedMazeEnv):
             blocked=self.blocked,
         )
 
-        self.obj, _ = self.add_object(1, 0, "ball", color=self.ball_to_find_color)
+        self.obj, _ = self.add_object(
+            1, 0, "ball", color=self.ball_to_find_color)
         self.place_agent(0, 0)
 
 

gym_minigrid/envs/playground.py

@@ -62,6 +62,12 @@ class PlaygroundEnv(MiniGridEnv):
                 obj = Ball(objColor)
             elif objType == "box":
                 obj = Box(objColor)
+            else:
+                raise ValueError(
+                    "{} object type given. Object type can only be of values key, ball and box.".format(
+                        objType
+                    )
+                )
             self.place_obj(obj)
 
         # No explicit mission in this environment

gym_minigrid/envs/putnear.py

@@ -57,6 +57,12 @@ class PutNearEnv(MiniGridEnv):
                 obj = Ball(objColor)
             elif objType == "box":
                 obj = Box(objColor)
+            else:
+                raise ValueError(
+                    "{} object type given. Object type can only be of values key, ball and box.".format(
+                        objType
+                    )
+                )
 
             pos = self.place_obj(obj, reject_fn=near_obj)
 

gym_minigrid/minigrid.py

@@ -19,6 +19,7 @@ from gym_minigrid.rendering import (
     point_in_triangle,
     rotate_fn,
 )
+from gym_minigrid.window import Window
 
 TILE_PIXELS = 32
 
@@ -253,8 +254,19 @@ class Door(WorldObj):
             state = 0
         elif self.is_locked:
             state = 2
+<<<<<<< HEAD
         else:
+=======
+        # if door is closed and unlocked
+        elif not self.is_open:
+>>>>>>> master-upstream
             state = 1
+        else:
+            raise ValueError(
+                "There is no possible state encoding for the state:\n -Door Open: {}\n -Door Closed: {}\n -Door Locked: {}".format(
+                    self.is_open, not self.is_open, self.is_locked
+                )
+            )
 
         return (OBJECT_TO_IDX[self.type], COLOR_TO_IDX[self.color], state)
 
@@ -656,13 +668,13 @@ class MiniGridEnv(gym.Env):
 
     def __init__(
         self,
-        grid_size=None,
-        width=None,
-        height=None,
-        max_steps=100,
-        see_through_walls=False,
-        agent_view_size=7,
-        render_mode=None,
+        grid_size: int = None,
+        width: int = None,
+        height: int = None,
+        max_steps: int = 100,
+        see_through_walls: bool = False,
+        agent_view_size: int = 7,
+        render_mode: str = None,
         **kwargs
     ):
         # Can't set both grid_size and width/height
@@ -707,8 +719,7 @@ class MiniGridEnv(gym.Env):
         # Range of possible rewards
         self.reward_range = (0, 1)
 
-        # Window to use for human rendering mode
-        self.window = None
+        self.window: Window = None
 
         # Environment configuration
         self.width = width
@@ -717,6 +728,7 @@ class MiniGridEnv(gym.Env):
         self.see_through_walls = see_through_walls
 
         # Current position and direction of the agent
+<<<<<<< HEAD
         self.agent_pos = (-1, -1)
         self.agent_dir = -1
 
@@ -724,6 +736,10 @@ class MiniGridEnv(gym.Env):
         self.grid = Grid(width, height)
         self.mission = ""
         self.carrying = None
+=======
+        self.agent_pos: np.ndarray = None
+        self.agent_dir: int = None
+>>>>>>> master-upstream
 
         # Initialize the state
         self.reset()
@@ -1136,8 +1152,12 @@ class MiniGridEnv(gym.Env):
                 terminated = True
                 reward = self._reward()
             if fwd_cell is not None and fwd_cell.type == "lava":
+<<<<<<< HEAD
                 terminated = True
 
+=======
+                done = True
+>>>>>>> master-upstream
         # Pick up an object
         elif action == self.actions.pickup:
             if fwd_cell and fwd_cell.can_pickup():
@@ -1256,9 +1276,7 @@ class MiniGridEnv(gym.Env):
             return
 
         if mode == "human" and not self.window:
-            import gym_minigrid.window
-
-            self.window = gym_minigrid.window.Window("gym_minigrid")
+            self.window = Window("gym_minigrid")
             self.window.show(block=False)
 
         # Compute which cells are visible to the agent

gym_minigrid/roomgrid.py

@@ -1,3 +1,5 @@
+import numpy as np
+
 from gym_minigrid.minigrid import COLOR_NAMES, Ball, Box, Door, Grid, Key, MiniGridEnv
 
 
@@ -69,7 +71,7 @@ class RoomGrid(MiniGridEnv):
         num_cols=3,
         max_steps=100,
         agent_view_size=7,
-        **kwargs
+        **kwargs,
     ):
         assert room_size > 0
         assert room_size >= 3
@@ -91,7 +93,7 @@ class RoomGrid(MiniGridEnv):
             max_steps=max_steps,
             see_through_walls=False,
             agent_view_size=agent_view_size,
-            **kwargs
+            **kwargs,
         )
 
     def room_from_pos(self, x, y):
@@ -163,9 +165,11 @@ class RoomGrid(MiniGridEnv):
                     room.door_pos[3] = room.neighbors[3].door_pos[1]
 
         # The agent starts in the middle, facing right
-        self.agent_pos = (
-            (self.num_cols // 2) * (self.room_size - 1) + (self.room_size // 2),
-            (self.num_rows // 2) * (self.room_size - 1) + (self.room_size // 2),
+        self.agent_pos = np.array(
+            (
+                (self.num_cols // 2) * (self.room_size - 1) + (self.room_size // 2),
+                (self.num_rows // 2) * (self.room_size - 1) + (self.room_size // 2),
+            )
         )
         self.agent_dir = 0
 
@@ -203,6 +207,8 @@ class RoomGrid(MiniGridEnv):
             obj = Ball(color)
         else:  # kind == "box"
             obj = Box(color)
+        else:
+            raise f"{kind} object kind is not available in this environment."
 
         return self.place_in_room(i, j, obj)
 

gym_minigrid/window.py

@@ -13,9 +13,7 @@ class Window:
     """
 
     def __init__(self, title):
-        self.fig = None
-
-        self.imshow_obj = None
+        self.no_image_shown = True
 
         # Create the figure and axes
         self.fig, self.ax = plt.subplots()
@@ -44,9 +42,9 @@ class Window:
 
         # If no image has been shown yet,
         # show the first image of the environment
-        if self.imshow_obj is None:
+        if self.no_image_shown:
             self.imshow_obj = self.ax.imshow(img, interpolation="bilinear")
-
+            self.no_image_shown = False
         # Update the image data
         self.imshow_obj.set_data(img)
 

gym_minigrid/wrappers.py

@@ -383,8 +383,7 @@ class FlatObsWrapper(gym.ObservationWrapper):
             dtype="uint8",
         )
 
-        self.cachedStr = None
-        self.cachedArray = None
+        self.cachedStr: str = None
 
     def observation(self, obs):
         image = obs["image"]
@@ -406,6 +405,10 @@ class FlatObsWrapper(gym.ObservationWrapper):
                     chNo = ord(ch) - ord("a")
                 elif ch == " ":
                     chNo = ord("z") - ord("a") + 1
+                else:
+                    raise ValueError(
+                        f"Character {ch} is not available in mission string."
+                    )
                 assert chNo < self.numCharCodes, "%s : %d" % (ch, chNo)
                 strArray[idx, chNo] = 1
 
@@ -460,7 +463,7 @@ class DirectionObsWrapper(gym.ObservationWrapper):
 
     def __init__(self, env, type="slope"):
         super().__init__(env)
-        self.goal_position = None
+        self.goal_position: tuple = None
         self.type = type
 
     def reset(self):

pyproject.toml

@@ -0,0 +1,35 @@
+[tool.pyright]
+
+include = [
+    "gym_minigrid/**",
+]
+
+exclude = [
+    "**/node_modules",
+    "**/__pycache__",
+
+   #"gym_minigrid/**",
+]
+
+strict = [
+
+]
+
+typeCheckingMode = "basic"
+pythonVersion = "3.7"
+typeshedPath = "typeshed"
+enableTypeIgnoreComments = true
+
+# This is required as the CI pre-commit does not download the module (i.e. numpy)
+#   Therefore, we have to ignore missing imports
+reportMissingImports = "none"
+
+reportUnknownMemberType = "none"
+reportUnknownParameterType = "none"
+reportUnknownVariableType = "none"
+reportUnknownArgumentType = "none"
+reportPrivateUsage = "warning"
+reportUntypedFunctionDecorator = "none"
+reportMissingTypeStubs = false
+reportUnboundVariable = "warning"
+reportGeneralTypeIssues ="none"