Skip to content

Commit d81b334

Browse files
committed
Fixing build issues.
1 parent 1a9fbab commit d81b334

File tree

5 files changed

+20
-32
lines changed

5 files changed

+20
-32
lines changed

dotnet/src/Experimental/Process.IntegrationTestRunner.Dapr/ProcessTestFixture.cs

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -128,30 +128,10 @@ private async Task WaitForHostStartupAsync()
128128
throw new InvalidProgramException("Dapr Test Host did not start");
129129
}
130130

131-
/// <summary>
132-
/// Starts a process.
133-
/// </summary>
134-
/// <param name="process">The process to start.</param>
135-
/// <param name="kernel">An instance of <see cref="Kernel"/></param>
136-
/// <param name="initialEvent">An optional initial event.</param>
137-
/// <param name="externalMessageChannel">channel used for external messages</param>
138-
/// <returns>A <see cref="Task{KernelProcessContext}"/></returns>
139-
public async Task<KernelProcessContext> StartProcessAsync(KernelProcess process, Kernel kernel, KernelProcessEvent initialEvent, IExternalKernelProcessMessageChannel? externalMessageChannel = null)
140-
{
141-
// Actual Kernel injection of Kernel and ExternalKernelProcessMessageChannel is in dotnet\src\Experimental\Process.IntegrationTestHost.Dapr\Program.cs
142-
return await this.StartAsync(process, process.State.StepId, initialEvent);
143-
}
144-
145-
/// <summary>
146-
/// Starts the specified process.
147-
/// </summary>
148-
/// <param name="key"></param>
149-
/// <param name="processId"></param>
150-
/// <param name="initialEvent"></param>
151-
/// <returns></returns>
152-
public async Task<KernelProcessContext> StartAsync(KernelProcess process, string runId, KernelProcessEvent initialEvent)
131+
/// <inheritdoc/>
132+
public async Task<KernelProcessContext> StartProcessAsync(KernelProcess process, Kernel kernel, KernelProcessEvent initialEvent, IExternalKernelProcessMessageChannel? externalMessageChannel = null, string? runId = null)
153133
{
154-
// Actual Kernel injection of Kernel and ExternalKernelProcessMessageChannel is in dotnet\src\Experimental\Process.IntegrationTestHost.Dapr\Program.cs
134+
runId ??= Guid.NewGuid().ToString();
155135
var context = new DaprTestProcessContext(process, runId, this._httpClient!);
156136
await context.StartKeyedWithEventAsync(process.State.StepId, initialEvent);
157137
return context;

dotnet/src/Experimental/Process.IntegrationTestRunner.Local/ProcessTestFixture.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ public class ProcessTestFixture
1919
/// <param name="kernel">An instance of <see cref="Kernel"/></param>
2020
/// <param name="initialEvent">An optional initial event.</param>
2121
/// <param name="externalMessageChannel">channel used for external messages</param>
22+
/// <param name="runId">The Id of the run.</param>
2223
/// <returns>A <see cref="Task{KernelProcessContext}"/></returns>
23-
public async Task<KernelProcessContext> StartProcessAsync(KernelProcess process, Kernel kernel, KernelProcessEvent initialEvent, IExternalKernelProcessMessageChannel? externalMessageChannel = null)
24+
public async Task<KernelProcessContext> StartProcessAsync(KernelProcess process, Kernel kernel, KernelProcessEvent initialEvent, IExternalKernelProcessMessageChannel? externalMessageChannel = null, string? runId = null)
2425
{
2526
return await process.StartAsync(kernel, initialEvent, externalMessageChannel: externalMessageChannel);
2627
}

dotnet/src/Experimental/Process.IntegrationTests.Shared/ProcessTestFixture.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ public abstract class ProcessTestFixture
1818
/// <param name="kernel">An instance of <see cref="Kernel"/></param>
1919
/// <param name="initialEvent">An optional initial event.</param>
2020
/// <param name="externalMessageChannel">channel used for external messages</param>
21+
/// <param name="runId">An optional run Id.</param>
2122
/// <returns>A <see cref="Task{KernelProcessContext}"/></returns>
22-
public abstract Task<KernelProcessContext> StartProcessAsync(KernelProcess process, Kernel kernel, KernelProcessEvent initialEvent, IExternalKernelProcessMessageChannel? externalMessageChannel = null);
23+
public abstract Task<KernelProcessContext> StartProcessAsync(KernelProcess process, Kernel kernel, KernelProcessEvent initialEvent, IExternalKernelProcessMessageChannel? externalMessageChannel = null, string? runId = null);
2324

2425
/// <summary>
2526
/// Starts the specified process.

dotnet/src/Experimental/Process.IntegrationTests.Shared/ProcessTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public async Task ProcessWithWhenAllListenerAsync()
8181

8282
// Act
8383
string testInput = "Test";
84-
var processHandle = await this._fixture.StartAsync(process, Guid.NewGuid().ToString(), new() { Id = ProcessTestsEvents.StartProcess, Data = testInput });
85-
//var processHandle = await this._fixture.StartProcessAsync(process, kernel, new() { Id = ProcessTestsEvents.StartProcess, Data = testInput });
84+
var processHandle = await this._fixture.StartProcessAsync(process, new(), new() { Id = ProcessTestsEvents.StartProcess, Data = testInput }, runId: Guid.NewGuid().ToString());
85+
8686
var processInfo = await processHandle.GetStateAsync();
8787

8888
// Assert

dotnet/src/Experimental/Process.LocalRuntime/LocalKernelProcessContext.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Copyright (c) Microsoft. All rights reserved.
2+
using System.Collections.Generic;
23
using System.Threading.Tasks;
34
using Microsoft.SemanticKernel.Process;
45

@@ -37,11 +38,6 @@ internal LocalKernelProcessContext(KernelProcess process, Kernel kernel, Process
3738
internal Task StartWithEventAsync(KernelProcessEvent initialEvent, Kernel? kernel = null) =>
3839
this._localProcess.RunOnceAsync(initialEvent, kernel);
3940

40-
//internal RunUntilEndAsync(KernelProcessEvent initialEvent, Kernel? kernel = null, TimeSpan? timeout = null)
41-
//{
42-
43-
//}
44-
4541
/// <summary>
4642
/// Sends a message to the process.
4743
/// </summary>
@@ -78,4 +74,14 @@ public async ValueTask DisposeAsync()
7874

7975
/// <inheritdoc/>
8076
public override Task<string> GetProcessIdAsync() => Task.FromResult(this._localProcess.Id);
77+
78+
/// <summary>
79+
/// Read the step states in from the process.
80+
/// </summary>
81+
/// <returns></returns>
82+
/// <exception cref="System.NotImplementedException"></exception>
83+
public override Task<IDictionary<string, KernelProcessStepState>> GetStepStatesAsync()
84+
{
85+
throw new System.NotImplementedException();
86+
}
8187
}

0 commit comments

Comments
 (0)