fix: bandit attributes, logs, and baseUrl in dotnet SDK relay (#85)

typotter · web-flow · commit 7a62c9fc42f1 · 2024-12-05T10:40:56.000-07:00
* Return assignment and bandit logs in test responses
* rename json test response method
* use latest SDK package, update Program hosts
* use Base URL instead of host/port
* handle input attributes without losing kind (numeric/categorical)
diff --git a/package-testing/dotnet-sdk-relay/EppoSDKRelay/AssignmentLogger.cs b/package-testing/dotnet-sdk-relay/EppoSDKRelay/AssignmentLogger.cs
@@ -4,15 +4,22 @@
 
 internal class AssignmentLogger : IAssignmentLogger
 {
+    public static AssignmentLogger Instance = new();
+
+    public Queue<AssignmentLogData> AssignmentLogs = new();
+    public Queue<BanditLogEvent> BanditLogs = new();
+
     public void LogAssignment(AssignmentLogData assignmentLogData)
     {
         Console.WriteLine("Assignment Log");
         Console.WriteLine(assignmentLogData);
+        AssignmentLogs.Enqueue(assignmentLogData);
     }
 
     public void LogBanditAction(BanditLogEvent banditLogEvent)
     {
         Console.WriteLine("Bandit Action Log");
         Console.WriteLine(banditLogEvent);
+        BanditLogs.Enqueue(banditLogEvent);
     }
 }
diff --git a/package-testing/dotnet-sdk-relay/EppoSDKRelay/Controllers/AssignmentController.cs b/package-testing/dotnet-sdk-relay/EppoSDKRelay/Controllers/AssignmentController.cs
@@ -29,22 +29,22 @@ public ActionResult<string> Post([FromBody] AssignmentRequest data)
         switch (data.AssignmentType)
         {
             case "STRING":
-                return JsonResult(eppoClient.GetStringAssignment(data.Flag, data.SubjectKey, convertedAttributes, defaultValue.ToString()!));
+                return JsonTestResponse(eppoClient.GetStringAssignment(data.Flag, data.SubjectKey, convertedAttributes, defaultValue.ToString()!));
 
             case "INTEGER":
                 var intResults = eppoClient.GetIntegerAssignment(data.Flag, data.SubjectKey, convertedAttributes, Convert.ToInt64(defaultValue.ToString()));
-                return JsonResult(intResults);
+                return JsonTestResponse(intResults);
 
             case "BOOLEAN":
-                return JsonResult(eppoClient.GetBooleanAssignment(data.Flag, data.SubjectKey, convertedAttributes, Convert.ToBoolean(defaultValue.ToString())));
+                return JsonTestResponse(eppoClient.GetBooleanAssignment(data.Flag, data.SubjectKey, convertedAttributes, Convert.ToBoolean(defaultValue.ToString())));
 
             case "NUMERIC":
-                return JsonResult(eppoClient.GetNumericAssignment(data.Flag, data.SubjectKey, convertedAttributes, Convert.ToDouble(defaultValue.ToString())));
+                return JsonTestResponse(eppoClient.GetNumericAssignment(data.Flag, data.SubjectKey, convertedAttributes, Convert.ToDouble(defaultValue.ToString())));
 
             case "JSON":
                 var jString = defaultValue.ToString();
                 var defaultJson = JObject.Parse(jString);
-                return JsonResult(eppoClient.GetJsonAssignment(data.Flag, data.SubjectKey, convertedAttributes, defaultJson));
+                return JsonTestResponse(eppoClient.GetJsonAssignment(data.Flag, data.SubjectKey, convertedAttributes, defaultJson));
         }
 
         return JsonError("Invalid Assignment Type " + data.AssignmentType);
diff --git a/package-testing/dotnet-sdk-relay/EppoSDKRelay/Controllers/BanditController.cs b/package-testing/dotnet-sdk-relay/EppoSDKRelay/Controllers/BanditController.cs
@@ -33,6 +33,6 @@ public ActionResult<string> Post([FromBody] BanditActionRequest data)
                                                 subject,
                                                 actions,
                                                 defaultVal);
