Simplify task management

Microsoft.GA4GH.TES.sln

@@ -49,6 +49,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tes.SDK", "src\Tes.SDK\Tes.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tes.SDK.Tests", "src\Tes.SDK.Tests\Tes.SDK.Tests.csproj", "{AE7ADB92-BEC6-4030-B62F-BDBB6AC53CB4}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tes.Repository", "src\Tes.Repository\Tes.Repository.csproj", "{515A4905-0522-4C72-BC18-41BE6A3BE880}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tes.SDK.Examples", "src\Tes.SDK.Examples\Tes.SDK.Examples.csproj", "{08A30572-2C5A-4F61-AF77-36F624A6020B}"
 EndProject
 Global
@@ -117,6 +119,10 @@ Global
 		{AE7ADB92-BEC6-4030-B62F-BDBB6AC53CB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AE7ADB92-BEC6-4030-B62F-BDBB6AC53CB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AE7ADB92-BEC6-4030-B62F-BDBB6AC53CB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{515A4905-0522-4C72-BC18-41BE6A3BE880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{515A4905-0522-4C72-BC18-41BE6A3BE880}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{515A4905-0522-4C72-BC18-41BE6A3BE880}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{515A4905-0522-4C72-BC18-41BE6A3BE880}.Release|Any CPU.Build.0 = Release|Any CPU
 		{08A30572-2C5A-4F61-AF77-36F624A6020B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{08A30572-2C5A-4F61-AF77-36F624A6020B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{08A30572-2C5A-4F61-AF77-36F624A6020B}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/CommonUtilities/CommonUtilities.csproj

@@ -18,6 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Polly" Version="8.4.2" />
+    <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     <!--Mitigate reported security issues-->
     <PackageReference Include="System.Text.Json" Version="8.0.5" />

src/CommonUtilities/Models/NodeTask.cs

@@ -33,7 +33,6 @@ public class NodeTask
         public string? OutputsMetricsFormat { get; set; }
         public List<string>? TimestampMetricsFormats { get; set; }
         public List<string>? BashScriptMetricsFormats { get; set; }
-        public string? MountParentDirectoryPath { get; set; }
         public RuntimeOptions RuntimeOptions { get; set; } = null!;
     }
 
@@ -80,6 +79,7 @@ public class RuntimeOptions
         public AzureEnvironmentConfig? AzureEnvironmentConfig { get; set; }
 
         public bool? SetContentMd5OnUpload { get; set; }
+        public string? MountParentDirectoryPath { get; set; }
     }
 
     public class StorageTargetLocation

src/CommonUtilities/PagedInterfaceExtensions.cs

@@ -69,10 +69,10 @@ public static IAsyncEnumerable<T> ExecuteWithRetryAsync<T>(this AsyncRetryHandle
         private sealed class PollyAsyncEnumerable<T> : IAsyncEnumerable<T>
         {
             private readonly IAsyncEnumerable<T> _source;
-            private readonly RetryHandler.AsyncRetryHandlerPolicy _retryPolicy;
+            private readonly AsyncRetryHandlerPolicy _retryPolicy;
             private readonly Polly.Context _ctx;
 
-            public PollyAsyncEnumerable(IAsyncEnumerable<T> source, RetryHandler.AsyncRetryHandlerPolicy retryPolicy, Polly.Context ctx)
+            public PollyAsyncEnumerable(IAsyncEnumerable<T> source, AsyncRetryHandlerPolicy retryPolicy, Polly.Context ctx)
             {
                 ArgumentNullException.ThrowIfNull(source);
                 ArgumentNullException.ThrowIfNull(retryPolicy);

src/CommonUtilities/RetryHandler.cs

@@ -6,19 +6,24 @@
 namespace CommonUtilities;
 
 /// <summary>
-/// Utility class that facilitates the retry policy implementations for HTTP clients. 
+/// Utility class that facilitates the retry policy implementations for HTTP clients.
 /// </summary>
 public static class RetryHandler
 {
     /// <summary>
     /// Polly Context key for caller method name
     /// </summary>
     public const string CallerMemberNameKey = $"Tes.ApiClients.{nameof(RetryHandler)}.CallerMemberName";
+
     /// <summary>
     /// Polly Context key for backup skip increment setting
     /// </summary>
     public const string BackupSkipProvidedIncrementKey = $"Tes.ApiClients.{nameof(RetryHandler)}.BackupSkipProvidedIncrementCount";
 
+    /// Polly Context key combined sleep method and enumerable duration policies
+    /// </summary>
+    public const string CombineSleepDurationsKey = $"Tes.ApiClients.{nameof(RetryHandler)}.CombineSleepDurations";
+
     #region RetryHandlerPolicies
     /// <summary>
     /// Non-generic synchronous retry policy
@@ -100,7 +105,6 @@ public AsyncRetryHandlerPolicy(IAsyncPolicy retryPolicy)
         /// <remarks>For mocking</remarks>
         public AsyncRetryHandlerPolicy() { }
 
-
         /// <summary>
         /// Executes a delegate with the configured async policy.
         /// </summary>
@@ -156,6 +160,20 @@ public virtual Task<TResult> ExecuteWithRetryAsync<TResult>(Func<CancellationTok
 
             return retryPolicy.ExecuteAsync((_, ct) => action(ct), PrepareContext(caller), cancellationToken);
         }
+
+        /// <summary>
+        /// Executes the specified asynchronous action within the policy and returns the captured result.
+        /// </summary>
+        /// <param name="action">The action to perform.</param>
+        /// <param name="cancellationToken">A cancellation token which can be used to cancel the action.  When a retry policy in use, also cancels any further retries.</param>
+        /// <param name="caller">Name of method originating the retriable operation.</param>
+        /// <returns>The captured result.</returns>
+        public virtual Task<PolicyResult> ExecuteAndCaptureAsync(Func<CancellationToken, Task> action, CancellationToken cancellationToken, [System.Runtime.CompilerServices.CallerMemberName] string? caller = default)
+        {
+            ArgumentNullException.ThrowIfNull(action);
+
+            return retryPolicy.ExecuteAndCaptureAsync((_, token) => action(token), PrepareContext(caller), cancellationToken);
+        }
     }
 
     /// <summary>
@@ -277,6 +295,6 @@ public virtual async Task<T> ExecuteWithRetryAndConversionAsync<T>(Func<Cancella
 
     public static Context PrepareContext(string? caller) => new()
     {
-        [CallerMemberNameKey] = caller
+        [CallerMemberNameKey] = caller ?? throw new ArgumentNullException(nameof(caller))
     };
 }