Merge pull request #336 from microsoft/generalise-query-parameters

generalise query parameter processing
microsoft · Aug 10, 2024 · 21fc935 · 21fc935
2 parents a750d7d + fab3350
commit 21fc935
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 22 deletions.
diff --git a/src/AzureAIProxy/Routes/AzureAISearch.cs b/src/AzureAIProxy/Routes/AzureAISearch.cs
@@ -19,7 +19,6 @@ public static RouteGroupBuilder MapAzureAISearchRoutes(this RouteGroupBuilder bu
     private static async Task<IResult> ProcessRequestAsync(
         [FromServices] ICatalogService catalogService,
         [FromServices] IProxyService proxyService,
-        [FromQuery(Name = "api-version")] string apiVersion,
         [FromBody] JsonDocument requestJsonDoc,
         HttpContext context,
         string index
@@ -46,10 +45,11 @@ string index
                     $"Deployment '{index}' not found for this event. Available deployments are: {string.Join(", ", eventCatalog.Select(d => d.DeploymentName))}"
                 );
 
-            var url = GenerateEndpointUrl(deployment, extPath, apiVersion);
+            var url = GenerateEndpointUrl(deployment, extPath);
             var (responseContent, statusCode) = await proxyService.HttpPostAsync(
                 url,
                 deployment.EndpointKey,
+                context,
                 requestJsonDoc,
                 requestContext,
                 deployment
@@ -58,10 +58,8 @@ string index
         }
     }
 
-    private static Uri GenerateEndpointUrl(Deployment deployment, string extPath, string apiVersion)
+    private static UriBuilder GenerateEndpointUrl(Deployment deployment, string extPath)
     {
-        var baseUrl = deployment.EndpointUrl.TrimEnd('/');
-
         string path = extPath switch
         {
             "/{index}/docs/search" => $"/indexes/{deployment.DeploymentName.Trim()}/docs/search",
@@ -70,6 +68,9 @@ private static Uri GenerateEndpointUrl(Deployment deployment, string extPath, st
             _ => throw new ArgumentException("Invalid route pattern"),
         };
 
-        return new Uri($"{baseUrl}{path}?api-version={apiVersion}");
+        return new UriBuilder(deployment.EndpointUrl.TrimEnd('/'))
+        {
+            Path = path
+        };
     }
 }
diff --git a/src/AzureAIProxy/Routes/AzureOpenAI.cs b/src/AzureAIProxy/Routes/AzureOpenAI.cs
@@ -24,7 +24,6 @@ public static RouteGroupBuilder MapAzureOpenAIRoutes(this RouteGroupBuilder buil
     private static async Task<IResult> ProcessRequestAsync(
         [FromServices] ICatalogService catalogService,
         [FromServices] IProxyService proxyService,
-        [FromQuery(Name = "api-version")] string apiVersion,
         [FromBody] JsonDocument requestJsonDoc,
         HttpContext context,
         string deploymentName
@@ -66,7 +65,7 @@ string deploymentName
                 );
             }
 
