@aws/nx-plugin 0.103.0 → 0.104.1

package/src/py/fast-api/__snapshots__/generator.spec.ts.snap

@@ -478,7 +478,7 @@ export class TestApi<
       pattern: 'isolated',
       operations: OPERATION_DETAILS,
       defaultIntegrationOptions: <FunctionProps>{
-        runtime: Runtime.PYTHON_3_12,
+        runtime: Runtime.PYTHON_3_14,
         handler: 'run.sh',
         code: Code.fromAsset(
           url.fileURLToPath(
@@ -1368,7 +1368,7 @@ export class TestApi<
       pattern: 'isolated',
       operations: OPERATION_DETAILS,
       defaultIntegrationOptions: <FunctionProps>{
-        runtime: Runtime.PYTHON_3_12,
+        runtime: Runtime.PYTHON_3_14,
         handler: 'run.sh',
         code: Code.fromAsset(
           url.fileURLToPath(
@@ -2296,7 +2296,7 @@ resource "aws_lambda_function" "api_lambda" {
   function_name    = "TestApiHandler"
   role            = aws_iam_role.lambda_execution_role.arn
   handler         = "run.sh"
-  runtime         = "python3.12"
+  runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.name}:753240598075:layer:LambdaAdapterLayerX86:24"]
   timeout         = 30
   memory_size     = 128
@@ -2944,7 +2944,7 @@ resource "aws_lambda_function" "api_lambda" {
   function_name    = "TestApiHandler"
   role            = aws_iam_role.lambda_execution_role.arn
   handler         = "run.sh"
-  runtime         = "python3.12"
+  runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.name}:753240598075:layer:LambdaAdapterLayerX86:24"]
   timeout         = 30
   memory_size     = 128
@@ -3579,7 +3579,7 @@ resource "aws_lambda_function" "api_lambda" {
   function_name    = "TestApiHandler"
   role            = aws_iam_role.lambda_execution_role.arn
   handler         = "run.sh"
-  runtime         = "python3.12"
+  runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.name}:753240598075:layer:LambdaAdapterLayerX86:24"]
   timeout         = 30
   memory_size     = 128
@@ -4238,7 +4238,7 @@ resource "aws_lambda_function" "api_lambda" {
   function_name    = "TestApiHandler"
   role            = aws_iam_role.lambda_execution_role.arn
   handler         = "run.sh"
-  runtime         = "python3.12"
+  runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.name}:753240598075:layer:LambdaAdapterLayerX86:24"]
   timeout         = 30
   memory_size     = 128
@@ -5041,7 +5041,7 @@ resource "aws_lambda_function" "api_lambda" {
   function_name    = "TestApiHandler"
   role            = aws_iam_role.lambda_execution_role.arn
   handler         = "run.sh"
-  runtime         = "python3.12"
+  runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.name}:753240598075:layer:LambdaAdapterLayerX86:24"]
   timeout         = 30
   memory_size     = 128
@@ -5846,7 +5846,7 @@ resource "aws_lambda_function" "api_lambda" {
   function_name    = "TestApiHandler"
   role            = aws_iam_role.lambda_execution_role.arn
   handler         = "run.sh"
-  runtime         = "python3.12"
+  runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.name}:753240598075:layer:LambdaAdapterLayerX86:24"]
   timeout         = 30
   memory_size     = 128

package/src/py/lambda-function/__snapshots__/generator.spec.ts.snap

@@ -45,7 +45,7 @@ export class TestProjectTestFunction extends Function {
   constructor(scope: Construct, id: string) {
     super(scope, id, {
       timeout: Duration.seconds(30),
-      runtime: Runtime.PYTHON_3_12,
+      runtime: Runtime.PYTHON_3_14,
       handler: 'test_project.test_function.lambda_handler',
       code: Code.fromAsset(
         url.fileURLToPath(
@@ -179,7 +179,7 @@ resource "aws_lambda_function" "lambda_function" {
   role            = aws_iam_role.lambda_role.arn
   handler         = "test_project.test_function.lambda_handler"
   source_code_hash = data.archive_file.lambda_zip.output_base64sha256
-  runtime         = "python3.12"
+  runtime         = "python3.14"
   timeout         = 30
 
   tracing_config {
@@ -332,7 +332,7 @@ resource "aws_lambda_function" "lambda_function" {
   role            = aws_iam_role.lambda_role.arn
   handler         = "test_project.snapshot_function.lambda_handler"
   source_code_hash = data.archive_file.lambda_zip.output_base64sha256
-  runtime         = "python3.12"
+  runtime         = "python3.14"
   timeout         = 30
 
   tracing_config {

package/src/py/mcp-server/files/deploy/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/docker/library/python:3.12-slim
+FROM public.ecr.aws/docker/library/python:3.14-slim
 
 WORKDIR /app
 

package/src/py/project/generator.js

@@ -57,8 +57,8 @@ const pyProjectGenerator = async (tree, schema) => {
             autoActivate: true,
             packageManager: 'uv',
             moveDevDependencies: false,
-            pyenvPythonVersion: '3.12.0',
-            pyprojectPythonDependency: '>=3.12',
+            pyenvPythonVersion: '3.14.0',
+            pyprojectPythonDependency: '>=3.14',
         });
     }
     await (0, nxlv_python_1.uvProjectGenerator)(tree, {
@@ -68,8 +68,8 @@ const pyProjectGenerator = async (tree, schema) => {
         buildBundleLocalDependencies: true,
         linter: 'ruff',
         rootPyprojectDependencyGroup: 'main',
-        pyenvPythonVersion: '3.12.0',
-        pyprojectPythonDependency: '>=3.12',
+        pyenvPythonVersion: '3.14.0',
+        pyprojectPythonDependency: '>=3.14',
         projectType: schema.projectType,
         projectNameAndRootFormat: 'as-provided',
         moduleName: normalizedModuleName,

package/src/py/strands-agent/__snapshots__/generator.spec.ts.snap

@@ -1,7 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`py#strands-agent generator > should match snapshot for BedrockAgentCoreRuntime generated constructs files > agent-Dockerfile 1`] = `
-"FROM public.ecr.aws/docker/library/python:3.12-slim
+"FROM public.ecr.aws/docker/library/python:3.14-slim
 
 WORKDIR /app
 

package/src/py/strands-agent/files/deploy/Dockerfile.template

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/docker/library/python:3.12-slim
+FROM public.ecr.aws/docker/library/python:3.14-slim
 
 WORKDIR /app
 

package/src/utils/agent-connection/files/py-core-auth/auth/sigv4.py.template

@@ -25,7 +25,7 @@ class SigV4HTTPXAuth(httpx.Auth):
 
     def auth_flow(
         self, request: httpx.Request
-    ) -> Generator[httpx.Request, httpx.Response, None]:
+    ) -> Generator[httpx.Request, httpx.Response]:
         headers = dict(request.headers)
 
         headers.pop("connection", None)

package/src/utils/api-constructs/files/cdk/app/apis/http/__apiNameKebabCase__.ts.template

@@ -121,7 +121,7 @@ export class <%= apiNameClassName %><
           ),
         ),
         <%_ } else if (backend.type === 'fastapi') { _%>
-        runtime: Runtime.PYTHON_3_12,
+        runtime: Runtime.PYTHON_3_14,
         handler: 'run.sh',
         code: Code.fromAsset(
           url.fileURLToPath(

package/src/utils/api-constructs/files/cdk/app/apis/rest/__apiNameKebabCase__.ts.template

@@ -128,7 +128,7 @@ export class <%= apiNameClassName %><
           ),
         ),
         <%_ } else if (backend.type === 'fastapi') { _%>
-        runtime: Runtime.PYTHON_3_12,
+        runtime: Runtime.PYTHON_3_14,
         handler: 'run.sh',
         code: Code.fromAsset(
           url.fileURLToPath(

package/src/utils/api-constructs/files/terraform/app/apis/http/__apiNameKebabCase__/__apiNameKebabCase__.tf.template

@@ -133,7 +133,7 @@ resource "aws_lambda_function" "api_lambda" {
   runtime         = "nodejs22.x"
   <%_ } else if (backend.type === 'fastapi') { _%>
   handler         = "run.sh"
-  runtime         = "python3.12"
+  runtime         = "python3.14"
   layers          = ["arn:aws:lambda:${data.aws_region.current.name}:753240598075:layer:LambdaAdapterLayerX86:24"]
   <%_ } _%>
   timeout         = 30

package/src/utils/api-constructs/files/terraform/app/apis/rest/__apiNameKebabCase__/__apiNameKebabCase__.tf.template

@@ -130,7 +130,7 @@ resource "aws_lambda_function" "api_lambda" {
   runtime         = "nodejs22.x"
   <%_ } else if (backend.type === 'fastapi') { _%>
   handler         = "run.sh"
-  runtime         = "python3.12"
+  runtime         = "python3.14"
   layers          = ["arn:aws:lambda:${data.aws_region.current.name}:753240598075:layer:LambdaAdapterLayerX86:24"]
   <%_ } _%>
   timeout         = 30

package/src/utils/function-constructs/function-constructs.js

@@ -42,7 +42,7 @@ const addLambdaFunctionCdkConstructs = async (tree, options) => {
     // Generate app specific CDK construct
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'cdk', 'app', 'lambda-functions'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'lambda-functions'), {
         ...options,
-        runtime: `Runtime.${options.runtime === 'python' ? 'PYTHON_3_12' : 'NODEJS_LATEST'}`,
+        runtime: `Runtime.${options.runtime === 'python' ? 'PYTHON_3_14' : 'NODEJS_LATEST'}`,
     }, {
         overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
     });
@@ -54,7 +54,7 @@ const addLambdaFunctionTerraformModules = (tree, options) => {
     // Generate app specific terraform module
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform', 'app', 'lambda-functions'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'src', 'app', 'lambda-functions'), {
         ...options,
-        runtime: options.runtime === 'python' ? 'python3.12' : 'nodejs22.x',
+        runtime: options.runtime === 'python' ? 'python3.14' : 'nodejs22.x',
     }, {
         overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
     });

package/src/utils/py.js

@@ -10,36 +10,38 @@ const devkit_1 = require("@nx/devkit");
 const versions_1 = require("./versions");
 const pip_requirements_js_1 = require("pip-requirements-js");
 const toml_2 = require("./toml");
+// Dedup key that distinguishes bare packages from the same package with
+// extras (e.g. `foo` vs `foo[bar]`), so adding a bare dep doesn't drop a
+// previously-added variant with extras.
+const depKey = (dep) => {
+    const parsed = (0, pip_requirements_js_1.parsePipRequirementsLine)(dep);
+    if (parsed?.type !== 'ProjectName') {
+        return dep;
+    }
+    const extras = [...(parsed.extras ?? [])].sort().join(',');
+    return extras ? `${parsed.name}[${extras}]` : parsed.name;
+};
+const mergeDeps = (existing, deps) => {
+    const incomingKeys = new Set(deps.map(depKey));
+    return [
+        ...(existing ?? []).filter((dep) => !incomingKeys.has(depKey(dep))),
+        ...(0, versions_1.withPyVersions)(deps),
+    ];
+};
 /**
  * Add dependencies to a pyproject.toml file
  */
 const addDependenciesToPyProjectToml = (tree, projectRoot, deps) => {
     const projectToml = (0, toml_1.parse)(tree.read((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), 'utf8'));
-    const newDeps = new Set(deps);
-    projectToml.project.dependencies = [
-        // Replace any dependencies that already exist
-        ...(projectToml.project?.dependencies ?? []).filter((dep) => {
-            const parsedDep = (0, pip_requirements_js_1.parsePipRequirementsLine)(dep);
-            return parsedDep.type !== 'ProjectName' || !newDeps.has(parsedDep.name);
-        }),
-        ...(0, versions_1.withPyVersions)(deps),
-    ];
+    projectToml.project.dependencies = mergeDeps(projectToml.project?.dependencies, deps);
     tree.write((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), (0, toml_1.stringify)(projectToml));
 };
 exports.addDependenciesToPyProjectToml = addDependenciesToPyProjectToml;
 const addDependenciesToDependencyGroupInPyProjectToml = (tree, projectRoot, group, deps) => {
     const projectToml = (0, toml_1.parse)(tree.read((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), 'utf8'));
-    const newDeps = new Set(deps);
     projectToml['dependency-groups'] = {
         ...projectToml['dependency-groups'],
-        [group]: [
-            // Replace any dependencies that already exist
-            ...(projectToml['dependency-groups']?.[group] ?? []).filter((dep) => {
-                const parsedDep = (0, pip_requirements_js_1.parsePipRequirementsLine)(dep);
-                return parsedDep.type !== 'ProjectName' || !newDeps.has(parsedDep.name);
-            }),
-            ...(0, versions_1.withPyVersions)(deps),
-        ],
+        [group]: mergeDeps(projectToml['dependency-groups']?.[group], deps),
     };
     tree.write((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), (0, toml_1.stringify)(projectToml));
 };

package/src/utils/py.js.map

@@ -1 +1 @@
-{"version":3,"file":"py.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"py.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,sCAA+C;AAC/C,uCAAqD;AAErD,yCAA2D;AAC3D,6DAA+D;AAC/D,iCAAoC;AAEpC,wEAAwE;AACxE,yEAAyE;AACzE,wCAAwC;AACxC,MAAM,MAAM,GAAG,CAAC,GAAW,EAAU,EAAE;IACrC,MAAM,MAAM,GAAG,IAAA,8CAAwB,EAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,MAAM,EAAE,IAAI,KAAK,aAAa,EAAE,CAAC;QACnC,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3D,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAChB,QAAuC,EACvC,IAAqB,EACX,EAAE;IACZ,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/C,OAAO;QACL,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,GAAG,IAAA,yBAAc,EAAC,IAAI,CAAC;KACxB,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACI,MAAM,8BAA8B,GAAG,CAC5C,IAAU,EACV,WAAmB,EACnB,IAAqB,EACrB,EAAE;IACF,MAAM,WAAW,GAAG,IAAA,YAAK,EACvB,IAAI,CAAC,IAAI,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CACjD,CAAC;IACrB,WAAW,CAAC,OAAO,CAAC,YAAY,GAAG,SAAS,CAC1C,WAAW,CAAC,OAAO,EAAE,YAAY,EACjC,IAAI,CACL,CAAC;IACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,EAChD,IAAA,gBAAS,EAAC,WAAW,CAAC,CACvB,CAAC;AACJ,CAAC,CAAC;AAhBW,QAAA,8BAA8B,kCAgBzC;AAEK,MAAM,+CAA+C,GAAG,CAC7D,IAAU,EACV,WAAmB,EACnB,KAAa,EACb,IAAqB,EACrB,EAAE;IACF,MAAM,WAAW,GAAG,IAAA,YAAK,EACvB,IAAI,CAAC,IAAI,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CACjD,CAAC;IACrB,WAAW,CAAC,mBAAmB,CAAC,GAAG;QACjC,GAAG,WAAW,CAAC,mBAAmB,CAAC;QACnC,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,WAAW,CAAC,mBAAmB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC;KACpE,CAAC;IACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,EAChD,IAAA,gBAAS,EAAC,WAAW,CAAC,CACvB,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,+CAA+C,mDAiB1D;AAQF;;;;GAIG;AACI,MAAM,UAAU,GAAG,CACxB,GAAkB,EAClB,IAAa,EACb,QAAuB,EACf,EAAE;IACV,OAAO,cAAc,IAAA,yBAAc,EAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAC3C,QAAQ;QACN,CAAC,CAAC,GAAG,QAAQ;aACR,GAAG,CACF,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAC9B,UAAU,GAAG,GAAG,SAAS,IAAI,IAAI,GAAG,OAAO,EAAE,CAChD;aACA,IAAI,CAAC,GAAG,CAAC,GAAG;QACjB,CAAC,CAAC,EACN,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AACpC,CAAC,CAAC;AAfW,QAAA,UAAU,cAerB;AAEF;;;GAGG;AACI,MAAM,iCAAiC,GAAG,CAC/C,IAAU,EACV,WAAmB,EACnB,qBAA6B,EACvB,EAAE;IACR,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IACvE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAChC,OAAO;IACT,CAAC;IAED,IAAA,iBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAqB,EAAE,EAAE;QACxD,uDAAuD;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,YAAY,IAAI,EAAE,CAAC;QAC9C,IACE,CAAC,IAAI,CAAC,IAAI,CACR,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,KAAK,qBAAqB;YAC3B,CAAC,CAAC,UAAU,CAAC,GAAG,qBAAqB,IAAI,CAAC;YAC1C,CAAC,CAAC,UAAU,CAAC,GAAG,qBAAqB,IAAI,CAAC,CAC7C,EACD,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,YAAY,GAAG,CAAC,GAAG,IAAI,EAAE,qBAAqB,CAAC,CAAC;QAC/D,CAAC;QAED,iDAAiD;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAY,CAAC,EAAE,GAAI,IAAI,CAAC,IAAY,CAAC,EAAE,IAAI,EAAE,CAAC;QACnD,IAAI,CAAC,IAAY,CAAC,EAAE,CAAC,OAAO,GAAI,IAAI,CAAC,IAAY,CAAC,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC;QACnE,IAAI,CAAC,IAAY,CAAC,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,GAAG;YACrD,SAAS,EAAE,IAAI;SAChB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAlCW,QAAA,iCAAiC,qCAkC5C"}