stashy

microsoft · Jan 17, 2025 · 6ae6067 · 6ae6067
1 parent 1809b62
commit 6ae6067
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/dotnet/samples/Hello/Hello.AppHost/Program.cs b/dotnet/samples/Hello/Hello.AppHost/Program.cs
@@ -12,7 +12,7 @@
     .WaitFor(backend);
 #pragma warning disable ASPIREHOSTINGPYTHON001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 // xlang is over http for now - in prod use TLS between containers
-builder.AddPythonApp("HelloAgentsPython", "../../../../python/packages/autogen-core/samples/xlang/hello_python_agent", "hello_python_agent.py", "../../../../../.venv")
+builder.AddPythonApp("HelloAgentsPython", "../../../../python/samples/core_xlang_hello_python_agent", "hello_python_agent.py", "../../.venv")
     .WithReference(backend)
     .WithEnvironment("AGENT_HOST", backend.GetEndpoint("http"))
     .WithEnvironment("STAY_ALIVE_ON_GOODBYE", "true")

diff --git a/dotnet/src/Microsoft.AutoGen/AgentHost/Properties/launchSettings.json b/dotnet/src/Microsoft.AutoGen/AgentHost/Properties/launchSettings.json
@@ -4,7 +4,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:50670;http://localhost:50673",
+      "applicationUrl": "https://localhost:53071;http://localhost:50673",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

diff --git a/dotnet/src/Microsoft.AutoGen/AgentHost/appsettings.json b/dotnet/src/Microsoft.AutoGen/AgentHost/appsettings.json
@@ -3,7 +3,10 @@
     "LogLevel": {
       "Default": "Warning",
       "Microsoft": "Warning",
-      "Microsoft.Orleans": "Warning"
+      "Microsoft.Hosting.Lifetime": "Information",
+      "Microsoft.AspNetCore": "Information",
+      "Microsoft.Orleans": "Warning",
+      "Orleans.Runtime": "Warning"
     }
   },
   "AllowedHosts": "*",

diff --git a/dotnet/test/Microsoft.AutoGen.Core.Grpc.Tests/AgentGrpcTests.cs b/dotnet/test/Microsoft.AutoGen.Core.Grpc.Tests/AgentGrpcTests.cs
@@ -18,7 +18,6 @@ namespace Microsoft.AutoGen.Core.Grpc.Tests;
 [Collection(GrpcClusterFixtureCollection.Name)]
 public class AgentGrpcTests(GrpcRuntimeFixture fixture)
 {
-    private readonly IServiceProvider _serviceProvider = fixture.AppHost.Services;
     private readonly GrpcRuntimeFixture _fixture = fixture;
     // need a variable to store the runtime instance
     public static WebApplication? Host { get; private set; }
@@ -30,7 +29,7 @@ public class AgentGrpcTests(GrpcRuntimeFixture fixture)
     [Fact]
     public async Task Agent_ShouldThrowException_WhenNotInitialized()
     {
-        var agent = ActivatorUtilities.CreateInstance<TestAgent>(_serviceProvider);
+        var agent = ActivatorUtilities.CreateInstance<TestAgent>(_fixture.Client.Services);
         await Assert.ThrowsAsync<UninitializedAgentWorker.AgentInitalizedIncorrectlyException>(
             async () =>
             {
@@ -130,12 +129,18 @@ public async Task PublishMessageAsync_and_ReceiveMessageTest()
             }
         }
         Assert.True(found);
+/*         await AgentsApp.PublishMessageAsync("TestEvent", new TextMessage()
+        {
+            Source = "TestEvent",
+            TextMessage_ = "buffer"
+        }, local: false).ConfigureAwait(true);
+ */         
         await agent.PublishMessageAsync(new TextMessage()
         {
             Source = "TestEvent",
             TextMessage_ = "buffer"
         }).ConfigureAwait(true);
-        await Task.Delay(100);
+        await Task.Delay(10000);
         Assert.True(TestAgent.ReceivedMessages.ContainsKey("TestEvent"));
         _fixture.Stop();
     }
@@ -156,7 +161,7 @@ public async Task InvokeCorrectHandler()
     [Fact]
     public async Task DelegateMessageToTestAgentAsync()
     {
-        var client = _fixture.AppHost.Services.GetRequiredService<Client>();
+        var client = _fixture.Client.Services.GetRequiredService<Client>();
         await client.PublishMessageAsync(new TextMessage()
         {
             Source = nameof(DelegateMessageToTestAgentAsync),
@@ -234,7 +239,7 @@ private static async Task<IHost> StartAppHostAsync()
 
     }
     public IHost Client { get; }
-    public IHost AppHost { get; }
+    public IHost? AppHost { get; }
 
     /// <summary>
     /// Start - starts the agent
@@ -253,7 +258,7 @@ private static async Task<IHost> StartAppHostAsync()
     /// <returns>void</returns>
     public void Stop()
     {
-        IHostApplicationLifetime hostApplicationLifetime = AppHost.Services.GetRequiredService<IHostApplicationLifetime>();
+        IHostApplicationLifetime hostApplicationLifetime = Client.Services.GetRequiredService<IHostApplicationLifetime>();
         hostApplicationLifetime.StopApplication();
     }
 }