Skip to content
This repository was archived by the owner on Oct 11, 2023. It is now read-only.
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1407 commits
Select commit Hold shift + click to select a range
bc72898
add missing missions
jaseweston Apr 29, 2021
8dac513
added star shine animation
JustinPinero Apr 29, 2021
32a0639
added star shine animation
JustinPinero Apr 29, 2021
9ed557c
events are totally broken
jaseweston Apr 30, 2021
0e1e8a9
Merge pull request #206 from facebookresearch/bugz6
JackUrb Apr 30, 2021
1c4e996
Merge pull request #205 from facebookresearch/bugz5
JackUrb Apr 30, 2021
25f7c78
Fixes and enhancements to use_events
JackUrb Apr 30, 2021
2f2c3da
styled soul spawn entry
JustinPinero Apr 30, 2021
cc25aab
Another round of backend fixes
JackUrb Apr 30, 2021
04e2184
Also fix debug logging?
JackUrb Apr 30, 2021
357b40a
Skip dialogue safety check on DEBUG
JackUrb Apr 30, 2021
07b77df
Usage limit to scrolls
JackUrb Apr 30, 2021
cbbfd51
Merge pull request #208 from facebookresearch/more-event-fixes
JackUrb Apr 30, 2021
dbf1d7c
added check for quest completion to reducer
JustinPinero Apr 30, 2021
be06c4c
added Mission success entry and total exp to progress bar
JustinPinero Apr 30, 2021
64e1bf8
fixed border on soul spawn event entry
JustinPinero Apr 30, 2021
912f47e
adding copy to tutorial page
JustinPinero May 3, 2021
c293791
added images to experience points topic
JustinPinero May 3, 2021
2a4f76f
adding images to experience points system topic
JustinPinero May 3, 2021
5ec2481
removed glowing effect from character description on soul spawn event
JustinPinero May 3, 2021
830faed
Merge pull request #207 from facebookresearch/stars
JustinPinero May 3, 2021
9d23f32
Merge branch 'master' into mission-entry
JustinPinero May 3, 2021
119d10b
Merge pull request #209 from facebookresearch/mission-entry
JustinPinero May 3, 2021
f454bb2
Merge branch 'master' into tutorialpage
JustinPinero May 3, 2021
f73bcd0
added imagee to experience points system
JustinPinero May 3, 2021
9f38425
added images to character basics
JustinPinero May 3, 2021
e6a8814
Proper serialization and deserialization of UseEvent
JackUrb May 3, 2021
f68beda
dozing fix
JackUrb May 3, 2021
52b31df
added image styles for tutorial page
JustinPinero May 3, 2021
561b8b5
added sizing styles to experience points system topic images
JustinPinero May 3, 2021
b732718
added image styles to character basics
JustinPinero May 3, 2021
bb9c65a
Death message
JackUrb May 3, 2021
d7d30c9
Death has better messaging
JackUrb May 3, 2021
097cd04
added and styled action images
JustinPinero May 3, 2021
f87d417
resized tutorial header subheader and text classes
JustinPinero May 3, 2021
03a2071
styled tutorial text
JustinPinero May 3, 2021
dda1b21
removed tutorial header
JustinPinero May 3, 2021
71c28e9
added back link to tutorial pagee
JustinPinero May 3, 2021
4fc698c
added Character header to soulspawn event
JustinPinero May 3, 2021
57028c2
styled stars and added shrinking animation and slide animation to mes…
JustinPinero May 4, 2021
b49d9db
added character map util function for default character emojis
JustinPinero May 4, 2021
22675a6
fixed images being transparent with background
JustinPinero May 4, 2021
8fb9433
removed inline styling and added soulspawn-subheader class
JustinPinero May 4, 2021
a76b3c8
comment out previous code for emoji mapping for later use
JustinPinero May 4, 2021
7a1d5df
Merge pull request #212 from facebookresearch/soulspawn-fix
JustinPinero May 4, 2021
3e8be24
Merge pull request #211 from facebookresearch/tutorialpage
JustinPinero May 4, 2021
b2d42f0
Merge pull request #214 from facebookresearch/default-emojis
JustinPinero May 4, 2021
3df0bb9
Merge pull request #213 from facebookresearch/star-animation
JustinPinero May 4, 2021
014d927
Merge pull request #215 from facebookresearch/pre-alpha-fixes3
JustinPinero May 4, 2021
248a7fa
Merge pull request #210 from facebookresearch/more-pre-launch-fixes
JackUrb May 4, 2021
ee65fe0
fixed type in exprience points system
JustinPinero May 4, 2021
ae53d5d
fixed character subheader placement
JustinPinero May 4, 2021
11a39ee
Merge pull request #216 from facebookresearch/tutorialpage
JustinPinero May 4, 2021
e7f2b03
Merge pull request #217 from facebookresearch/soulspawn-fix
JustinPinero May 4, 2021
a657ccd
update help commands
jaseweston May 4, 2021
6432d55
Merge pull request #218 from facebookresearch/bugz7
JackUrb May 4, 2021
2cb9bb9
added modal component and instruction modal state
JustinPinero May 4, 2021
79a13a7
Fixing doubled context on unsafe message
JackUrb May 4, 2021
4d42294
Parsing events with capitalization
JackUrb May 4, 2021
2e52e1f
Fixing grammar in leave and arrive events
JackUrb May 4, 2021
0d830ff
Merge pull request #219 from facebookresearch/more-pre-launch-fixes-2
JackUrb May 4, 2021
15fcda4
added header to instruction modal content
JustinPinero May 4, 2021
dcfa168
added copy to modal and back functionality to tutorial page back button
JustinPinero May 4, 2021
2b580c7
styled instruction modal and added tutorial screenshots
JustinPinero May 4, 2021
e009d1d
added closes functionality to modal
JustinPinero May 4, 2021
dad4476
added new back button to terms and about pages
JustinPinero May 4, 2021
de37591
Merge pull request #220 from facebookresearch/instruction-modal
JackUrb May 4, 2021
fa9e6b7
set modal to not render unless player xp<=10
JustinPinero May 4, 2021
5880a1d
Merge pull request #221 from facebookresearch/instruction-modal
JackUrb May 4, 2021
251063d
fixed typo in minitutorial
JustinPinero May 5, 2021
829b561
Update index.js
JackUrb May 5, 2021
d2508ab
Merge pull request #222 from facebookresearch/copy-corrections
JackUrb May 5, 2021
0fb7dd2
added help entry
JustinPinero May 5, 2021
73c96ef
updated styles
JustinPinero May 5, 2021
1bce452
Merge pull request #223 from facebookresearch/help-entry
JustinPinero May 5, 2021
291172d
added send button and styles to chat input component
JustinPinero May 6, 2021
76333ab
generative start features
jaseweston May 6, 2021
0202de5
moar
jaseweston May 6, 2021
70f4aca
Merge pull request #225 from facebookresearch/bugz7
jaseweston May 7, 2021
6e28b8d
requirements change
jaseweston May 7, 2021
565dd76
Merge pull request #227 from facebookresearch/requirements2
jaseweston May 7, 2021
67ccfae
Merge pull request #224 from facebookresearch/sendbutton
JustinPinero May 7, 2021
46d197d
aadded play button to bottom of tutorial page
JustinPinero May 10, 2021
a00596c
added status entry
JustinPinero May 10, 2021
586ec95
humanz (#228)
jaseweston May 10, 2021
d039da1
added and styled inventory message entry
JustinPinero May 10, 2021
bc2d41f
added button revisions
JustinPinero May 11, 2021
9d6da90
Update Actions.js
JackUrb May 11, 2021
515312d
fixed mobile styling for entry
JustinPinero May 11, 2021
0c559e1
Merge pull request #230 from facebookresearch/status-entry
JustinPinero May 11, 2021
73027b4
Merge pull request #229 from facebookresearch/tutorial-button
JustinPinero May 11, 2021
972d725
Merge branch 'entry-button-revisions' into inventory-message
JustinPinero May 11, 2021
5d132d0
resolved conflicts
JustinPinero May 11, 2021
7a211d6
restyled inventory message and made it responsive
JustinPinero May 11, 2021
8f67ce5
Merge pull request #231 from facebookresearch/inventory-message
JustinPinero May 11, 2021
fafb2f7
refactored status message
JustinPinero May 11, 2021
6c8f474
restyled help entry with requested revisions
JustinPinero May 11, 2021
20e5726
Added and styled Quest component and added it to entry component
JustinPinero May 11, 2021
47b59b9
Merge pull request #232 from facebookresearch/help-entry
JustinPinero May 11, 2021
3d283e8
Merge branch 'entry-button-revisions' into quest-entry
JustinPinero May 11, 2021
27e98c4
merged other entries and removed console logs
JustinPinero May 11, 2021
33b51d4
Merge pull request #233 from facebookresearch/quest-entry
JustinPinero May 11, 2021
b429296
merged all branches
JustinPinero May 11, 2021
73c9c04
restyled home page
JustinPinero May 12, 2021
b4fa629
fixed sizing bug
JustinPinero May 12, 2021
036a2bf
refactored landing app
JustinPinero May 12, 2021
7a3c4fc
restyled aboutpage
JustinPinero May 12, 2021
a031a3d
restyled tutorialpage
JustinPinero May 12, 2021
51e2752
restyled terms page
JustinPinero May 12, 2021
ad55310
restyled login page
JustinPinero May 12, 2021
75661be
restyled error page and logout page
JustinPinero May 12, 2021
dd577ea
styling gameapp
JustinPinero May 12, 2021
1ac36ff
Merge pull request #234 from facebookresearch/entry-button-revisions
JustinPinero May 12, 2021
bf267c7
restyling chatlog for mobile
JustinPinero May 12, 2021
5e2c71e
added media queries to entry styles
JustinPinero May 12, 2021
8450929
added isMobile state and restyled modal
JustinPinero May 12, 2021
3ac2298
added drawer feature
JustinPinero May 12, 2021
270a8fa
added resize state and event listener
JustinPinero May 12, 2021
631bbae
added glowing button component removed typos in gameapp/styles.css bu…
JustinPinero May 13, 2021
ba159f0
added mobile frame header
JustinPinero May 13, 2021
80efa4c
added toggleswitch, header, and buttons to mobile frame
JustinPinero May 13, 2021
bc95170
connected mobile frame to gameapp
JustinPinero May 13, 2021
b200afd
styled toggle and header
JustinPinero May 13, 2021
bbf8b5d
fixed responsive sizing in mobile frame
JustinPinero May 13, 2021
b352064
fixed speech bubble tails responsiveness
JustinPinero May 13, 2021
e2cd944
fixed chat icon positioning in mobile view
JustinPinero May 13, 2021
fb47886
fixing chatlog styles
JustinPinero May 13, 2021
7e5fde6
fixed chat alignment issues in mobile ui
JustinPinero May 13, 2021
0225c65
Merge pull request #235 from facebookresearch/mobile-gameapp
JustinPinero May 13, 2021
7aeac58
Merge pull request #236 from facebookresearch/mobile-landingapp
JustinPinero May 13, 2021
18e217c
added tooltip and lable to sidebar toggle switch
JustinPinero May 13, 2021
b6fcec3
Merge pull request #237 from facebookresearch/mobile-restyling
JustinPinero May 13, 2021
a46d00b
fixed spacing issue from help message (#238)
JustinPinero May 14, 2021
02ec6ed
Mobile restyling Fixes (#239)
JustinPinero May 17, 2021
1073970
fixed fonts on level dispaly and progress bar, changed logout button …
JustinPinero May 26, 2021
4c1e578
fixed sizing of messages, sizing of text, send button styling
JustinPinero May 26, 2021
475ea76
Merge pull request #242 from facebookresearch/ui-fixes-3
JustinPinero Jun 10, 2021
643bb5d
parse actions with wierd quotes (#244)
JackUrb Jun 14, 2021
7b9b396
Updating parser for multithreading (#251)
JackUrb Aug 9, 2021
7fa6605
added say and do buttons added documentation
JustinPinero Aug 20, 2021
6e53c89
removed unused code and added more documentation to chatdisplay compo…
JustinPinero Aug 20, 2021
118a438
adding mobile style fixes to progress bar and level display
JustinPinero Aug 23, 2021
33868e8
wired tell feature
JustinPinero Aug 24, 2021
ae54785
fixed repsonsive styling of player info icons on mobile
JustinPinero Aug 24, 2021
66244c4
adding redux
JustinPinero Aug 25, 2021
d902725
added redux and redux toolkit
JustinPinero Aug 31, 2021
e93bf67
added typescript to game app
JustinPinero Aug 31, 2021
817e784
Server data browsing scripts and fixes (#255)
JackUrb Sep 1, 2021
9a9be9d
Requirements fix (#258)
JackUrb Sep 1, 2021
475ffba
Human to player (#259)
JackUrb Sep 1, 2021
d3837c2
Crowdsourcing UI (#261)
JackUrb Sep 1, 2021
68640bc
Fixing npc assignment bug (#263)
JackUrb Sep 7, 2021
c83984e
added redux foundation, added personal info slices, added xp, giftxp,…
JustinPinero Sep 8, 2021
65746ea
added increaseXp and decrementGiftXp to reducer actions
JustinPinero Sep 8, 2021
e9d4f2f
added foundation for redux websocket integration
JustinPinero Sep 9, 2021
13a8a70
added documentation to slices, wired xp and giftxp redux state into e…
JustinPinero Sep 10, 2021
13b8a2e
removed passed props from experience info components
JustinPinero Sep 10, 2021
12506bd
added sessioninfo section to features, added session xp slice, added …
JustinPinero Sep 10, 2021
4547328
removed xp props from sidebar
JustinPinero Sep 10, 2021
5c42499
fixed emoji picker redux action, added view slice
JustinPinero Sep 13, 2021
9cc7403
Added documentation to GamePage for new state and useEffects, removed…
JustinPinero Sep 13, 2021
f4496b0
added chatInput Slice
JustinPinero Sep 13, 2021
90f79e1
restructured messages and types, restyling messages
JustinPinero Sep 13, 2021
fc69fed
fixed overlapping system messages
JustinPinero Sep 13, 2021
eb89633
restructured message types and styles, fixed help message overlap bug…
JustinPinero Sep 14, 2021
a6d2e00
restyled help message for both mobile and desktop
JustinPinero Sep 14, 2021
784c85e
Multi-agent chat first pass (#264)
JackUrb Sep 14, 2021
519f3cb
removed console logs, unused code, added substantial documentation, r…
JustinPinero Sep 14, 2021
6cfcb03
added styling for safari browser, added styling for mobile, fixed mai…
JustinPinero Sep 14, 2021
2b9ddb7
building tutorial popover
JustinPinero Sep 16, 2021
32f15cb
added info button
JustinPinero Sep 16, 2021
c369b33
added tutorial popover component, added gamecopy file with tutorial c…
JustinPinero Sep 16, 2021
f5a42d5
added tooltips to both chat display and sidebar
JustinPinero Sep 16, 2021
9b4f8c9
added help mode, added on click tool tips to playerinfo, Character i…
JustinPinero Sep 22, 2021
9713b81
added tooltips and animations to quest message, status message, agent…
JustinPinero Sep 22, 2021
ea63ee3
added tooltips and animations for inventory, send button, chat input,…
JustinPinero Sep 22, 2021
7d14f99
added infobutton component, added render condition to infobutton in s…
JustinPinero Sep 24, 2021
0350863
fixed toggle to clear tooltips during switch when in help mode
JustinPinero Sep 24, 2021
be8a582
added and styled final tool tips, fixed cycle tooltips on chat bar, f…
JustinPinero Sep 24, 2021
79eeed9
Merge pull request #267 from facebookresearch/help-mode
JustinPinero Sep 24, 2021
73a0935
Merge pull request #265 from facebookresearch/gameapp-ui-update4
JustinPinero Sep 27, 2021
cee8d88
Added lightqa readme that shows how to run seq2seq2seq interactively …
leox1v Oct 13, 2021
ae75d8d
Creating a light world object from an instance of the old graph (#269)
mojtaba-komeili Oct 14, 2021
8b62f36
Updated lightqa readme with new checkpoints. (#270)
leox1v Oct 15, 2021
f051a33
Clarifying the equipped objects (#271)
mojtaba-komeili Oct 20, 2021
87e2711
Documentation time (#273)
JackUrb Jan 24, 2022
cd09544
Creating `light` master script for ParlAI tooling (#274)
JackUrb Jan 24, 2022
44d366e
adding common sense + world builder code
Alex-Gurung Jan 27, 2022
e33dc86
Merging in teachers and code for RL-Quests paper. (#275)
JackUrb Jan 31, 2022
b302099
Rl quests merge (#276)
JackUrb Jan 31, 2022
efa0673
Intro code for new project (#279)
JackUrb Feb 15, 2022
cab6d82
Merge branch 'main' into commonsense-merge
Alex-Gurung Feb 15, 2022
4301100
Merge pull request #278 from facebookresearch/commonsense-merge
Alex-Gurung Feb 15, 2022
758d141
initial setup for both object interaction tasks
Alex-Gurung Mar 1, 2022
ab82ce7
small cleanup task reviewing
Alex-Gurung Mar 1, 2022
64593f3
default attr. from light db, make editable
Alex-Gurung Mar 3, 2022
6605891
small bug fix & format changes
Alex-Gurung Mar 7, 2022
3cf14ad
slightly cleaner in-place update
Alex-Gurung Mar 7, 2022
3696e01
Task lightgame (#281)
JustinPinero Mar 16, 2022
e3b9fab
messy separation into tasks, needs cleanup
Alex-Gurung Mar 22, 2022
717d6f0
Pre-authorized worker login (#282)
JackUrb Mar 24, 2022
e498c24
polishing new tasks, making to-fill more distinct
Alex-Gurung Mar 28, 2022
481ff18
remove location box from attribute task
Alex-Gurung Mar 28, 2022
fd7f3a9
updating constraint task with backstory q
Alex-Gurung Mar 28, 2022
3c82cfb
rename narration field, remove deleted obj
Alex-Gurung Mar 30, 2022
77dbae6
removed deleted options, action phrase
Alex-Gurung Mar 30, 2022
e22f91d
Gameapp instruction modal removal (#285)
JustinPinero Apr 11, 2022
20f8e87
Tutorial world, full implementation (#266)
JackUrb Apr 12, 2022
e1ca97a
Single model, reusing ActionParser (#286)
JackUrb Apr 12, 2022
badc60d
World hotfix
JackUrb Apr 12, 2022
cd4e2cc
Small deploy-related fixes (#287)
JackUrb Apr 14, 2022
3983f6a
LIGHT Tutorial fixes (#289)
JackUrb Apr 19, 2022
dd6850f
Worldbuilder update (#272)
JustinPinero May 6, 2022
63051b9
New database stubs for updated data model
JackUrb May 11, 2022
388efc2
Enums, Dataclasses
JackUrb May 12, 2022
bad0d45
addressing some comments
JackUrb May 16, 2022
b167526
updating narration and first 2 grounding tasks
Alex-Gurung May 24, 2022
acbfdcb
Merge branch 'main' into object-interaction-tasks
Alex-Gurung May 24, 2022
cf7a6c6
updates for whole pipline
Alex-Gurung Jun 13, 2022
255f1ef
cleanup, deleted a file
Alex-Gurung Jun 13, 2022
173d21f
Rebuild on main, committed (#299)
JackUrb Jul 28, 2022
a06a3a9
Merge branch 'main' into new-data-model
JackUrb Jul 28, 2022
d23811e
requirements
JackUrb Jul 28, 2022
67bd4ce
Fix tests on `main` (#301)
JackUrb Jul 29, 2022
6577160
Merge branch 'main' into new-data-model
JackUrb Jul 29, 2022
183449b
Implementing New Users Tables (#292)
JackUrb Aug 22, 2022
84843af
New Episode logging (#293)
JackUrb Aug 22, 2022
0c4b397
New environment db (#295)
JackUrb Aug 22, 2022
a17f38b
Using `EpisodeDB` in main game path (#297)
JackUrb Aug 22, 2022
d4691d4
Using `UserDB` as main game identity storage (#298)
JackUrb Aug 22, 2022
2bef3dc
Creating and using the `ModelPool` (#300)
JackUrb Aug 22, 2022
c05132b
Fixing bad merge
JackUrb Aug 22, 2022
643e1b2
Merge branch 'new-data-model' of https://github.com/facebookresearch/…
JackUrb Aug 22, 2022
93a6362
Creating LIGHT's ModelServer (#302)
JackUrb Aug 22, 2022
bf1b367
`asyncio` all over LIGHT (#304)
JackUrb Aug 22, 2022
a372a2e
AWS Option for LIGHT data model storage (#305)
JackUrb Aug 22, 2022
baad3d4
dropped change on merge
JackUrb Aug 22, 2022
c376dbb
Stable Server commit before coming refactors (#306)
JackUrb Aug 22, 2022
17de201
Privacy commitment improvements (#307)
JackUrb Aug 22, 2022
ce07613
Base architecture README
JackUrb Aug 22, 2022
fa347e2
Small fixes for episode db keys
JackUrb Aug 25, 2022
a349b1f
Merge branch 'new-data-model' of https://github.com/facebookresearch/…
JackUrb Aug 25, 2022
0978216
world dissociation
JackUrb Aug 30, 2022
bf5b04a
Small episode test cleanup
JackUrb Aug 30, 2022
bb2e262
Merge branch 'main' into new-data-model
JackUrb Aug 31, 2022
7fedbbd
Adding headers
JackUrb Aug 31, 2022
5eefa84
Some rollbacks, some copyright fixes
JackUrb Aug 31, 2022
0a45ad2
More header fixes
JackUrb Aug 31, 2022
3b6940e
Clean up irrelevant paths
JackUrb Aug 31, 2022
71365c9
Merge branch 'new-data-model' into refactor-phase-2-full-deploy
JackUrb Aug 31, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crowdsourcing/quests/run_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions deploy/web/configs/dev/config
Original file line number Diff line number Diff line change
@@ -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
''
6 changes: 3 additions & 3 deletions deploy/web/configs/dev/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
14 changes: 14 additions & 0 deletions deploy/web/configs/devfair-no-models/config
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 2 additions & 10 deletions deploy/web/configs/devfair/config
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 16 additions & 0 deletions deploy/web/configs/local-no-models/config
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 2 additions & 6 deletions deploy/web/configs/local/config
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 2 additions & 12 deletions deploy/web/configs/prod/config
Original file line number Diff line number Diff line change
Expand Up @@ -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
''
17 changes: 1 addition & 16 deletions deploy/web/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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`
9 changes: 8 additions & 1 deletion deploy/web/gameapp/src/WebSockets/useWSDataSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 = () => {
Expand Down
3 changes: 2 additions & 1 deletion deploy/web/gameapp/src/features/api/Messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion deploy/web/landingapp/src/pages/AboutPage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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} />
Expand Down
1 change: 1 addition & 0 deletions deploy/web/server/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# LIGHT Server Architecture doc
11 changes: 7 additions & 4 deletions deploy/web/server/builder_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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))
Expand Down
Loading