Plan Status Code Updates

Ares.Core.Tests/Execution/CampaignExecutorTests.cs

@@ -58,7 +58,8 @@ public void SetUp()
         It.IsAny<RequestMetadata>(),
         It.IsAny<IEnumerable<Parameter>>(),
         It.IsAny<IEnumerable<Ares.Datamodel.Analyzing.Analysis>>(),
-        It.IsAny<IEnumerable<ExperimentOverview>>(),
+        It.IsAny<IEnumerable<ExperimentOverview>>(),
+        It.IsAny<PlanStatusCode>(),
         It.IsAny<CancellationToken>()))
       .ReturnsAsync(true);
 
@@ -217,7 +218,8 @@ public async Task Replan_Composes_And_Executes_Experiment_Again()
       It.IsAny<RequestMetadata>(),
       It.IsAny<IEnumerable<Parameter>>(),
       It.IsAny<IEnumerable<Ares.Datamodel.Analyzing.Analysis>>(),
-      It.IsAny<IEnumerable<ExperimentOverview>>(),
+      It.IsAny<IEnumerable<ExperimentOverview>>(),
+      It.IsAny<PlanStatusCode>(),
       It.IsAny<CancellationToken>()), Times.Once);
   }
 

Ares.Core/Execution/Enums/ExperimentLoopOutcome.cs

@@ -0,0 +1,8 @@
+namespace Ares.Core.Execution.Enums;
+
+public enum ExperimentLoopOutcome
+{
+  Succeeded,
+  Failed,
+  Canceled
+}

Ares.Core/Execution/Enums/ExperimentPhase.cs

@@ -0,0 +1,15 @@
+namespace Ares.Core.Execution.Enums;
+
+public enum ExperimentPhase
+{
+  Initialize,
+  Plan,
+  Compose,
+  Execute,
+  Analyze,
+  Retry,
+  Replan,
+  Complete,
+  Failed,
+  Canceled
+}

Ares.Core/Execution/Executors/CampaignExecutor.cs

@@ -3,6 +3,7 @@
 using Ares.Core.Device.State.Logging;
 using Ares.Core.Exceptions;
 using Ares.Core.Execution.ControlTokens;
+using Ares.Core.Execution.Enums;
 using Ares.Core.Execution.Executors.Composers;
 using Ares.Core.Execution.Extensions;
 using Ares.Core.Execution.Safety;
@@ -13,6 +14,7 @@
 using Ares.Core.Settings;
 using Ares.Datamodel;
 using Ares.Datamodel.Analyzing;
+using Ares.Datamodel.Planning;
 using Ares.Datamodel.Templates;
 using Google.Protobuf.WellKnownTypes;
 using Microsoft.Extensions.Logging;
@@ -22,28 +24,7 @@
 namespace Ares.Core.Execution.Executors;
 
 public class CampaignExecutor : ICampaignExecutor
