[release/13.0] Add WithPip following Node.js patterns and rename AddPythonScript to AddPythonApp

playground/python/Python.AppHost/Program.cs

@@ -3,13 +3,13 @@
 
 var builder = DistributedApplication.CreateBuilder(args);
 
-builder.AddPythonScript("script-only", "../script_only", "main.py");
-builder.AddPythonScript("instrumented-script", "../instrumented_script", "main.py");
+builder.AddPythonApp("script-only", "../script_only", "main.py");
+builder.AddPythonApp("instrumented-script", "../instrumented_script", "main.py");
 
 builder.AddPythonModule("fastapi-app", "../module_only", "uvicorn")
     .WithArgs("api:app", "--reload", "--host=0.0.0.0", "--port=8000")
     .WithHttpEndpoint(targetPort: 8000)
-    .WithUvEnvironment();
+    .WithUv();
 
 // Run the same app on another port using uvicorn directly
 builder.AddPythonExecutable("fastapi-uvicorn-app", "../module_only", "uvicorn")
@@ -27,11 +27,11 @@
         c.Args.Add("--port=8002");
     })
     .WithHttpEndpoint(targetPort: 8002)
-    .WithUvEnvironment();
+    .WithUv();
 
 // Uvicorn app using the AddUvicornApp method
 builder.AddUvicornApp("uvicorn-app", "../uvicorn_app", "app:app")
-    .WithUvEnvironment()
+    .WithUv()
     .WithExternalHttpEndpoints();
 
 #if !SKIP_DASHBOARD_REFERENCE

playground/python/flask_app/README.md

@@ -23,7 +23,7 @@ This app is configured to run via the Python.AppHost project using `AddPythonMod
 var flaskApp = builder.AddPythonModule("flask-app", "../flask_app", "flask")
     .WithArgs("run", "--host=0.0.0.0", "--port=8000")
     .WithHttpEndpoint(targetPort: 8000)
-    .WithUvEnvironment();
+    .WithUv();
 ```
 
 ## Local Development

src/Aspire.Hosting.Python/PythonEnvironmentAnnotation.cs

@@ -5,12 +5,16 @@
 
 namespace Aspire.Hosting.Python;
 
-// Marker annotation to indicate a resource is for setting up a UV environment for a Python app.
+// Marker annotation to indicate a resource is for setting up a Python environment.
 internal class PythonEnvironmentAnnotation : IResourceAnnotation
 {
     public string? Version { get; set; }
 
-    public bool Uv { get; set; }
-
     public VirtualEnvironment? VirtualEnvironment { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether to automatically create the virtual environment if it doesn't exist.
+    /// Defaults to true.
+    /// </summary>
+    public bool CreateVenvIfNotExists { get; set; } = true;
 }

src/Aspire.Hosting.Python/PythonInstallCommandAnnotation.cs

@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Hosting.ApplicationModel;
+
+namespace Aspire.Hosting.Python;
+
+/// <summary>
+/// Represents the annotation for the Python package manager's install command.
+/// </summary>
+/// <param name="args">
+/// The command line arguments for the Python package manager's install command.
+/// This includes the command itself (i.e. "install", "sync").
+/// </param>
+internal sealed class PythonInstallCommandAnnotation(string[] args) : IResourceAnnotation
+{
+    /// <summary>
+    /// Gets the command-line arguments supplied to the Python package manager.
+    /// </summary>
+    public string[] Args { get; } = args;
+}

src/Aspire.Hosting.Python/PythonUvEnvironmentResource.cs → src/Aspire.Hosting.Python/PythonInstallerResource.cs

@@ -6,11 +6,11 @@
 namespace Aspire.Hosting.Python;
 
 /// <summary>
-/// A resource that represents a UV environment setup task for a Python application.
+/// A resource that represents a Python package installer task for a Python application.
 /// </summary>
 /// <param name="name">The name of the resource.</param>
 /// <param name="parent">The parent Python application resource.</param>
-internal sealed class PythonUvEnvironmentResource(string name, PythonAppResource parent)
-    : ExecutableResource(name, "uv", parent.WorkingDirectory)
+internal sealed class PythonInstallerResource(string name, PythonAppResource parent)
+    : ExecutableResource(name, "python", parent.WorkingDirectory)
 {
 }

src/Aspire.Hosting.Python/PythonPackageInstallerAnnotation.cs

@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Hosting.ApplicationModel;
+
+namespace Aspire.Hosting.Python;
+
+/// <summary>
+/// Represents an annotation for a Python installer resource.
+/// </summary>
+internal sealed class PythonPackageInstallerAnnotation(ExecutableResource installerResource) : IResourceAnnotation
+{
+    /// <summary>
+    /// The instance of the Installer resource used.
+    /// </summary>
+    public ExecutableResource Resource { get; } = installerResource;
+}

src/Aspire.Hosting.Python/PythonPackageManagerAnnotation.cs

@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Hosting.ApplicationModel;
+
+namespace Aspire.Hosting.Python;
+
+/// <summary>
+/// Represents the annotation for the Python package manager used in a resource.
+/// </summary>
+/// <param name="executableName">The name of the executable used to run the package manager.</param>
+internal sealed class PythonPackageManagerAnnotation(string executableName) : IResourceAnnotation
+{
+    /// <summary>
+    /// Gets the executable used to run the Python package manager.
+    /// </summary>
+    public string ExecutableName { get; } = executableName;
+}

src/Aspire.Hosting.Python/PythonVenvCreatorResource.cs

@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Hosting.ApplicationModel;
+
+namespace Aspire.Hosting.Python;
+
+/// <summary>
+/// A resource that represents a Python virtual environment creator task for a Python application.
+/// </summary>
+/// <param name="name">The name of the resource.</param>
+/// <param name="parent">The parent Python application resource.</param>
+/// <param name="venvPath">The path where the virtual environment should be created.</param>
+internal sealed class PythonVenvCreatorResource(string name, PythonAppResource parent, string venvPath)
+    : ExecutableResource(name, "python", parent.WorkingDirectory)
+{
+    /// <summary>
+    /// Gets the path where the virtual environment will be created.
+    /// </summary>
+    public string VenvPath => venvPath;
+}

src/Aspire.ProjectTemplates/templates/aspire-py-starter/13.0/apphost.cs

@@ -12,7 +12,7 @@
 
 #endif
 var app = builder.AddUvicornApp("app", "./app", "main:app")
-    .WithUvEnvironment()
+    .WithUv()
     .WithExternalHttpEndpoints()
 #if UseRedisCache
     .WithReference(cache)