Refactor mapping

Author: reakaleek

src/api/Elastic.Documentation.Api.Lambda/AskAiEndpoint.cs renamed to src/api/Elastic.Documentation.Api.Infrastructure/MappingsExstension.cs

@@ -3,14 +3,20 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Documentation.Api.Core.AskAi;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 
-namespace Elastic.Documentation.Api.Lambda;
+namespace Elastic.Documentation.Api.Infrastructure;
 
-public static class AskAiEndpoint
+public static class MappingsExtension
 {
-	public static void MapAskAiEndpoint(this RouteGroupBuilder parentGroup)
+	public static void MapElasticDocsApiEndpoints(this IEndpointRouteBuilder group) =>
+		MapAskAiEndpoint(group);
+
+	private static void MapAskAiEndpoint(IEndpointRouteBuilder group)
 	{
-		var askAiGroup = parentGroup.MapGroup("/ask-ai");
+		var askAiGroup = group.MapGroup("/ask-ai");
 		_ = askAiGroup.MapPost("/stream", async (AskAiRequest askAiRequest, AskAiUsecase askAiUsecase, Cancel ctx) =>
 		{
 			var stream = await askAiUsecase.AskAi(askAiRequest, ctx);

src/api/Elastic.Documentation.Api.Infrastructure/ServicesExtension.cs

@@ -32,11 +32,11 @@ public class LlmGatewayOptions
 
 public static class ServicesExtension
 {
-	public static void AddApiUsecases(this IServiceCollection services, string? appEnvironment)
+	public static void AddElasticDocsApiUsecases(this IServiceCollection services, string? appEnvironment)
 	{
 		if (AppEnvironmentExtensions.TryParse(appEnvironment, out var parsedEnvironment, true))
 		{
-			AddApiUsecases(
+			AddElasticDocsApiUsecases(
 				services,
 				parsedEnvironment
 			);
@@ -45,15 +45,15 @@ public static void AddApiUsecases(this IServiceCollection services, string? appE
 		{
 			var logger = services.BuildServiceProvider().GetRequiredService<ILogger>();
 			logger.LogWarning("Unable to parse environment {Environment} into AppEnvironment. Using default AppEnvironment.Dev", appEnvironment);
-			AddApiUsecases(
+			AddElasticDocsApiUsecases(
 				services,
 				AppEnvironment.Dev
 			);
 		}
 	}
 
 
-	private static void AddApiUsecases(this IServiceCollection services, AppEnvironment appEnvironment)
+	private static void AddElasticDocsApiUsecases(this IServiceCollection services, AppEnvironment appEnvironment)
 	{
 		_ = services.ConfigureHttpJsonOptions(options =>
 		{

src/api/Elastic.Documentation.Api.Lambda/Program.cs

@@ -6,17 +6,16 @@
 using Amazon.Lambda.APIGatewayEvents;
 using Amazon.Lambda.Serialization.SystemTextJson;
 using Elastic.Documentation.Api.Infrastructure;
-using Elastic.Documentation.Api.Lambda;
 
 var builder = WebApplication.CreateSlimBuilder(args);
 
 builder.Services.AddAWSLambdaHosting(LambdaEventSource.RestApi, new SourceGeneratorLambdaJsonSerializer<LambdaJsonSerializerContext>());
-builder.Services.AddApiUsecases(Environment.GetEnvironmentVariable("APP_ENVIRONMENT"));
+builder.Services.AddElasticDocsApiUsecases(Environment.GetEnvironmentVariable("APP_ENVIRONMENT"));
 
 var app = builder.Build();
 
 var v1 = app.MapGroup("/v1");
-v1.MapAskAiEndpoint();
+v1.MapElasticDocsApiEndpoints();
 
 app.Run();
 

src/tooling/docs-builder/Http/DocumentationWebHost.cs

@@ -40,7 +40,7 @@ public DocumentationWebHost(ILoggerFactory logFactory, string? path, int port, I
 	{
 		_writeFileSystem = writeFs;
 		var builder = WebApplication.CreateSlimBuilder();
-		builder.Services.AddApiUsecases("dev");
+		builder.Services.AddElasticDocsApiUsecases("dev");
 		DocumentationTooling.CreateServiceCollection(builder.Services, LogLevel.Information);
 		_ = builder.Logging
 			.AddFilter("Microsoft.AspNetCore.Hosting.Diagnostics", LogLevel.Error)
@@ -134,7 +134,9 @@ private void SetUpRoutes()
 		_ = _webApplication.MapGet("/api/{**slug}", (string slug, ReloadableGeneratorState holder, Cancel ctx) =>
 			ServeApiFile(holder, slug, ctx));
 
-		_ = _webApplication.MapPost("/_api/v1/ask-ai/stream", ProxyChatRequest);
+
+		var apiV1 = _webApplication.MapGroup("/_api/v1");
+		apiV1.MapElasticDocsApiEndpoints();
 
 		_ = _webApplication.MapGet("{**slug}", (string slug, ReloadableGeneratorState holder, Cancel ctx) =>
 			ServeDocumentationFile(holder, slug, ctx));
@@ -241,10 +243,4 @@ private static IResult LiveReloadHtml(string content, Encoding? encoding = null,
 
 		return Results.Content(content, "text/html", encoding, statusCode);
 	}
-
-	private static async Task<IResult> ProxyChatRequest(AskAiRequest request, AskAiUsecase usecase, Cancel ctx)
-	{
-		var stream = await usecase.AskAi(request, ctx);
-		return Results.Stream(stream, "text/event-stream");
-	}
 }