Merge branch 'Develop' of https://github.com/AFRL-ARES/ARES into Develop

nkleiner · nkleiner · commit a3121a64b166 · 2025-11-07T09:49:02.000-05:00
# Conflicts:
#	AlicatMFC/AlicatMFC.csproj
#	FlirCM3/FlirCM3.csproj
#	HerkulexDRS/HerkulexDRS.csproj
#	LaserChiller/LaserChiller.csproj
#	LindbergFurnace/LindbergFurnace.csproj
#	PrusaMK4S/PrusaMK4S.csproj
#	RestSerialDevice/RestSerialDevice.csproj
#	SyringePumpNE1000/SyringePumpNE1000.csproj
#	TC0304/TC0304.csproj
#	TicStepperController/TicStepperController.csproj
#	ValveController/ValveController.csproj
diff --git a/Ares.Core.Tests/AnalyzerManagerTests.cs b/Ares.Core.Tests/AnalyzerManagerTests.cs
@@ -24,12 +24,12 @@ public TempAnalyzer(string name, string version) : base(name, "TempAnalyzer", ve
     {
     }
 
-    public override Task<Analysis> Analyze(AresStruct inputs, CancellationToken cancellationToken)
+    public override Task<Analysis> Analyze(AresStruct inputs, RequestMetadata metadata, CancellationToken cancellationToken)
     {
       throw new NotImplementedException();
     }
 
-    public override Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, CancellationToken cancellationToken)
+    public override Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, RequestMetadata metadata, CancellationToken cancellationToken)
     {
       throw new NotImplementedException();
     }
diff --git a/Ares.Core.Tests/Ares.Core.Tests.csproj b/Ares.Core.Tests/Ares.Core.Tests.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.Tools" Version="2.72.0">
+    <PackageReference Include="Grpc.Tools" Version="2.76.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -18,7 +18,7 @@
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.10.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Ares.Core.Tests/Data/Analyzer/TestReplyAnalyzer.cs b/Ares.Core.Tests/Data/Analyzer/TestReplyAnalyzer.cs
@@ -10,17 +10,17 @@ public TestReplyAnalyzer() : base("Test Analyzer", "TestAnalyzer", "1.0")
   {
   }
 
-  public override Task<Analysis> Analyze(AresStruct inputs, CancellationToken cancellationToken)
+  public override Task<Analysis> Analyze(AresStruct inputs, RequestMetadata metadata, CancellationToken cancellationToken)
   {
     var firstData = inputs.Fields["TestAnalyzerInput"];
     var analysis = new Analysis() { Result = (float)firstData.NumberValue, AnalysisOutcome = Outcome.Success };
 
     return Task.FromResult(analysis);
   }
 
-  public override Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, CancellationToken cancellationToken)
+  public override Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, RequestMetadata metadata, CancellationToken cancellationToken)
   {
-    return Analyze(inputs, cancellationToken);
+    return Analyze(inputs, metadata, cancellationToken);
   }
 
   public override Task<AnalyzerCapabilities> GetCapabilities(CancellationToken cancellationToken)
diff --git a/Ares.Core.Tests/ManualPlannerTests.cs b/Ares.Core.Tests/ManualPlannerTests.cs
@@ -55,7 +55,7 @@ public async Task CorrectNumberOfResults_FileLines()
     plannerSeed.FileLines = new ManualPlannerFileLines();
     plannerSeed.FileLines.PlannerValues.AddRange(_fileLines);
     await _manualPlanner.Seed(plannerSeed);
-    var planResponse = await _manualPlanner.Plan(_parameterMetadatas, string.Empty, Array.Empty<ExperimentOverview>(), Array.Empty<Analysis>(), CancellationToken.None);
+    var planResponse = await _manualPlanner.Plan(_parameterMetadatas, new RequestMetadata(), Array.Empty<ExperimentOverview>(), Array.Empty<Analysis>(), CancellationToken.None);
     Assert.That(planResponse.Results, Has.Exactly(3).Items);
   }
 }
diff --git a/Ares.Core/Analyzing/AnalysisHelper.cs b/Ares.Core/Analyzing/AnalysisHelper.cs
@@ -16,7 +16,7 @@ public AnalysisHelper(IAnalyzerRepo analyzerRepo)
     _analyzerRepo = analyzerRepo;
   }
 
