LIGHT Refactor phase 2 - full deploy

crowdsourcing/quests/run_task.py

@@ -7,6 +7,7 @@
 import os
 import time
 import shlex
+import asyncio
 from mephisto.abstractions.databases.local_database import LocalMephistoDB
 from mephisto.operations.operator import Operator
 from mephisto.operations.utils import get_root_dir
@@ -167,10 +168,10 @@ def construct_tasks(num_tasks):
     builder = StarspaceBuilder(ldb, opt=opt)
     random.seed(88)
     while len(tasks) < num_tasks:
-        g, world = builder.get_graph()
+        g, world = asyncio.run(builder.get_graph())
         while len(world.oo_graph.agents) == 0:
             print("no agents in room")
-            g, world = builder.get_graph()
+            g, world = asyncio.run(builder.get_graph())
         possible_agents = list(world.oo_graph.agents.values())
         random.shuffle(possible_agents)
         for character in possible_agents:

deploy/web/configs/dev/config

@@ -1,16 +1,16 @@
 --data-model-db
 /home/ubuntu/data/database.db
 --hostname
-www.light-rpg.ai
+dev.light-rpg.ai
 --light-model-root
 /home/ubuntu/data/models/
 --password
 LetsPlay
 --port
 8088
---builder-model
-starspace/angela_starspace/model4
---dialog-model
-dialog_gen/model
---acting-model
-main_act/model
+--db-backend
+aws-postgres
+--is-logging
+True
+--safety-list
+''

deploy/web/configs/dev/config.js

@@ -5,9 +5,9 @@
  */
 
 const DEV = {
-  host: "https://www.light-rpg.ai",
-  hostname: "www.light-rpg.ai",
-  port: "8088",
+  host: "https://dev.light-rpg.ai",
+  hostname: "dev.light-rpg.ai",
+  port: "80",
 };
 
 export default DEV;

deploy/web/configs/devfair-no-models/config

@@ -10,5 +10,19 @@ LetsPlay
 35496
 --safety-list
 ''
+--safety-model-opt-file
+''
+--dialog-model-opt-file
+''
+--action-model-opt-file
+''
+--roleplaying-score-opt-file
+''
+--generic-act-opt-file
+''
+--parser-opt-file
+''
 --disable-builder
 True
+--db-backend
+local

deploy/web/configs/devfair/config

@@ -10,13 +10,5 @@ LetsPlay
 35496
 --safety-list
 /checkpoint/light/data/safety/reddit_and_beathehobbot_lists/OffensiveLanguage.txt
---dialog-model
-game2021/gen_dialog_model/model.checkpoint
---acting-model
-main_act/model
---parser-model-file
-/checkpoint/jase/projects/light/parser/parser3/34c_jobid=1/model
---roleplaying-score-model-file
-/checkpoint/light/models/game2020/roleplay_scorer/model
---generic-act-model-file
-/checkpoint/light/models/game2021/act_model/model
+--db-backend
+local

deploy/web/configs/local-no-models/config

@@ -8,3 +8,19 @@ localhost
 LetsPlay
 --port
 35494
+--safety-model-opt-file
+''
+--dialog-model-opt-file
+''
+--action-model-opt-file
+''
+--roleplaying-score-opt-file
+''
+--generic-act-opt-file
+''
+--parser-opt-file
+''
+--db-backend
+local
+--is-logging
+True

deploy/web/configs/local/config

@@ -8,9 +8,5 @@ localhost
 LetsPlay
 --port
 35494
---builder-model
-starspace/angela_starspace/model4
---dialog-model
-dialog_gen/model
---acting-model
-main_act/model
+--db-backend
+local

deploy/web/configs/prod/config

@@ -8,19 +8,9 @@ www.light-rpg.ai
 LetsPlay
 --port
 8080
---builder-model
-starspace/angela_starspace/model4
---dialog-model
-dialog/model.checkpoint
---acting-model
-main_act/model
---parser-model-file
-/home/ubuntu/data/models/parser/model
---roleplaying-score-model-file
-/home/ubuntu/data/models/scoring/model
---generic-act-model-file
-/home/ubuntu/data/models/acting/model
 --disable-builder
 True
 --is-logging
 True
+--safety-list
+''

deploy/web/deploy.sh

@@ -26,19 +26,4 @@ fi
 
 CONF_FN=$WEBDIR"/configs/"$1"/config"
 
