Fixes to parent number safe access (autogenhub#66)

alessandro-avila · web-flow · commit 3fe0bbf99464 · 2024-05-23T17:38:34.000+02:00
diff --git 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 override async Task HandleEvent(Event item)
                             { "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
@@ -3,7 +3,6 @@
 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 async override Task HandleEvent(Event item)
                     });
                 }
 
-                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
@@ -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 Hubber(IManageGithub ghService)
 
     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
@@ -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 @@ public static class EventExtensions
     {
         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
@@ -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;
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using Microsoft.AI.DevTeam.Events;`
`4`	`4`	`using Microsoft.SemanticKernel;`
`5`	`5`	`using Microsoft.SemanticKernel.Memory;`
`6`		`-using Newtonsoft.Json.Linq;`
`7`	`6`	`using Orleans.Runtime;`
`8`	`7`
`9`	`8`	`namespace Microsoft.AI.DevTeam;`
`@@ -37,7 +36,7 @@ public async override Task HandleEvent(Event item)`
`37`	`36`	`});`
`38`	`37`	`}`
`39`	`38`
`40`		`- break;`
	`39`	`+ break;`
`41`	`40`	`case nameof(GithubFlowEventType.DevPlanChainClosed):`
`42`	`41`	`{`
`43`	`42`	`var context = item.ToGithubContext();`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`using Microsoft.AI.Agents.Abstractions;`
	`2`	`+using Microsoft.AI.DevTeam.Extensions;`
	`3`	`+using System.Globalization;`
`2`	`4`
`3`	`5`	`namespace Microsoft.AI.DevTeam.Events`
`4`	`6`	`{`
`@@ -26,26 +28,28 @@ public static class EventExtensions`
`26`	`28`	`{`
`27`	`29`	`public static GithubContext ToGithubContext(this Event evt)`
`28`	`30`	`{`
	`31`	`+ ArgumentNullException.ThrowIfNull(evt);`
	`32`	`+`
`29`	`33`	`return new GithubContext`
`30`	`34`	`{`
`31`	`35`	`Org = evt.Data["org"],`
`32`	`36`	`Repo = evt.Data["repo"],`
`33`		`- IssueNumber = long.Parse(evt.Data["issueNumber"]),`
`34`		`- ParentNumber = string.IsNullOrEmpty(evt.Data["parentNumber"]) ? default : long.Parse(evt.Data["parentNumber"])`
	`37`	`+ IssueNumber = evt.Data.TryParseLong("issueNumber"),`
	`38`	`+ ParentNumber = evt.Data.TryParseLong("parentNumber")`
`35`	`39`	`};`
`36`	`40`	`}`
`37`	`41`
`38`	`42`	`public static Dictionary<string, string> ToData(this GithubContext context)`
`39`	`43`	`{`
	`44`	`+ ArgumentNullException.ThrowIfNull(context);`
	`45`	`+`
`40`	`46`	`return new Dictionary<string, string> {`
`41`		`- { "org", context.Org },`
`42`		`- { "repo", context.Repo },`
`43`		`- { "issueNumber", $"{context.IssueNumber}" },`
`44`		`- { "parentNumber", context.ParentNumber.HasValue? default: context.ParentNumber.ToString() }`
	`47`	`+ { "org", context.Org },`
	`48`	`+ { "repo", context.Repo },`
	`49`	`+ { "issueNumber", $"{context.IssueNumber}" },`
	`50`	`+ { "parentNumber", context.ParentNumber.HasValue ? Convert.ToString(context.ParentNumber, CultureInfo.InvariantCulture) : string.Empty }`
`45`	`51`	`};`
`46`	`52`	`}`
`47`		`-`
`48`		`-`
`49`	`53`	`}`
`50`	`54`
`51`	`55`	`public class GithubContext`