Allow publishing of Ollama and SQLite hosting integrations (#710)

* Initial plan for issue

* Remove automatic ExcludeFromManifest calls from Ollama and SQLite integrations

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

* Restore ExcludeFromManifest for OpenWebUI resource

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

Author: Copilot

src/CommunityToolkit.Aspire.Hosting.Ollama/OllamaResourceBuilderExtensions.cs

@@ -68,8 +68,7 @@ public static IResourceBuilder<OllamaResource> AddOllama(this IDistributedApplic
         return builder.AddResource(resource)
           .WithAnnotation(new ContainerImageAnnotation { Image = OllamaContainerImageTags.Image, Tag = OllamaContainerImageTags.Tag, Registry = OllamaContainerImageTags.Registry })
           .WithHttpEndpoint(port: port, targetPort: 11434, name: OllamaResource.OllamaEndpointName)
-          .WithHttpHealthCheck("/")
-          .ExcludeFromManifest();
+          .WithHttpHealthCheck("/");
     }
 
     /// <summary>

src/CommunityToolkit.Aspire.Hosting.Sqlite/SqliteResourceBuilderExtensions.cs

@@ -16,7 +16,6 @@ public static class SqliteResourceBuilderExtensions
     /// <param name="databasePath">The optional path to the database file. If no path is provided the database is stored in a temporary location.</param>
     /// <param name="databaseFileName">The filename of the database file. Must include extension. If no file name is provided, a randomly generated file name is used.</param>
     /// <returns>A resource builder for the Sqlite resource.</returns>
-    /// <remarks>The Sqlite resource is excluded from the manifest.</remarks>
     public static IResourceBuilder<SqliteResource> AddSqlite(this IDistributedApplicationBuilder builder, [ResourceName] string name, string? databasePath = null, string? databaseFileName = null)
     {
         ArgumentNullException.ThrowIfNull(builder, nameof(builder));
@@ -56,8 +55,7 @@ public static IResourceBuilder<SqliteResource> AddSqlite(this IDistributedApplic
             ]
         };
         return builder.AddResource(resource)
-                      .WithInitialState(state)
-                      .ExcludeFromManifest();
+                      .WithInitialState(state);
     }
 
     /// <summary>
@@ -83,8 +81,7 @@ public static IResourceBuilder<SqliteResource> WithSqliteWeb(this IResourceBuild
                                 .WithBindMount(builder.Resource.DatabasePath, "/data")
                                 .WaitFor(builder)
                                 .WithHttpHealthCheck("/")
-                                .WithParentRelationship(builder.Resource)
-                                .ExcludeFromManifest();
+                                .WithParentRelationship(builder.Resource);
 
         configureContainer?.Invoke(resourceBuilder);
 

tests/CommunityToolkit.Aspire.Hosting.Ollama.Tests/AddOllamaTests.cs

@@ -166,6 +166,21 @@ public void OpenWebUIConfigured()
         Assert.Single(resource.OllamaResources);
     }
 
+    [Fact]
+    public void OpenWebUIResourceExcludedFromManifestByDefault()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+        _ = builder.AddOllama("ollama", port: null).WithOpenWebUI();
+
+        using var app = builder.Build();
+
+        var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();
+
+        var resource = Assert.Single(appModel.Resources.OfType<OpenWebUIResource>());
+
+        Assert.True(resource.TryGetAnnotationsOfType<ManifestPublishingCallbackAnnotation>(out var annotations));
+    }
+
     [Fact]
     public void OpenWebUIConfiguredWithMultipleOllamaServers()
     {
@@ -383,6 +398,21 @@ public void OllamaRegistersHttpHealthCheck()
         Assert.Contains(resource.Name, annotation.Key);
     }
 
+    [Fact]
+    public void ResourceIncludedInManifestByDefault()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+        _ = builder.AddOllama("ollama");
+
+        using var app = builder.Build();
+
+        var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();
+
+        var resource = Assert.Single(appModel.Resources.OfType<OllamaResource>());
+
+        Assert.False(resource.TryGetAnnotationsOfType<ManifestPublishingCallbackAnnotation>(out var annotations));
+    }
+
     [Fact]
     public void OllamaRegistrationContainsResourceCommandAnnotations()
     {

tests/CommunityToolkit.Aspire.Hosting.Sqlite.Tests/AddSqliteTests.cs

@@ -45,15 +45,12 @@ public void ResourceIsRunningState()
     }
 
     [Fact]
-    public void ResourceExcludedFromManifestByDefault()
+    public void ResourceIncludedInManifestByDefault()
     {
         var builder = DistributedApplication.CreateBuilder();
         var sqlite = builder.AddSqlite("sqlite");
 
-        Assert.True(sqlite.Resource.TryGetAnnotationsOfType<ManifestPublishingCallbackAnnotation>(out var annotations));
-        var annotation = Assert.Single(annotations);
-
-        Assert.Null(annotation.Callback);
+        Assert.False(sqlite.Resource.TryGetAnnotationsOfType<ManifestPublishingCallbackAnnotation>(out var annotations));
     }
 
     [Fact]
@@ -145,6 +142,18 @@ public async Task SqliteWebResourceConfigured()
         Assert.Equal("sqlite", parentAnnotation.Resource.Name);
     }
 
+    [Fact]
+    public void SqliteWebResourceIncludedInManifestByDefault()
+    {
+        var builder = DistributedApplication.CreateBuilder();
+        var sqlite = builder.AddSqlite("sqlite")
+            .WithSqliteWeb();
+
+        var sqliteWeb = Assert.Single(builder.Resources.OfType<SqliteWebResource>());
+
+        Assert.False(sqliteWeb.TryGetAnnotationsOfType<ManifestPublishingCallbackAnnotation>(out var annotations));
+    }
+
     [Fact]
     public void ResourceWithExtensionFromNuGet()
     {