addressing PR comments

Author: Sophia Tevosyan

src/Worker/Grpc/ExtendedSessionState.cs src/Worker/Core/ExtendedSessionState.cssrc/Worker/Grpc/ExtendedSessionState.cs renamed to src/Worker/Core/ExtendedSessionState.cs

@@ -3,20 +3,20 @@
 
 using DurableTask.Core;
 
-namespace Microsoft.DurableTask.Worker.Grpc;
+namespace Microsoft.DurableTask.Worker;
 
 /// <summary>
 /// Represents the state of an extended session for an orchestration.
 /// </summary>
-class ExtendedSessionState
+public class ExtendedSessionState
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="ExtendedSessionState"/> class.
     /// </summary>
     /// <param name="state">The orchestration's runtime state.</param>
     /// <param name="taskOrchestration">The TaskOrchestration implementation of the orchestration.</param>
     /// <param name="orchestrationExecutor">The TaskOrchestrationExecutor for the orchestration.</param>
-    internal ExtendedSessionState(OrchestrationRuntimeState state, TaskOrchestration taskOrchestration, TaskOrchestrationExecutor orchestrationExecutor)
+    public ExtendedSessionState(OrchestrationRuntimeState state, TaskOrchestration taskOrchestration, TaskOrchestrationExecutor orchestrationExecutor)
     {
         this.RuntimeState = state;
         this.TaskOrchestration = taskOrchestration;
@@ -26,15 +26,15 @@ internal ExtendedSessionState(OrchestrationRuntimeState state, TaskOrchestration
     /// <summary>
     /// Gets or sets the saved runtime state of the orchestration.
     /// </summary>
-    internal OrchestrationRuntimeState RuntimeState { get; set; }
+    public OrchestrationRuntimeState RuntimeState { get; set; }
 
     /// <summary>
     /// Gets or sets the saved TaskOrchestration implementation of the orchestration.
     /// </summary>
-    internal TaskOrchestration TaskOrchestration { get; set; }
+    public TaskOrchestration TaskOrchestration { get; set; }
 
     /// <summary>
     /// Gets or sets the saved TaskOrchestrationExecutor.
     /// </summary>
-    internal TaskOrchestrationExecutor OrchestrationExecutor { get; set; }
+    public TaskOrchestrationExecutor OrchestrationExecutor { get; set; }
 }

src/Worker/Grpc/ExtendedSessionsCache.cs src/Worker/Core/ExtendedSessionsCache.cssrc/Worker/Grpc/ExtendedSessionsCache.cs renamed to src/Worker/Core/ExtendedSessionsCache.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Caching.Memory;
 
-namespace Microsoft.DurableTask.Worker.Grpc;
+namespace Microsoft.DurableTask.Worker;
 
 /// <summary>
 /// A cache for extended sessions that wraps a <see cref="MemoryCache"/> instance.
@@ -13,6 +13,12 @@ public class ExtendedSessionsCache : IDisposable
 {
     MemoryCache? extendedSessions;
 
+    /// <summary>
+    /// Gets a value indicating whether returns whether or not the cache has been initialized.
+    /// </summary>
+    /// <returns>True if the cache has been initialized, false otherwise.</returns>
+    public bool IsInitialized => this.extendedSessions is not null;
+
     /// <summary>
     /// Dispose the cache and release all resources.
     /// </summary>
@@ -39,13 +45,4 @@ public MemoryCache GetOrInitializeCache(double expirationScanFrequencyInSeconds)
 
         return this.extendedSessions;
     }
-
-    /// <summary>
-    /// Returns whether or not the cache has been initialized.
-    /// </summary>
-    /// <returns>True if the cache has been initialized, false otherwise.</returns>
-    public bool IsInitialized()
-    {
-        return this.extendedSessions is not null;
-    }
 }

src/Worker/Core/Worker.csproj

@@ -9,6 +9,7 @@ The worker is responsible for processing durable task work items.</PackageDescri
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Options" />
     <PackageReference Include="System.Text.Json" />

src/Worker/Grpc/GrpcOrchestrationRunner.cs

