python dependencies message

Author: jginternational

kratos.gid/exec/launch.json

@@ -2,7 +2,7 @@
     "configurations": [
         {
             "name": "Launch via pip",
-            "script": "global_pip"
+            "script": "pip"
         },
         {
             "name": "Launch via pip with local packages",

kratos.gid/exec/pip.unix.bat

@@ -0,0 +1,48 @@
+#!/bin/bash
+# OutputFile: "$2/$1.info"
+# ErrorFile: "$2/$1.err"
+#delete previous result file
+rm -f "$2/$1*.post.bin"
+rm -f "$2/$1*.post.res"
+rm -f "$2/$1*.post.msh"
+rm -f "$2/$1.info"
+rm -f "$2/$1.err"
+rm -f "$2/$1.flavia.dat"
+
+# include .bashrc if it exists
+if [ -f "$HOME/.bashrc" ]; then
+    . "$HOME/.bashrc"
+fi
+
+
+
+# gid redefines LD_LIBRARY_PATH to its own libs directory
+# and maintains OLD_LD_LIBRARY_PATH with previous settings
+# therefore, we use the OLD_LD_LIBRARY_PATH and prepend the path to the kratos libs
+if [ "$OLD_LD_LIBRARY_PATH" != "" ]; then
+    export LD_LIBRARY_PATH="$3/exec/Kratos":"$3/exec/Kratos/libs":$OLD_LD_LIBRARY_PATH
+else
+    # do not add the ':'
+    export LD_LIBRARY_PATH="$3/exec/Kratos":"$3/exec/Kratos/libs"
+fi
+
+# Prevents the PYTHONHOME error from happening and isolate possible python repacks present
+# in the system and interfeering with runkratos
+# export PYTHONHOME="$3/exec/Kratos"
+export PYTHONPATH="$3/exec/Kratos/python34.zip":"$3/exec/Kratos":$PYTHONPATH
+
+
+# if mac
+KERNEL=`uname -s`
+if [ $KERNEL = "Darwin" ]; then
+    KERNEL_NAME="macosx"
+    export DYLD_LIBRARY_PATH="$3/exec/Kratos":"$3/exec/Kratos/libs":$DYLD_LIBRARY_PATH
+    export DYLD_FALLBACK_LIBRARY_PATH="$3/exec/Kratos":"$3/exec/Kratos/libs":$DYLD_FALLBACK_LIBRARY_PATH
+    export PYTHONPATH="$3/exec/Kratos/Lib":"$3/exec/Kratos/Lib/lib-dynload/":$PYTHONPATH
+    export PYTHONHOME="$3/exec/Kratos"
+else
+    KERNEL_NAME="linux"
+fi
+
+# Run Python using the script MainKratos.py
+python3 MainKratos.py > "$2/$1.info" 2> "$2/$1.err"

kratos.gid/exec/pip.win.bat

@@ -0,0 +1,18 @@
+REM @ECHO OFF
+REM Identification for arguments
+REM basename                          = %1
+REM Project directory                 = %2
+REM Problem directory                 = %3
+
+REM OutputFile: "%2\%1.info"
+REM ErrorFile: "%2\%1.err"
+
+REM Remove previous calculation files and results
+DEL "%2\%1.info"
+DEL "%2\%1.err"
+DEL "%2\%1*.post.bin"
+DEL "%2\%1*.post.res"
+DEL "%2\%1*.post.msh"
+
+@REM Calculate!
+python MainKratos.py > "%2\\%1.info" 2> "%2\\%1.err"

kratos.gid/scripts/Launch.tcl

@@ -64,7 +64,11 @@ proc Kratos::GetMissingPipPackages { } {
 
 
 proc Kratos::CheckDependencies { } {
-    if {[pythonVersion] <= 0} {
+    if { [GidUtils::IsTkDisabled] } {
+        return 0
+    }
+    set py_version [Kratos::pythonVersion]
+    if {$py_version <= 0} {
         set msgBox_type yesno
         #  -do_not_ask_again 1 -do_not_ask_again_key "kratos_install_python"
         set reply [tk_messageBox -icon warning -type $msgBox_type -parent .gid \
@@ -76,8 +80,20 @@ proc Kratos::CheckDependencies { } {
         if {[string equal $reply "cancel"]} {
 
         }
-    } else {
+    }
+    set missing_packages [Kratos::GetMissingPipPackages]
+    if {[llength $missing_packages] > 0} {
+        set msgBox_type yesno
+        #  -do_not_ask_again 1 -do_not_ask_again_key "kratos_install_python"
+        set reply [tk_messageBox -icon warning -type $msgBox_type -parent .gid \
+                -message "Python $py_version is installed, but there are some missing packages. Do you want Kratos to install them? \n\nPackages to be installed: \n$missing_packages" \
+                -title [_ "Missing python packages"]]
+        if {[string equal $reply "yes"]} {
+            Kratos::InstallAllPythonDependencies
+        }
+        if {[string equal $reply "cancel"]} {
 
+        }
     }
 }
 
@@ -87,13 +103,13 @@ proc Kratos::GetLaunchConfigurationFile { } {
     return [list $new_dir $file]
 }
 
-proc Kratos::LoadLaunchModes { } {
+proc Kratos::LoadLaunchModes { {force 0} } {
     # Get location of launch config script
     lassign [Kratos::GetLaunchConfigurationFile] new_dir file
 
     # If it does not exist, copy it from exec
     if {[file exists $new_dir] == 0} {file mkdir $new_dir}
-    if {[file exists $file] == 0} {
+    if {[file exists $file] == 0 || $force} {
         ::GidUtils::SetWarnLine "Loading launch mode"
         set source [file join $::Kratos::kratos_private(Path) exec launch.json]
         file copy -force $source $file

kratos.gid/scripts/Menus.tcl

@@ -151,7 +151,9 @@ proc Kratos::ChangeMenus { } {
     if {[GidUtils::VersionCmp "14.1.4d"] <0 } { set cmd  [list ChangeVariables kratos_preferences] } {set cmd [list PreferencesWindow kratos_preferences]}
     GiDMenu::InsertOption "Kratos" [list "Kratos preferences" ] [incr pos] PRE $cmd "" "" replace =
     GiDMenu::InsertOption "Kratos" [list "View current log" ] [incr pos] PREPOST [list Kratos::ViewLog] "" "" replace =
-    GiDMenu::InsertOption "Kratos" [list "Install python and dependencies" ] [incr pos] PREPOST [list Kratos::CheckDependencies] "" "" replace =
+    GiDMenu::InsertOption "Kratos" [list "Install python and dependencies" ] [incr pos] PREPOST [list Kratos::InstallAllPythonDependencies] "" "" replace =
+    GiDMenu::InsertOption "Kratos" [list "Refresh launch configurations" ] [incr pos] PREPOST [list Kratos::LoadLaunchModes 1] "" "" replace =
+    GiDMenu::InsertOption "Kratos" [list "---"] [incr pos] PRE "" "" "" replace =
     GiDMenu::InsertOption "Kratos" [list "About Kratos" ] [incr pos] PREPOST [list Kratos::About] "" "" replace =
     GidChangeDataLabel "Data units" ""
     GidChangeDataLabel "Interval" ""