Skip to content

Add support for interactive compute. Closes #1691 #1693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brollb merged 39 commits into from
Jun 19, 2020
Merged

Add support for interactive compute. Closes #1691 #1693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
ce1c836
Add event emitter utility
brollb May 4, 2020
aab7f46
WIP Add basic interactive compute support
brollb May 4, 2020
e305aea
WIP interactive compute. Add dependencies and router
brollb May 4, 2020
27a18eb
misc code cleanup
brollb May 4, 2020
c9168bf
Combine COMPLETE/CLOSE messages
brollb May 5, 2020
8c6768a
Refactor tasks in interactive compute
brollb May 5, 2020
bef1cf5
WIP refactor compute backend, client, local compute
brollb May 5, 2020
ce384b0
Add deepforge serialization files and addArtifact support
brollb May 5, 2020
204fe34
Add session.close to interactive sessions
brollb May 5, 2020
5766013
WIP IC Add member method for encoding msgs
brollb May 5, 2020
1cb1c38
WIP IC Throw error on exec w/ non-zero exitCode
brollb May 13, 2020
69f3e97
WIP IC add session w/ auto queueing support
brollb May 13, 2020
7fb5acd
WIP IC Rename action name in ensureIdle
brollb May 13, 2020
f6151e0
WIP code cleanup
brollb May 13, 2020
d6740e7
WIP create server in "before"
brollb May 8, 2020
27a82ea
Refactor interactive client code (improve testability)
brollb May 13, 2020
0af3c37
addFile support for interactive sessions
brollb May 11, 2020
7ca42bd
Use Session.new for creation (throws on failure)
brollb May 14, 2020
211d6c8
Detect compute creation errors
brollb May 14, 2020
16faa7f
rm old debug logs
brollb May 14, 2020
3cf060e
Rename start-session.js to start.js
brollb May 14, 2020
f27c843
Fixed bugs with start.js code on interactive compute
brollb May 14, 2020
46c1ea2
Send ERROR message on job failure
brollb May 18, 2020
3cab40a
Combine wss ports. Add DEEPFORGE_INTERACTIVE_COMPUTE_HOST
brollb Jun 4, 2020
a3148bc
ensure client ws open before sending
brollb Jun 4, 2020
0f5f535
async fn -> fn
brollb Jun 4, 2020
050ad4d
Merge branch 'master' into 1691-interactive-compute
brollb Jun 4, 2020
8c32beb
use router lifecycle hooks
brollb Jun 4, 2020
9929025
Merge branch 'master' into 1691-interactive-compute
brollb Jun 5, 2020
bcfe155
Update package-lock
brollb Jun 8, 2020
bed7d72
Fix tests
brollb Jun 8, 2020
f125462
Add integration tests and auth for blob client
brollb Jun 9, 2020
1d924d2
Add InteractiveComputeHost info to gmeConfig.extensions
brollb Jun 19, 2020
0771341
Fixed default server URL detection
brollb Jun 19, 2020
268ed9c
Update the router to use the interactive compute from the gme config
brollb Jun 19, 2020
d1f52aa
Remove old debug comments
brollb Jun 19, 2020
7d6d875
add start/stop interactive compute logs
brollb Jun 19, 2020
50d664a
Stop the server after the interactive compute integration tests
brollb Jun 19, 2020
ee76873
Remove debug logs
brollb Jun 19, 2020
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
6 changes: 6 additions & 0 deletions config/config.extensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

module.exports = config => {
config.extensions = {};
config.extensions.InteractiveComputeHost = process.env.DEEPFORGE_INTERACTIVE_COMPUTE_HOST;
return config;
};
5 changes: 5 additions & 0 deletions config/config.webgme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ config.rest.components['SciServerAuth'] = {
mount: 'routers/SciServerAuth',
options: {}
};
config.rest.components['InteractiveCompute'] = {
src: __dirname + '/../src/routers/InteractiveCompute/InteractiveCompute.js',
mount: 'routers/InteractiveCompute',
options: {}
};

// Visualizer descriptors
config.visualization.visualizerDescriptors.push(__dirname + '/../src/visualizers/Visualizers.json');
Expand Down
3 changes: 2 additions & 1 deletion config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ var env = process.env.NODE_ENV || 'default',
config = require(configFilename),
validateConfig = require('webgme/config/validator');

validateConfig(configFilename);
validateConfig(config);
config = require(__dirname + '/config.extensions.js')(config);
module.exports = config;
2 changes: 2 additions & 0 deletions docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ services:
environment:
- "MONGO_URI=mongodb://mongo:27017/deepforge"
- "DEEPFORGE_HOST=https://dev.deepforge.org"
- "DEEPFORGE_INTERACTIVE_COMPUTE_HOST=https://dev-compute.deepforge.org"
- "DEEPFORGE_PUBLIC_KEY=/token_keys/public_key"
- "DEEPFORGE_PRIVATE_KEY=/token_keys/private_key"
image: deepforge/kitchen-sink:latest
ports:
- "8888:8888"
- "8889:8889"
volumes:
- "$HOME/.deepforge/blob:/data/blob"
- "${TOKEN_KEYS_DIR}:/token_keys"
Expand Down
Loading