Merge branch 'main' into LittleLittleCloud-patch-2

microsoft · Dec 3, 2024 · 68e4443 · 68e4443
2 parents 615ce8c + 79c5aaa
commit 68e4443
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcGateway.cs b/dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcGateway.cs
@@ -137,7 +137,7 @@ private async ValueTask AddSubscriptionAsync(GrpcWorkerConnection connection, Ad
         }
         _subscriptionsByAgentType[agentType] = request.Subscription;
         _subscriptionsByTopic.GetOrAdd(topic, _ => []).Add(agentType);
-        await _subscriptions.Subscribe(topic, agentType);
+        await _subscriptions.SubscribeAsync(topic, agentType);
         //var response = new AddSubscriptionResponse { RequestId = request.RequestId, Error = "", Success = true };
         Message response = new()
         {

diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/ISubscriptionsGrain.cs b/dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/ISubscriptionsGrain.cs
@@ -4,7 +4,7 @@
 namespace Microsoft.AutoGen.Agents;
 public interface ISubscriptionsGrain : IGrainWithIntegerKey
 {
-    ValueTask Subscribe(string agentType, string topic);
-    ValueTask Unsubscribe(string agentType, string topic);
+    ValueTask SubscribeAsync(string agentType, string topic);
+    ValueTask UnsubscribeAsync(string agentType, string topic);
     ValueTask<Dictionary<string, List<string>>> GetSubscriptions(string agentType);
 }
diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/SubscriptionsGrain.cs b/dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/SubscriptionsGrain.cs
@@ -15,7 +15,7 @@ public ValueTask<Dictionary<string, List<string>>> GetSubscriptions(string? agen
         }
         return new ValueTask<Dictionary<string, List<string>>>(_subscriptions);
     }
-    public ValueTask Subscribe(string agentType, string topic)
+    public async ValueTask SubscribeAsync(string agentType, string topic)
     {
         if (!_subscriptions.TryGetValue(topic, out var subscriptions))
         {
@@ -27,11 +27,9 @@ public ValueTask Subscribe(string agentType, string topic)
         }
         _subscriptions[topic] = subscriptions;
         state.State.Subscriptions = _subscriptions;
-        state.WriteStateAsync();
-
-        return ValueTask.CompletedTask;
+        await state.WriteStateAsync().ConfigureAwait(false);
     }
-    public ValueTask Unsubscribe(string agentType, string topic)
+    public async ValueTask UnsubscribeAsync(string agentType, string topic)
     {
         if (!_subscriptions.TryGetValue(topic, out var subscriptions))
         {
@@ -43,8 +41,7 @@ public ValueTask Unsubscribe(string agentType, string topic)
         }
         _subscriptions[topic] = subscriptions;
         state.State.Subscriptions = _subscriptions;
-        state.WriteStateAsync();
-        return ValueTask.CompletedTask;
+        await state.WriteStateAsync();
     }
 }
 public sealed class SubscriptionsState