Merge pull request #47 from kerrlabajo/feat/download

Download Feature
kerrlabajo · May 12, 2024 · b0c06b6 · b0c06b6
2 parents 40096d1 + 1090101
commit b0c06b6
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 22 deletions.
diff --git a/Form1.Designer.cs b/Form1.Designer.cs
diff --git a/Form1.cs b/Form1.cs
@@ -595,12 +595,17 @@ private async void btnFetchOutput_Click(object sender, EventArgs e)
                 {
                     outputListComboBox.Items.Clear();
                     outputKey = $"users/{USERNAME}/training-jobs/{jobName[0]}/output/output.tar.gz";
-
+                    outputListComboBox.SelectedText = jobName[1];
                     foreach (var obj in jobName)
                     {
                         outputListComboBox.Items.Add(obj); 
                     }
                 }
+                else
+                {
+                    outputListComboBox.Items.Add("No items"); 
+                    btnDownloadModel.Enabled = false; 
+                }
             }
             catch (Exception ex)
             {
@@ -622,7 +627,7 @@ private void outputListComboBox_SelectedValueChanged(object sender, EventArgs e)
             {
                 string trainingJobOuputs = outputListComboBox.GetItemText(outputListComboBox.SelectedItem);
                 outputKey = $"users/{USERNAME}/training-jobs/{trainingJobOuputs}/output/output.tar.gz";
-                modelKey = $"users/ {USERNAME} /training-jobs/{trainingJobOuputs}/output/model.tar.gz";
+                modelKey = $"users/{USERNAME}/training-jobs/{trainingJobOuputs}/output/model.tar.gz";
                 btnDownloadModel.Enabled = true;
             }
             else
@@ -944,6 +949,33 @@ public void UpdateTrainingStatus(string status, string description)
                 MessageBox.Show($"Error: {ex.Message}");
             }
         }
+        public void UpdateDownloadStatus(int percentage)
+        {
+            try
+            {
+                if (this.InvokeRequired)
+                {
+                    if (percentage >= downloadProgressBar.Minimum && percentage <= downloadProgressBar.Maximum)
+                    {
+                        this.Invoke(new Action(() => UpdateDownloadStatus(percentage)));
+                        return;
+                    }
+                }
+
+                downloadProgressBar.Value = percentage;
+
+                if(percentage >= 100)
+                    downloadProgressBar.Value = 0;
+            }
+            catch (ObjectDisposedException)
+            {
+                Console.WriteLine("Main form is closed. Cannot update download progress bar.");
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Error: {ex.Message}");
+            }
+        }
 
         public void DisplayLogMessage(string logMessage)
         {
@@ -1011,7 +1043,7 @@ private async void btnFetchDatasets_Click(object sender, EventArgs e)
             {
                 List<string> datasets = await AWS_Helper.GetAvailableDatasetsList(s3Client, SAGEMAKER_BUCKET);
 
-                if (datasets != null)
+                if (datasets != null && datasets.Count > 0)
                 {
                     datasetListComboBox.Items.Clear();
 
@@ -1020,6 +1052,10 @@ private async void btnFetchDatasets_Click(object sender, EventArgs e)
                         datasetListComboBox.Items.Add(obj);
                     }
                 }
+                else
+                {
+                    datasetListComboBox.Items.Add("No items");
+                }
             }
             catch (Exception ex)
             {

diff --git a/Functions/AWS_Helper.cs b/Functions/AWS_Helper.cs
@@ -45,11 +45,11 @@ public static async Task<List<string>> GetTrainingJobOutputList(AmazonS3Client s
                 var response = await s3Client.ListObjectsV2Async(new ListObjectsV2Request
                 {
                     BucketName = bucketName,
-                    Prefix = "training-jobs"
+                    Prefix = $"users/{UserConnectionInfo.UserName}/training-jobs",
                 });
 
                 return response.S3Objects
-                    .Select(o => new { Key = o.Key.Split('/')[1], Date = ExtractDateFromKey(o.Key) })
+                    .Select(o => new { Key = o.Key.Split('/')[3], Date = ExtractDateFromKey(o.Key) })
                     .OrderByDescending(o => o.Date) 
                     .Select(o => o.Key)
                     .Distinct()

diff --git a/Functions/FileTransferUtility.cs b/Functions/FileTransferUtility.cs
@@ -311,10 +311,12 @@ private static void ConfigureProgressTracking(TransferUtilityDownloadRequest dow
 
             downloadRequest.WriteObjectProgressEvent += (sender, args) =>
             {
-                int percentage = (int)(args.TransferredBytes * 100 / args.TotalBytes);
+                int percentage = args.PercentDone;
                 if (!cancellationToken.IsCancellationRequested)
                 {
                     UIUpdater.UpdateTrainingStatus($"Downloading Files from S3", $"Downloading {args.TransferredBytes}/{args.TotalBytes} - {percentage}%");
+
+                    UIUpdater.UpdateDownloadStatus(percentage);
                 }
 
             };

diff --git a/Functions/IUIUpdater.cs b/Functions/IUIUpdater.cs
@@ -15,5 +15,6 @@ public interface IUIUpdater
         void UpdateTrainingStatus(string status, string description);
         void DisplayLogMessage(string logMessage);
         string ConvertAnsiToRtf(string ansiText);
+        void UpdateDownloadStatus(int percentage);
     }
 }