From fd9506fcb3afc0ba8048d738524fa36e66dc1b5c Mon Sep 17 00:00:00 2001 From: Denys Zaitsev Date: Sun, 15 Jun 2025 19:45:28 +0300 Subject: [PATCH 1/6] fix for retention script --- build/gdrive_retention.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/gdrive_retention.ps1 b/build/gdrive_retention.ps1 index 29de8d3..4fe1864 100644 --- a/build/gdrive_retention.ps1 +++ b/build/gdrive_retention.ps1 @@ -1,4 +1,4 @@ -# Configuration + # Configuration $rcloneRemote = "AzaionGoogleDrive:AzaionSuiteBuilds" $rclone = "rclone" # Assuming rclone is available in the PATH. @@ -41,7 +41,7 @@ foreach ($file in $allFiles) { } # --- Full Installers --- -Write-Header "Checking for old Full installers (AzaionSuite.Full.*.zip)" +Write-Header 'Checking for old Full installers (AzaionSuite.Full.*.zip)' $fullFiles = $allFiles | Where-Object { $_ -like "AzaionSuite.Full.*.zip" } | Sort-Object -Descending if ($fullFiles.Count -eq 0) { @@ -73,7 +73,7 @@ if ($fullFiles.Count -eq 0) { } # --- Iterative Installers --- -Write-Header "Checking for old Iterative installers (AzaionSuite.Iterative.*.exe)" +Write-Header 'Checking for old Iterative installers (AzaionSuite.Iterative.*.exe)' $iterativeFiles = $allFiles | Where-Object { $_ -like "AzaionSuite.Iterative.*.exe" } | Sort-Object -Descending if ($iterativeFiles.Count -eq 0) { @@ -105,3 +105,4 @@ if ($iterativeFiles.Count -eq 0) { } Write-Header "Cleanup script completed" + From 13659bee24a83522e90ed9599a3886a8bb5f4724 Mon Sep 17 00:00:00 2001 From: Denys Zaitsev Date: Sun, 15 Jun 2025 19:47:14 +0300 Subject: [PATCH 2/6] fix for retention script --- build/gdrive_retention.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/gdrive_retention.ps1 b/build/gdrive_retention.ps1 index 29de8d3..4fe1864 100644 --- a/build/gdrive_retention.ps1 +++ b/build/gdrive_retention.ps1 @@ -1,4 +1,4 @@ -# Configuration + # Configuration $rcloneRemote = "AzaionGoogleDrive:AzaionSuiteBuilds" $rclone = "rclone" # Assuming rclone is available in the PATH. @@ -41,7 +41,7 @@ foreach ($file in $allFiles) { } # --- Full Installers --- -Write-Header "Checking for old Full installers (AzaionSuite.Full.*.zip)" +Write-Header 'Checking for old Full installers (AzaionSuite.Full.*.zip)' $fullFiles = $allFiles | Where-Object { $_ -like "AzaionSuite.Full.*.zip" } | Sort-Object -Descending if ($fullFiles.Count -eq 0) { @@ -73,7 +73,7 @@ if ($fullFiles.Count -eq 0) { } # --- Iterative Installers --- -Write-Header "Checking for old Iterative installers (AzaionSuite.Iterative.*.exe)" +Write-Header 'Checking for old Iterative installers (AzaionSuite.Iterative.*.exe)' $iterativeFiles = $allFiles | Where-Object { $_ -like "AzaionSuite.Iterative.*.exe" } | Sort-Object -Descending if ($iterativeFiles.Count -eq 0) { @@ -105,3 +105,4 @@ if ($iterativeFiles.Count -eq 0) { } Write-Header "Cleanup script completed" + From 9568e3fe26224139271a0d117514ed87b7626dbd Mon Sep 17 00:00:00 2001 From: Alex Bezdieniezhnykh Date: Sun, 15 Jun 2025 21:30:28 +0300 Subject: [PATCH 3/6] fix numpy version --- Azaion.Inference/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 608bb944221c468487005173612bb87480fe71e2 Mon Sep 17 00:00:00 2001 From: Alex Bezdieniezhnykh Date: Sun, 15 Jun 2025 21:50:43 +0300 Subject: [PATCH 4/6] fix loaderconfig check --- Azaion.LoaderUI/Login.xaml.cs | 5 ++++- Azaion.LoaderUI/loaderconfig.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Azaion.LoaderUI/Login.xaml.cs b/Azaion.LoaderUI/Login.xaml.cs index 06d1dde..4ef06c9 100644 --- a/Azaion.LoaderUI/Login.xaml.cs +++ b/Azaion.LoaderUI/Login.xaml.cs @@ -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 From c5e72669c5ef3493fd43a2007c5727af4733cbf8 Mon Sep 17 00:00:00 2001 From: Alex Bezdieniezhnykh Date: Sun, 15 Jun 2025 23:04:05 +0300 Subject: [PATCH 5/6] Create desktop icon: checked --- Azaion.LoaderUI/Login.xaml.cs | 2 +- build/installer.full.iss | 2 +- build/installer.iterative.iss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Azaion.LoaderUI/Login.xaml.cs b/Azaion.LoaderUI/Login.xaml.cs index 06d1dde..0a49829 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(); } diff --git a/build/installer.full.iss b/build/installer.full.iss index f67a5d0..127a8da 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}"; Flags: checked [Files] Source: "..\dist-dlls\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; diff --git a/build/installer.iterative.iss b/build/installer.iterative.iss index a6029b6..103f14d 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}"; Flags: checked [Files] Source: "..\dist-azaion\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; From f1fb9e8ae9ebecee25208ac6da7d8fcd1ef48db8 Mon Sep 17 00:00:00 2001 From: Alex Bezdieniezhnykh Date: Sun, 15 Jun 2025 23:21:56 +0300 Subject: [PATCH 6/6] fix flags in inno setup fix build inference --- Azaion.Inference/build_inference.cmd | 1 - build/installer.full.iss | 2 +- build/installer.iterative.iss | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) 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/build/installer.full.iss b/build/installer.full.iss index 127a8da..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: checked +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 103f14d..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: checked +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; [Files] Source: "..\dist-azaion\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs;