Update links to Inform7-6M62 build. (#303)

* Update links to Inform7-6M62 build.

* Bump version to 1.5.3

* Update requirements.txt

* networkx.OrderedGraph is deprecated, using networkx.Graph instead.

* TextWorld now requires Python 3.7+

* Use gym.spaces.Space instead of None as the default action_space and observation_space.

* Fix Selenium version

Author: MarcCote

README.md

@@ -6,7 +6,7 @@ A text-based game generator and extensible sandbox learning environment for trai
 
 ## Installation
 
-TextWorld requires __Python 3__ and only supports __Linux__ and __macOS__ systems at the moment. For __Windows__ users, docker can be used as a workaround (see Docker section below).
+TextWorld requires __Python 3.7+__ and only supports __Linux__ and __macOS__ systems at the moment. For __Windows__ users, docker can be used as a workaround (see Docker section below).
 
 ### Requirements
 

requirements-full.txt

@@ -4,7 +4,7 @@ tqdm>=4.17.1
 cffi>=1.0.0
 networkx>=2
 more_itertools
-tatsu>=4.3.0
+tatsu>=4.3.0,<5
 hashids>=1.2.0
 jericho>=2.2.0
 mementos>=1.3.1
@@ -18,7 +18,7 @@ gym>=0.10.11
 # For visualization
 pybars3>=0.9.3
 flask>=1.0.2
-selenium>=3.12.0
+selenium>=3.12.0,<4.3
 greenlet>=0.4.13
 gevent>=1.3.5
 pillow>=5.1.0

requirements-vis.txt

@@ -1,7 +1,7 @@
 # For visualization
 pybars3>=0.9.3
 flask>=1.0.2
-selenium>=3.12.0
+selenium>=3.12.0,<4.3
 greenlet>=0.4.13
 gevent>=1.3.5
 pillow>=5.1.0

requirements.txt

@@ -4,7 +4,7 @@ tqdm>=4.17.1
 cffi>=1.0.0
 networkx>=2
 more_itertools
-tatsu>=4.3.0
+tatsu>=4.3.0,<5
 hashids>=1.2.0
 jericho>=3.0.3
 mementos>=1.3.1

setup.sh

@@ -20,10 +20,10 @@ cd textworld/thirdparty/
 # Install command line Inform 7
 if [ ! -e I7_6M62_Linux_all.tar.gz ]; then
     echo "Downloading Inform7 CLI"
-    curl -LO http://inform7.com/apps/6M62/I7_6M62_Linux_all.tar.gz
+    curl -LO http://emshort.com/inform-app-archive/6M62/I7_6M62_Linux_all.tar.gz
     if [ "${machine}" == 'Mac' ] && [ ! -e I7-6M62-OSX-Interim.dmg ]; then
         echo "Downloading Inform7 for Mac"
-        curl -LO http://inform7.com/apps/6M62/I7-6M62-OSX-Interim.dmg
+        curl -LO http://emshort.com/inform-app-archive/6M62/I7-6M62-OSX-Interim.dmg
     fi
 fi
 if [ ! -d inform7-6M62 ]; then

textworld/challenges/tw_cooking/cooking.py

@@ -729,7 +729,7 @@ def __init__(self, neighbors, size=(5, 5), max_attempts=200, rng=None):
         self.max_attempts = max_attempts
         self.neighbors = neighbors
         self.rng = rng or np.random.RandomState(1234)
-        self.grid = nx.grid_2d_graph(size[0], size[1], create_using=nx.OrderedGraph())
+        self.grid = nx.grid_2d_graph(size[0], size[1], create_using=nx.Graph())
         self.nb_attempts = 0
 
     def _walk(self, G, node, remaining):
@@ -773,7 +773,7 @@ def place_rooms(self, rooms):
         self.rng.shuffle(nodes)
 
         for start in nodes:
-            G = nx.OrderedGraph()
+            G = nx.Graph()
             room = rooms[0][0]
             G.add_node(start, id="r_{}".format(len(G)), name=room, start=True)
 

textworld/generator/graph_networks.py

@@ -37,8 +37,8 @@ def gen_layout(rng, n_nodes=5, h=10, w=10):
     Generate a map with n_nodes rooms by
     picking a subgraph from a h,w grid.
     '''
-    G = nx.grid_2d_graph(h, w, create_using=nx.OrderedGraph())
-    new_G = nx.OrderedGraph()
+    G = nx.grid_2d_graph(h, w, create_using=nx.Graph())
+    new_G = nx.Graph()
     pos = (rng.randint(0, h - 1),
            rng.randint(0, w - 1))
     visited = set()
@@ -155,7 +155,7 @@ def create_map(rng, n_nodes, h, w, possible_door_states=["open", "closed", "lock
 def create_small_map(rng, n_rooms, possible_door_states=["open", "closed", "locked"]):
     G = nx.grid_2d_graph(3, 3)
 
-    G = nx.OrderedGraph()
+    G = nx.Graph()
     room0 = (0, 0)
     G.add_node(room0, name="r_0")
 

textworld/gym/envs/textworld_batch.py

@@ -10,6 +10,7 @@
 import numpy as np
 import gym
 from gym.utils import colorize
+from gym.spaces import Space
 
 from textworld import EnvInfos
 from textworld.envs.wrappers import Filter, GenericEnvironment, Limit
@@ -86,8 +87,8 @@ def __init__(self,
         BatchEnvType = AsyncBatchEnv if self.batch_size > 1 and asynchronous else SyncBatchEnv
         self.batch_env = BatchEnvType(env_fns, auto_reset)
 
-        self.action_space = action_space
-        self.observation_space = observation_space
+        self.action_space = action_space or Space()
+        self.observation_space = observation_space or Space()
 
     def seed(self, seed: Optional[int] = None) -> List[int]:
         """ Set the seed for this environment's random generator(s).

textworld/textgen/parser.py

@@ -86,7 +86,7 @@ def _symbol_(self):  # noqa
 
     @tatsumasu()
     def _literal_(self):  # noqa
-        self._pattern('(([^;|<>\\n\\[\\]()]|\\[[^\\[\\]]*\\]|\\([^()]*\\))+(?<!\\s))?')
+        self._pattern('(([^;|<>\\n\\[\\]()]|\\[[^\\[\\]]*\\]|\\([^()]*\\))+(?<!\\s))')
 
     @tatsumasu('Literal')
     def _literalAlternative_(self):  # noqa
@@ -137,6 +137,8 @@ def _alternative_(self):  # noqa
                 self._match_()
             with self._option():
                 self._entity_()
+            with self._option():
+                self._void()
             self._error('no available options')
 
     @tatsumasu()

textworld/textgen/textgen.ebnf

@@ -7,7 +7,7 @@
 
 symbol = ?"[\w()/!<>-]+" ;
 
-literal = ?"(([^;|<>\n\[\]()]|\[[^\[\]]*\]|\([^()]*\))+(?<!\s))?" ;
+literal = ?"(([^;|<>\n\[\]()]|\[[^\[\]]*\]|\([^()]*\))+(?<!\s))" ;
 
 literalAlternative::Literal = value:literal ;
 
@@ -17,7 +17,7 @@ entity = adjectiveNoun | literalAlternative ;
 
 match::Match = lhs:entity "<->" rhs:entity ;
 
-alternative = match | entity;
+alternative = match | entity | ();
 
 alternatives = ";".{alternative}+ ;