From 839e8f724358bd92cc13da6cabd6bfbc3d05498d Mon Sep 17 00:00:00 2001 From: Philip Love Date: Tue, 24 Aug 2021 00:59:37 -0400 Subject: [PATCH] ML- Modified App-Schemas - Multiple adjustments to previously existing ML App-Schemas --- Projects/ProjectsSchema.json | 18 ++- .../Schemas/App-Schema/data-feature.json | 17 ++- .../Schemas/App-Schema/dense-layer.json | 2 +- .../App-Schema/dimensionality-units.json | 2 +- .../Schemas/App-Schema/fit-dataset.json | 16 ++- .../Schemas/App-Schema/input-layer.json | 28 +++-- .../TensorFlow/Schemas/App-Schema/model.json | 19 ++- .../Schemas/App-Schema/optimizer.json | 112 ++++++++++++++++-- .../App-Schema/supervised-learning.json | 16 ++- .../App-Schema/tensorflow-library.json | 10 ++ 10 files changed, 211 insertions(+), 29 deletions(-) diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index 35f199398..ce4508dd5 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -322,7 +322,7 @@ "onMouseOverIndex": 2, "onMouseClickIndex": 7, "onMouseDownIndex": 0 - }, + }, { "name": "Chat Space", "folderName": "Chat-Space", @@ -982,6 +982,20 @@ "functionName": "newTensorFlowBotModulesTensorFlowLibrary", "fileName": "TensorFlowLibrary.js", "folderName": "Learning-Bot/Low-Frequency-Learning" + }, + { + "name": "TensorFlow Models Manager", + "propertyName": "tensorFlowModelsManager", + "functionName": "newTensorFlowModelsManager", + "fileName": "TensorFlowModelsManager.js", + "folderName": "Learning-Bot/Low-Frequency-Learning" + }, + { + "name": "ML Data Manager", + "propertyName": "mlData", + "functionName": "newMLDataObj", + "fileName": "MLDataManager.js", + "folderName": "Learning-Bot/Low-Frequency-Learning" } ] } @@ -1250,4 +1264,4 @@ "Positions" ] } -] \ No newline at end of file +] diff --git a/Projects/TensorFlow/Schemas/App-Schema/data-feature.json b/Projects/TensorFlow/Schemas/App-Schema/data-feature.json index 9da82f9b8..255c7162e 100644 --- a/Projects/TensorFlow/Schemas/App-Schema/data-feature.json +++ b/Projects/TensorFlow/Schemas/App-Schema/data-feature.json @@ -10,6 +10,15 @@ "relatedUiObject": "Feature Formula", "actionFunction": "payload.executeAction" }, + { + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "featurePreprocessing", + "label": "Add Feature Preprocessing", + "relatedUiObject": "Feature Preprocessing", + "actionFunction": "payload.executeAction" + }, { "action": "Delete UI Object", "actionProject": "Foundations", @@ -33,7 +42,13 @@ "type": "node", "childType": "Feature Formula", "autoAdd": true + }, + { + "name": "featurePreprocessing", + "type": "node", + "childType": "Feature Preprocessing", + "autoAdd": false } ], "icon": "tensorflow" -} \ No newline at end of file +} diff --git a/Projects/TensorFlow/Schemas/App-Schema/dense-layer.json b/Projects/TensorFlow/Schemas/App-Schema/dense-layer.json index 9886b81d5..8d87fbf9c 100644 --- a/Projects/TensorFlow/Schemas/App-Schema/dense-layer.json +++ b/Projects/TensorFlow/Schemas/App-Schema/dense-layer.json @@ -146,4 +146,4 @@ } ], "icon": "tensorflow" -} \ No newline at end of file +} diff --git a/Projects/TensorFlow/Schemas/App-Schema/dimensionality-units.json b/Projects/TensorFlow/Schemas/App-Schema/dimensionality-units.json index 65b99e782..fdb2a77c2 100644 --- a/Projects/TensorFlow/Schemas/App-Schema/dimensionality-units.json +++ b/Projects/TensorFlow/Schemas/App-Schema/dimensionality-units.json @@ -33,4 +33,4 @@ "propertyNameAtParent": "dimensionalityUnits", "childrenNodesProperties": [], "icon": "tensorflow" -} \ No newline at end of file +} diff --git a/Projects/TensorFlow/Schemas/App-Schema/fit-dataset.json b/Projects/TensorFlow/Schemas/App-Schema/fit-dataset.json index dc9a39f98..40448c93d 100644 --- a/Projects/TensorFlow/Schemas/App-Schema/fit-dataset.json +++ b/Projects/TensorFlow/Schemas/App-Schema/fit-dataset.json @@ -1,6 +1,15 @@ { "type": "Fit Dataset", "menuItems": [ + { + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "datasetArgs", + "label": "Add Dataset Args", + "relatedUiObject": "Dataset Args", + "actionFunction": "payload.executeAction" + }, { "action": "Add UI Object", "actionProject": "Foundations", @@ -46,6 +55,11 @@ }, "propertyNameAtParent": "fitDataset", "childrenNodesProperties": [ + { + "name": "datasetArgs", + "type": "node", + "childType": "Dataset Args" + }, { "name": "verbose", "type": "node", @@ -63,4 +77,4 @@ } ], "icon": "tensorflow" -} \ No newline at end of file +} diff --git a/Projects/TensorFlow/Schemas/App-Schema/input-layer.json b/Projects/TensorFlow/Schemas/App-Schema/input-layer.json index ad523f6ab..98ff649a0 100644 --- a/Projects/TensorFlow/Schemas/App-Schema/input-layer.json +++ b/Projects/TensorFlow/Schemas/App-Schema/input-layer.json @@ -1,6 +1,15 @@ { "type": "Input Layer", "menuItems": [ + { + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "inputFeatures", + "label": "Add Input Features", + "relatedUiObject": "Input Features", + "actionFunction": "payload.executeAction" + }, { "action": "Add UI Object", "actionProject": "Foundations", @@ -23,9 +32,9 @@ "action": "Add UI Object", "actionProject": "Foundations", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "inputFeatures", - "label": "Add Input Features", - "relatedUiObject": "Input Features", + "propertyToCheckFor": "collectionCondition", + "label": "Add Collection Condition", + "relatedUiObject": "Collection Condition", "actionFunction": "payload.executeAction" }, { @@ -52,6 +61,11 @@ }, "propertyNameAtParent": "inputLayer", "childrenNodesProperties": [ + { + "name": "inputFeatures", + "type": "node", + "childType": "Input Features" + }, { "name": "inputShape", "type": "node", @@ -63,10 +77,10 @@ "childType": "Batch Input Shape" }, { - "name": "inputFeatures", - "type": "node", - "childType": "Input Features" + "name": "collectionCondition", + "type": "node", + "childType": "Collection Condition" } ], "icon": "tensorflow" -} \ No newline at end of file +} diff --git a/Projects/TensorFlow/Schemas/App-Schema/model.json b/Projects/TensorFlow/Schemas/App-Schema/model.json index 753c3c0c7..fb9794156 100644 --- a/Projects/TensorFlow/Schemas/App-Schema/model.json +++ b/Projects/TensorFlow/Schemas/App-Schema/model.json @@ -44,6 +44,15 @@ "relatedUiObject": "Fit Dataset", "actionFunction": "payload.executeAction" }, + { + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "dataReporting", + "label": "Add Data Reporting", + "relatedUiObject": "Data Reporting", + "actionFunction": "payload.executeAction" + }, { "action": "Delete UI Object", "actionProject": "Foundations", @@ -59,7 +68,7 @@ "config": true }, "initialValues": { - "config": "{ \n \"codeName\": \"\"\n}" + "config": "{ \n \"codeName\": \"\" \n }" }, "addLeftIcons": true, "level": 3, @@ -87,6 +96,12 @@ "name": "fitDataset", "type": "node", "childType": "Fit Dataset" + }, + { + "name": "dataReporting", + "type": "node", + "childType": "Data Reporting", + "autoAdd": true } ] -} \ No newline at end of file +} diff --git a/Projects/TensorFlow/Schemas/App-Schema/optimizer.json b/Projects/TensorFlow/Schemas/App-Schema/optimizer.json index 677081b27..2e647f374 100644 --- a/Projects/TensorFlow/Schemas/App-Schema/optimizer.json +++ b/Projects/TensorFlow/Schemas/App-Schema/optimizer.json @@ -2,11 +2,67 @@ "type": "Optimizer", "menuItems": [ { - "action": "Configure", - "label": "Configure", - "iconPathOn": "configuration", - "iconPathOff": "configuration", - "actionFunction": "uiObject.configEditor.activate" + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "optimizerType", + "label": "Add Optimizer by Name", + "relatedUiObject": "Optimizer by Name", + "actionFunction": "payload.executeAction" + }, + { + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "optimizerType", + "label": "Add SGD Instance", + "relatedUiObject": "SGD Instance", + "actionFunction": "payload.executeAction" + }, + { + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "optimizerType", + "label": "Add Momentum Instance", + "relatedUiObject": "Momentum Instance", + "actionFunction": "payload.executeAction" + }, + { + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "optimizerType", + "label": "Add Adagrad Instance", + "relatedUiObject": "Adagrad Instance", + "actionFunction": "payload.executeAction" + }, + { + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "optimizerType", + "label": "Add Adadelta Instance", + "relatedUiObject": "Adadelta Instance", + "actionFunction": "payload.executeAction" + }, + { + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "optimizerType", + "label": "Add Adam Instance", + "relatedUiObject": "Adam Instance", + "actionFunction": "payload.executeAction" + }, + { + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "optimizerType", + "label": "Add Rmsprop Instance", + "relatedUiObject": "Rmsprop Instance", + "actionFunction": "payload.executeAction" }, { "action": "Delete UI Object", @@ -19,18 +75,48 @@ "actionFunction": "payload.executeAction" } ], - "editors": { - "config": true - }, - "initialValues": { - "config": "{ \n \"value\": \"sgd\"\n}" - }, "addLeftIcons": true, "level": 3, "attachingRules": { "compatibleTypes": "->Compile->" }, "propertyNameAtParent": "optimizer", - "childrenNodesProperties": [], + "childrenNodesProperties": [ + { + "name": "optimizerType", + "type": "node", + "childType": "Optimizer by Name" + }, + { + "name": "optimizerType", + "type": "node", + "childType": "SGD Instance" + }, + { + "name": "optimizerType", + "type": "node", + "childType": "Momentum Instance" + }, + { + "name": "optimizerType", + "type": "node", + "childType": "Adagrad Instance" + }, + { + "name": "optimizerType", + "type": "node", + "childType": "Adadelta Instance" + }, + { + "name": "optimizerType", + "type": "node", + "childType": "Adam Instance" + }, + { + "name": "optimizerType", + "type": "node", + "childType": "Rmsprop Instance" + } + ], "icon": "tensorflow" -} \ No newline at end of file +} diff --git a/Projects/TensorFlow/Schemas/App-Schema/supervised-learning.json b/Projects/TensorFlow/Schemas/App-Schema/supervised-learning.json index fa259cfb8..4b6e3de03 100644 --- a/Projects/TensorFlow/Schemas/App-Schema/supervised-learning.json +++ b/Projects/TensorFlow/Schemas/App-Schema/supervised-learning.json @@ -10,6 +10,15 @@ "relatedUiObject": "Artificial Neural Network", "actionFunction": "payload.executeAction" }, + { + "action": "Add UI Object", + "actionProject": "Foundations", + "disableIfPropertyIsDefined": true, + "propertyToCheckFor": "typeOfModel", + "label": "Add Logistic Regression", + "relatedUiObject": "Logistic Regression", + "actionFunction": "payload.executeAction" + }, { "action": "Delete UI Object", "actionProject": "Foundations", @@ -32,6 +41,11 @@ "name": "typeOfModel", "type": "node", "childType": "Artificial Neural Network" + }, + { + "name": "typeOfModel", + "type": "node", + "childType": "Logistic Regression" } ] -} \ No newline at end of file +} diff --git a/Projects/TensorFlow/Schemas/App-Schema/tensorflow-library.json b/Projects/TensorFlow/Schemas/App-Schema/tensorflow-library.json index b56310931..c1cd6cb96 100644 --- a/Projects/TensorFlow/Schemas/App-Schema/tensorflow-library.json +++ b/Projects/TensorFlow/Schemas/App-Schema/tensorflow-library.json @@ -45,6 +45,16 @@ "label": "Add Reinforcement Learning", "relatedUiObject": "Reinforcement Learning", "actionFunction": "payload.executeAction" + }, + { + "action": "Delete UI Object", + "actionProject": "Foundations", + "askConfirmation": true, + "confirmationLabel": "Confirm to Delete", + "label": "Delete", + "iconPathOn": "delete-entity", + "iconPathOff": "delete-entity", + "actionFunction": "payload.executeAction" } ], "addLeftIcons": true,