-        return JsonResult(result);
+        return JsonTestResponse(result);
     }
 }
diff --git a/package-testing/dotnet-sdk-relay/EppoSDKRelay/Controllers/JsonControllerBase.cs b/package-testing/dotnet-sdk-relay/EppoSDKRelay/Controllers/JsonControllerBase.cs
@@ -3,39 +3,60 @@
 using EppoSDKRelay.DTO;
 using System.Text.Json;
 using Newtonsoft.Json.Linq;
+using eppo_sdk.dto;
+using eppo_sdk.dto.bandit;
 
 namespace EppoSDKRelay.controllers;
 
-public class JsonControllerBase : ControllerBase {
+public class JsonControllerBase : ControllerBase
+{
 
     protected static readonly JsonSerializerOptions SerializeOptions = new()
     {
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
         WriteIndented = true
     };
 
-    protected static ActionResult<string> JsonResult(object result)
+    protected static ActionResult<string> JsonTestResponse(object result)
     {
         // System.Text.Json does not play nicely with Newtonsoft types
         // Since "Objects" implement IEnumerable, System.Text will try to encode
         // the json object as an array. :(
-        if (result is JObject) {
+        if (result is JObject)
+        {
             result = ((JObject)result).ToObject<Dictionary<string, object>>();
         }
 
         var response = new TestResponse
         {
-            Result = result
+            Result = result,
+            AssignmentLog = DequeueAllForResponse<AssignmentLogData>(AssignmentLogger.Instance.AssignmentLogs),
+            BanditLog =  DequeueAllForResponse<BanditLogEvent>(AssignmentLogger.Instance.BanditLogs),
         };
         return JsonSerializer.Serialize(response, SerializeOptions);
     }
-    
+
     protected static ActionResult<string> JsonError(String error)
     {
         return JsonSerializer.Serialize(new TestResponse
         {
             Error = error
         }, SerializeOptions);
     }
-    
+
+    public static List<object> DequeueAllForResponse<T>(Queue<T> queue)
+    {
+        List<object> items = [];
+
+        while (queue.Count > 0)
+        {
+            var item = queue.Dequeue();
+            if (item != null)
+            {
+                items.Add(item);
+            }
+        }
+
+        return items;
+    }
 }
diff --git a/package-testing/dotnet-sdk-relay/EppoSDKRelay/DTO/AttributeSet.cs b/package-testing/dotnet-sdk-relay/EppoSDKRelay/DTO/AttributeSet.cs
@@ -4,14 +4,8 @@ namespace EppoSDKRelay.DTO;
 
 public class AttributeSet
 {
-    public Dictionary<string, object?> NumericAttributes { get; set; }
-    public Dictionary<string, object?> CategoricalAttributes { get; set; }
-
-    public Dictionary<string, object?> AttributeDictionary
-    {
-        get => new Dictionary<string, object?>[] { NumericAttributes, CategoricalAttributes }.SelectMany(dict => dict)
-                         .ToDictionary(pair => pair.Key, pair => pair.Value);
-    }
+    public required Dictionary<string, object?> NumericAttributes { get; set; }
+    public required Dictionary<string, object?> CategoricalAttributes { get; set; }
 
     public Dictionary<string, string?> CategoricalAttributesAsStrings
     {
@@ -23,6 +17,5 @@ public class AttributeSet
     public Dictionary<string, object?> NumericAttributesAsNumbers => NumericAttributes
                 .Where(kvp =>
                     (kvp.Value is JsonElement jsonElement) && jsonElement.ValueKind == JsonValueKind.Number)
-                .ToDictionary(kvp => kvp.Key, static kvp => (object?)((JsonElement)kvp.Value).GetDouble());
-
+                .ToDictionary(kvp => kvp.Key, static kvp => kvp.Value == null ? null : (object?)((JsonElement)kvp.Value).GetDouble());
 }
diff --git a/package-testing/dotnet-sdk-relay/EppoSDKRelay/DTO/BanditActionRequest.cs b/package-testing/dotnet-sdk-relay/EppoSDKRelay/DTO/BanditActionRequest.cs
@@ -21,6 +21,6 @@ public ContextAttributes GetSubjectContext()
     public IDictionary<string, ContextAttributes> GetActionContextDict()
     {
         return Actions.ToDictionary(action => action.ActionKey,
-                                    action => ContextAttributes.FromDict(action.ActionKey, Values.ConvertJsonValuesToPrimitives(action.AttributeDictionary)));
+                                    action => ContextAttributes.FromNullableAttributes(action.ActionKey, Values.ConvertJsonValuesToPrimitives(action.CategoricalAttributes), Values.ConvertJsonValuesToPrimitives(action.NumericAttributes)));
     }
 }
diff --git a/package-testing/dotnet-sdk-relay/EppoSDKRelay/EppoSDKRelay.csproj b/package-testing/dotnet-sdk-relay/EppoSDKRelay/EppoSDKRelay.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Eppo.Sdk" Version="3.4.0" />
+    <PackageReference Include="Eppo.Sdk" Version="3.5.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
diff --git a/package-testing/dotnet-sdk-relay/EppoSDKRelay/Program.cs b/package-testing/dotnet-sdk-relay/EppoSDKRelay/Program.cs
@@ -14,5 +14,8 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
             {
                 builder.UseStartup<Startup>();
                 builder.UseUrls("http://" + host + ":" + port);
+
+                // Listen on the docker hostname as well
+                builder.UseUrls("http://host.docker.internal:" + port);
             });
 }
