Skip to content

Add overload for AddMcpStorage taking a factory and skipIf #9367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glen-84 merged 1 commit into from
Mar 13, 2026
Merged

Add overload for AddMcpStorage taking a factory and skipIf #9367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 29 additions & 10 deletions src/HotChocolate/Adapters/src/Adapters.Mcp/Extensions/RequestExecutorBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#if !NET9_0_OR_GREATER
using System.Diagnostics.CodeAnalysis;
#endif
using HotChocolate.Adapters.Mcp.Directives;
using HotChocolate.Adapters.Mcp.Storage;
using HotChocolate.Execution.Configuration;
Expand Down Expand Up @@ -29,17 +27,24 @@ public static IRequestExecutorBuilder AddMcp(

builder.AddDirectiveType<McpToolAnnotationsDirectiveType>();

builder.ConfigureOnRequestExecutorCreatedAsync(
async (executor, cancellationToken) =>
{
var schema = executor.Schema;
var storageObserver = schema.Services.GetRequiredService<McpStorageObserver>();
await storageObserver.StartAsync(cancellationToken);
});

return builder;
}

public static IRequestExecutorBuilder AddMcpStorage<
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(
this IRequestExecutorBuilder builder,
Func<IServiceProvider, T> factory,
Func<IServiceProvider, bool>? skipIf = null)
where T : class, IMcpStorage
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentNullException.ThrowIfNull(factory);

builder.ConfigureSchemaServices(s => s.AddSingleton<IMcpStorage, T>(factory));

return builder.AddMcpStorageWarmupTask(skipIf);
}

public static IRequestExecutorBuilder AddMcpStorage(
this IRequestExecutorBuilder builder,
IMcpStorage storage)
Expand All @@ -49,6 +54,20 @@ public static IRequestExecutorBuilder AddMcpStorage(

builder.ConfigureSchemaServices(s => s.AddSingleton(storage));

return builder.AddMcpStorageWarmupTask();
}

private static IRequestExecutorBuilder AddMcpStorageWarmupTask(
this IRequestExecutorBuilder builder,
Func<IServiceProvider, bool>? skipIf = null)
{
builder.AddWarmupTask(async (executor, cancellationToken) =>
{
var schema = executor.Schema;
var storageObserver = schema.Services.GetRequiredService<McpStorageObserver>();
await storageObserver.StartAsync(cancellationToken);
}, skipIf);

return builder;
}
}
1 change: 1 addition & 0 deletions src/HotChocolate/Adapters/src/Adapters.Mcp/HotChocolate.Adapters.Mcp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\AspNetCore\src\AspNetCore\HotChocolate.AspNetCore.csproj" />
<ProjectReference Include="..\..\..\Core\src\Types\HotChocolate.Types.csproj" />
<ProjectReference Include="..\Adapters.Mcp.Core\HotChocolate.Adapters.Mcp.Core.csproj" />
</ItemGroup>
Expand Down
38 changes: 29 additions & 9 deletions ...otChocolate/Adapters/src/Fusion.Adapters.Mcp/Extensions/FusionGatewayBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#if !NET9_0_OR_GREATER
using System.Diagnostics.CodeAnalysis;
#endif
using HotChocolate.Adapters.Mcp.Storage;
using HotChocolate.Fusion.Configuration;
using Microsoft.Extensions.DependencyInjection;
Expand All @@ -26,16 +24,24 @@ public static IFusionGatewayBuilder AddMcp(
builder.ConfigureSchemaServices(
(_, services) => services.AddMcpSchemaServices(configureServerOptions, configureServer));

builder.AddWarmupTask(async (executor, cancellationToken) =>
{
var schema = executor.Schema;
var storageObserver = schema.Services.GetRequiredService<McpStorageObserver>();
await storageObserver.StartAsync(cancellationToken);
});

return builder;
}

public static IFusionGatewayBuilder AddMcpStorage<
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(
this IFusionGatewayBuilder builder,
Func<IServiceProvider, T> factory,
Func<IServiceProvider, bool>? skipIf = null)
where T : class, IMcpStorage
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentNullException.ThrowIfNull(factory);

builder.ConfigureSchemaServices((_, s) => s.AddSingleton<IMcpStorage, T>(factory));

return builder.AddMcpStorageWarmupTask(skipIf);
}

public static IFusionGatewayBuilder AddMcpStorage(
this IFusionGatewayBuilder builder,
IMcpStorage storage)
Expand All @@ -45,6 +51,20 @@ public static IFusionGatewayBuilder AddMcpStorage(

builder.ConfigureSchemaServices((_, s) => s.AddSingleton(storage));

return builder.AddMcpStorageWarmupTask();
}

private static IFusionGatewayBuilder AddMcpStorageWarmupTask(
this IFusionGatewayBuilder builder,
Func<IServiceProvider, bool>? skipIf = null)
{
builder.AddWarmupTask(async (executor, cancellationToken) =>
{
var schema = executor.Schema;
var storageObserver = schema.Services.GetRequiredService<McpStorageObserver>();
await storageObserver.StartAsync(cancellationToken);
}, skipIf);

return builder;
}
}
Loading