-{
-  private enum ExperimentPhase
-  {
-    Initialize,
-    Plan,
-    Compose,
-    Execute,
-    Analyze,
-    Retry,
-    Replan,
-    Complete,
-    Failed,
-    Canceled
-  }
-
-  private enum ExperimentLoopOutcome
-  {
-    Succeeded,
-    Failed,
-    Canceled
-  }
-
+{ 
   private readonly IExecutionReporter _executionReporter;
   private readonly ISubject<CampaignExecutionStatus> _executionStatusSubject;
   private readonly ICommandComposer<ExperimentTemplate, ExperimentExecutor> _experimentComposer;
@@ -66,6 +47,7 @@ private enum ExperimentLoopOutcome
   private ExperimentTemplate? _currentExperimentTemplate = null;
   private int _experimentCount = 0;
   private TaskCompletionSource<ErrorHandling>? _userDecisionSource;
+  private PlanStatusCode _latestPlanStatusCode = PlanStatusCode.PlanStatusUnspecified;
 
   internal CampaignExecutor(ICommandComposer<ExperimentTemplate, ExperimentExecutor> experimentComposer,
     IPlanningHelper planningHelper,
@@ -227,7 +209,11 @@ private async Task NotifyCampaignStart()
     return (true, startupSummary);
   }
 
-  private async Task<ExperimentLoopOutcome> ExecuteExperimentLoop(string campaignPath, List<Analysis> analyses, List<ExperimentExecutionSummary> experimentSummaries, ExecutionControlToken token, ExperimentExecutionSummary startupSummary)
+  private async Task<ExperimentLoopOutcome> ExecuteExperimentLoop(string campaignPath, 
+    List<Analysis> analyses, 
+    List<ExperimentExecutionSummary> experimentSummaries, 
+    ExecutionControlToken token, 
+    ExperimentExecutionSummary startupSummary)
   {
     var currentPhase = ExperimentPhase.Initialize;
     var currentExperimentPath = "";
@@ -398,9 +384,17 @@ private async Task<ExperimentPhase> ExecuteCurrentExperiment(string currentExper
       .SelectMany(s => s.CommandSummaries)
       .FirstOrDefault(c => !c.Result.Success);
 
-    return failedCommandSummary is null
-      ? ExperimentPhase.Analyze
-      : await HandleError(failedCommandSummary, token);
+    if(failedCommandSummary is null)
+    {
+      _latestPlanStatusCode = PlanStatusCode.PlanAccepted;
+      return ExperimentPhase.Analyze;
+    }
+
+    else
+    {
+      UpdatePlanStatus(failedCommandSummary.StatusCode);
+      return await HandleError(failedCommandSummary, token);
+    }
   }
 
   private async Task<ExperimentPhase> AnalyzeCurrentExperiment(ExperimentExecutionSummary startupSummary, List<Analysis> analyses, List<ExperimentExecutionSummary> experimentSummaries, ExecutionControlToken token)
@@ -480,6 +474,7 @@ private async Task<ExperimentPhase> HandleError(CommandExecutionSummary cmdSumma
 
       var decisionSource = new TaskCompletionSource<ErrorHandling>(TaskCreationOptions.RunContinuationsAsynchronously);
       _userDecisionSource = decisionSource;
+
       try
       {
         errorHandling = await decisionSource.Task.WaitAsync(token.CancellationToken);
@@ -517,6 +512,15 @@ private async Task<ExperimentPhase> HandleError(CommandExecutionSummary cmdSumma
     }
   }
 
+  private void UpdatePlanStatus(CommandStatusCode failCode)
+  {
+    if(failCode == CommandStatusCode.OutOfRange || failCode == CommandStatusCode.ParametersUnachievable)
+      _latestPlanStatusCode = PlanStatusCode.PlanUnachievable;
+
+    else
+      _latestPlanStatusCode = PlanStatusCode.PlanFailed;
+  }
+
   private async Task<bool> PlanExperiment(List<Analysis> analyses, ExperimentTemplate currentExperimentTemplate, List<ExperimentExecutionSummary> experimentSummaries, ExecutionControlToken token)
   {
     Status.PlannerState = PlannerState.PlanningInProgress;
@@ -537,6 +541,7 @@ private async Task<bool> PlanExperiment(List<Analysis> analyses, ExperimentTempl
       currentExperimentTemplate.GetAllPlannedParameters(),
       analyses,
       experimentSummaries.Select(es => es.ExperimentOverview),
+      _latestPlanStatusCode,
       token.CancellationToken);
 
     if(!resolveSuccess)
@@ -745,7 +750,8 @@ private async Task<ExperimentExecutorResult> GenerateExperimentExecutor(Experime
           metadata, 
           experimentTemplate.GetAllPlannedParameters(), 
           analyses, 
-          previousExperiments, 
+          previousExperiments,
+          PlanStatusCode.PlanAccepted,
           cancellationToken);
 
         if(!resolveSuccess)

Ares.Core/Execution/Executors/CommandExecutor.cs

@@ -109,7 +109,6 @@ public async Task<CommandExecutionSummary> Execute(ExecutionControlToken token,
 
     Status.Result = result.Result;
     _stateSubject.OnNext(Status);
-    _stateSubject.OnCompleted();
 
     return ExecutorSummaryHelpers.CreateCommandExecutionSummary(Template, result, timeStarted, DateTime.UtcNow);
   }

Ares.Core/Execution/Executors/ExecutorSummaryHelpers.cs

@@ -58,7 +58,8 @@ public static CommandExecutionSummary CreateCommandExecutionSummary(CommandTempl
       CommandDescription = template.Metadata.Description,
       CommandName = template.Metadata.Name,
       StatusCode = deviceResult?.StatusCode ?? CommandStatusCode.StatusUnspecified
-    };
+     };
+
 
     if(template.HasOutputVarName)
       commandExecutionSummary.VarName = template.OutputVarName;

Ares.Core/Execution/Executors/ExperimentExecutor.cs

@@ -20,6 +20,7 @@ public ExperimentExecutor(ExperimentTemplate template, IExecutor<StepExecutionSu
 
     Status.StepExecutionStatuses.AddRange(experimentStepExecutors.Select(executor => executor.Status));
 
+
     var experimentStepExecutionObservation = experimentStepExecutors.Select(executor =>
     {
       return executor.ExperimentStatusObservable.Select(_ =>

Ares.Core/Planning/IPlanningHelper.cs

@@ -23,6 +23,7 @@ Task<bool> TryResolveParameters(IEnumerable<PlannerAllocation> plannerAllocation
     IEnumerable<Parameter> parameters,
     IEnumerable<Analysis> seedAnalyses,
     IEnumerable<ExperimentOverview> seedExperiments,
+    PlanStatusCode code,
     CancellationToken cancellationToken);
 
   /// <summary>

Ares.Core/Planning/PlanningHelper.cs

@@ -34,6 +34,7 @@
     IEnumerable<Parameter> parameters,
     IEnumerable<Analysis> seedAnalyses,
     IEnumerable<ExperimentOverview> seedExperiments,
+    PlanStatusCode statusCode,
     CancellationToken cancellationToken)
   {
     var parameterArray = parameters.ToArray();
@@ -72,6 +73,7 @@
         var planRequest = new PlanningRequest();
         planRequest.PlanningParameters.AddRange(plannableParameters.Select(parameter => ConvertToPlanningParameter(parameter, seedExperiments)));
         planRequest.AnalysisResults.AddRange(seedAnalysesArr.Select(a => (double)a.Result));
+        planRequest.PreviousPlanStatusCode = statusCode;
         planRequest.Metadata = metadata;
         planTransaction.PlanningRequest = planRequest;
 
@@ -79,13 +81,13 @@
         planTransaction.TimeResponseReceived = DateTime.UtcNow.ToTimestamp();
         planTransaction.PlanningResponse = planResponse;
 
         if(planResponse.PlanningOutcome == Outcome.Failure)
         {
           if(string.IsNullOrWhiteSpace(planResponse.ErrorString))
             await _notifier.Notify("Planner Error!", "Planner reported that planning failed, but did not provide any specific error as to why.", NotificationSeverityEnum.Error);
 
           else
             await _notifier.Notify($"Planner Reported Error: {planResponse.ErrorString}", "Planner Error!", NotificationSeverityEnum.Error);
 
           return false;
         }

UI/Components/Layouts/MainLayout.razor

@@ -258,6 +258,7 @@
     Tracker.OnSystemReady -= HandleSystemReady;
     notificationService.OnNotificationReceived -= HandleBackgroundNotification;
     _driverSubscription?.Dispose();
+
     _cts.Cancel();
     _cts.Dispose();
   }

UI/Features/Execution/ExecutionViewModel.cs

@@ -236,6 +236,7 @@ private async Task RefreshExecutionEligibility()
     LastExecutionEligibility = await _automationClient.CheckExecutionEligibility(new Empty(), null);
   }
 
+
   public async Task ExecutionNotesUploaded(Stream fileStream)
   {
     using var reader = new StreamReader(fileStream);