Config

Benjamin Renard
1 parent 2a4ea30c
Showing 7 changed files with 55 additions and 29 deletions Show diff stats
.gitignore
desktop.php
js/app/controllers/JobsMgr.js
js/app/views/MachineLearningUI.js
js/app/views/TabResultUI.js
php/classes/AmdaAction.php
php/config.php
@@ -9,6 +9,7 @@ generic_data/help/
 generic_data/SimuTemplate/TargetsSimu.xml*
 generic_data/guest*
 generic_data/HAPI/metadata/amda-catalog.json
+update_amda/tree.xml
 js/lib/ext
 help/simu
 help/auto
@@ -53,9 +53,6 @@ if ($sessionID === FALSE) {
     <!--	<script type="text/javascript" src="js/lib/ext/ext-all-dev.js"></script> -->
     <script type="text/javascript" src="js/lib/ext-override.js"></script>
     <script type="text/javascript" src="js/lib/showdown/showdown.min.js"></script>
-	
-<!-- Direct API -->
-    <script type="text/javascript" src="php/api.php"></script> 
  
     <!--  Plotly module-->
     <script src="js/lib/plotly/plotly-2.14.0.min.js"></script>
@@ -99,6 +99,7 @@ Ext.define(&#39;amdaDesktop.JobsMgr&#39;, {
                     break
                   case 'machinelearning':
                     type = 'Machine Learning '
+                    break
                   default:
                     type = 'unknown'
                 }
@@ -31,7 +31,6 @@ Ext.define(&#39;amdaUI.MachineLearningUI&#39;, {
 	),
  
 	logs:"",
-	debug:true,
  
 	predLogsCmp :null,
  
@@ -140,6 +139,18 @@ Ext.define(&#39;amdaUI.MachineLearningUI&#39;, {
 	createModelUI: function() {
 		var me = this;
  
+		this.predLogsCmp = new Ext.Component({ 
+			tpl:"<div>\
+					<h2 class='ml-pred-logs-titile'>PREDICTIONS: LOGS</h2>\
+					<div class='ml-pred-logs-content' id='prediction_logs'>{messages}</div>\
+				</div>", 
+			 
+			data: { 
+			   messages:""
+			},
+			hidden: true
+		});
+
 		this.modelUI = Ext.create('Ext.panel.Panel', {
 			layout: 'border',
 			items: [
@@ -241,6 +252,7 @@ Ext.define(&#39;amdaUI.MachineLearningUI&#39;, {
 		loadMask.show(false);
 		var me = this;
 		AmdaAction.runMLModel(this.runModelObj.getJsonValues(), function (result, e) {
+			console.log(e);
 			loadMask.hide();
 			if (!e.status){
 				myDesktopApp.errorMsg('Internal error during request');
@@ -389,36 +401,44 @@ Ext.define(&#39;amdaUI.MachineLearningUI&#39;, {
 						this.createModelUI()
 					]
 				}
-			]
+			],
+			listeners: {
+				afterrender: function() {
+					me.setSocket();
+				}
+			}
 		};
  
-		if(this.debug){
-			this.predLogsCmp = new Ext.Component({ 
-				tpl:"<div>\
-						<h2 class='ml-pred-logs-titile'>PREDICTIONS: LOGS</h2>\
-						<div class='ml-pred-logs-content' id='prediction_logs'>{messages}</div>\
-					</div>", 
-			 
-				data: { 
-				   messages:""
-				} 
-			});
-			this.setSocket();
-		}
+		
+		
 		Ext.apply (this, Ext.apply (arguments, myConf));
 	},
  
 	setSocket: function(){
-		const endPoint = "http://172.17.0.1:5000";
-		const socket = io.connect(`${endPoint}`);
-		const typeMsg = "running";
 		const me = this;
-		
-		socket.emit(typeMsg, "I'm connected");
-		socket.on(typeMsg, (msg) => {
-			const txt = msg.data;
-			me.logs+= "<p>"+ txt+"</p>";
-			me.predLogsCmp.update({messages:me.logs}); 
-		  });
+
+		AmdaAction.getMLConfig(function (result, e) {
+			if (!e.status){
+				return;
+			}
+			if (!result.success){
+				return;
+			}
+
+			if (result.entrypoint) {
+				me.predLogsCmp.setVisible(true);
+
+				const endPoint = result.entrypoint;
+				const socket = io.connect(`${endPoint}`);
+				const typeMsg = "running";
+
+				socket.emit(typeMsg, "I'm connected");
+				socket.on(typeMsg, (msg) => {
+					const txt = msg.data;
+					me.logs+= "<p>"+ txt+"</p>";
+					me.predLogsCmp.update({messages:me.logs}); 
+				});
+			}
+		});		
 	},
 });
@@ -35,7 +35,8 @@ Ext.define(&#39;amdaUI.TabResultUI&#39;, {
 						break;
 			case 'statistic': var title = 'Statistics Results';
 						break;
-			case 'machinelearning': var title = 'Machine Learning Results'
+			case 'machinelearning': var title = 'Machine Learning Results';
+						break;
 			default:
 		}
  
@@ -1675,6 +1675,11 @@ class AmdaAction
 		return $this->executeRequest((Object) array('mode' => 'moduleslist'), FunctionTypeEnumClass::MACHINELEARNING);
 	}
  
+	public function getMLConfig()
+	{
+		return $this->executeRequest((Object) array('mode' => 'configinfo'), FunctionTypeEnumClass::MACHINELEARNING);
+	}
+
 	public function getMLModelInfo($obj)
 	{
 		return $this->executeRequest((Object) array('mode' => 'moduleinfo', 'params' => array('id' => $obj->id)), FunctionTypeEnumClass::MACHINELEARNING);
@@ -199,6 +199,7 @@ $API = array(
 			'getRequestByProcessId' => array('len'=>1),
 			'parseTemplatedParam' => array('len'=>1),
 			'readDefaultMLModels' => array('len'=>0),
+			'getMLConfig' => array('len'=>0),
 			'getMLModelInfo' => array('len'=>1),
 			'runMLModel' => array('len'=>1),
 			'getMLResult' => array('len'=>3),