Merge pull request #7 from Bunnings-Engineering/feat/setup-llama-and-mcp-integration

Sandhyabun · web-flow · commit 14928d15278f · 2025-10-16T17:39:57.000+11:00
Feat/setup llama and mcp integration
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -43,7 +43,7 @@ jobs:
         wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
         dpkg -i packages-microsoft-prod.deb
         rm packages-microsoft-prod.deb
-        apt-get update  && apt-get install -y dotnet-sdk-8.0
+        apt-get update  && apt-get install -y dotnet-sdk-9.0
 
     - name: Prepare models
       run: | 
diff --git a/.github/workflows/code_format.yml b/.github/workflows/code_format.yml
@@ -19,7 +19,7 @@ jobs:
             - name: Setup .NET
               uses: actions/setup-dotnet@v3
               with:
-                  dotnet-version: 8.0.x
+                  dotnet-version: 9.0.x
             - name: Restore dependencies
               run: dotnet restore
             - name: Format
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     name: Test
     runs-on: ${{ matrix.os }}
-    strategy:
+    strategy: 
       fail-fast: false
       matrix:
         build: [linux-release, windows-release, osx-release]
@@ -37,7 +37,7 @@ jobs:
     - uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          8.0.x
+          9.0.x
     - name: Install Mobile Workloads
       if: ${{ contains(runner.os, 'windows') }}
       run: |
diff --git a/.github/workflows/release-minor-trigger.yml b/.github/workflows/release-minor-trigger.yml
@@ -12,8 +12,8 @@ jobs:
     runs-on: ubuntu-22.04
     
     steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET 6.0.x SDK
-      uses: actions/setup-dotnet@v3
+    - uses: actions/checkout@v4
+    - name: Setup .NET 9.0.x SDK
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 9.0.x
diff --git a/.github/workflows/release-patch-trigger.yml b/.github/workflows/release-patch-trigger.yml
@@ -13,7 +13,7 @@ jobs:
     
     steps:
     - uses: actions/checkout@v3
-    - name: Setup .NET 6.0.x SDK
+    - name: Setup .NET 9.0.x SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 9.0.x
diff --git a/.github/workflows/update_api_references.yml b/.github/workflows/update_api_references.yml
@@ -17,12 +17,12 @@ jobs:
     - uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          8.0.x
+          9.0.x
     - name: install_tool_and_generate_api_docs
       run: |
         dotnet tool install -g XMLDoc2Markdown
         dotnet build ./LLama/LLamaSharp.csproj
-        cd LLama/bin/Debug/net8.0
+        cd LLama/bin/Debug/net9.0
         rm -rf ../../../../docs/xmldocs
         dotnet xmldoc2md LLamaSharp.dll -o ../../../../docs/xmldocs --back-button
     
diff --git a/LLama.Benchmark/LLama.Benchmark.csproj b/LLama.Benchmark/LLama.Benchmark.csproj
@@ -3,15 +3,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Configuration>Release</Configuration>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.2" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.4" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.4" />
   </ItemGroup>
 
     <ItemGroup>
diff --git a/LLama.Examples/LLama.Examples.csproj b/LLama.Examples/LLama.Examples.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\LLama\LLamaSharp.Runtime.targets" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x64</Platforms>
@@ -14,14 +14,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
     <PackageReference Include="Microsoft.KernelMemory.Core" Version="0.98.250508.3" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.64.0" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.65.0" />
     <PackageReference Include="Microsoft.SemanticKernel.Plugins.Memory" Version="1.44.0-alpha" />
     <PackageReference Include="NAudio" Version="2.2.1" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
-    <PackageReference Include="Spectre.Console" Version="0.50.0" />
-    <PackageReference Include="Spectre.Console.ImageSharp" Version="0.50.0" />
+    <PackageReference Include="Spectre.Console" Version="0.51.1" />
+    <PackageReference Include="Spectre.Console.ImageSharp" Version="0.51.1" />
     <PackageReference Include="Whisper.net" Version="1.8.1" />
     <PackageReference Include="Whisper.net.Runtime" Version="1.8.1" />
     <PackageReference Include="Whisper.net.Runtime.Clblast" Version="1.5.0" />
diff --git a/LLama.Experimental/LLama.Experimental.csproj b/LLama.Experimental/LLama.Experimental.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net9;netstandard2.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <langversion>12</langversion>
diff --git a/LLama.KernelMemory/LLamaSharp.KernelMemory.csproj b/LLama.KernelMemory/LLamaSharp.KernelMemory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Version>0.25.0</Version>
diff --git a/LLama.SemanticKernel/LLamaSharp.SemanticKernel.csproj b/LLama.SemanticKernel/LLamaSharp.SemanticKernel.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net9.0</TargetFrameworks>
 		<RootNamespace>LLamaSharp.SemanticKernel</RootNamespace>
 		<Nullable>enable</Nullable>
 		<LangVersion>10</LangVersion>
@@ -34,7 +34,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.64.0" />
+		<PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.65.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
diff --git a/LLama.Unittest/LLama.Unittest.csproj b/LLama.Unittest/LLama.Unittest.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\LLama\LLamaSharp.Runtime.targets" />
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>LLama.Unittest</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Platforms>AnyCPU;x64</Platforms>
@@ -17,7 +17,7 @@
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="System.Linq.Async" Version="6.0.3" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/LLama.Web/LLama.Web.csproj b/LLama.Web/LLama.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <Import Project="..\LLama\LLamaSharp.Runtime.targets" />
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>disable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.19" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.9" />
     <PackageReference Include="System.Linq.Async" Version="6.0.3" />
   </ItemGroup>
 