diff --git a/package-testing/dotnet-sdk-relay/EppoSDKRelay/Startup.cs b/package-testing/dotnet-sdk-relay/EppoSDKRelay/Startup.cs
@@ -5,19 +5,17 @@ namespace EppoSDKRelay;
 
 public class Startup
 {
-    static readonly String apiHost = Environment.GetEnvironmentVariable("EPPO_API_HOST") ?? "localhost";
-    static readonly String apiPort = Environment.GetEnvironmentVariable("EPPO_API_PORT") ?? "5000";
+    static readonly String eppoBaseUrl = Environment.GetEnvironmentVariable("EPPO_BASE_URL") ?? "http://localhost:5000/api";
     static readonly String apiToken = Environment.GetEnvironmentVariable("EPPO_API_TOKEN") ?? "NO_TOKEN";
 
 
     public static void InitEppoClient()
     {
-        var url =  "http://" + apiHost + ":" + apiPort;
-        Console.WriteLine("Initializating SDK pointed at" + url);
+        Console.WriteLine("Initializating SDK pointed at" + eppoBaseUrl);
 
-        var eppoClientConfig = new EppoClientConfig(apiToken, new AssignmentLogger())
+        var eppoClientConfig = new EppoClientConfig(apiToken, AssignmentLogger.Instance)
         {
-            BaseUrl = url
+            BaseUrl = eppoBaseUrl
         };
 
         EppoClient.Init(eppoClientConfig);
@@ -45,7 +43,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseDeveloperExceptionPage();
 
             app.UseSwagger();
-            app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "My REST Server v1"));
         }
 
         app.UseHttpsRedirection();

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,22 @@`
`4`	`4`
`5`	`5`	`internal class AssignmentLogger : IAssignmentLogger`
`6`	`6`	`{`
	`7`	`+ public static AssignmentLogger Instance = new();`
	`8`	`+`
	`9`	`+ public Queue<AssignmentLogData> AssignmentLogs = new();`
	`10`	`+ public Queue<BanditLogEvent> BanditLogs = new();`
	`11`	`+`
`7`	`12`	`public void LogAssignment(AssignmentLogData assignmentLogData)`
`8`	`13`	`{`
`9`	`14`	`Console.WriteLine("Assignment Log");`
`10`	`15`	`Console.WriteLine(assignmentLogData);`
	`16`	`+ AssignmentLogs.Enqueue(assignmentLogData);`
`11`	`17`	`}`
`12`	`18`
`13`	`19`	`public void LogBanditAction(BanditLogEvent banditLogEvent)`
`14`	`20`	`{`
`15`	`21`	`Console.WriteLine("Bandit Action Log");`
`16`	`22`	`Console.WriteLine(banditLogEvent);`
	`23`	`+ BanditLogs.Enqueue(banditLogEvent);`
`17`	`24`	`}`
`18`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ public ActionResult<string> Post([FromBody] BanditActionRequest data)`
`33`	`33`	`subject,`
`34`	`34`	`actions,`
`35`	`35`	`defaultVal);`
`36`		`- return JsonResult(result);`
	`36`	`+ return JsonTestResponse(result);`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ public ContextAttributes GetSubjectContext()`
`21`	`21`	`public IDictionary<string, ContextAttributes> GetActionContextDict()`
`22`	`22`	`{`
`23`	`23`	`return Actions.ToDictionary(action => action.ActionKey,`
`24`		`- action => ContextAttributes.FromDict(action.ActionKey, Values.ConvertJsonValuesToPrimitives(action.AttributeDictionary)));`
	`24`	`+ action => ContextAttributes.FromNullableAttributes(action.ActionKey, Values.ConvertJsonValuesToPrimitives(action.CategoricalAttributes), Values.ConvertJsonValuesToPrimitives(action.NumericAttributes)));`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,8 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>`
`14`	`14`	`{`
`15`	`15`	`builder.UseStartup<Startup>();`
`16`	`16`	`builder.UseUrls("http://" + host + ":" + port);`
	`17`	`+`
	`18`	`+ // Listen on the docker hostname as well`
	`19`	`+ builder.UseUrls("http://host.docker.internal:" + port);`
`17`	`20`	`});`
`18`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,19 +5,17 @@ namespace EppoSDKRelay;`
`5`	`5`
`6`	`6`	`public class Startup`
`7`	`7`	`{`
`8`		`- static readonly String apiHost = Environment.GetEnvironmentVariable("EPPO_API_HOST") ?? "localhost";`
`9`		`- static readonly String apiPort = Environment.GetEnvironmentVariable("EPPO_API_PORT") ?? "5000";`
	`8`	`+ static readonly String eppoBaseUrl = Environment.GetEnvironmentVariable("EPPO_BASE_URL") ?? "http://localhost:5000/api";`
`10`	`9`	`static readonly String apiToken = Environment.GetEnvironmentVariable("EPPO_API_TOKEN") ?? "NO_TOKEN";`
`11`	`10`
`12`	`11`
`13`	`12`	`public static void InitEppoClient()`
`14`	`13`	`{`
`15`		`- var url = "http://" + apiHost + ":" + apiPort;`
`16`		`- Console.WriteLine("Initializating SDK pointed at" + url);`
	`14`	`+ Console.WriteLine("Initializating SDK pointed at" + eppoBaseUrl);`
`17`	`15`
`18`		`- var eppoClientConfig = new EppoClientConfig(apiToken, new AssignmentLogger())`
	`16`	`+ var eppoClientConfig = new EppoClientConfig(apiToken, AssignmentLogger.Instance)`
`19`	`17`	`{`
`20`		`- BaseUrl = url`
	`18`	`+ BaseUrl = eppoBaseUrl`
`21`	`19`	`};`
`22`	`20`
`23`	`21`	`EppoClient.Init(eppoClientConfig);`
`@@ -45,7 +43,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`45`	`43`	`app.UseDeveloperExceptionPage();`
`46`	`44`
`47`	`45`	`app.UseSwagger();`
`48`		`- app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "My REST Server v1"));`
`49`	`46`	`}`
`50`	`47`
`51`	`48`	`app.UseHttpsRedirection();`