Skip to content
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.

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

Ts/2500 implement notebook beaker integrate within model config #2758

Merged
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
88b44aa
renaming var for clarity
Tom-Szendrey Feb 13, 2024
337b786
modelId no longer needed.
Tom-Szendrey Feb 14, 2024
b971e17
Merge branch 'main' of https://github.com/DARPA-ASKEM/TERArium into T…
Tom-Szendrey Feb 14, 2024
8541d69
TODO: knobs to remove weird debounced dependency.
Tom-Szendrey Feb 15, 2024
568ef83
lots needs to be fixed still broken
Tom-Szendrey Feb 15, 2024
ecc62eb
updating model state
Tom-Szendrey Feb 15, 2024
beb8c85
update local vars -> state rather than the loop
Tom-Szendrey Feb 15, 2024
49660e8
took out lodash
Tom-Szendrey Feb 15, 2024
bb6f91a
use jupyterContext rather than rebuild
Tom-Szendrey Feb 15, 2024
c5f56cc
Lots of model initalizing
Tom-Szendrey Feb 16, 2024
0ec612a
removing a bunch of console logs
Tom-Szendrey Feb 16, 2024
5421715
Merge branch 'main' of https://github.com/DARPA-ASKEM/TERArium into T…
Tom-Szendrey Feb 20, 2024
8ab873e
spitting output on preview
Tom-Szendrey Feb 20, 2024
f75bb03
Merge branch 'main' of https://github.com/DARPA-ASKEM/TERArium into T…
Tom-Szendrey Feb 20, 2024
7ae8e65
add isTemporary flag to createModelConfiguration
Tom-Szendrey Feb 20, 2024
2552d20
Merge branch 'main' of https://github.com/DARPA-ASKEM/TERArium into T…
Tom-Szendrey Feb 20, 2024
2a9bd18
starting codeText updated
Tom-Szendrey Feb 20, 2024
2679561
updating selectedOutputId
Tom-Szendrey Feb 20, 2024
0854bac
only update the keys provided from preview
Tom-Szendrey Feb 20, 2024
a712484
handle model preview should update knobs
Tom-Szendrey Feb 20, 2024
c3ad306
Merge branch 'main' of https://github.com/DARPA-ASKEM/TERArium into T…
Tom-Szendrey Feb 20, 2024
4193049
removing no longer required
Tom-Szendrey Feb 21, 2024
5ee8050
show Demeter some love
Tom-Szendrey Feb 21, 2024
b069021
using onMounted
Tom-Szendrey Feb 21, 2024
3139681
minor cleanup to init logic flow
Tom-Szendrey Feb 21, 2024
ac27e3e
Merge branch 'main' of https://github.com/DARPA-ASKEM/TERArium into T…
Tom-Szendrey Feb 21, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@ export const createModelConfiguration = async (
model_id: string | undefined,
name: string,
description: string,
configuration: Model
configuration: Model,
isTemporary?: boolean
) => {
if (!model_id) {
return null;
}
const temporary = isTemporary ?? false;
const response = await API.post(`/model-configurations`, {
model_id,
temporary,
name,
description,
configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@ import type { Initial, ModelParameter } from '@/types/Types';

export const name = 'ModelConfigOperation';

export interface ModelEditCode {
code: string;
timestamp: number;
}

export interface ModelConfigOperationState {
modelId: string | null;
name: string;
description: string;
initials?: Initial[];
parameters?: ModelParameter[];
timeseries?: { [key: string]: string };
initials: Initial[];
parameters: ModelParameter[];
timeseries: { [key: string]: string };
modelEditCodeHistory: ModelEditCode[];
hasCodeBeenRun: boolean;
tempConfigId: string; // This is used for beaker context when there is no output selected. It is a config id that is in TDS and marked as temp
}

export const ModelConfigOperation: Operation = {
Expand All @@ -23,9 +30,14 @@ export const ModelConfigOperation: Operation = {

initState: () => {
const init: ModelConfigOperationState = {
modelId: null,
name: '',
description: ''
description: '',
modelEditCodeHistory: [],
hasCodeBeenRun: false,
tempConfigId: '',
initials: [],
parameters: [],
timeseries: {}
};
return init;
}
Expand Down
Loading
Loading