diff --git a/backend_react/react_app.py b/backend_react/react_app.py index 0cb3d89fc767984580cba0fe2ef47cc43daf3aaa..5bc371aa448f4b99c1ff86cfccf6345ddc0bbc0d 100644 --- a/backend_react/react_app.py +++ b/backend_react/react_app.py @@ -23,9 +23,9 @@ import os import sys sys.path.insert(0, os.path.abspath('..')) -# import agents and its functions -from ..MetaAugment import UCB1_JC_py as UCB1_JC -from ..MetaAugment.autoaugment_learners import evo_learner +# # import agents and its functions +from MetaAugment import UCB1_JC_py as UCB1_JC +from MetaAugment.autoaugment_learners import evo_learner import MetaAugment.controller_networks as cn import MetaAugment.autoaugment_learners as aal print('@@@ import successful') @@ -43,8 +43,8 @@ app = Flask(__name__) def get_form_data(): print('@@@ in Flask Home') # form_data = request.get_json() - form_data = request.files['ds_upload'] - print('@@@ form_data', form_data) + # form_data = request.files['ds_upload'] + # print('@@@ form_data', form_data) # form_data = request.form.get('test') # print('@@@ this is form data', request.get_data()) @@ -156,7 +156,7 @@ def confirm(): data = {'ds': ds, 'ds_name': ds_name, 'IsLeNet': IsLeNet, 'ds_folder.filename': ds_name, 'auto_aug_learner':auto_aug_learner, 'batch_size': batch_size, 'learning_rate': learning_rate, 'toy_size':toy_size, 'iterations':iterations, } - return {'data 1': 'show data'} + return {'batch_size': '12'} # ======================================================================== @app.route('/training', methods=['POST', 'GET']) diff --git a/src/pages/Confirm.js b/src/pages/Confirm.js index 779b6b2ef162233ae597ed58335a5da9c4334f05..e293133a61438cde948b463ad8a4d3e581873b27 100644 --- a/src/pages/Confirm.js +++ b/src/pages/Confirm.js @@ -4,14 +4,19 @@ import CheckCircleOutlineRoundedIcon from '@mui/icons-material/CheckCircleOutlin import TuneRoundedIcon from '@mui/icons-material/TuneRounded'; export default function Confirm() { + const [batchSize, setBatchSize] = useState(0) // // const [myData, setMyData] = useState([{}]) -// useEffect(async () => { -// await fetch('/confirm').then( -// response => {console.log('response', response, 'response.json()', response.json()); response.json()} -// ) -// // .then(data => {console.log('training', data); -// // }) -// }, []); + useEffect(() => { + const res = fetch('/confirm').then( + response => response.json() + ).then(data => setBatchSize(data.batch_size)); + + console.log("batchsize", batchSize) + // setBatchSize(res.batch_size) + + // .then(data => {console.log('training', data); + // }) + }, []); @@ -34,7 +39,7 @@ export default function Confirm() { <ListItemAvatar> <TuneRoundedIcon color="primary" fontSize='large'/> </ListItemAvatar> - <ListItemText primary="Batch size" secondary="[Batch size]" /> + <ListItemText primary="Batch size" secondary={batchSize} /> </ListItem> </Grid> <Grid xs={12} sm={6} item > diff --git a/src/pages/Home.js b/src/pages/Home.js index 63183d191cb0a4cd8c098f9ab2c289d9d58ede88..a3057f585732b495bbd13972e39d25157eccbe67 100644 --- a/src/pages/Home.js +++ b/src/pages/Home.js @@ -58,6 +58,7 @@ export default function Home() { body: formData }).then((response) => response.json()); console.log('check if it is here') + navigate('/confirm', {replace:true}); // ///////// testing