unified package, only 2 modes, dependency check

Author: jginternational

kratos.gid/exec/launch.json

@@ -2,19 +2,25 @@
     "configurations": [
         {
             "name": "Launch via pip",
-            "script": "pip"
+            "script": "pip",
+            "pip_packages": "KratosMultiphysics-all",
+            "dependency_check": "Kratos::CheckDependenciesPipMode"
         },
         {
             "name": "Launch via pip with local packages",
-            "script": "local_pip"
+            "script": "local_pip",
+            "pip_packages": "exec/packages/**.whl",
+            "dependency_check": "Kratos::CheckDependenciesLocalPipMode"
         },
         {
             "name": "Launch local compiled version",
-            "script": "compiled"
+            "script": "compiled",
+            "dependency_check": "Kratos::CheckDependenciesLocalMode"
         },
         {
             "name": "Docker",
-            "script": ""
+            "script": "",
+            "dependency_check": "Kratos::CheckDependenciesDockerMode"
         }
     ]
 }

kratos.gid/kratos.tcl

@@ -187,9 +187,11 @@ proc Kratos::InitGlobalVariables {dir} {
     set namespaces [list ]
 
     variable pip_packages_required
-    set pip_packages_required [list KratosMultiphysics KratosFluidDynamicsApplication KratosConvectionDiffusionApplication \
-    KratosDEMApplication numpy KratosDamApplication KratosSwimmingDEMApplication KratosStructuralMechanicsApplication KratosMeshMovingApplication \
-    KratosMappingApplication KratosParticleMechanicsApplication KratosLinearSolversApplication KratosContactStructuralMechanicsApplication]
+    # set pip_packages_required [list KratosMultiphysics KratosFluidDynamicsApplication KratosConvectionDiffusionApplication \
+    # KratosDEMApplication numpy KratosDamApplication KratosSwimmingDEMApplication KratosStructuralMechanicsApplication KratosMeshMovingApplication \
+    # KratosMappingApplication KratosParticleMechanicsApplication KratosLinearSolversApplication KratosContactStructuralMechanicsApplication \
+    # KratosFSIApplication]
+    set pip_packages_required KratosMultiphysics-all==9.0.2
 }
 
 proc Kratos::LoadCommonScripts { } {

kratos.gid/scripts/Controllers/Preferences.xml

@@ -21,10 +21,10 @@
         <entrywithbutton name="debug_folder" label="Debug path" variable="debug_folder" buttonimage="folder.png" variablemanager='Kratos::ManagePreferences' buttonfunction="OpenBrowserForDirectory" help='Path to the kratos debug folder. This is placed in the launch.json file for debugging' />
         <combobox name="launch_configuration" label="Launch configuration" variable="launch_configuration" variablemanager='Kratos::ManagePreferences' help='' >
             <option value='Launch via pip' label='Launch via pip'/>
-            <option value='Launch via pip with local packages' label='Launch via pip with local packages'/>
+            <!-- <option value='Launch via pip with local packages' label='Launch via pip with local packages'/> -->
             <option value='Launch local compiled version' label='Launch local compiled version'/>
-            <option value='Docker' label='Docker'/>
-            <option value='Custom...' label='Custom...'/>
+            <!-- <option value='Docker' label='Docker'/> -->
+            <!-- <option value='Custom...' label='Custom...'/> -->
         </combobox>
     </labelframe>
 </group>

kratos.gid/scripts/Controllers/PreferencesWindow.tcl

@@ -12,6 +12,7 @@ proc Kratos::ManagePreferences { cmd name {value ""}} {
         "SetValue" {
             set ::Kratos::kratos_private($name) $value
             if {$name eq "allow_logs"} {Kratos::InitLog}
+            if {$name eq "launch_configuration"} {Kratos::CheckDependencies}
         }
         "GetDefaultValue" {
             # same as GetValue

kratos.gid/scripts/Launch.tcl

@@ -81,6 +81,15 @@ proc Kratos::GetMissingPipPackages { } {
 
 
 proc Kratos::CheckDependencies { } {
+    set curr_mode [Kratos::GetLaunchMode]
+    # W $curr_mode
+    if {[dict exists $curr_mode dependency_check]} {
+        set deps [dict get $curr_mode dependency_check]
+        $deps
+    }
+}
+
+proc Kratos::CheckDependenciesPipMode {} {
     if { [GidUtils::IsTkDisabled] } {
         return 0
     }
@@ -120,6 +129,15 @@ proc Kratos::CheckDependencies { } {
         }
     }
 }
+proc Kratos::CheckDependenciesLocalPipMode {} {
+
+}
+proc Kratos::CheckDependenciesLocalMode {} {
+    W "local"
+}
+proc Kratos::CheckDependenciesDockerMode {} {
+
+}
 
 proc Kratos::GetLaunchConfigurationFile { } {
     set new_dir [file join $::env(HOME) .kratos_multiphysics]
@@ -165,12 +183,23 @@ proc Kratos::SetDefaultLaunchMode { } {
 proc Kratos::ExecuteLaunchByMode {launch_mode} {
     set bat_file ""
     if { $::tcl_platform(platform) == "windows" } { set os win } {set os unix}
+    set mode [Kratos::GetLaunchMode $launch_mode]
+    if {$mode ne ""} {
+        set bat [dict get $mode script]
+        set bat_file [file join exec $bat.$os.bat]
+    }
+
+    return $bat_file
+}
+
+proc Kratos::GetLaunchMode { {launch_mode "current"} } {
+    set curr_mode ""
+    if {$launch_mode eq "current"} {set launch_mode $Kratos::kratos_private(launch_configuration)}
     foreach mode $::Kratos::kratos_private(configurations) {
         set mode_name [dict get $mode name]
         if {$mode_name eq $launch_mode} {
-            set bat [dict get $mode script]
-            set bat_file [file join exec $bat.$os.bat]
+            set curr_mode $mode
         }
     }
-    return $bat_file
-}
+    return $curr_mode
+}

kratos.gid/scripts/Menus.tcl

@@ -151,7 +151,7 @@ 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::InstallAllPythonDependencies] "" "" replace =
+    GiDMenu::InsertOption "Kratos" [list "Install python and update 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 =