-            var url = GenerateEndpointUrl(deployment, extPath, apiVersion);
+            var url = GenerateEndpointUrl(deployment, extPath);
 
             try
             {
@@ -87,6 +86,7 @@ await proxyService.HttpPostStreamAsync(
                 var (responseContent, statusCode) = await proxyService.HttpPostAsync(
                     url,
                     deployment.EndpointKey,
+                    context,
                     requestJsonDoc,
                     requestContext,
                     deployment
@@ -130,10 +130,11 @@ private static bool IsStreaming(JsonDocument requestJsonDoc)
             : null;
     }
 
-    private static Uri GenerateEndpointUrl(Deployment deployment, string extPath, string apiVersion)
+    private static UriBuilder GenerateEndpointUrl(Deployment deployment, string extPath)
     {
-        var baseUrl =
-            $"{deployment.EndpointUrl.TrimEnd('/')}/openai/deployments/{deployment.DeploymentName.Trim()}";
-        return new Uri($"{baseUrl}{extPath}?api-version={apiVersion}");
+        return new UriBuilder(deployment.EndpointUrl.TrimEnd('/'))
+        {
+            Path = $"/openai/deployments/{deployment.DeploymentName.Trim()}{extPath}"
+        };
     }
 }
diff --git a/src/AzureAIProxy/Services/IProxyService.cs b/src/AzureAIProxy/Services/IProxyService.cs
@@ -6,14 +6,15 @@ namespace AzureAIProxy.Services;
 public interface IProxyService
 {
     Task<(string responseContent, int statusCode)> HttpPostAsync(
-        Uri requestUrl,
+        UriBuilder requestUrl,
         string endpointKey,
+        HttpContext context,
         JsonDocument requestJsonDoc,
         RequestContext requestContext,
         Deployment deployment
     );
     Task HttpPostStreamAsync(
-        Uri requestUrl,
+        UriBuilder requestUrl,
         string endpointKey,
         HttpContext context,
         JsonDocument requestJsonDoc,

diff --git a/src/AzureAIProxy/Services/MockProxyService.cs b/src/AzureAIProxy/Services/MockProxyService.cs
@@ -23,8 +23,9 @@ private static int RandomDelayInMilliseconds
     /// This method is used for testing purposes and does not actually send an HTTP request.
     /// </summary>
     public async Task<(string responseContent, int statusCode)> HttpPostAsync(
-        Uri requestUrl,
+        UriBuilder requestUrl,
         string endpointKey,
+        HttpContext context,
         JsonDocument requestJsonDoc,
         RequestContext requestContext,
         Deployment deployment
@@ -33,7 +34,8 @@ Deployment deployment
         using var httpClient = httpClientFactory.CreateClient();
         httpClient.Timeout = TimeSpan.FromSeconds(HttpTimeoutSeconds);
 
-        using var requestMessage = new HttpRequestMessage(HttpMethod.Post, requestUrl);
+        var requestUrlWithQuery = AppendQueryParameters(requestUrl, context);
+        using var requestMessage = new HttpRequestMessage(HttpMethod.Post, requestUrlWithQuery);
         requestMessage.Content = new StringContent(
             requestJsonDoc.RootElement.ToString(),
             Encoding.UTF8,
@@ -61,7 +63,7 @@ Deployment deployment
     /// This method is used for testing purposes and does not actually send an HTTP request.
     /// </summary>
     public async Task HttpPostStreamAsync(
-        Uri requestUrl,
+        UriBuilder requestUrl,
         string endpointKey,
         HttpContext context,
         JsonDocument requestJsonDoc,
@@ -72,7 +74,8 @@ Deployment deployment
         var httpClient = httpClientFactory.CreateClient();
         httpClient.Timeout = TimeSpan.FromSeconds(HttpTimeoutSeconds);
 
-        using var requestMessage = new HttpRequestMessage(HttpMethod.Post, requestUrl);
+        var requestUrlWithQuery = AppendQueryParameters(requestUrl, context);
+        using var requestMessage = new HttpRequestMessage(HttpMethod.Post, requestUrlWithQuery);
         requestMessage.Content = new StringContent(
             requestJsonDoc.RootElement.ToString(),
             Encoding.UTF8,
@@ -121,4 +124,20 @@ bool streaming
                 + "\"}";
         }
     }
+
+    /// <summary>
+    /// Appends query parameters from the specified <see cref="HttpContext"/> to the given request URL.
+    /// </summary>
+    /// <param name="requestUrl">The request URL to append the query parameters to.</param>
+    /// <param name="context">The <see cref="HttpContext"/> containing the query parameters.</param>
+    /// <returns>A new <see cref="Uri"/> object with the appended query parameters.</returns>
+    private static Uri AppendQueryParameters(UriBuilder requestUrl, HttpContext context)
+    {
+        var queryParameters = context.Request.Query
+            .Where(q => !string.IsNullOrEmpty(q.Value)) // Skip parameters with empty values
+            .Select(q => $"{q.Key}={q.Value!}");
+
+        requestUrl.Query = string.Join("&", queryParameters);
+        return requestUrl.Uri;
+    }
 }
diff --git a/src/AzureAIProxy/Services/ProxyService.cs b/src/AzureAIProxy/Services/ProxyService.cs
@@ -17,8 +17,9 @@ public class ProxyService(IHttpClientFactory httpClientFactory, IMetricService m
     /// <param name="endpointKey">The endpoint key to use for authentication.</param>
     /// <returns>A tuple containing the response content and the status code of the HTTP response.</returns>
     public async Task<(string responseContent, int statusCode)> HttpPostAsync(
-        Uri requestUrl,
+        UriBuilder requestUrl,
         string endpointKey,
+        HttpContext context,
         JsonDocument requestJsonDoc,
         RequestContext requestContext,
         Deployment deployment
@@ -27,7 +28,8 @@ Deployment deployment
         using var httpClient = httpClientFactory.CreateClient();
         httpClient.Timeout = TimeSpan.FromSeconds(HttpTimeoutSeconds);
 
-        using var requestMessage = new HttpRequestMessage(HttpMethod.Post, requestUrl);
+        var requestUrlWithQuery = AppendQueryParameters(requestUrl, context);
+        using var requestMessage = new HttpRequestMessage(HttpMethod.Post, requestUrlWithQuery);
         requestMessage.Content = new StringContent(
             requestJsonDoc.RootElement.ToString(),
             Encoding.UTF8,
@@ -51,7 +53,7 @@ Deployment deployment
     /// <param name="requestString">The request body as a string.</param>
     /// <returns>A task representing the asynchronous operation.</returns>
     public async Task HttpPostStreamAsync(
-        Uri requestUrl,
+        UriBuilder requestUrl,
         string endpointKey,
         HttpContext context,
         JsonDocument requestJsonDoc,
@@ -62,7 +64,8 @@ Deployment deployment
         var httpClient = httpClientFactory.CreateClient();
         httpClient.Timeout = TimeSpan.FromSeconds(HttpTimeoutSeconds);
 
-        using var requestMessage = new HttpRequestMessage(HttpMethod.Post, requestUrl);
+        var requestUrlWithQuery = AppendQueryParameters(requestUrl, context);
+        using var requestMessage = new HttpRequestMessage(HttpMethod.Post, requestUrlWithQuery);
         requestMessage.Content = new StringContent(
             requestJsonDoc.RootElement.ToString(),
             Encoding.UTF8,
@@ -82,4 +85,20 @@ Deployment deployment
         await using var responseStream = await response.Content.ReadAsStreamAsync();
         await responseStream.CopyToAsync(context.Response.Body);
     }
+
+    /// <summary>
+    /// Appends query parameters from the specified <see cref="HttpContext"/> to the given request URL.
+    /// </summary>
+    /// <param name="requestUrl">The request URL to append the query parameters to.</param>
+    /// <param name="context">The <see cref="HttpContext"/> containing the query parameters.</param>
+    /// <returns>A new <see cref="Uri"/> object with the appended query parameters.</returns>
+    private static Uri AppendQueryParameters(UriBuilder requestUrl, HttpContext context)
+    {
+        var queryParameters = context.Request.Query
+            .Where(q => !string.IsNullOrEmpty(q.Value)) // Skip parameters with empty values
+            .Select(q => $"{q.Key}={q.Value!}");
+
+        requestUrl.Query = string.Join("&", queryParameters);
+        return requestUrl.Uri;
+    }
 }