Skip to content

Commit b7987e8

Browse files
kostapetankostapetan
committed
WIP update
1 parent 53fdd69 commit b7987e8

File tree

24 files changed

+230
-323
lines changed

24 files changed

+230
-323
lines changed

Diff for: ‎dotnet/samples/Hello/HelloAIAgents/HelloAIAgent.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
namespace HelloAIAgents;
1010
[TopicSubscription("HelloAgents")]
1111
public class HelloAIAgent(
12-
RuntimeContext context,
1312
[FromKeyedServices("EventTypes")] EventTypes typeRegistry,
1413
IHostApplicationLifetime hostApplicationLifetime,
1514
IChatClient client) : HelloAgent(
16-
context,
1715
typeRegistry,
1816
hostApplicationLifetime),
1917
IHandle<NewMessageReceived>
@@ -24,9 +22,9 @@ public async Task Handle(NewMessageReceived item)
2422
var prompt = "Please write a limerick greeting someone with the name " + item.Message;
2523
var response = await client.CompleteAsync(prompt);
2624
var evt = new Output { Message = response.Message.Text };
27-
await PublishMessageAsync(evt).ConfigureAwait(false);
25+
await PublishEventAsync(evt).ConfigureAwait(false);
2826

2927
var goodbye = new ConversationClosed { UserId = AgentId.Key, UserMessage = "Goodbye" };
30-
await PublishMessageAsync(goodbye).ConfigureAwait(false);
28+
await PublishEventAsync(goodbye).ConfigureAwait(false);
3129
}
3230
}

Diff for: ‎dotnet/samples/Hello/HelloAIAgents/Program.cs