-  public async Task<Analysis> Analyze(ExperimentTemplate template, ExperimentExecutionSummary experimentSummary, CancellationToken cancellationToken)
+  public async Task<Analysis> Analyze(ExperimentTemplate template, ExperimentExecutionSummary experimentSummary, RequestMetadata metadata, CancellationToken cancellationToken)
   {
     var analyzer = GetAnalyzer(template.AnalyzerId);
     var analyzerInputs = ExperimentOutputToAnalyzerInputs(
@@ -25,7 +25,7 @@ public async Task<Analysis> Analyze(ExperimentTemplate template, ExperimentExecu
     try
     {
       // TODO: Maybe add support for settings overrides if needed
-      var analysis = await analyzer.Analyze(analyzerInputs, cancellationToken);
+      var analysis = await analyzer.Analyze(analyzerInputs, metadata, cancellationToken);
       experimentSummary.ExperimentOverview.AnalysisOverview = new AnalysisOverview
       {
         UniqueId = Guid.NewGuid().ToString(),
diff --git a/Ares.Core/Analyzing/AnalyzerBase.cs b/Ares.Core/Analyzing/AnalyzerBase.cs
@@ -69,9 +69,9 @@ public void UpdateSettings(AresStruct settings)
     }
   }
 
-  public abstract Task<Analysis> Analyze(AresStruct inputs, CancellationToken cancellationToken);
+  public abstract Task<Analysis> Analyze(AresStruct inputs, RequestMetadata metadata, CancellationToken cancellationToken);
 
-  public abstract Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, CancellationToken cancellationToken);
+  public abstract Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, RequestMetadata metadata, CancellationToken cancellationToken);
 
   public abstract Task<AresDataSchema> GetParameters(CancellationToken cancellationToken);
 
diff --git a/Ares.Core/Analyzing/IAnalyzer.cs b/Ares.Core/Analyzing/IAnalyzer.cs
@@ -100,15 +100,15 @@ public interface IAnalyzer
   /// <param name="cancellationToken"></param>
   /// <param name="settings">Optional list of settings to influence the analysis</param>
   /// <returns><see cref="Analysis" /> which is the outcome of the analysis performed.</returns>
-  Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, CancellationToken cancellationToken = default);
+  Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, RequestMetadata metadata, CancellationToken cancellationToken = default);
 
   /// <summary>
   /// Does the actual analysis work.
   /// </summary>
   /// <param name="inputs">The experiment outputs to analyze in the form of the <see cref="AnalysisInput" /> proto message</param>
   /// <param name="cancellationToken"></param>
   /// <returns><see cref="Analysis" /> which is the outcome of the analysis performed.</returns>
-  Task<Analysis> Analyze(AresStruct inputs, CancellationToken cancellationToken);
+  Task<Analysis> Analyze(AresStruct inputs, RequestMetadata metadata, CancellationToken cancellationToken);
 
   /// <summary>
   /// How long do we expect the analyzer to do its analysis before ARES decides that analyzing has failed.
diff --git a/Ares.Core/Analyzing/NoneAnalyzer.cs b/Ares.Core/Analyzing/NoneAnalyzer.cs
@@ -18,7 +18,7 @@ public NoneAnalyzer() : base("NONE", "NONE :)", "1.0.0")
     AnalyzerState = State.Active;
   }
 