@@ -84,50 +84,9 @@ public static string LoadAndRun(
         ITaskOrchestrator implementation,
         IServiceProvider? services = null)
     {
-        Check.NotNullOrEmpty(encodedOrchestratorRequest);
-        Check.NotNull(implementation);
-
-        P.OrchestratorRequest request = P.OrchestratorRequest.Parser.Base64Decode<P.OrchestratorRequest>(
-            encodedOrchestratorRequest);
-
-        List<HistoryEvent> pastEvents = request.PastEvents.Select(ProtoUtils.ConvertHistoryEvent).ToList();
-        IEnumerable<HistoryEvent> newEvents = request.NewEvents.Select(ProtoUtils.ConvertHistoryEvent);
-        Dictionary<string, object?> properties = request.Properties.ToDictionary(
-                pair => pair.Key,
-                pair => ProtoUtils.ConvertValueToObject(pair.Value));
-
-        // Re-construct the orchestration state from the history.
-        // New events must be added using the AddEvent method.
-        OrchestrationRuntimeState runtimeState = new(pastEvents);
-        foreach (HistoryEvent newEvent in newEvents)
-        {
-            runtimeState.AddEvent(newEvent);
-        }
-
-        TaskName orchestratorName = new(runtimeState.Name);
-        ParentOrchestrationInstance? parent = runtimeState.ParentInstance is ParentInstance p
-            ? new(new(p.Name), p.OrchestrationInstance.InstanceId)
-            : null;
-
-        DurableTaskShimFactory factory = services is null
-            ? DurableTaskShimFactory.Default
-            : ActivatorUtilities.GetServiceOrCreateInstance<DurableTaskShimFactory>(services);
-        TaskOrchestration shim = factory.CreateOrchestration(orchestratorName, implementation, properties, parent);
-        TaskOrchestrationExecutor executor = new(runtimeState, shim, BehaviorOnContinueAsNew.Carryover, request.EntityParameters.ToCore(), ErrorPropagationMode.UseFailureDetails);
-        OrchestratorExecutionResult result = executor.Execute();
-
-        P.OrchestratorResponse response = ProtoUtils.ConstructOrchestratorResponse(
-            request.InstanceId,
-            request.ExecutionId,
-            result.CustomStatus,
-            result.Actions,
-            completionToken: string.Empty, /* doesn't apply */
-            entityConversionState: null,
-            orchestrationActivity: null);
-        byte[] responseBytes = response.ToByteArray();
-        return Convert.ToBase64String(responseBytes);
-    }
-
+        return LoadAndRun(encodedOrchestratorRequest, implementation, services);
+    }
+
     /// <summary>
     /// Deserializes orchestration history from <paramref name="encodedOrchestratorRequest"/> and uses it to resume the
     /// orchestrator implemented by <paramref name="implementation"/>.
@@ -136,8 +95,8 @@ public static string LoadAndRun(
     /// The encoded protobuf payload representing an orchestration execution request. This is a base64-encoded string.
     /// </param>
     /// <param name="implementation">
-    /// An <see cref="ITaskOrchestrator"/> implementation that defines the orchestrator logic.
-    /// </param>
+    /// An <see cref="ITaskOrchestrator"/> implementation that defines the orchestrator logic.
+    /// </param>
     /// <param name="extendedSessionsCache">
     /// The cache of extended sessions which can be used to retrieve the <see cref="ExtendedSessionState"/> if this orchestration request is from within an extended session.
     /// </param>
@@ -155,13 +114,12 @@ public static string LoadAndRun(
     /// </exception>
     public static string LoadAndRun(
         string encodedOrchestratorRequest,
-        ITaskOrchestrator implementation,
-        ExtendedSessionsCache extendedSessionsCache,
+        ITaskOrchestrator implementation,
+        ExtendedSessionsCache? extendedSessionsCache,
         IServiceProvider? services = null)
     {
         Check.NotNullOrEmpty(encodedOrchestratorRequest);
-        Check.NotNull(implementation);
-        Check.NotNull(extendedSessionsCache);
+        Check.NotNull(implementation);
 
         P.OrchestratorRequest request = P.OrchestratorRequest.Parser.Base64Decode<P.OrchestratorRequest>(
             encodedOrchestratorRequest);
@@ -186,7 +144,7 @@ public static string LoadAndRun(
             && extendedSessionIdleTimeout >= 0)
         {
             extendedSessionIdleTimeoutInSeconds = extendedSessionIdleTimeout;
-            extendedSessions = extendedSessionsCache.GetOrInitializeCache(extendedSessionIdleTimeoutInSeconds);
+            extendedSessions = extendedSessionsCache?.GetOrInitializeCache(extendedSessionIdleTimeoutInSeconds);
         }
 
         if (properties.TryGetValue("IncludePastEvents", out object? includePastEventsObj)

src/Worker/Grpc/Worker.Grpc.csproj

@@ -6,10 +6,6 @@
     <EnableStyleCop>true</EnableStyleCop>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="../Core/Worker.csproj" />
     <ProjectReference Include="../../Abstractions/Abstractions.csproj" />

test/Worker/Core.Tests/Worker.Tests.csproj

@@ -10,7 +10,6 @@
 
   <ItemGroup>
     <ProjectReference Include="$(SrcRoot)Worker/Core/Worker.csproj" />
-    <ProjectReference Include="..\..\..\src\Worker\Grpc\Worker.Grpc.csproj" />
   </ItemGroup>
 
 </Project>