From f074bbe37d967c9f9941b9ab34b20c6516779c8e Mon Sep 17 00:00:00 2001 From: Kosta Petan Date: Wed, 28 Feb 2024 15:44:13 +0100 Subject: [PATCH] Simplify subscription --- src/libs/Microsoft.AI.DevTeam/Agents/Agent.cs | 9 +++ .../Microsoft.AI.DevTeam/Agents/AzureGenie.cs | 9 --- .../Microsoft.AI.DevTeam/Agents/Developer.cs | 61 ------------------- .../Agents/DeveloperLead.cs | 8 --- .../Microsoft.AI.DevTeam/Agents/Hubber.cs | 8 --- .../Agents/ProductManager.cs | 42 ------------- 6 files changed, 9 insertions(+), 128 deletions(-) diff --git a/src/libs/Microsoft.AI.DevTeam/Agents/Agent.cs b/src/libs/Microsoft.AI.DevTeam/Agents/Agent.cs index c313d1efb..f5bbf436e 100644 --- a/src/libs/Microsoft.AI.DevTeam/Agents/Agent.cs +++ b/src/libs/Microsoft.AI.DevTeam/Agents/Agent.cs @@ -13,4 +13,13 @@ public abstract class Agent : Grain, IGrainWithStringKey var stream = streamProvider.GetStream(streamId); await stream.OnNextAsync(item); } + + public async override Task OnActivateAsync(CancellationToken cancellationToken) + { + var streamProvider = this.GetStreamProvider("StreamProvider"); + var streamId = StreamId.Create(Consts.MainNamespace, this.GetPrimaryKeyString()); + var stream = streamProvider.GetStream(streamId); + + await stream.SubscribeAsync(HandleEvent); + } } diff --git a/src/libs/Microsoft.AI.DevTeam/Agents/AzureGenie.cs b/src/libs/Microsoft.AI.DevTeam/Agents/AzureGenie.cs index 8d138195a..b70f6a7dc 100644 --- a/src/libs/Microsoft.AI.DevTeam/Agents/AzureGenie.cs +++ b/src/libs/Microsoft.AI.DevTeam/Agents/AzureGenie.cs @@ -13,15 +13,6 @@ public class AzureGenie : Agent _azureService = azureService; } - public async override Task OnActivateAsync(CancellationToken cancellationToken) - { - var streamProvider = this.GetStreamProvider("StreamProvider"); - var streamId = StreamId.Create(Consts.MainNamespace, this.GetPrimaryKeyString()); - var stream = streamProvider.GetStream(streamId); - - await stream.SubscribeAsync(HandleEvent); - } - public override async Task HandleEvent(Event item, StreamSequenceToken? token) { switch (item.Type) diff --git a/src/libs/Microsoft.AI.DevTeam/Agents/Developer.cs b/src/libs/Microsoft.AI.DevTeam/Agents/Developer.cs index 0e564431d..5dbfbe404 100644 --- a/src/libs/Microsoft.AI.DevTeam/Agents/Developer.cs +++ b/src/libs/Microsoft.AI.DevTeam/Agents/Developer.cs @@ -9,7 +9,6 @@ using Orleans.Streams; namespace Microsoft.AI.DevTeam; -//[RegexImplicitStreamSubscription("")] [ImplicitStreamSubscription(Consts.MainNamespace)] public class Dev : AiAgent { @@ -24,15 +23,6 @@ public class Dev : AiAgent _logger = logger; } - public async override Task OnActivateAsync(CancellationToken cancellationToken) - { - var streamProvider = this.GetStreamProvider("StreamProvider"); - var streamId = StreamId.Create(Consts.MainNamespace, this.GetPrimaryKeyString()); - var stream = streamProvider.GetStream(streamId); - - await stream.SubscribeAsync(HandleEvent); - } - public async override Task HandleEvent(Event item, StreamSequenceToken? token) { switch (item.Type) @@ -82,57 +72,6 @@ public class Dev : AiAgent } } - public Task ReviewPlan(string plan) - { - throw new NotImplementedException(); - } - - public async Task CloseImplementation() - { - // var dev = _grains.GetGrain(issueNumber, suffix); - // var code = await dev.GetLastMessage(); - // var lookup = _grains.GetGrain(suffix); - // var parentIssue = await lookup.GetMetadata((int)issueNumber); - // await _azService.Store(new SaveOutputRequest - // { - // ParentIssueNumber = parentIssue.IssueNumber, - // IssueNumber = (int)issueNumber, - // Output = code, - // Extension = "sh", - // Directory = "output", - // FileName = "run", - // Org = org, - // Repo = repo - // }); - // var sandboxRequest = new SandboxRequest - // { - // Org = org, - // Repo = repo, - // IssueNumber = (int)issueNumber, - // ParentIssueNumber = parentIssue.IssueNumber - // }; - // await _azService.RunInSandbox(sandboxRequest); - - // var commitRequest = new CommitRequest - // { - // Dir = "output", - // Org = org, - // Repo = repo, - // ParentNumber = parentIssue.IssueNumber, - // Number = (int)issueNumber, - // Branch = $"sk-{parentIssue.IssueNumber}" - // }; - // var markTaskCompleteRequest = new MarkTaskCompleteRequest - // { - // Org = org, - // Repo = repo, - // CommentId = parentIssue.CommentId - // }; - - // var sandbox = _grains.GetGrain(issueNumber, suffix); - // await sandbox.ScheduleCommitSandboxRun(commitRequest, markTaskCompleteRequest, sandboxRequest); - } - public async Task BuildUnderstanding(string content) { try diff --git a/src/libs/Microsoft.AI.DevTeam/Agents/DeveloperLead.cs b/src/libs/Microsoft.AI.DevTeam/Agents/DeveloperLead.cs index 85e7a1dcd..817056042 100644 --- a/src/libs/Microsoft.AI.DevTeam/Agents/DeveloperLead.cs +++ b/src/libs/Microsoft.AI.DevTeam/Agents/DeveloperLead.cs @@ -23,14 +23,6 @@ public class DeveloperLead : AiAgent _logger = logger; _ghService = ghService; } - public async override Task OnActivateAsync(CancellationToken cancellationToken) - { - var streamProvider = this.GetStreamProvider("StreamProvider"); - var streamId = StreamId.Create(Consts.MainNamespace, this.GetPrimaryKeyString()); - var stream = streamProvider.GetStream(streamId); - - await stream.SubscribeAsync(HandleEvent); - } public async override Task HandleEvent(Event item, StreamSequenceToken? token) { diff --git a/src/libs/Microsoft.AI.DevTeam/Agents/Hubber.cs b/src/libs/Microsoft.AI.DevTeam/Agents/Hubber.cs index dc83c0aa2..6c04110f3 100644 --- a/src/libs/Microsoft.AI.DevTeam/Agents/Hubber.cs +++ b/src/libs/Microsoft.AI.DevTeam/Agents/Hubber.cs @@ -17,14 +17,6 @@ public class Hubber : Agent _ghService = ghService; } - public async override Task OnActivateAsync(CancellationToken cancellationToken) - { - var streamProvider = this.GetStreamProvider("StreamProvider"); - var streamId = StreamId.Create(Consts.MainNamespace, this.GetPrimaryKeyString()); - var stream = streamProvider.GetStream(streamId); - - await stream.SubscribeAsync(HandleEvent); - } public override async Task HandleEvent(Event item, StreamSequenceToken? token) { switch (item.Type) diff --git a/src/libs/Microsoft.AI.DevTeam/Agents/ProductManager.cs b/src/libs/Microsoft.AI.DevTeam/Agents/ProductManager.cs index eb4d6aeb5..9c587b177 100644 --- a/src/libs/Microsoft.AI.DevTeam/Agents/ProductManager.cs +++ b/src/libs/Microsoft.AI.DevTeam/Agents/ProductManager.cs @@ -21,14 +21,6 @@ public class ProductManager : AiAgent _logger = logger; } - public async override Task OnActivateAsync(CancellationToken cancellationToken) - { - var streamProvider = this.GetStreamProvider("StreamProvider"); - var streamId = StreamId.Create(Consts.MainNamespace, this.GetPrimaryKeyString()); - var stream = streamProvider.GetStream(streamId); - - await stream.SubscribeAsync(HandleEvent); - } public async override Task HandleEvent(Event item, StreamSequenceToken? token) { switch (item.Type) @@ -77,38 +69,4 @@ public class ProductManager : AiAgent return default; } } - - // public async Task CloseReadme() - // { - // var pm = _grains.GetGrain(issueNumber, suffix); - // var readme = await pm.GetLastMessage(); - // var lookup = _grains.GetGrain(suffix); - // var parentIssue = await lookup.GetMetadata((int)issueNumber); - // await _azService.Store(new SaveOutputRequest - // { - // ParentIssueNumber = parentIssue.IssueNumber, - // IssueNumber = (int)issueNumber, - // Output = readme, - // Extension = "md", - // Directory = "output", - // FileName = "readme", - // Org = org, - // Repo = repo - // }); - // await _ghService.CommitToBranch(new CommitRequest - // { - // Dir = "output", - // Org = org, - // Repo = repo, - // ParentNumber = parentIssue.IssueNumber, - // Number = (int)issueNumber, - // Branch = $"sk-{parentIssue.IssueNumber}" - // }); - // await _ghService.MarkTaskComplete(new MarkTaskCompleteRequest - // { - // Org = org, - // Repo = repo, - // CommentId = parentIssue.CommentId - // }); - // } }