More backend and event fixes pre-launch

deploy/web/configs/prod/config

@@ -22,3 +22,5 @@ main_act/model
 /home/ubuntu/data/models/acting/model
 --disable-builder
 True
+--is-logging
+True

deploy/web/gameapp/src/GameRouter.js

@@ -12,6 +12,7 @@ const GameRouter = () => {
       <HashRouter>
         <Switch>
           <Route path="/" component={GamePage} exact />
+          <Route path="/_=_" component={GamePage} exact />
           <Route path="/profile" component={ProfilePage} exact />
         </Switch>
       </HashRouter>

deploy/web/landingapp/src/pages/LandingPage/index.js

@@ -121,7 +121,7 @@ const LandingPage = (props) => {
           </div>
           <div className="menu-container__section">
             <div className="menu-container">
-              <a style={{ textDecoration: "none" }} href="/play">
+              <a style={{ textDecoration: "none" }} href="/play/">
                 <div className="menu-item ">
                   <h1>Play Now</h1>
                 </div>

deploy/web/server/html/landing.html

@@ -48,6 +48,6 @@ <h3>Usage terms</h3>
       playing the game.
     </p>
 
-    <a href="/play"><h1>Play Now</h1></a>
+    <a href="/play/"><h1>Play Now</h1></a>
   </body>
 </html>

deploy/web/server/run_server.py

@@ -154,6 +154,16 @@ def main():
     DEFAULT_PORT = 35494
     DEFAULT_HOSTNAME = "localhost"
 
+    def str2bool(v):
+        if isinstance(v, bool):
+            return v
+        if v.lower() in ("yes", "true", "t", "y", "1"):
+            return True
+        elif v.lower() in ("no", "false", "f", "n", "0"):
+            return False
+        else:
+            raise argparse.ArgumentTypeError("Boolean value expected.")
+
     parser = argparse.ArgumentParser(
         description="Start the game server.", fromfile_prefix_chars="@"
     )
@@ -245,6 +255,12 @@ def main():
         type=str,
         default="",
     )
+    parser.add_argument(
+        "--is-logging",
+        type=str2bool,
+        default=False,
+        help="flag to enable storing logs of interactions",
+    )
     FLAGS, _unknown = parser.parse_known_args()
 
     print(FLAGS)

deploy/web/server/tests/test_tornado_server.py

@@ -582,7 +582,7 @@ def test_landing_page_redirect(self, mocked_auth):
         headers = {"Content-Type": "application/json"}
         with self.assertRaises(httpclient.HTTPClientError) as cm:
             response = yield self.client.fetch(
-                f"{URL}/play",
+                f"{URL}/play/",
                 method="GET",
                 headers=headers,
                 follow_redirects=False,

deploy/web/server/tornado_server.py

@@ -403,6 +403,7 @@ def get_handlers(self, database, hostname=DEFAULT_HOSTNAME, password="LetsPlay")
             (r"/#/error", NotFoundHandler, {"database": database}),
             (r"/play", GameHandler, {"database": database}),
             (r"/play/?id=.*", GameHandler, {"database": database}),
+            (r"/play/*", GameHandler, {"database": database}),
             (r"/build", BuildHandler, {"database": database}),
             (
                 r"/login",
@@ -501,7 +502,7 @@ async def get(self):
                 code=self.get_argument("code"),
             )
             self.set_current_user(fb_user["id"])
-            self.redirect("/play")
+            self.redirect("/play/")
             return
         self.authorize_redirect(
             redirect_uri=redirect,
@@ -542,7 +543,7 @@ def post(self):
                 _ = ldb.create_user(name)
             self.set_current_user(name)
             # self.redirect(self.get_argument("next", "/"))
-            self.redirect("/play")
+            self.redirect("/play/")
         else:
             error_msg = "?error=" + tornado.escape.url_escape("incorrect")
             self.redirect("/#/login" + error_msg)

light/graph/builders/map_json_builder.py

@@ -40,6 +40,7 @@ def get_graph(self):
         data = f.read()
         f.close()
         g = OOGraph.from_json(data)
+        g._opt = self.opt
         self.original_agents = {
             agent.name: (agent.get_room(), agent.get_props())
             for agent in g.agents.values()

light/graph/events/graph_events.py

@@ -88,6 +88,23 @@ def view_as(self, viewer: GraphAgent) -> Optional[str]:
 class SpeechEvent(GraphEvent):
     """Base speaking class mostly to handle dialogue safety."""
 
+    def __init__(
+        self,
+        actor: GraphAgent,
+        target_nodes: Optional[List[GraphNode]] = None,
+        text_content: Optional[str] = None,
+        event_id: Optional[str] = None,
+    ):
+        super().__init__(
+            actor,
+            target_nodes=target_nodes,
+            text_content=text_content,
+            event_id=event_id,
+        )
+        # Give opportunity to skip the safety after initialization
+        # for debug reasons
+        self.skip_safety = False
+
     def is_dialogue_safe(self, text):
         if safety_classifier is None:
             self.safe = True
@@ -109,7 +126,7 @@ def execute(self, world: "World") -> List[GraphEvent]:
         """On execution, store the expected views, then broadcast"""
         assert not self.executed
         actor_name = self.actor.get_prefix_view()
-        if self.is_dialogue_safe(self.text_content):
+        if self.skip_safety or self.is_dialogue_safe(self.text_content):
             self.__in_room_view = f'{actor_name} said "{self.text_content}"'
             self.__self_view = None
         else: