Merge pull request #519 from MEDomicsLab/develop

v1.7.0 merge

Author: MahdiAll99

.gitmodules

@@ -5,4 +5,4 @@
 [submodule "pythonCode/submodules/MEDprofiles"]
 	path = pythonCode/submodules/MEDprofiles
 	url = git@github.com:MEDomics-UdeS/MEDprofiles.git
-	branch = fusion_MEDomicsLab
+	branch = fusion_MEDomicsLab

build/pkg-scripts/postinstall build/pkg-scripts/postinstall.shbuild/pkg-scripts/postinstall renamed to build/pkg-scripts/postinstall.sh

@@ -60,6 +60,7 @@ mac: # Added from package.json
   #   - "Contents/MacOS/MEDomicsLab"
 pkg: # Added from package.json
   isRelocatable: false
+  scripts: "../build/pkg-scripts"
 win: # Added from package.json
   target: nsis
   icon: "app/assets/icon.ico"

build/pkg-scripts/preinstall build/pkg-scripts/preinstall.shbuild/pkg-scripts/preinstall renamed to build/pkg-scripts/preinstall.sh

@@ -32,6 +32,9 @@ func AddHandleFunc() {
 	Utils.CreateHandleFunc(prePath+"/create_group_DB/", handleCreateGroupDB)
 	Utils.CreateHandleFunc(prePath+"/generate_sample_data/", handleGenerateSampleData)
 	Utils.CreateHandleFunc(prePath+"/find_duplicate_columns_DB", handleFindDuplicateColumnsDB)
+	Utils.CreateHandleFunc(prePath+"/normalizeDB/", handleNormalizeDB)
+	Utils.CreateHandleFunc(prePath+"/drop_columns_tags/", handleDeleteColumnsAndTags)
+
 }
 
 // handleMerge handles the request to merge the datasets for the DB
@@ -297,6 +300,16 @@ func handleGenerateSampleData(jsonConfig string, id string) (string, error) {
 	return response, nil
 }
 
+func handleNormalizeDB(jsonConfig string, id string) (string, error) {
+	log.Println("Normalizing DB...", id)
+	response, err := Utils.StartPythonScripts(jsonConfig, "../pythonCode/modules/input/normalizeDB.py", id)
+	Utils.RemoveIdFromScripts(id)
+	if err != nil {
+		return "", err
+	}
+	return response, nil
+}
+
 // handleFindDuplicateColumnsDB to identify duplicate columns from a CSV
 // It returns the response from the python script
 func handleFindDuplicateColumnsDB(jsonConfig string, id string) (string, error) {
@@ -316,3 +329,12 @@ func handleFindDuplicateColumnsDB(jsonConfig string, id string) (string, error)
 
 	return response, nil
 }
+func handleDeleteColumnsAndTags(jsonConfig string, id string) (string, error) {
+	log.Println("Deleting Columns...", id)
+	response, err := Utils.StartPythonScripts(jsonConfig, "../pythonCode/modules/input/drop_columns_tags.py", id)
+	Utils.RemoveIdFromScripts(id)
+	if err != nil {
+		return "", err
+	}
+	return response, nil
+}

electron-builder.yml

@@ -0,0 +1,52 @@
+package superset
+
+import (
+	Utils "go_module/src"
+	"log"
+)
+
+var prePath = "superset"
+
+// AddHandleFunc adds the specific module handle function to the server
+func AddHandleFunc() {
+	Utils.CreateHandleFunc(prePath+"/launch/", handleLaunch)
+	Utils.CreateHandleFunc(prePath+"/create_user/", handleCreateUser)
+	Utils.CreateHandleFunc(prePath+"/progress/", handleProgress)
+}
+
+// handleStartSweetviz handles the request to run a sweetviz analysis
+// It returns the response from the python script
+func handleLaunch(jsonConfig string, id string) (string, error) {
+	log.Println("launching superset...", id)
+	response, err := Utils.StartPythonScripts(jsonConfig, "../pythonCode/modules/superset/launch.py", id)
+	Utils.RemoveIdFromScripts(id)
+	if err != nil {
+		return "", err
+	}
+	return response, nil
+}
+
+// handleCreateUser handles the request to create a user in superset
+// It returns the response from the python script
+func handleCreateUser(jsonConfig string, id string) (string, error) {
+	log.Println("creating user in superset...", id)
+	response, err := Utils.StartPythonScripts(jsonConfig, "../pythonCode/modules/superset/create_user.py", id)
+	Utils.RemoveIdFromScripts(id)
+	if err != nil {
+		return "", err
+	}
+	return response, nil
+}
+
+// handleProgress handles the request to get the progress of the experiment
+// It returns the progress of the experiment
+func handleProgress(jsonConfig string, id string) (string, error) {
+	Utils.Mu.Lock()
+	progress := Utils.Scripts[id].Progress
+	Utils.Mu.Unlock()
+	if progress != "" {
+		return progress, nil
+	} else {
+		return "{\"now\":\"0\", \"currentLabel\":\"Warming up\"}", nil
+	}
+}

go_server/blueprints/input/input.go

@@ -14,6 +14,7 @@ import (
 	Learning "go_module/blueprints/learning"
 	MED3pa "go_module/blueprints/med3pa"
 	MEDfl "go_module/blueprints/medfl"
+	Superset "go_module/blueprints/superset"
 	Utils "go_module/src"
 	"log"
 	"net/http"
@@ -36,6 +37,7 @@ func main() {
 	Application.AddHandleFunc()
 	MED3pa.AddHandleFunc()
 	MEDfl.AddHandleFunc()
+	Superset.AddHandleFunc()
 	Utils.CreateHandleFunc("get_server_health", handleGetServerHealth)
 	Utils.CreateHandleFunc("removeId/", handleRemoveId)
 	Utils.CreateHandleFunc("clearAll", handleClearAll)
@@ -49,9 +51,8 @@ func main() {
 
 	if len(os.Args) == 6 {
 		condaEnv = os.Args[5]
-	} 
-	
-	
+	}
+
 	log.Println("Conda env: " + condaEnv)
 	os.Setenv("MED_ENV", condaEnv)
 	os.Setenv("MED_TMP", os.Args[4])
@@ -66,7 +67,6 @@ func main() {
 		return
 	}
 
-
 }
 
 // handleGetServerHealth handles the request to get the server health

go_server/blueprints/superset/superset.go

@@ -192,7 +192,7 @@ func StartPythonScripts(jsonParam string, filename string, id string) (string, e
 	err = Scripts[id].Cmd.Start()
 	Mu.Unlock()
 	if err != nil {
-		log.Println("Error starting command " + script)
+		log.Println("Error starting command " + Scripts[id].Cmd.String())
 		return "", err
 	}
 	response := ""

go_server/main

@@ -87,7 +87,6 @@ function sendStatusToWindow(text) {
 }
 
 autoUpdater.on("checking-for-update", () => {
-  console.log("DEBUG: checking for update")
   sendStatusToWindow("Checking for update...")
 })