Add args & hyperparameters fields in MachineLearning UI

Benjamin Renard
1 parent 00a63bd4
Showing 3 changed files with 101 additions and 20 deletions Show diff stats
js/app/models/MLModelObject.js
js/app/models/MachineLearningRun.js
js/app/views/MachineLearningUI.js
@@ -20,6 +20,9 @@ Ext.define(&#39;amdaModel.MLModelObject&#39;, {
 	fields : [
 		{name: 'name', type: 'string'},  
 		{name: 'description', type: 'string'},
-		{name: 'output', type: 'auto'}
+		{name: 'output', type: 'auto'},
+		{name: 'args', type: 'auto'},
+		{name: 'hyperparameters', type: 'auto'},
+		{name: 'defaults', type: 'auto'},
 	]
 });
@@ -24,10 +24,12 @@ Ext.define(&#39;amdaModel.MachineLearningRun&#39;, {
 		{name: 'mode', type: 'string'},
 		{name: 'start', type : 'date', defaultValue : new Date()},
                 {name: 'stop', type : 'date', defaultValue : new Date()},
-		{name: 'output', type: 'auto', defaultValue : null} 
+		{name: 'output', type: 'auto', defaultValue : null},
+		{name: 'args', type: 'auto', defaultValue : null},
+		{name: 'hyperparameters', type: 'auto', defaultValue : null},
 	],
  
-	propertiesToCopy : 'id,name,moduleId,start,stop,output',
+	propertiesToCopy : 'id,name,moduleId,start,stop,output,args,hyperparameters',
  
 	getJsonValues : function(){
         	var myValues  = new Object();
@@ -36,8 +38,15 @@ Ext.define(&#39;amdaModel.MachineLearningRun&#39;, {
         	myValues.mode = this.get('mode');
 		myValues.startDate = this.get('start');
 		myValues.stopDate  = this.get('stop');
-		myValues.params = {'parameter': 'imf'};
 		myValues.output = this.get('output');
+		myValues.args = {}
+		if (this.get('args')) {
+			myValues.args = this.get('args');
+		}
+		myValues.hyperparameters = {};
+		if (this.get('hyperparameters')) {
+			myValues.hyperparameters = this.get('hyperparameters');
+		}
         	return myValues;
 	}
  
@@ -52,17 +52,69 @@ Ext.define(&#39;amdaUI.MachineLearningUI&#39;, {
 	},
  
 	createPredictionUI: function() {
+		var me = this;
 		this.predictionUI = Ext.create('Ext.form.Panel', {
 			items: [
 				{
-					xtype: 'datefield', name: 'start', fieldLabel: 'Start Time',
+					xtype: 'datefield', id: 'prediction-start', name: 'start', fieldLabel: 'Start Time',
 					format: 'Y-m-d\\TH:i:s'
 				},
 				{
-					xtype: 'datefield', name: 'stop', fieldLabel: 'Stop Time',
+					xtype: 'datefield', id: 'prediction-stop', name: 'stop', fieldLabel: 'Stop Time',
 					format: 'Y-m-d\\TH:i:s'
-				}
-			]
+				},
+				{
+					xtype: 'fieldset', id: 'prediction-args', title: 'Input arguments', hidden: true
+				},
+				{
+					xtype: 'fieldset', id: 'prediction-hyperparameters', title: 'Hyper parameters', hidden: true, enable: false
+				},
+			],
+			setModel: function(modelinfo) {
+				var defaultValues = modelinfo.get('defaults');
+				if (!defaultValues) defaultValues = {};
+
+				if (defaultValues['start'])
+					me.predictionUI.queryById('prediction-start').setValue(defaultValues['start']);
+
+				if (defaultValues['stop'])
+					me.predictionUI.queryById('prediction-stop').setValue(defaultValues['stop']);
+
+				var args = modelinfo.get('args');
+				if (!args) args = [];
+				me.predictionUI.queryById('prediction-args').setVisible(args.length > 0);
+				me.predictionUI.queryById('prediction-args').removeAll();
+				Ext.Array.each(args, function(arg) {
+					if (arg == 'start' || arg == 'stop') {
+						return;
+					}
+					var field = me.predictionUI.queryById('prediction-args').add({
+						xtype: 'textfield',
+						fieldLabel: arg,
+						name: arg,
+						allowBlank: false
+					});
+					if (defaultValues[arg]) {
+						field.setValue(defaultValues[arg]);
+					}
+				});
+
+				var hyperparameters = modelinfo.get('hyperparameters');
+				if (!hyperparameters) hyperparameters = [];
+				me.predictionUI.queryById('prediction-hyperparameters').setVisible(hyperparameters.length > 0);
+				me.predictionUI.queryById('prediction-hyperparameters').removeAll();
+				Ext.Array.each(hyperparameters, function(hyperparam) {
+					var field = me.predictionUI.queryById('prediction-hyperparameters').add({
+						xtype: 'textfield',
+						fieldLabel: hyperparam,
+						name: hyperparam,
+						allowBlank: false
+					});
+					if (defaultValues[hyperparam]) {
+						field.setValue(defaultValues[hyperparam]);
+					}
+				});
+			}
 		});
 		return this.predictionUI;
 	},
