Skip to content

A programming framework for agentic AI

Fixes to parent number safe access (#66)

Alessandro Avila3fe0bbf99464
diff --git a/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/AzureGenie.cs b/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/AzureGenie.cs
index 421f59d47..0730e8ac9 100644
--- a/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/AzureGenie.cs
+++ b/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/AzureGenie.cs
@@ -1,7 +1,8 @@
using Microsoft.AI.Agents.Abstractions;
using Microsoft.AI.Agents.Orleans;
using Microsoft.AI.DevTeam.Events;
-using Newtonsoft.Json.Linq;
+using Microsoft.AI.DevTeam.Extensions;
+using System.Globalization;
namespace Microsoft.AI.DevTeam;
@@ -11,24 +12,29 @@ public class AzureGenie : Agent
protected override string Namespace => Consts.MainNamespace;
private readonly IManageAzure _azureService;
- public AzureGenie( IManageAzure azureService)
+ public AzureGenie(IManageAzure azureService)
{
_azureService = azureService;
}
public override async Task HandleEvent(Event item)
{
+ if (item?.Type is null)
+ {
+ throw new ArgumentNullException(nameof(item));
+ }
+
+ var data = item.Data ?? throw new ArgumentNullException(nameof(item));
+ var parentNumber = data.TryParseLong("parentNumber");
+ var issueNumber = data.TryParseLong("issueNumber");
+ var org = data["org"].ToString();
+ var repo = data["repo"].ToString();
+ var subject = $"{org}/{repo}/{issueNumber}";
+
switch (item.Type)
{
case nameof(GithubFlowEventType.ReadmeCreated):
- {
- var data = item.Data;
- var parentNumber = long.Parse(data["parentNumber"].ToString());
- var issueNumber = long.Parse(data["issueNumber"].ToString());
- var org = data["org"].ToString();
- var repo = data["repo"].ToString();
- var subject = $"{org}/{repo}/{issueNumber}";
- await Store(org,repo, parentNumber, issueNumber, "readme", "md", "output", data["readme"].ToString());
+ await Store(org, repo, parentNumber, issueNumber, "readme", "md", "output", data["readme"].ToString());
await PublishEvent(Consts.MainNamespace, this.GetPrimaryKeyString(), new Event
{
Type = nameof(GithubFlowEventType.ReadmeStored),
@@ -40,32 +46,21 @@ public class AzureGenie : Agent
{ "parentNumber", $"{parentNumber}" }
}
});
- }
-
break;
case nameof(GithubFlowEventType.CodeCreated):
- {
- var data = item.Data;
- var parentNumber = long.Parse(data["parentNumber"].ToString());
- var issueNumber = long.Parse(data["issueNumber"].ToString());
- var org = data["org"].ToString();
- var repo = data["repo"].ToString();
- var subject = $"{org}/{repo}/{issueNumber}";
- await Store(org,repo, parentNumber, issueNumber, "run", "sh", "output", data["code"].ToString());
+ await Store(org, repo, parentNumber, issueNumber, "run", "sh", "output", data["code"].ToString());
await RunInSandbox(org, repo, parentNumber, issueNumber);
await PublishEvent(Consts.MainNamespace, this.GetPrimaryKeyString(), new Event
{
Type = nameof(GithubFlowEventType.SandboxRunCreated),
Subject = subject,
Data = new Dictionary<string, string> {
- { "org", org },
- { "repo", repo },
- { "issueNumber", $"{issueNumber}" },
- { "parentNumber", $"{parentNumber}" }
- }
+ { "org", org },
+ { "repo", repo },
+ { "issueNumber", $"{issueNumber}" },
+ { "parentNumber", $"{parentNumber}" }
+ }
});
- }
-
break;
default:
break;
diff --git a/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/DeveloperLead/DeveloperLead.cs b/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/DeveloperLead/DeveloperLead.cs
index 1e55fd844..81fac1354 100644
--- a/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/DeveloperLead/DeveloperLead.cs
+++ b/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/DeveloperLead/DeveloperLead.cs
@@ -3,7 +3,6 @@ using Microsoft.AI.Agents.Orleans;
using Microsoft.AI.DevTeam.Events;
using Microsoft.SemanticKernel;
using Microsoft.SemanticKernel.Memory;
-using Newtonsoft.Json.Linq;
using Orleans.Runtime;
namespace Microsoft.AI.DevTeam;
@@ -37,7 +36,7 @@ public class DeveloperLead : AiAgent<DeveloperLeadState>, ILeadDevelopers
});
}
- break;
+ break;
case nameof(GithubFlowEventType.DevPlanChainClosed):
{
var context = item.ToGithubContext();
diff --git a/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/Hubber.cs b/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/Hubber.cs
index 85a495e25..0069f2126 100644
--- a/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/Hubber.cs
+++ b/samples/gh-flow/src/Microsoft.AI.DevTeam/Agents/Hubber.cs
@@ -1,4 +1,5 @@
-using System.Text.Json;
+using System;
+using System.Text.Json;
using Microsoft.AI.Agents.Abstractions;
using Microsoft.AI.Agents.Orleans;
using Microsoft.AI.DevTeam.Events;
@@ -18,6 +19,9 @@ public class Hubber : Agent
public override async Task HandleEvent(Event item)
{
+ ArgumentNullException.ThrowIfNull(item);
+ ArgumentNullException.ThrowIfNull(item.Data);
+
switch (item.Type)
{
case nameof(GithubFlowEventType.NewAsk):
diff --git a/samples/gh-flow/src/Microsoft.AI.DevTeam/Events/GithubFlowEventType.cs b/samples/gh-flow/src/Microsoft.AI.DevTeam/Events/GithubFlowEventType.cs
index 558b8dbb5..3aec523bc 100644
--- a/samples/gh-flow/src/Microsoft.AI.DevTeam/Events/GithubFlowEventType.cs
+++ b/samples/gh-flow/src/Microsoft.AI.DevTeam/Events/GithubFlowEventType.cs
@@ -1,4 +1,6 @@
using Microsoft.AI.Agents.Abstractions;
+using Microsoft.AI.DevTeam.Extensions;
+using System.Globalization;
namespace Microsoft.AI.DevTeam.Events
{
@@ -26,26 +28,28 @@ namespace Microsoft.AI.DevTeam.Events
{
public static GithubContext ToGithubContext(this Event evt)
{
+ ArgumentNullException.ThrowIfNull(evt);
+
return new GithubContext
{
Org = evt.Data["org"],
Repo = evt.Data["repo"],
- IssueNumber = long.Parse(evt.Data["issueNumber"]),
- ParentNumber = string.IsNullOrEmpty(evt.Data["parentNumber"]) ? default : long.Parse(evt.Data["parentNumber"])
+ IssueNumber = evt.Data.TryParseLong("issueNumber"),
+ ParentNumber = evt.Data.TryParseLong("parentNumber")
};
}
public static Dictionary<string, string> ToData(this GithubContext context)
{
+ ArgumentNullException.ThrowIfNull(context);
+
return new Dictionary<string, string> {
- { "org", context.Org },
- { "repo", context.Repo },
- { "issueNumber", $"{context.IssueNumber}" },
- { "parentNumber", context.ParentNumber.HasValue? default: context.ParentNumber.ToString() }
+ { "org", context.Org },
+ { "repo", context.Repo },
+ { "issueNumber", $"{context.IssueNumber}" },
+ { "parentNumber", context.ParentNumber.HasValue ? Convert.ToString(context.ParentNumber, CultureInfo.InvariantCulture) : string.Empty }
};
}
-
-
}
public class GithubContext
diff --git a/samples/gh-flow/src/Microsoft.AI.DevTeam/Extensions/ParseExtensions.cs b/samples/gh-flow/src/Microsoft.AI.DevTeam/Extensions/ParseExtensions.cs
new file mode 100644
index 000000000..8c618c1a4
--- /dev/null
+++ b/samples/gh-flow/src/Microsoft.AI.DevTeam/Extensions/ParseExtensions.cs
@@ -0,0 +1,16 @@
+namespace Microsoft.AI.DevTeam.Extensions
+{
+ public static class ParseExtensions
+ {
+ public static long TryParseLong(this Dictionary<string, string> data, string key)
+ {
+ ArgumentNullException.ThrowIfNull(data);
+
+ if (data.TryGetValue(key, out string? value) && !string.IsNullOrEmpty(value) && long.TryParse(value, out var result))
+ {
+ return result;
+ }
+ return default;
+ }
+ }
+}