+4-6
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ namespace HelloAIAgents
3333
{
3434
[TopicSubscription("HelloAgents")]
3535
public class HelloAgent(
36-
RuntimeContext context,
3736
[FromKeyedServices("EventTypes")] EventTypes typeRegistry,
38-
IHostApplicationLifetime hostApplicationLifetime) : AgentBase(
39-
context,
37+
IHostApplicationLifetime hostApplicationLifetime) : Agent(
4038
typeRegistry),
4139
ISayHello,
4240
IHandle<NewMessageReceived>,
@@ -49,13 +47,13 @@ public async Task Handle(NewMessageReceived item, CancellationToken cancellation
4947
{
5048
Message = response
5149
};
52-
await PublishMessageAsync(evt).ConfigureAwait(false);
50+
await PublishEventAsync(evt).ConfigureAwait(false);
5351
var goodbye = new ConversationClosed
5452
{
5553
UserId = AgentId.Key,
5654
UserMessage = "Goodbye"
5755
};
58-
await PublishMessageAsync(goodbye).ConfigureAwait(false);
56+
await PublishEventAsync(goodbye).ConfigureAwait(false);
5957
}
6058
public async Task Handle(ConversationClosed item, CancellationToken cancellationToken = default)
6159
{
@@ -64,7 +62,7 @@ public async Task Handle(ConversationClosed item, CancellationToken cancellation
6462
{
6563
Message = goodbye
6664
};
67-
await PublishMessageAsync(evt).ConfigureAwait(false);
65+
await PublishEventAsync(evt).ConfigureAwait(false);
6866
//sleep30 seconds
6967
await Task.Delay(30000).ConfigureAwait(false);
7068
hostApplicationLifetime.StopApplication();

Diff for: ‎dotnet/samples/Hello/HelloAgent/Program.cs

+6-8
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ namespace HelloAgent
3030
{
3131

3232
[TopicSubscription("HelloAgents")]
33-
public class HelloAgent(
34-
RuntimeContext context, IHostApplicationLifetime hostApplicationLifetime,
35-
[FromKeyedServices("EventTypes")] EventTypes typeRegistry) : AgentBase(
36-
context,
33+
public class HelloAgent( IHostApplicationLifetime hostApplicationLifetime,
34+
[FromKeyedServices("EventTypes")] EventTypes typeRegistry) : Agent(
3735
typeRegistry),
3836
IHandle<NewMessageReceived>,
3937
IHandle<ConversationClosed>,
@@ -43,20 +41,20 @@ public async Task Handle(NewMessageReceived item, CancellationToken cancellation
4341
{
4442
var response = await SayHello(item.Message).ConfigureAwait(false);
4543
var evt = new Output { Message = response };
46-
await PublishMessageAsync(evt).ConfigureAwait(false);
44+
await PublishEventAsync(evt).ConfigureAwait(false);
4745
var goodbye = new ConversationClosed
4846
{
4947
UserId = AgentId.Key,
5048
UserMessage = "Goodbye"
5149
};
52-
await PublishMessageAsync(goodbye).ConfigureAwait(false);
50+
await PublishEventAsync(goodbye).ConfigureAwait(false);
5351
}
5452
public async Task Handle(ConversationClosed item, CancellationToken cancellationToken = default)
5553
{
5654
var goodbye = $"********************* {item.UserId} said {item.UserMessage} ************************";
5755
var evt = new Output { Message = goodbye };
58-
await PublishMessageAsync(evt).ConfigureAwait(true);
59-
await PublishMessageAsync(new Shutdown()).ConfigureAwait(false);
56+
await PublishEventAsync(evt).ConfigureAwait(true);
57+
await PublishEventAsync(new Shutdown()).ConfigureAwait(false);
6058
}
6159

6260
public async Task Handle(Shutdown item, CancellationToken cancellationToken = default)

Diff for: ‎dotnet/samples/Hello/HelloAgentState/Program.cs

+5-7
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ namespace HelloAgentState
2121

2222
[TopicSubscription("HelloAgents")]
2323
public class HelloAgent(
24-
RuntimeContext context,
2524
IHostApplicationLifetime hostApplicationLifetime,
26-
[FromKeyedServices("EventTypes")] EventTypes typeRegistry) : AgentBase(
27-
context,
25+
[FromKeyedServices("EventTypes")] EventTypes typeRegistry) : Agent(
2826
typeRegistry),
2927
IHandle<NewMessageReceived>,
3028
IHandle<ConversationClosed>,
@@ -48,15 +46,15 @@ await StoreAsync(new AgentState
4846
AgentId = AgentId,
4947
TextData = JsonSerializer.Serialize(state)
5048
}).ConfigureAwait(false);
51-
await PublishMessageAsync(evt).ConfigureAwait(false);
49+
await PublishEventAsync(evt).ConfigureAwait(false);
5250
var goodbye = new ConversationClosed
5351
{
5452
UserId = AgentId.Key,
5553
UserMessage = "Goodbye"
5654
};
57-
await PublishMessageAsync(goodbye).ConfigureAwait(false);
55+
await PublishEventAsync(goodbye).ConfigureAwait(false);
5856
// send the shutdown message
59-
await PublishMessageAsync(new Shutdown { Message = AgentId.Key }).ConfigureAwait(false);
57+
await PublishEventAsync(new Shutdown { Message = AgentId.Key }).ConfigureAwait(false);
6058

6159
}
6260
public async Task Handle(ConversationClosed item, CancellationToken cancellationToken = default)
@@ -68,7 +66,7 @@ public async Task Handle(ConversationClosed item, CancellationToken cancellation
6866
{
6967
Message = goodbye
7068
};
71-
await PublishMessageAsync(evt).ConfigureAwait(true);
69+
await PublishEventAsync(evt).ConfigureAwait(true);
7270
state["workflow"] = "Complete";
7371
await StoreAsync(new AgentState
7472
{

Diff for: ‎dotnet/samples/dev-team/DevTeam.Agents/AiAgent.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
namespace DevTeam.Agents;
77

8-
public class AiAgent<T> : AgentBase
8+
public class AiAgent<T> : Agent
99
{
10-
public AiAgent(RuntimeContext context, EventTypes eventTypes, ILogger<AiAgent<T>> logger) : base(context, eventTypes, logger)
10+
public AiAgent(EventTypes eventTypes, ILogger<AiAgent<T>> logger) : base(eventTypes, logger)
1111
{
1212
}
1313

Diff for: ‎dotnet/samples/dev-team/DevTeam.Agents/Developer/Developer.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
namespace DevTeam.Agents;
88

99
[TopicSubscription("devteam")]
10-
public class Dev(RuntimeContext context, [FromKeyedServices("EventTypes")] EventTypes typeRegistry, ILogger<Dev> logger)
11-
: AiAgent<DeveloperState>(context, typeRegistry, logger), IDevelopApps,
10+
public class Dev([FromKeyedServices("EventTypes")] EventTypes typeRegistry, ILogger<Dev> logger)
11+
: AiAgent<DeveloperState>(typeRegistry, logger), IDevelopApps,
1212
IHandle<CodeGenerationRequested>,
1313
IHandle<CodeChainClosed>
1414
{
@@ -22,7 +22,7 @@ public async Task Handle(CodeGenerationRequested item, CancellationToken cancell
2222
IssueNumber = item.IssueNumber,
2323
Code = code
2424
};
25-
await PublishMessageAsync(evt);
25+
await PublishEventAsync(evt);
2626
}
2727

2828
public async Task Handle(CodeChainClosed item, CancellationToken cancellationToken = default)
@@ -33,7 +33,7 @@ public async Task Handle(CodeChainClosed item, CancellationToken cancellationTok
3333
{
3434
Code = lastCode
3535
};
36-
await PublishMessageAsync(evt);
36+
await PublishEventAsync(evt);
3737
}
3838

3939
public async Task<string> GenerateCode(string ask)

Diff for: ‎dotnet/samples/dev-team/DevTeam.Agents/DeveloperLead/DeveloperLead.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
namespace DevTeam.Agents;
88

99
[TopicSubscription("devteam")]
10-
public class DeveloperLead(RuntimeContext context, [FromKeyedServices("EventTypes")] EventTypes typeRegistry, ILogger<DeveloperLead> logger)
11-
: AiAgent<DeveloperLeadState>(context,typeRegistry, logger), ILeadDevelopers,
10+
public class DeveloperLead([FromKeyedServices("EventTypes")] EventTypes typeRegistry, ILogger<DeveloperLead> logger)
11+
: AiAgent<DeveloperLeadState>(typeRegistry, logger), ILeadDevelopers,
1212
IHandle<DevPlanRequested>,
1313
IHandle<DevPlanChainClosed>
1414
{
@@ -22,7 +22,7 @@ public async Task Handle(DevPlanRequested item, CancellationToken cancellationTo
2222
IssueNumber = item.IssueNumber,
2323
Plan = plan
2424
};
25-
await PublishMessageAsync(evt);
25+
await PublishEventAsync(evt);
2626
}
2727

2828
public async Task Handle(DevPlanChainClosed item, CancellationToken cancellationToken = default)
@@ -33,7 +33,7 @@ public async Task Handle(DevPlanChainClosed item, CancellationToken cancellation
3333
{
3434
Plan = lastPlan
3535
};
36-
await PublishMessageAsync(evt);
36+
await PublishEventAsync(evt);
3737
}
3838
public async Task<string> CreatePlan(string ask)
3939
{

Diff for: ‎dotnet/samples/dev-team/DevTeam.Agents/ProductManager/ProductManager.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
namespace DevTeam.Agents;
88

99
[TopicSubscription("devteam")]
10-
public class ProductManager(RuntimeContext context, [FromKeyedServices("EventTypes")] EventTypes typeRegistry, ILogger<ProductManager> logger)
11-
: AiAgent<ProductManagerState>(context, typeRegistry, logger), IManageProducts,
10+
public class ProductManager([FromKeyedServices("EventTypes")] EventTypes typeRegistry, ILogger<ProductManager> logger)
11+
: AiAgent<ProductManagerState>(typeRegistry, logger), IManageProducts,
1212
IHandle<ReadmeChainClosed>,
1313
IHandle<ReadmeRequested>
1414
{
@@ -20,7 +20,7 @@ public async Task Handle(ReadmeChainClosed item, CancellationToken cancellationT
2020
{
2121
Readme = lastReadme
2222
};
23-
await PublishMessageAsync(evt);
23+
await PublishEventAsync(evt);
2424
}
2525

2626
public async Task Handle(ReadmeRequested item, CancellationToken cancellationToken = default)
@@ -33,7 +33,7 @@ public async Task Handle(ReadmeRequested item, CancellationToken cancellationTok
3333
Repo = item.Repo,
3434
IssueNumber = item.IssueNumber
3535
};
36-
await PublishMessageAsync(evt);
36+
await PublishEventAsync(evt);
3737
}
3838

3939
public async Task<string> CreateReadme(string ask)

Diff for: ‎dotnet/samples/dev-team/DevTeam.Backend/Agents/AzureGenie.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
using Microsoft.AutoGen.Core;
77
namespace Microsoft.AI.DevTeam;
88

9-
public class AzureGenie(RuntimeContext context, [FromKeyedServices("EventTypes")] EventTypes typeRegistry, IManageAzure azureService)
10-
: AgentBase(context, typeRegistry),
9+
public class AzureGenie([FromKeyedServices("EventTypes")] EventTypes typeRegistry, IManageAzure azureService)
10+
: Agent(typeRegistry),
1111
IHandle<ReadmeCreated>,
1212
IHandle<CodeCreated>
1313
{

Diff for: ‎dotnet/samples/dev-team/DevTeam.Backend/Agents/Hubber.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
namespace Microsoft.AI.DevTeam;
1111

12-
public class Hubber(RuntimeContext context, [FromKeyedServices("EventTypes")] EventTypes typeRegistry, IManageGithub ghService)
13-
: AgentBase(context,typeRegistry),
12+
public class Hubber([FromKeyedServices("EventTypes")] EventTypes typeRegistry, IManageGithub ghService)
13+
: Agent(typeRegistry),
1414
IHandle<NewAsk>,
1515
IHandle<ReadmeGenerated>,
1616
IHandle<DevPlanGenerated>,

0 commit comments

Comments
 (0)