-  public override Task<Analysis> Analyze(AresStruct inputs, CancellationToken cancellationToken)
+  public override Task<Analysis> Analyze(AresStruct inputs, RequestMetadata metadata, CancellationToken cancellationToken)
   {
     var analysis = new Analysis
     {
@@ -29,9 +29,9 @@ public override Task<Analysis> Analyze(AresStruct inputs, CancellationToken canc
     return Task.FromResult(analysis);
   }
 
-  public override Task<Analysis> Analyze(AresStruct inputs, AresStruct _settings, CancellationToken cancellationToken)
+  public override Task<Analysis> Analyze(AresStruct inputs, AresStruct _settings, RequestMetadata metadata, CancellationToken cancellationToken)
   {
-    return Analyze(inputs, cancellationToken);
+    return Analyze(inputs, metadata, cancellationToken);
   }
 
   public override Task<AnalyzerCapabilities> GetCapabilities(CancellationToken cancellationToken)
diff --git a/Ares.Core/Analyzing/RemoteAnalyzer.cs b/Ares.Core/Analyzing/RemoteAnalyzer.cs
@@ -29,7 +29,7 @@ public RemoteAnalyzer(string name, Uri address) : base(name, "", "_._._")
 
   public Uri Address { get; }
 
-  public override async Task<Analysis> Analyze(AresStruct inputs, CancellationToken cancellationToken = default)
+  public override async Task<Analysis> Analyze(AresStruct inputs, RequestMetadata metadata, CancellationToken cancellationToken = default)
   {
     var client = GetClient();
     var analysisRequest = new AnalysisRequest
@@ -50,7 +50,7 @@ public override async Task<Analysis> Analyze(AresStruct inputs, CancellationToke
   /// <param name="settings">These will add-to/override existing settings values if provided. </param>
   /// <param name="cancellationToken"></param>
   /// <returns></returns>
-  public override Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, CancellationToken cancellationToken = default)
+  public override Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, RequestMetadata metadata, CancellationToken cancellationToken = default)
   {
     var client = GetClient();
     var mergedSettings = Settings.AppendStruct(settings);
diff --git a/Ares.Core/Ares.Core.csproj b/Ares.Core/Ares.Core.csproj
@@ -18,7 +18,7 @@
 
 
   <ItemGroup>
-	  <PackageReference Include="ARES.Datamodel" Version="0.14.1-beta.1" />
+	  <PackageReference Include="ARES.Datamodel" Version="0.15.1-beta.1" />
 	  <PackageReference Include="CsvHelper" Version="33.1.0" />
 	  <PackageReference Include="DynamicData" Version="9.4.1" />
 	  <PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
diff --git a/Ares.Core/Execution/Executors/CampaignExecutor.cs b/Ares.Core/Execution/Executors/CampaignExecutor.cs
@@ -178,9 +178,17 @@ await _stateLoggerManager.EnableOverrideAsync(new Datamodel.Device.DeviceLogging
         // and thus sending a null result to the analyzer might break it depending on the analyzer
         if(!token.IsCancelled)
         {
+          var metadata = new RequestMetadata 
+          { 
+            CampaignId = Template.UniqueId, 
+            CampaignName = Template.Name, 
+            ExperimentId = experimentExecutor.Template.UniqueId, 
+            SystemName = "ARES OS" 
+          };
           var analysis = await _analysisHelper.Analyze(
             experimentExecutor.Template,
             experimentSummary,
+            metadata,
             token.CancellationToken);
 
           // The following are top level checks for analysis failure in case the
@@ -312,7 +320,8 @@ private async Task<ExperimentExecutorResult> GenerateExperimentExecutor(Experime
     {
       if(analyses.Count() % ReplanRate == 0)
       {
-        var resolveSuccess = await _planningHelper.TryResolveParameters(Template.PlannerAllocations, Template.UniqueId, experimentTemplate.GetAllPlannedParameters(), analyses, previousExperiments, cancellationToken);
+        var metadata = new RequestMetadata { CampaignId = Template.UniqueId, CampaignName = Template.Name, ExperimentId = template.UniqueId, SystemName = "ARES OS" };
+        var resolveSuccess = await _planningHelper.TryResolveParameters(Template.PlannerAllocations, metadata, experimentTemplate.GetAllPlannedParameters(), analyses, previousExperiments, cancellationToken);
         if(!resolveSuccess)
         {
           result.ErrorString = "Failed to plan! Experiment will be terminated!";
diff --git a/Ares.Core/Planning/IPlannerService.cs b/Ares.Core/Planning/IPlannerService.cs
@@ -89,7 +89,7 @@ public interface IPlannerService
   /// <param name="cancellationToken"></param>
   /// <returns></returns>
   Task<PlanResponse> Plan(IEnumerable<ParameterMetadata> plannableParameters,
-    string campaignId,
+    RequestMetadata metadata,
     IEnumerable<ExperimentOverview> previousExperiments,
     IEnumerable<Analysis> analysisHistory, 
     CancellationToken cancellationToken = default);
@@ -104,7 +104,7 @@ Task<PlanResponse> Plan(IEnumerable<ParameterMetadata> plannableParameters,
   /// <param name="cancellationToken"></param>
   /// <returns></returns>
   Task<PlanResponse> Plan(IEnumerable<ParameterMetadata> plannableParameters,
-    string campaignId,
+    RequestMetadata metadata,
     IEnumerable<ExperimentOverview> previousExperiments,
     IEnumerable<Analysis> analysisHistory,
     AresStruct settings,
diff --git a/Ares.Core/Planning/IPlanningHelper.cs b/Ares.Core/Planning/IPlanningHelper.cs
@@ -19,7 +19,7 @@ public interface IPlanningHelper
   /// <param name="seedAnalyses">The completed experiment analyses used to seed the plan</param>
   /// <returns>True if planning succeeded, false otherwise</returns>
   Task<bool> TryResolveParameters(IEnumerable<PlannerAllocation> plannerAllocations,
-    string campaignId,
+    RequestMetadata metadata,
     IEnumerable<Parameter> parameters,
     IEnumerable<Analysis> seedAnalyses,
     IEnumerable<ExperimentOverview> seedExperiments,
diff --git a/Ares.Core/Planning/ManualPlanner.cs b/Ares.Core/Planning/ManualPlanner.cs
@@ -4,6 +4,7 @@
 using Ares.Datamodel.Extensions;
 using Ares.Datamodel.Planning;
 using Ares.Datamodel.Templates;
+using Grpc.Core;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 
@@ -28,7 +29,7 @@ public ManualPlanner()
 
 
   public Task<PlanResponse> Plan(IEnumerable<ParameterMetadata> plannableParameters,
-    string campaignId,
+    RequestMetadata metadata,
     IEnumerable<ExperimentOverview> experiments, 
     IEnumerable<Analysis> _, 
     CancellationToken __)
@@ -165,9 +166,9 @@ public Task<PlannerServiceCapabilities> GetCapabilities(CancellationToken cancel
     return Task.FromResult(response);
   }
 
-  public async Task<PlanResponse> Plan(IEnumerable<ParameterMetadata> plannableParameters, string campaignId, IEnumerable<ExperimentOverview> previousExperiments, IEnumerable<Analysis> analysisHistory, AresStruct settings, CancellationToken cancellationToken = default)
+  public async Task<PlanResponse> Plan(IEnumerable<ParameterMetadata> plannableParameters, RequestMetadata metadata, IEnumerable<ExperimentOverview> previousExperiments, IEnumerable<Analysis> analysisHistory, AresStruct settings, CancellationToken cancellationToken = default)
   {
-    return await Plan(plannableParameters, campaignId, previousExperiments, analysisHistory, cancellationToken);
+    return await Plan(plannableParameters, metadata, previousExperiments, analysisHistory, cancellationToken);
   }
 
   private record ManualPlanResult(string Name, AresValue Value)
diff --git a/Ares.Core/Planning/PlannerServiceBase.cs b/Ares.Core/Planning/PlannerServiceBase.cs
@@ -60,13 +60,13 @@ public void UpdateSettings(AresStruct settings)
   }
 
   public abstract Task<PlanResponse> Plan(IEnumerable<ParameterMetadata> plannableParameters,
-    string campaignId,
+    RequestMetadata metadata,
     IEnumerable<ExperimentOverview> previousExperiments,
     IEnumerable<Analysis> analysisHistory, 
     CancellationToken cancellationToken = default);
 
   public abstract Task<PlanResponse> Plan(IEnumerable<ParameterMetadata> plannableParameters,
-    string campaignId,
+    RequestMetadata metadata,
     IEnumerable<ExperimentOverview> previousExperiments,
     IEnumerable<Analysis> analysisHistory,
     AresStruct settings,
diff --git a/Ares.Core/Planning/PlanningHelper.cs b/Ares.Core/Planning/PlanningHelper.cs
@@ -21,7 +21,7 @@ public PlanningHelper(IPlannerServiceRepo plannerManager, ILogger<PlanningHelper
   }
 
   public async Task<bool> TryResolveParameters(IEnumerable<PlannerAllocation> plannerAllocations,
-    string campaignId,
+    RequestMetadata metadata,
     IEnumerable<Parameter> parameters,
     IEnumerable<Analysis> seedAnalyses,
     IEnumerable<ExperimentOverview> seedExperiments,
@@ -46,7 +46,8 @@ public async Task<bool> TryResolveParameters(IEnumerable<PlannerAllocation> plan
       try
       {
         var plannableParameters = grouping.Select(pair => pair.Metadata).ToArray();
-        var planResponse = await planner.Plan(plannableParameters, campaignId, seedExperiments, seedAnalysesArr, cancellationToken);
+        //make metadata thx
+        var planResponse = await planner.Plan(plannableParameters, metadata, seedExperiments, seedAnalysesArr, cancellationToken);
 
         if(planResponse.Outcome == Outcome.Failure)
         {
diff --git a/Ares.Core/Planning/RemotePlannerService.cs b/Ares.Core/Planning/RemotePlannerService.cs
@@ -144,13 +144,13 @@ public override async Task<PlannerServiceCapabilities> GetCapabilities(Cancellat
   }
 
   public override async Task<PlanResponse> Plan(IEnumerable<ParameterMetadata> plannableParameters,
-    string campaignId,
+    RequestMetadata metadata,
     IEnumerable<ExperimentOverview> previousExperiments,
     IEnumerable<Analysis> analysisHistory,
     CancellationToken cancellationToken = default)
   {
     var client = GetClient();
-    var planRequest = new PlanningRequest() { AdapterSettings = Settings, SessionId = campaignId };
+    var planRequest = new PlanningRequest() { AdapterSettings = Settings, Metadata = metadata };
     planRequest.PlanningParameters.AddRange(plannableParameters.Select(parameter => ConvertToPlanningParameter(parameter, previousExperiments)));
     planRequest.AnalysisResults.AddRange(analysisHistory.Select(a => (double)a.Result));
     var result = await client.PlanAsync(planRequest, cancellationToken: cancellationToken);
@@ -161,14 +161,14 @@ public override async Task<PlanResponse> Plan(IEnumerable<ParameterMetadata> pla
   }
 
   public override async Task<PlanResponse> Plan(IEnumerable<ParameterMetadata> plannableParameters,
-    string campaignId,
+    RequestMetadata metadata,
     IEnumerable<ExperimentOverview> previousExperiments,
     IEnumerable<Analysis> analysisHistory,
     AresStruct settings,
     CancellationToken cancellationToken = default)
   {
     var client = GetClient();
-    var planRequest = new PlanningRequest() { AdapterSettings = settings, SessionId = campaignId };
+    var planRequest = new PlanningRequest() { AdapterSettings = settings, Metadata = metadata };
     planRequest.PlanningParameters.AddRange(plannableParameters.Select(parameter => ConvertToPlanningParameter(parameter, previousExperiments)));
     planRequest.AnalysisResults.AddRange(analysisHistory.Select(a => (double)a.Result));
     var result = await client.PlanAsync(planRequest, cancellationToken: cancellationToken);
diff --git a/Ares.Device.Serial.Tests/Ares.Device.Serial.Tests.csproj b/Ares.Device.Serial.Tests/Ares.Device.Serial.Tests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.10.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Ares.Device.Tests/Ares.Device.Tests.csproj b/Ares.Device.Tests/Ares.Device.Tests.csproj
@@ -20,15 +20,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.Tools" Version="2.72.0">
+    <PackageReference Include="Grpc.Tools" Version="2.76.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.10.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Ares.Device/AresDevicePluginBase/Ares.Device.csproj b/Ares.Device/AresDevicePluginBase/Ares.Device.csproj
@@ -35,7 +35,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ARES.Datamodel" Version="0.14.1-beta.1" />
+    <PackageReference Include="ARES.Datamodel" Version="0.15.1-beta.1" />
     <PackageReference Include="System.Reactive" Version="6.1.0" />
   </ItemGroup>
 
diff --git a/AresMessaging/AresMessaging.csproj b/AresMessaging/AresMessaging.csproj
@@ -12,10 +12,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ARES.Datamodel" Version="0.14.1-beta.1" GeneratePathProperty="True" />
+    <PackageReference Include="ARES.Datamodel" Version="0.15.1-beta.1" GeneratePathProperty="True" />
     <PackageReference Include="Google.Protobuf" Version="3.33.0" />
     <PackageReference Include="Grpc" Version="2.46.6" />
-    <PackageReference Include="Grpc.Tools" Version="2.72.0">
+    <PackageReference Include="Grpc.Tools" Version="2.76.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/CrealityCamera/AresCamera.csproj b/CrealityCamera/AresCamera.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="AForge.Video" Version="2.2.5" />
     <PackageReference Include="AForge.Video.DirectShow" Version="2.2.5" />
     <PackageReference Include="Google.Protobuf" Version="3.33.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.72.0">
+    <PackageReference Include="Grpc.Tools" Version="2.76.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/DemoRemoteAnalyzer/DemoRemoteAnalyzer.csproj b/DemoRemoteAnalyzer/DemoRemoteAnalyzer.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ARES.Datamodel" Version="0.14.1-beta.1" />
+    <PackageReference Include="ARES.Datamodel" Version="0.15.1-beta.1" />
     <PackageReference Include="Grpc.AspNetCore" Version="2.71.0" />
   </ItemGroup>
 
diff --git a/DemoRemoteDevice/DemoRemoteDevice.csproj b/DemoRemoteDevice/DemoRemoteDevice.csproj
diff --git a/DemoRemotePlanner/DemoRemotePlanner.csproj b/DemoRemotePlanner/DemoRemotePlanner.csproj
diff --git a/PrusaMK4S/PrusaMK4S.csproj b/PrusaMK4S/PrusaMK4S.csproj
diff --git a/UI/UI.csproj b/UI/UI.csproj

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ public TempAnalyzer(string name, string version) : base(name, "TempAnalyzer", ve`
`24`	`24`	`{`
`25`	`25`	`}`
`26`	`26`
`27`		`- public override Task<Analysis> Analyze(AresStruct inputs, CancellationToken cancellationToken)`
	`27`	`+ public override Task<Analysis> Analyze(AresStruct inputs, RequestMetadata metadata, CancellationToken cancellationToken)`
`28`	`28`	`{`
`29`	`29`	`throw new NotImplementedException();`
`30`	`30`	`}`
`31`	`31`
`32`		`- public override Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, CancellationToken cancellationToken)`
	`32`	`+ public override Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, RequestMetadata metadata, CancellationToken cancellationToken)`
`33`	`33`	`{`
`34`	`34`	`throw new NotImplementedException();`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,17 +10,17 @@ public TestReplyAnalyzer() : base("Test Analyzer", "TestAnalyzer", "1.0")`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
`13`		`- public override Task<Analysis> Analyze(AresStruct inputs, CancellationToken cancellationToken)`
	`13`	`+ public override Task<Analysis> Analyze(AresStruct inputs, RequestMetadata metadata, CancellationToken cancellationToken)`
`14`	`14`	`{`
`15`	`15`	`var firstData = inputs.Fields["TestAnalyzerInput"];`
`16`	`16`	`var analysis = new Analysis() { Result = (float)firstData.NumberValue, AnalysisOutcome = Outcome.Success };`
`17`	`17`
`18`	`18`	`return Task.FromResult(analysis);`
`19`	`19`	`}`
`20`	`20`
`21`		`- public override Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, CancellationToken cancellationToken)`
	`21`	`+ public override Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, RequestMetadata metadata, CancellationToken cancellationToken)`
`22`	`22`	`{`
`23`		`- return Analyze(inputs, cancellationToken);`
	`23`	`+ return Analyze(inputs, metadata, cancellationToken);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public override Task<AnalyzerCapabilities> GetCapabilities(CancellationToken cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public async Task CorrectNumberOfResults_FileLines()`
`55`	`55`	`plannerSeed.FileLines = new ManualPlannerFileLines();`
`56`	`56`	`plannerSeed.FileLines.PlannerValues.AddRange(_fileLines);`
`57`	`57`	`await _manualPlanner.Seed(plannerSeed);`
`58`		`- var planResponse = await _manualPlanner.Plan(_parameterMetadatas, string.Empty, Array.Empty<ExperimentOverview>(), Array.Empty<Analysis>(), CancellationToken.None);`
	`58`	`+ var planResponse = await _manualPlanner.Plan(_parameterMetadatas, new RequestMetadata(), Array.Empty<ExperimentOverview>(), Array.Empty<Analysis>(), CancellationToken.None);`
`59`	`59`	`Assert.That(planResponse.Results, Has.Exactly(3).Items);`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public AnalysisHelper(IAnalyzerRepo analyzerRepo)`
`16`	`16`	`_analyzerRepo = analyzerRepo;`
`17`	`17`	`}`
`18`	`18`
`19`		`- public async Task<Analysis> Analyze(ExperimentTemplate template, ExperimentExecutionSummary experimentSummary, CancellationToken cancellationToken)`
	`19`	`+ public async Task<Analysis> Analyze(ExperimentTemplate template, ExperimentExecutionSummary experimentSummary, RequestMetadata metadata, CancellationToken cancellationToken)`
`20`	`20`	`{`
`21`	`21`	`var analyzer = GetAnalyzer(template.AnalyzerId);`
`22`	`22`	`var analyzerInputs = ExperimentOutputToAnalyzerInputs(`
`@@ -25,7 +25,7 @@ public async Task<Analysis> Analyze(ExperimentTemplate template, ExperimentExecu`
`25`	`25`	`try`
`26`	`26`	`{`
`27`	`27`	`// TODO: Maybe add support for settings overrides if needed`
`28`		`- var analysis = await analyzer.Analyze(analyzerInputs, cancellationToken);`
	`28`	`+ var analysis = await analyzer.Analyze(analyzerInputs, metadata, cancellationToken);`
`29`	`29`	`experimentSummary.ExperimentOverview.AnalysisOverview = new AnalysisOverview`
`30`	`30`	`{`
`31`	`31`	`UniqueId = Guid.NewGuid().ToString(),`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,9 @@ public void UpdateSettings(AresStruct settings)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- public abstract Task<Analysis> Analyze(AresStruct inputs, CancellationToken cancellationToken);`
	`72`	`+ public abstract Task<Analysis> Analyze(AresStruct inputs, RequestMetadata metadata, CancellationToken cancellationToken);`
`73`	`73`
`74`		`- public abstract Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, CancellationToken cancellationToken);`
	`74`	`+ public abstract Task<Analysis> Analyze(AresStruct inputs, AresStruct settings, RequestMetadata metadata, CancellationToken cancellationToken);`
`75`	`75`
`76`	`76`	`public abstract Task<AresDataSchema> GetParameters(CancellationToken cancellationToken);`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public NoneAnalyzer() : base("NONE", "NONE :)", "1.0.0")`
`18`	`18`	`AnalyzerState = State.Active;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public override Task<Analysis> Analyze(AresStruct inputs, CancellationToken cancellationToken)`
	`21`	`+ public override Task<Analysis> Analyze(AresStruct inputs, RequestMetadata metadata, CancellationToken cancellationToken)`
`22`	`22`	`{`
`23`	`23`	`var analysis = new Analysis`
`24`	`24`	`{`
`@@ -29,9 +29,9 @@ public override Task<Analysis> Analyze(AresStruct inputs, CancellationToken canc`
`29`	`29`	`return Task.FromResult(analysis);`
`30`	`30`	`}`
`31`	`31`
`32`		`- public override Task<Analysis> Analyze(AresStruct inputs, AresStruct _settings, CancellationToken cancellationToken)`
	`32`	`+ public override Task<Analysis> Analyze(AresStruct inputs, AresStruct _settings, RequestMetadata metadata, CancellationToken cancellationToken)`
`33`	`33`	`{`
`34`		`- return Analyze(inputs, cancellationToken);`
	`34`	`+ return Analyze(inputs, metadata, cancellationToken);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public override Task<AnalyzerCapabilities> GetCapabilities(CancellationToken cancellationToken)`