-python $SERVER_FILE @$CONF_FN
-
-	.ipynb_checkpoints/
-	Env Database Merge Workbook.ipynb
-	Orig Episode Database Merge Workbook.ipynb
-	Quest Database Merge Notebook.ipynb
-	Wild Episode Database Merge.ipynb
-	crowdsourcing/environment/world_builder/
-	crowdsourcing/filtering/is_safe_is_light/data/
-	deploy/MODEL_SERVER_SETUP.sh
-	deploy/WORLD_SERVER_SETUP.sh
-	hydra_configs/
-	json-builder-respawns
-	models/
-	scripts/examples/complex_world_scrubbed.json
-	test_db/
+cat $CONF_FN | python $SERVER_FILE `xargs -0`

deploy/web/gameapp/src/WebSockets/useWSDataSource.js

@@ -24,7 +24,7 @@ function uuidv4() {
 
 // MESSAGE REDUCER
 const reducer = (state, msg) => {
-  window.top.postMessage(JSON.stringify(msg), "*");
+  window.parent.postMessage(JSON.stringify(msg), "*");
   if (
     msg.text &&
     msg.text.indexOf("You mumble something incomprehensible") >= 0
@@ -133,6 +133,7 @@ export function useWSDataSource(url) {
   const [persona, setPersona] = useState(null);
   const [location, setLocation] = useState(null);
   const [agents, setAgents] = useState({});
+  const [aliveInterval, setAliveInterval] = useState(null);
   /*---------------REFS----------------*/
   const websocket = useRef();
   const agentList = useRef(agents);
@@ -225,13 +226,19 @@ export function useWSDataSource(url) {
 
     websocket.current.onopen = () => {
       setConnected(true);
+      const hb = JSON.stringify({ command: "hb", data: {} });
+      var interval = window.setInterval(() => {
+        websocket.current.send(hb);
+      }, 10000);
+      setAliveInterval(interval);
     };
 
     websocket.current.onerror = websocket.current.onclose = (e) => {
       console.log("errored", e);
       setConnected(false);
       setErrored(true);
       websocket.current = null;
+      window.clearInterval(aliveInterval);
     };
   }
   const disconnectFromSession = () => {

deploy/web/gameapp/src/features/api/Messages.ts

@@ -57,4 +57,5 @@ export const api = createApi({
   }),
 });
 
-export const { useGetMessagesQuery } = api;
+// TODO @Justin this is unused, what are we doing with it?
+// export const { useGetMessagesQuery } = api;

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

@@ -52,7 +52,7 @@ const AboutPage = (props) => {
             collected from within LIGHT, with the goal of enabling other
             researchers to extend upon our work, and this will be available for
             download from the project page. The complete source code for the
-            project is available on our github.
+            project will be made available on our github.
           </p>
         </div>
         <img className="aboutpage-image" src={Unicorn} />

deploy/web/server/README.md

@@ -0,0 +1 @@
+# LIGHT Server Architecture doc

deploy/web/server/builder_server.py

@@ -10,6 +10,7 @@
 import inspect
 import time
 import tornado.web
+import asyncio
 from tornado.ioloop import IOLoop
 from tornado import locks
 from tornado import gen
@@ -625,7 +626,7 @@ def initialize(self, database):
         self.builder = get_builder(database)
 
     @tornado.web.authenticated
-    def get(self, type, source):
+    async def get(self, type, source):
         if type not in ["room", "object", "character"]:
             raise AppException(reason="Type is not valid. ", status_code=400)
         with self.db as ldb:
@@ -635,11 +636,13 @@ def get(self, type, source):
             return
         source_obj = source_objs[0]
         if type == "room":
-            items = builder.get_neighbor_rooms(source_obj["id"])
+            items = await builder.get_neighbor_rooms(source_obj["id"])
         elif type == "object":
-            items = builder.get_contained_items(source_obj["id"], source_obj["type"])
+            items = await builder.get_contained_items(
+                source_obj["id"], source_obj["type"]
+            )
         elif type == "character":
-            items = builder.get_contained_characters(source_obj["id"])
+            items = await builder.get_contained_characters(source_obj["id"])
         with self.db as ldb:
             result_items = [dict(ldb.get_id(id=x.db_id, expand=True)[0]) for x in items]
         self.write(json.dumps(result_items))