Merge pull request #331 from MarcCote/speedup_render

Loading speedup: Avoid loading viewers unless required.

scripts/tw-play

@@ -50,7 +50,7 @@ def main():
 
     agent.reset(env)
     if args.viewer is not None:
-        from textworld.envs.wrappers import HtmlViewer
+        from textworld.envs.wrappers.viewer import HtmlViewer
         env = HtmlViewer(env, port=args.viewer)
 
     if args.mode == "human" or args.very_verbose:

textworld/envs/wrappers/__init__.py

@@ -2,7 +2,6 @@
 # Licensed under the MIT license.
 
 
-from textworld.envs.wrappers.viewer import HtmlViewer
 from textworld.envs.wrappers.recorder import Recorder
 from textworld.envs.wrappers.filter import Filter
 from textworld.envs.wrappers.limit import Limit

textworld/envs/wrappers/tests/test_viewer.py

@@ -6,7 +6,7 @@
 
 from textworld.utils import make_temp_directory
 from textworld.generator import compile_game
-from textworld.envs.wrappers import HtmlViewer
+from textworld.envs.wrappers.viewer import HtmlViewer
 from textworld.render import get_webdriver
 
 

textworld/generator/maker.py

@@ -23,7 +23,6 @@
 from textworld.generator.game import GameOptions
 from textworld.generator.game import Game, World, Quest, Event, EntityInfo
 from textworld.generator.graph_networks import DIRECTIONS
-from textworld.render import visualize
 from textworld.envs.wrappers import Recorder
 
 
@@ -857,7 +856,7 @@ def render(self, interactive: bool = False):
         :param filename: filename for screenshot
         """
         game = self.build(validate=False)
-        return visualize(game, interactive=interactive)
+        return textworld.render.visualize(game, interactive=interactive)
 
     def import_graph(self, G: nx.Graph) -> List[WorldRoom]:
         """ Convert Graph object to a list of `Proposition`.