Skip to content

Fix parameter substitution in GitHub Models #10428

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
davidfowl merged 2 commits into from
Jul 15, 2025
Merged

Fix parameter substitution in GitHub Models #10428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92e6c60
Fix parameter substitution in GitHub Models
sebastienros Jul 15, 2025
d529377
Use reference
sebastienros Jul 15, 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: 3 additions & 1 deletion src/Aspire.Hosting.GitHub.Models/GitHubModelResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ namespace Aspire.Hosting.GitHub.Models;
/// </summary>
public class GitHubModelResource : Resource, IResourceWithConnectionString, IResourceWithoutLifetime
{
internal ParameterResource DefaultKeyParameter { get; set; }

/// <summary>
/// Initializes a new instance of the <see cref="GitHubModelResource"/> class.
/// </summary>
Expand All @@ -21,7 +23,7 @@ public GitHubModelResource(string name, string model, ParameterResource? organiz
{
Model = model;
Organization = organization;
Key = key;
Key = DefaultKeyParameter = key;
}

/// <summary>
Expand Down
7 changes: 5 additions & 2 deletions src/Aspire.Hosting.GitHub.Models/GitHubModelsExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,11 @@ public static IResourceBuilder<GitHubModelResource> WithApiKey(this IResourceBui
throw new ArgumentException("The API key parameter must be marked as secret. Use AddParameter with secret: true when creating the parameter.", nameof(apiKey));
}

// Remove the existing API key parameter
builder.ApplicationBuilder.Resources.Remove(builder.Resource.Key);
// Remove the existing parameter if it's the default one
if (builder.Resource.DefaultKeyParameter == builder.Resource.Key)
{
builder.ApplicationBuilder.Resources.Remove(builder.Resource.Key);
}

builder.Resource.Key = apiKey.Resource;

Expand Down
20 changes: 20 additions & 0 deletions tests/Aspire.Hosting.GitHub.Models.Tests/GitHubModelsExtensionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,26 @@ public void WithApiKeySucceedsIfParameterIsSecret()
Assert.Equal(apiKey.Resource, github.Resource.Key);
}

[Fact]
public void WithApiKeyCalledTwiceOnlyRemovesDefaultParameter()
{
using var builder = TestDistributedApplicationBuilder.Create();

var github = builder.AddGitHubModel("github", "openai/gpt-4o-mini");

Assert.NotNull(builder.Resources.FirstOrDefault(r => r.Name == "github-gh-apikey"));

github.WithApiKey(builder.AddParameter("secret-key1", secret: true));

Assert.Null(builder.Resources.FirstOrDefault(r => r.Name == "github-gh-apikey"));
Assert.NotNull(builder.Resources.FirstOrDefault(r => r.Name == "secret-key1"));

github.WithApiKey(builder.AddParameter("secret-key2", secret: true));

Assert.NotNull(builder.Resources.FirstOrDefault(r => r.Name == "secret-key1"));
Assert.NotNull(builder.Resources.FirstOrDefault(r => r.Name == "secret-key2"));
}

[Fact]
public void WithHealthCheckAddsHealthCheckAnnotation()
{
Expand Down
Loading