Skip to content

Fix URI template derivation and lookup #530

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
merged 9 commits into from
Jun 23, 2025
Merged

Fix URI template derivation and lookup #530

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
61d3d9d
Use lowercase host in resource URI template derivation.
eiriktsarpalis Jun 18, 2025
fee0573
Address feedback
eiriktsarpalis Jun 19, 2025
153faa3
Add casing testing for non-templated resource lookups.
eiriktsarpalis Jun 19, 2025
d5dd345
Fix uri primitive lookup
eiriktsarpalis Jun 21, 2025
4e70cc1
Use a hardcoded mcp hostname in derived resource template URIs and en…
eiriktsarpalis Jun 22, 2025
616bd2a
Merge branch 'main' into use-lowercase-derived-uritemplaes
eiriktsarpalis Jun 23, 2025
705be6b
Address feedback
eiriktsarpalis Jun 23, 2025
c1f4dcb
Fix equality comparison
eiriktsarpalis Jun 23, 2025
df6872b
Use dedicated type for resource collections.
eiriktsarpalis Jun 23, 2025
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
4 changes: 2 additions & 2 deletions src/ModelContextProtocol.Core/Server/AIFunctionMcpServerResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ private static AIFunctionFactoryOptions CreateAIFunctionFactoryOptions(
Name = name,
Title = options?.Title,
Description = options?.Description,
MimeType = options?.MimeType,
MimeType = options?.MimeType ?? "application/octet-stream",
};

return new AIFunctionMcpServerResource(function, resource);
Expand Down Expand Up @@ -295,7 +295,7 @@ private static string DeriveUriTemplate(string name, AIFunction function)
{
StringBuilder template = new();

template.Append("resource://").Append(Uri.EscapeDataString(name));
template.Append("resource://").Append(Uri.EscapeDataString(name.ToLowerInvariant()));

if (function.JsonSchema.TryGetProperty("properties", out JsonElement properties))
{
Expand Down
14 changes: 7 additions & 7 deletions tests/ModelContextProtocol.Tests/Configuration/McpServerBuilderExtensionsResourcesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ public void Register_Resources_From_Current_Assembly()
sc.AddMcpServer().WithResourcesFromAssembly();
IServiceProvider services = sc.BuildServiceProvider();

Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResource?.Uri == $"resource://{nameof(SimpleResources.SomeNeatDirectResource)}");
Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResourceTemplate?.UriTemplate == $"resource://{nameof(SimpleResources.SomeNeatTemplatedResource)}{{?name}}");
Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResource?.Uri == $"resource://{nameof(SimpleResources.SomeNeatDirectResource).ToLowerInvariant()}");
Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResourceTemplate?.UriTemplate == $"resource://{nameof(SimpleResources.SomeNeatTemplatedResource).ToLowerInvariant()}{{?name}}");
}

[Fact]
Expand All @@ -279,13 +279,13 @@ public void Register_Resources_From_Multiple_Sources()
sc.AddMcpServer()
.WithResources<SimpleResources>()
.WithResources<MoreResources>()
.WithResources([McpServerResource.Create(() => "42", new() { UriTemplate = "myResources://Returns42/{something}" })]);
.WithResources([McpServerResource.Create(() => "42", new() { UriTemplate = "myResources://returns42/{something}" })]);
IServiceProvider services = sc.BuildServiceProvider();

Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResource?.Uri == $"resource://{nameof(SimpleResources.SomeNeatDirectResource)}");
Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResourceTemplate?.UriTemplate == $"resource://{nameof(SimpleResources.SomeNeatTemplatedResource)}{{?name}}");
Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResourceTemplate?.UriTemplate == $"resource://{nameof(MoreResources.AnotherNeatDirectResource)}");
Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResourceTemplate.UriTemplate == "myResources://Returns42/{something}");
Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResource?.Uri == $"resource://{nameof(SimpleResources.SomeNeatDirectResource).ToLowerInvariant()}");
Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResourceTemplate?.UriTemplate == $"resource://{nameof(SimpleResources.SomeNeatTemplatedResource).ToLowerInvariant()}{{?name}}");
Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResourceTemplate?.UriTemplate == $"resource://{nameof(MoreResources.AnotherNeatDirectResource).ToLowerInvariant()}");
Assert.Contains(services.GetServices<McpServerResource>(), t => t.ProtocolResourceTemplate.UriTemplate == "myResources://returns42/{something}");
}

[McpServerResourceType]
Expand Down
Loading
Loading