diff --git a/LLama.WebAPI/Controllers/McpController.cs b/LLama.WebAPI/Controllers/McpController.cs
@@ -0,0 +1,30 @@
+using LLama.WebAPI.Services;
+using Microsoft.AspNetCore.Mvc;
+using LLama.WebAPI.Models;
+
+namespace LLama.WebAPI.Controllers
+{
+    [ApiController]
+    [Route("api/[controller]")]
+    public class McpController : ControllerBase
+    {
+        private readonly McpClientService _mcpClient;
+        private readonly ILogger<McpController> _logger;
+        public McpController(McpClientService mcpClient, ILogger<McpController> logger)
+        {
+            _mcpClient = mcpClient;
+            _logger = logger;
+        }
+        [HttpPost("send")]
+        public async Task<IActionResult> SendToMcp([FromBody] SendMessageInput input)
+        {
+            _logger.LogInformation("Incoming MCP request: {Input}", input);
+            var result = await _mcpClient.SendAsync(input);
+            return Ok(result);
+        }
+
+    }
+
+
+
+}
diff --git a/LLama.WebAPI/LLama.WebAPI.csproj b/LLama.WebAPI/LLama.WebAPI.csproj
@@ -1,16 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <Import Project="..\LLama\LLamaSharp.Runtime.targets" />
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <InvariantGlobalization>true</InvariantGlobalization>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.19" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
+      <PackageReference Include="LLamaSharp" Version="0.25.0" />
+      <PackageReference Include="LLamaSharp.Backend.Cpu" Version="0.25.0" />
+      <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
+    <PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.13.22" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.9" />
+    <PackageReference Include="ModelContextProtocol" Version="0.4.0-preview.2" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LLama.WebAPI/Models/McpSettings.cs b/LLama.WebAPI/Models/McpSettings.cs
@@ -0,0 +1,9 @@
+namespace LLama.WebAPI.Models;
+
+
+public class McpSettings
+{
+    public string ServerUrl { get; set; } = string.Empty;
+    public string? ApiKey { get; set; }
+    public bool EnableStreaming { get; set; }
+}
diff --git a/LLama.WebAPI/Models/SendMessageInput.cs b/LLama.WebAPI/Models/SendMessageInput.cs
@@ -1,4 +1,4 @@
-﻿namespace LLama.WebAPI.Models;
+namespace LLama.WebAPI.Models;
 
 public class SendMessageInput
 {
diff --git a/LLama.WebAPI/Program.cs b/LLama.WebAPI/Program.cs
@@ -1,32 +1,44 @@
-using LLama.WebAPI.Services;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-
-builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-
-builder.Services.AddSingleton<StatefulChatService>();
-builder.Services.AddScoped<StatelessChatService>();
-
-var app = builder.Build();
-app.UseRouting();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-app.UseAuthorization();
-
-app.UseEndpoints(endpoints =>
-{
-    _ = endpoints.MapControllers();
-});
-
-app.Run();
+using LLama.WebAPI.Services;
+using LLama.WebAPI.Models;
+using Microsoft.Extensions.Options;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllers();
+// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+
+builder.Services.AddSingleton<StatefulChatService>();
+builder.Services.AddScoped<StatelessChatService>();
+builder.Services.AddHttpClient<McpClientService>();
+
+
+builder.Services.Configure<McpSettings>(
+    builder.Configuration.GetSection("Mcp")
+);
+
+
+builder.Services.AddSingleton(sp =>
+    sp.GetRequiredService<IOptions<McpSettings>>().Value
+);
+
+var app = builder.Build();
+app.UseMiddleware<LLama.WebAPI.Services.McpLoggingMiddleware>();
+app.UseRouting();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseSwagger();
+    app.UseSwaggerUI();
+}
+
+app.UseAuthorization();
+
+app.UseEndpoints(endpoints =>
+{
+    _ = endpoints.MapControllers();
+});
+
+app.Run();
diff --git a/LLama.WebAPI/Services/Mcp/McpLoggingMiddleware.cs b/LLama.WebAPI/Services/Mcp/McpLoggingMiddleware.cs
diff --git a/LLama.WebAPI/Services/McpClientService.cs b/LLama.WebAPI/Services/McpClientService.cs
diff --git a/LLama.WebAPI/Services/StatefulChatService.cs b/LLama.WebAPI/Services/StatefulChatService.cs
diff --git a/LLama.WebAPI/Services/StatelessChatService.cs b/LLama.WebAPI/Services/StatelessChatService.cs
diff --git a/LLama.WebAPI/Services/appsettings.json b/LLama.WebAPI/Services/appsettings.json
diff --git a/LLama.WebAPI/appsettings.Development.json b/LLama.WebAPI/appsettings.Development.json
diff --git a/LLama.WebAPI/appsettings.json b/LLama.WebAPI/appsettings.json
diff --git a/LLama/LLamaSharp.csproj b/LLama/LLamaSharp.csproj
