Switch from Console app to HTTP API (#6)

Aaronontheweb · web-flow · commit a7305ee51cf1 · 2025-04-09T20:14:48.000Z
* added web api

* added web application

* removed console app

* updated README
diff --git a/AI.Playground.slnx b/AI.Playground.slnx
@@ -1,7 +1,8 @@
 <Solution>
   <Folder Name="/0-HelloWorld/">
     <Project Path="src\0-hello-world\AI.HelloWorld.AppHost\AI.HelloWorld.AppHost.csproj" Type="Classic C#" />
-    <Project Path="src\0-hello-world\AI.HelloWorld.Console\AI.HelloWorld.Console.csproj" Type="Classic C#" />
+    <Project Path="src\0-hello-world\AI.HelloWorld.PromptApi\AI.HelloWorld.PromptApi.csproj" Type="Classic C#" />
+    <File Path="src\0-hello-world\README.md" />
   </Folder>
   <Folder Name="/build/">
     <File Path="Directory.Build.props" />
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,15 +2,25 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Label="Common">
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="8.1.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.0" />
+  </ItemGroup>
+  <ItemGroup Label="Aspire">
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.1.0" />
     <PackageVersion Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="9.3.1-beta.259" />
     <PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.3.1-beta.259" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
+  </ItemGroup>
+  <ItemGroup Label="OpenTelemetry">
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
-    <PackageVersion Include="Spectre.Console" Version="0.50.0" />
-    <PackageVersion Include="Spectre.Console.Cli" Version="0.50.0" />
+  </ItemGroup>
+  <ItemGroup Label="ASP.NET Core">
+    <PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="8.1.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
   </ItemGroup>
 </Project>
diff --git a/src/0-hello-world/AI.HelloWorld.AppHost/AI.HelloWorld.AppHost.csproj b/src/0-hello-world/AI.HelloWorld.AppHost/AI.HelloWorld.AppHost.csproj
@@ -16,6 +16,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\AI.HelloWorld.Console\AI.HelloWorld.Console.csproj" />
+      <ProjectReference Include="..\AI.HelloWorld.PromptApi\AI.HelloWorld.PromptApi.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/0-hello-world/AI.HelloWorld.AppHost/Program.cs b/src/0-hello-world/AI.HelloWorld.AppHost/Program.cs
@@ -11,7 +11,7 @@
 var chat = ollama
     .AddModel("chat", "llama3.2:3b"); // 3b parameter model
 
-builder.AddProject<Projects.AI_HelloWorld_Console>("console")
+builder.AddProject<Projects.AI_HelloWorld_PromptApi>("prompt-api")
     .WithReference(chat)
     .WaitFor(chat);
 
diff --git a/src/0-hello-world/AI.HelloWorld.Console/AI.HelloWorld.Console.csproj b/src/0-hello-world/AI.HelloWorld.Console/AI.HelloWorld.Console.csproj
diff --git a/src/0-hello-world/AI.HelloWorld.Console/Program.cs b/src/0-hello-world/AI.HelloWorld.Console/Program.cs
diff --git a/src/0-hello-world/AI.HelloWorld.PromptApi/AI.HelloWorld.PromptApi.csproj b/src/0-hello-world/AI.HelloWorld.PromptApi/AI.HelloWorld.PromptApi.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="CommunityToolkit.Aspire.OllamaSharp" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi"/>
+        <PackageReference Include="Swashbuckle.AspNetCore.Swagger" />
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" />
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\..\shared\Telemetry\Telemetry.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/0-hello-world/AI.HelloWorld.PromptApi/AI.HelloWorld.PromptApi.http b/src/0-hello-world/AI.HelloWorld.PromptApi/AI.HelloWorld.PromptApi.http
@@ -0,0 +1,6 @@
+@AI.HelloWorld.PromptApi_HostAddress = http://localhost:5055
+
+POST {{AI.HelloWorld.PromptApi_HostAddress}}/prompt/
+Accept: application/json
+
+###
diff --git a/src/0-hello-world/AI.HelloWorld.PromptApi/Program.cs b/src/0-hello-world/AI.HelloWorld.PromptApi/Program.cs
@@ -0,0 +1,45 @@
+using AI.Telemetry;
+using Microsoft.Extensions.AI;
+using Microsoft.OpenApi.Models;
+using Swashbuckle.AspNetCore;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Logging.ConfigureAiLogging();
+builder.Services.ConfigureAiTelemetry();
+
+builder.AddOllamaApiClient("chat")
+    .AddChatClient()
+    .UseFunctionInvocation()
+    .UseOpenTelemetry()
+    .UseLogging();
+
+// Add services to the container.
+// Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
+builder.Services.AddOpenApi();
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen(c =>
+{
+    c.SwaggerDoc("v1", new OpenApiInfo { Title = "Prompt API", Version = "v1" });
+});
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseSwagger();
+    app.UseSwaggerUI();
+    app.MapOpenApi();
+}
+
+app.UseHttpsRedirection();
+
+app.MapPost("/prompt", async (string prompt, IChatClient chatClient, CancellationToken ct) =>
+    {
+        var resp = await chatClient.GetResponseAsync(prompt, cancellationToken: ct);
+        return Results.Ok(resp);
+    })
+    .WithName("SendPrompt");
+
+app.Run();
diff --git a/src/0-hello-world/AI.HelloWorld.PromptApi/Properties/launchSettings.json b/src/0-hello-world/AI.HelloWorld.PromptApi/Properties/launchSettings.json
@@ -0,0 +1,23 @@
+﻿{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "http://localhost:5055",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "https://localhost:7216;http://localhost:5055",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/src/0-hello-world/AI.HelloWorld.PromptApi/appsettings.Development.json b/src/0-hello-world/AI.HelloWorld.PromptApi/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/src/0-hello-world/AI.HelloWorld.PromptApi/appsettings.json b/src/0-hello-world/AI.HelloWorld.PromptApi/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/src/0-hello-world/README.md b/src/0-hello-world/README.md
@@ -1,6 +1,6 @@
 # AI Hello World Project
 
-This project demonstrates a simple "Hello, World!" application using [.NET Aspire](https://learn.microsoft.com/en-us/dotnet/aspire/get-started/aspire-overview).
+This project demonstrates a simple "Hello, World!" application using [.NET Aspire](https://learn.microsoft.com/en-us/dotnet/aspire/get-started/aspire-overview) and ASP.NET Core.
 
 ## Running the Project
 
@@ -12,7 +12,7 @@ dotnet run --project AI.HelloWorld.AppHost/AI.HelloWorld.AppHost.csproj
 
 ### Model
 
-By default this project will download and run the [`llama3.2:3b`](https://ollama.com/library/llama3.2:3b) model, which can run just fine even on a machine without any GPU support. You can configure this inside the `AI.HelloWorld.AppHost.Program.cs` file:
+By default, this project will download and run the [`llama3.2:3b`](https://ollama.com/library/llama3.2:3b) model, which can run just fine even on a machine without any GPU support. You can configure this inside the `AI.HelloWorld.AppHost.Program.cs` file:
 
 ```csharp
 var ollama =
@@ -25,4 +25,14 @@ var ollama =
  */
 var chat = ollama
     .AddModel("chat", "llama3.2:3b"); // 3b parameter model
-```
+```
+
+## Accessing the Swagger Endpoint
+
+Once the application is running, you can access the Swagger UI to explore the API endpoints. By default, the Swagger UI is available at:
+
+```
+http://localhost:5055/swagger/index.html
+```
+
+This interface allows you to interact with the Prompt API, view available endpoints, and send requests directly from the browser.
diff --git a/src/shared/Telemetry/Telemetry.csproj b/src/shared/Telemetry/Telemetry.csproj
@@ -9,6 +9,8 @@
     <ItemGroup>
         <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
         <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
         <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
     </ItemGroup>
 
diff --git a/src/shared/Telemetry/TelemetryExtensions.cs b/src/shared/Telemetry/TelemetryExtensions.cs
@@ -22,7 +22,7 @@ public static ILoggingBuilder ConfigureAiLogging(this ILoggingBuilder builder)
 
         return builder;
     }
-    
+
     public static IServiceCollection ConfigureAiTelemetry(this IServiceCollection services,
         Action<MeterProviderBuilder>? additionalMeters = null,
         Action<TracerProviderBuilder>? additionalTracers = null)
@@ -36,14 +36,22 @@ public static IServiceCollection ConfigureAiTelemetry(this IServiceCollection se
                     .AddTelemetrySdk()
                     .AddServiceVersionDetector();
             })
-            .UseOtlpExporter()
             .WithMetrics(c =>
             {
-                c.AddRuntimeInstrumentation();
+                c.AddRuntimeInstrumentation()
+                    .AddHttpClientInstrumentation()
+                    .AddAspNetCoreInstrumentation();
 
                 additionalMeters?.Invoke(c);
             })
-            .WithTracing(c => { additionalTracers?.Invoke(c); });
+            .WithTracing(c =>
+            {
+                c.AddHttpClientInstrumentation()
+                    .AddAspNetCoreInstrumentation();
+
+                additionalTracers?.Invoke(c);
+            })
+            .UseOtlpExporter();
 
         return services;
     }