@@ -70,7 +122,10 @@ Ext.define(&#39;amdaUI.MachineLearningUI&#39;, {
 	createFittingUI: function() {
 		this.fittingUI = Ext.create('Ext.form.Panel', {
 			items: [
-                        ]
+                        ],
+			setModel: function(modelinfo) {
+
+			}
                 });
                 return this.fittingUI;
 	},
@@ -99,7 +154,6 @@ Ext.define(&#39;amdaUI.MachineLearningUI&#39;, {
 								this.createPredictionUI()
 							],
 							bbar: [
-								'->',
 								{xtype: 'button', text: 'Run Prediction', handler: this.runPredictionRequest, scope: me}
 							]
 						},
@@ -117,14 +171,11 @@ Ext.define(&#39;amdaUI.MachineLearningUI&#39;, {
 					setModel: function(modelinfo) {
 						me.runModelObj.set('moduleId', modelinfo.get('id'));
 						me.runModelObj.set('output', modelinfo.get('output'));
+						var defaultValues = modelinfo.get('defaults');
+						if (!defaultValues) defaultValues = {};
+
 						this.items.each(function(item) {
-							Ext.Object.each(me.runModelObj.getData(), function(key, value) {
-								if (key != 'mode') {
-									var field = item.items.getAt(0).getForm().findField(key);
-									if (field)
-										field.setValue(value);
-								}
-							});
+							item.items.getAt(0).setModel(modelinfo);
 						});
 					}
 				}
@@ -147,17 +198,35 @@ Ext.define(&#39;amdaUI.MachineLearningUI&#39;, {
 	},
  
 	runRequest: function(mode) {
+		var currentUI = null;
 		switch (mode) {
 			case 'fitting':
-				//this.fittingUI.getForm().updateRecord(this.runModelObj);
+				currentUI = this.fittingUI;
 				 myDesktopApp.errorMsg('Not available in this version');
 				return;
-				//break;
 			case 'prediction':
-				this.predictionUI.getForm().updateRecord(this.runModelObj);
+				currentUI = this.predictionUI;
 				break;
 		}
+		currentUI.getForm().updateRecord(this.runModelObj);
 		this.runModelObj.set('mode', mode);
+
+		var args = {};
+		if (currentUI.queryById(mode+'-args').isVisible()) {
+			currentUI.queryById(mode+'-args').items.each(function (item) {
+				args[item.name] = item.getValue();
+			});
+		}
+		this.runModelObj.set('args', args);
+
+		var hyperparameters = {};
+		if (currentUI.queryById(mode+'-hyperparameters').isVisible()) {
+			currentUI.queryById(mode+'-hyperparameters').items.each(function (item) {
+				hyperparameters[item.name] = item.getValue();
+			});
+		}
+		this.runModelObj.set('hyperparameters', hyperparameters);
+
 		loadMask.show(false);
 		var me = this;
 		AmdaAction.runMLModel(this.runModelObj.getJsonValues(), function (result, e) {