Update to Aspire 9 #43
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -396,3 +396,6 @@ FodyWeavers.xsd | |
|
|
||
| # JetBrains Rider | ||
| *.sln.iml | ||
|
|
||
| # Python Virtual Environments | ||
| .venv | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,10 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <packageSources> | ||
| <!--To inherit the global NuGet package sources remove the <clear/> line below --> | ||
| <clear /> | ||
| <add key="nuget" value="https://api.nuget.org/v3/index.json" /> | ||
| <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" /> | ||
|
Member
There was a problem hiding this comment. Is this for the Aspire 9.x prerelease packages?
Member
Author
There was a problem hiding this comment. Yes. These will hit public nuget.org tomorrow. |
||
| </packageSources> | ||
|
|
||
| <packageSourceMapping> | ||
|
|
@@ -12,5 +13,8 @@ | |
| <packageSource key="nuget"> | ||
| <package pattern="*" /> | ||
| </packageSource> | ||
| <packageSource key="dotnet8"> | ||
| <package pattern="*" /> | ||
| </packageSource> | ||
| </packageSourceMapping> | ||
| </configuration> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <RootNamespace>eShopSupport.DataGenerator</RootNamespace> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,27 +1,25 @@ | ||||||
| <Project Sdk="Microsoft.NET.Sdk"> | ||||||
| <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0-rc.1.24511.1" /> | ||||||
|
Member
There was a problem hiding this comment.
Suggested change
|
||||||
| <PropertyGroup> | ||||||
| <OutputType>Exe</OutputType> | ||||||
| <TargetFramework>net9.0</TargetFramework> | ||||||
| <ImplicitUsings>enable</ImplicitUsings> | ||||||
| <Nullable>enable</Nullable> | ||||||
| <IsAspireHost>true</IsAspireHost> | ||||||
| <UserSecretsId>dbe89ad9-90f1-44de-9646-7e98b2d8c69d</UserSecretsId> | ||||||
| </PropertyGroup> | ||||||
| <ItemGroup> | ||||||
| <PackageReference Include="Aspire.Hosting.AppHost" /> | ||||||
| <PackageReference Include="Aspire.Hosting.Azure.Storage" /> | ||||||
| <PackageReference Include="Aspire.Hosting.PostgreSQL" /> | ||||||
| <PackageReference Include="Aspire.Hosting.Python" /> | ||||||
| <PackageReference Include="Aspire.Hosting.Qdrant" /> | ||||||
| <PackageReference Include="Aspire.Hosting.Redis" /> | ||||||
| </ItemGroup> | ||||||
| <ItemGroup> | ||||||
| <ProjectReference Include="..\Backend\Backend.csproj" /> | ||||||
| <ProjectReference Include="..\CustomerWebUI\CustomerWebUI.csproj" /> | ||||||
| <ProjectReference Include="..\IdentityServer\IdentityServer.csproj" /> | ||||||
| <ProjectReference Include="..\StaffWebUI\StaffWebUI.csproj" /> | ||||||
| </ItemGroup> | ||||||
| </Project> | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -140,7 +140,7 @@ private static async Task DownloadModelAsync(ILogger logger, EndpointReference h | |
|
|
||
| var httpClient = new HttpClient { Timeout = TimeSpan.FromDays(1) }; | ||
| var request = new HttpRequestMessage(HttpMethod.Post, $"{httpEndpoint.Url}/api/pull") { Content = JsonContent.Create(new { name = modelName }) }; | ||
| var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken); | ||
| var responseContentStream = await response.Content.ReadAsStreamAsync(cancellationToken); | ||
| var streamReader = new StreamReader(responseContentStream); | ||
| var line = (string?)null; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,8 +43,19 @@ | |
|
|
||
| var blobStorage = storage.AddBlobs("eshopsupport-blobs"); | ||
|
|
||
| var stage = builder.ExecutionContext.IsRunMode ? "base" : /* default stage */ null; | ||
| var pythonInference = builder.AddDockerfile("python-inference", "../PythonInference", /* default dockerfile */ null, stage) | ||
| .WithHttpEndpoint(port: 57000, targetPort: 8000) | ||
| .WithContainerRuntimeArgs("--gpus=all") | ||
| .WithLifetime(ContainerLifetime.Persistent); | ||
|
Member
There was a problem hiding this comment. Does this definitely work? It does cause the Docker container to keep running even after AppHost is shut down (albeit removing the port mapping, which is a bit inconvenient). But then each time I start the AppHost project using Ctrl+F5, it kills the previous Docker container and starts a new one, which seems to defeat the purpose of the feature.
Member
Author
There was a problem hiding this comment.
If you want stable ports inside and outside of Aspire for this resource you can pass the desired port numbers and disable the proxying on the endpoint.
Definitely shouldn't be doing that and I wasn't seeing that locally. It will only do that if it detects changes to the container definition but I'm not sure of the exact variables it includes. @danegsta?
Member
There was a problem hiding this comment. By default we consider the container image name (or image sha in the case of building via dockerfile), ports, volume mounts, environment, and the command/arguments used to launch the container. The port mapping shouldn't be lost for a persistent container, but it generally won't show up in the Docker Desktop UI due to a seeming bug in how they report randomly assigned host ports (which we use). You have to inspect the container and look in the networking config section to see the real port, otherwise it just shows up as 0 in the other inspected port data and is missing from the UI. |
||
|
|
||
| if (builder.ExecutionContext.IsRunMode) | ||
| { | ||
| // Mount app files into the container & enable auto-reload when running in development | ||
| pythonInference | ||
| .WithBindMount("../PythonInference", "/app") | ||
| .WithArgs("--reload"); | ||
| } | ||
|
|
||
| var redis = builder.AddRedis("redis"); | ||
|
|
||
|
|
@@ -53,7 +64,7 @@ | |
| .WithReference(chatCompletion) | ||
| .WithReference(blobStorage) | ||
| .WithReference(vectorDb) | ||
| .WithReference(pythonInference.GetEndpoint("http")) | ||
| .WithReference(redis) | ||
| .WithEnvironment("IdentityUrl", identityEndpoint) | ||
| .WithEnvironment("ImportInitialDataDir", Path.Combine(builder.AppHostDirectory, "..", "..", "seeddata", isE2ETest ? "test" : "dev")); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <RootNamespace>eShopSupport.Backend</RootNamespace> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| </PropertyGroup> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,21 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <RootNamespace>eShopSupport.DataIngestor</RootNamespace> | ||
| <StartArguments>$(SolutionDir)\seeddata\DataGenerator\output</StartArguments> | ||
| <NoWarn>$(NoWarn);SKEXP0001;SKEXP0050</NoWarn> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\Backend\Backend.csproj" /> | ||
| <ProjectReference Include="..\Evaluator\Evaluator.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="PdfPig" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <RootNamespace>eShopSupport.Evaluator</RootNamespace> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| </PropertyGroup> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| FROM python:3.12.5-slim AS base | ||
|
|
||
| # Set the working directory, the app files could be bind-mounted here | ||
| WORKDIR /app | ||
|
|
||
| # Copy the requirements file | ||
| COPY requirements.txt . | ||
|
|
||
| # Install dependencies | ||
| RUN pip install --no-cache-dir -r requirements.txt | ||
|
|
||
| # Ensure the server is accessible from outside the container | ||
| ENV UVICORN_HOST=0.0.0.0 | ||
|
|
||
| # Set the entry point to run the application | ||
| ENTRYPOINT ["python", "-m", "uvicorn", "main:app"] | ||
|
|
||
| CMD [] | ||
|
|
||
| FROM base AS publish | ||
|
|
||
| COPY . . |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,5 +28,8 @@ | |
| <ItemGroup> | ||
| <Folder Include="routers\" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="Dockerfile" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" /> | ||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,7 +49,8 @@ public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicati | |
| }) | ||
| .WithTracing(tracing => | ||
| { | ||
| tracing.AddSource(builder.Environment.ApplicationName) | ||
| .AddAspNetCoreInstrumentation() | ||
| // Uncomment the following line to enable gRPC instrumentation (requires the OpenTelemetry.Instrumentation.GrpcNetClient package) | ||
| //.AddGrpcClientInstrumentation() | ||
| .AddHttpClientInstrumentation() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <IsAspireSharedProject>true</IsAspireSharedProject> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <RootNamespace>eShopSupport.StaffWebUI</RootNamespace> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| using Aspire.Hosting; | ||
| using Aspire.Hosting.Testing; | ||
| using eShopSupport.ServiceDefaults.Clients.Backend; | ||
| using IdentityModel.Client; | ||
|
|
||
|
|
@@ -21,7 +22,7 @@ private async Task<DistributedApplication> InitializeAsync() | |
| Environment.CurrentDirectory = Projects.AppHost.ProjectPath; | ||
| Environment.SetEnvironmentVariable("E2E_TEST", "true"); | ||
| Environment.SetEnvironmentVariable("E2E_TEST_CHAT_COMPLETION_CACHE_DIR", | ||
| Path.Combine(Projects.AppHost.ProjectPath, "ChatCompletionCache")); | ||
|
Member
There was a problem hiding this comment. Out of interest, why change this?
Member
There was a problem hiding this comment. Also if you do change this, I think you'd need to regenerate the cache or at least move all its files to the new directory, since they are meant to be stored in source control.
Contributor
There was a problem hiding this comment. Good catch, I think I changed this as a test and forgot to change it back. For a moment at least the E2ETest project no longer showed up as a member of
Contributor
There was a problem hiding this comment. @SteveSandersonMS Actually, I take it back...this still is an issue. E2ETest is no longer in the Projects namespace nor is there any metadata created for it. I'm not sure how this code originally worked, before the update. Is there a better way to get the project path now? |
||
| var builder = await DistributedApplicationTestingBuilder.CreateAsync<Projects.AppHost>(); | ||
| var app = await builder.BuildAsync(); | ||
| await app.StartAsync(); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These versions aren't in sync. It would be nice to keep using the common AspireVersion property.