diff --git a/Azaion.Inference/build_inference.cmd b/Azaion.Inference/build_inference.cmd index c08c978..a880c9b 100644 --- a/Azaion.Inference/build_inference.cmd +++ b/Azaion.Inference/build_inference.cmd @@ -45,7 +45,6 @@ venv\Scripts\pyinstaller --name=azaion-inference ^ --hidden-import onnx_engine ^ --hidden-import inference_engine ^ --hidden-import inference ^ ---hidden-import main-inf ^ start.py robocopy "dist\azaion-inference\_internal" "..\dist-azaion\_internal" "ai_config.cp312-win_amd64.pyd" "annotation.cp312-win_amd64.pyd" diff --git a/Azaion.Inference/requirements.txt b/Azaion.Inference/requirements.txt index 25458a4..6c9f1c9 100644 --- a/Azaion.Inference/requirements.txt +++ b/Azaion.Inference/requirements.txt @@ -1,7 +1,7 @@ pyinstaller Cython opencv-python==4.10.0.84 -numpy +numpy==2.3.0 onnxruntime-gpu cryptography==44.0.2 psutil diff --git a/Azaion.LoaderUI/Login.xaml.cs b/Azaion.LoaderUI/Login.xaml.cs index 06d1dde..14e18a4 100644 --- a/Azaion.LoaderUI/Login.xaml.cs +++ b/Azaion.LoaderUI/Login.xaml.cs @@ -79,7 +79,7 @@ public partial class Login TbStatus.Text = "Loading..."; while (!Process.GetProcessesByName(Constants.INFERENCE_EXE).Any()) await Task.Delay(500); - await Task.Delay(500); + await Task.Delay(1500); Close(); } @@ -168,7 +168,10 @@ public partial class Login private async Task GetInstallerVer() { TbStatus.Text = "Checking for the newer version..."; - var installerName = await _azaionApi.GetLastInstallerName(_dirConfig?.SuiteInstallerDirectory ?? Constants.SUITE_FOLDER); + var installerDir = string.IsNullOrWhiteSpace(_dirConfig?.SuiteInstallerDirectory) + ? Constants.SUITE_FOLDER + : _dirConfig.SuiteInstallerDirectory; + var installerName = await _azaionApi.GetLastInstallerName(installerDir); var version = installerName .Replace("AzaionSuite.Iterative.", "") .Replace(".exe", ""); diff --git a/Azaion.LoaderUI/loaderconfig.json b/Azaion.LoaderUI/loaderconfig.json index c77a864..4b65763 100644 --- a/Azaion.LoaderUI/loaderconfig.json +++ b/Azaion.LoaderUI/loaderconfig.json @@ -1,6 +1,6 @@ { "DirectoriesConfig": { - "SuiteInstallerDirectory": "" + "SuiteInstallerDirectory": null } } \ No newline at end of file diff --git a/build/installer.full.iss b/build/installer.full.iss index f67a5d0..fd1bab4 100644 --- a/build/installer.full.iss +++ b/build/installer.full.iss @@ -21,7 +21,7 @@ DiskSpanning=yes Name: "english"; MessagesFile: "compiler:Default.isl" [Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; [Files] Source: "..\dist-dlls\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; diff --git a/build/installer.iterative.iss b/build/installer.iterative.iss index a6029b6..1ac7d13 100644 --- a/build/installer.iterative.iss +++ b/build/installer.iterative.iss @@ -20,7 +20,7 @@ SolidCompression=yes Name: "english"; MessagesFile: "compiler:Default.isl" [Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; [Files] Source: "..\dist-azaion\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;