@aws/nx-plugin 1.0.0-rc.3 → 1.0.0-rc.30

package/src/py/fast-api/react/open-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"open-api.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/open-api.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAMoB;AACpB,kDAAuD;AACvD,gDAAiD;AAMjD;;GAEG;AACI,MAAM,oBAAoB,GAAG,CAClC,IAAU,EACV,EAAE,OAAO,EAA+B,EAClB,EAAE;IACxB,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAEjD,oFAAoF;IACpF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,gBAAgB,CAAC,EAC9C,OAAO,CAAC,IAAI,EACZ;QACE,UAAU;KACX,CACF,CAAC;IAEF,6DAA6D;IAC7D,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9E,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IACvE,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;QAC7C,GAAG,OAAO;QACV,OAAO,EAAE,IAAA,uBAAc,EAAC;YACtB,GAAG,OAAO,CAAC,OAAO;YAClB,KAAK,EAAE;gBACL,GAAG,OAAO,CAAC,OAAO,EAAE,KAAK;gBACzB,SAAS,EAAE;oBACT,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CACvB;oBACD,SAAS;iBACV;aACF;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE,CAAC,4CAA4C,CAAC;gBACvD,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,oGAAoG;qBACrG;iBACF;aACF;SACF,CAAC;KACH,CAAC,CAAC;IAEH,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC,CAAC;AA9CW,QAAA,oBAAoB,wBA8C/B;AAEF,MAAM,oBAAoB,GAAG,CAAC,aAAmC,EAAU,EAAE;IAC3E,IAAI,aAAa,CAAC,UAAU,EAAE,CAAC;QAC7B,MAAM,eAAe,GAAG,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5D,OAAO,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrD,CAAC;IACD,MAAM,OAAO,GAAI,aAAa,CAAC,QAAgB,EAAE,OAAO,CAAC;IACzD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,IAAI,KAAK,CAAC,8CAA8C,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;AAChF,CAAC,CAAC"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/open-api.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { snakeCase } from '../../../utils/names';\nimport { sortObjectKeys } from '../../../utils/object';\n\nexport interface AddOpenApiGenerationOptions {\n  project: ProjectConfiguration;\n}\n\n/**\n * Adds FastAPI -> OpenApi spec generation as part of the FastAPI project build\n */\nexport const addOpenApiGeneration = (\n  tree: Tree,\n  { project }: AddOpenApiGenerationOptions,\n): { specPath: string } => {\n  const moduleName = getFastApiModuleName(project);\n\n  // Add OpenAPI spec generation script to FastAPI spec, preserving an existing\n  // copy so re-running does not reformat it nondeterministically\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files/fast-api'),\n    project.root,\n    {\n      moduleName,\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  // Instrument the script as part of the fastapi project build\n  const fastApiOpenApiDist = joinPathFragments('dist', project.root, 'openapi');\n  const specPath = joinPathFragments(fastApiOpenApiDist, 'openapi.json');\n  updateProjectConfiguration(tree, project.name, {\n    ...project,\n    targets: sortObjectKeys({\n      ...project.targets,\n      build: {\n        ...project.targets?.build,\n        dependsOn: [\n          ...(project.targets?.build?.dependsOn ?? []).filter(\n            (t) => t !== 'openapi',\n          ),\n          'openapi',\n        ],\n      },\n      openapi: {\n        cache: true,\n        executor: 'nx:run-commands',\n        outputs: ['{workspaceRoot}/dist/{projectRoot}/openapi'],\n        options: {\n          commands: [\n            'uv run python {projectRoot}/scripts/generate_open_api.py \"dist/{projectRoot}/openapi/openapi.json\"',\n          ],\n        },\n      },\n    }),\n  });\n\n  return { specPath };\n};\n\nconst getFastApiModuleName = (projectConfig: ProjectConfiguration): string => {\n  if (projectConfig.sourceRoot) {\n    const sourceRootParts = projectConfig.sourceRoot.split('/');\n    return sourceRootParts[sourceRootParts.length - 1];\n  }\n  const apiName = (projectConfig.metadata as any)?.apiName;\n  if (apiName) {\n    return snakeCase(apiName);\n  }\n  new Error(`Could not determine sourceRoot for project ${projectConfig.name}`);\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","snakeCase","sortObjectKeys","addOpenApiGeneration","tree","project","moduleName","getFastApiModuleName","dirname","root","overwriteStrategy","KeepExisting","fastApiOpenApiDist","specPath","name","targets","build","dependsOn","filter","t","openapi","cache","executor","outputs","options","commands","projectConfig","sourceRoot","sourceRootParts","split","length","apiName","metadata","Error"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAGjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,SAAS,QAAQ,0BAAuB;AACjD,SAASC,cAAc,QAAQ,2BAAwB;AAMvD;;CAEC,GACD,OAAO,MAAMC,uBAAuB,CAClCC,MACA,EAAEC,OAAO,EAA+B;IAExC,MAAMC,aAAaC,qBAAqBF;IAExC,6EAA6E;IAC7E,+DAA+D;IAC/DR,cACEO,MACAN,kBAAkB,YAAYU,OAAO,EAAE,mBACvCH,QAAQI,IAAI,EACZ;QACEH;IACF,GACA;QACEI,mBAAmBX,kBAAkBY,YAAY;IACnD;IAGF,6DAA6D;IAC7D,MAAMC,qBAAqBd,kBAAkB,QAAQO,QAAQI,IAAI,EAAE;IACnE,MAAMI,WAAWf,kBAAkBc,oBAAoB;IACvDZ,2BAA2BI,MAAMC,QAAQS,IAAI,EAAE;QAC7C,GAAGT,OAAO;QACVU,SAASb,eAAe;YACtB,GAAGG,QAAQU,OAAO;YAClBC,OAAO;gBACL,GAAGX,QAAQU,OAAO,EAAEC,KAAK;gBACzBC,WAAW;uBACN,AAACZ,CAAAA,QAAQU,OAAO,EAAEC,OAAOC,aAAa,EAAE,AAAD,EAAGC,MAAM,CACjD,CAACC,IAAMA,MAAM;oBAEf;iBACD;YACH;YACAC,SAAS;gBACPC,OAAO;gBACPC,UAAU;gBACVC,SAAS;oBAAC;iBAA6C;gBACvDC,SAAS;oBACPC,UAAU;wBACR;qBACD;gBACH;YACF;QACF;IACF;IAEA,OAAO;QAAEZ;IAAS;AACpB,EAAE;AAEF,MAAMN,uBAAuB,CAACmB;IAC5B,IAAIA,cAAcC,UAAU,EAAE;QAC5B,MAAMC,kBAAkBF,cAAcC,UAAU,CAACE,KAAK,CAAC;QACvD,OAAOD,eAAe,CAACA,gBAAgBE,MAAM,GAAG,EAAE;IACpD;IACA,MAAMC,UAAWL,cAAcM,QAAQ,EAAUD;IACjD,IAAIA,SAAS;QACX,OAAO9B,UAAU8B;IACnB;IACA,IAAIE,MAAM,CAAC,2CAA2C,EAAEP,cAAcZ,IAAI,EAAE;AAC9E"}

package/src/py/fast-api/react/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/py/fast-api/react/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nexport interface FastApiReactGeneratorSchema {\n  frontendProjectName: string;\n  fastApiProjectName: string;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GACD,WAIC"}

package/src/py/fast-api/react/schema.d.ts

@@ -5,4 +5,5 @@
 export interface FastApiReactGeneratorSchema {
   frontendProjectName: string;
   fastApiProjectName: string;
+  preferInstallDependencies?: boolean;
 }

package/src/py/fast-api/react/schema.json

@@ -20,6 +20,11 @@
       "description": "",
       "x-prompt": "Package containing your FastAPI backend",
       "x-dropdown": "projects"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["frontendProjectName", "fastApiProjectName"]

package/src/py/fast-api/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/py/fast-api/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/fast-api/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { IacOption } from '../../utils/iac';\n\nexport interface PyFastApiProjectGeneratorSchema {\n  readonly name: string;\n  readonly infra: 'rest-lambda' | 'http-lambda' | 'none';\n  readonly integrationPattern?: 'isolated' | 'shared';\n  readonly auth: 'iam' | 'cognito' | 'custom';\n  readonly directory?: string;\n  readonly subDirectory?: string;\n  readonly moduleName?: string;\n  readonly iac: IacOption;\n  readonly preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAID,WAUC"}

package/src/py/fast-api/schema.d.ts

@@ -14,4 +14,5 @@ export interface PyFastApiProjectGeneratorSchema {
   readonly subDirectory?: string;
   readonly moduleName?: string;
   readonly iac: IacOption;
+  readonly preferInstallDependencies?: boolean;
 }

package/src/py/fast-api/schema.json

@@ -76,6 +76,11 @@
       "enum": ["rest-lambda", "http-lambda", "none"],
       "x-prompt": "What infrastructure would you like to deploy your API with?",
       "x-priority": "important"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["name"]

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

@@ -70,11 +70,11 @@ exports[`lambda-handler project generator > terraform iac > should generate terr
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "6.52.0"
     }
     archive = {
       source  = "hashicorp/archive"
-      version = "~> 2.0"
+      version = "2.8.0"
     }
   }
 }
@@ -251,11 +251,11 @@ exports[`lambda-handler project generator > terraform iac > should match snapsho
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "6.52.0"
     }
     archive = {
       source  = "hashicorp/archive"
-      version = "~> 2.0"
+      version = "2.8.0"
     }
   }
 }

package/src/py/lambda-function/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { GeneratorCallback, Tree } from '@nx/devkit';
-import { PyLambdaFunctionGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { PyLambdaFunctionGeneratorSchema } from './schema';
 export declare const LAMBDA_FUNCTION_GENERATOR_INFO: NxGeneratorInfo;
 export interface LambdaFunctionDetails {
     /**

package/src/py/lambda-function/generator.js

@@ -1,42 +1,37 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pyLambdaFunctionGenerator = exports.LAMBDA_FUNCTION_GENERATOR_INFO = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const nxlv_python_1 = require("../../utils/nxlv-python");
-const shared_constructs_1 = require("../../utils/shared-constructs");
-const names_1 = require("../../utils/names");
-const format_1 = require("../../utils/format");
-const npm_scope_1 = require("../../utils/npm-scope");
-const object_1 = require("../../utils/object");
-const nx_1 = require("../../utils/nx");
-const metrics_1 = require("../../utils/metrics");
-const bundle_1 = require("../../utils/bundle/bundle");
-const py_1 = require("../../utils/py");
-const function_constructs_1 = require("../../utils/function-constructs/function-constructs");
-const paths_1 = require("../../utils/paths");
-const iac_1 = require("../../utils/iac");
-exports.LAMBDA_FUNCTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const getLambdaFunctionDetails = (tree, schema) => {
-    const scope = (0, names_1.toSnakeCase)((0, npm_scope_1.getNpmScope)(tree));
-    const normalizedFunctionName = (0, names_1.toSnakeCase)(schema.name);
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
+import { addPythonBundleTarget } from "../../utils/bundle/bundle.js";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { addLambdaFunctionInfra } from "../../utils/function-constructs/function-constructs.js";
+import { resolveIac } from "../../utils/iac.js";
+import { installDependencies } from "../../utils/install.js";
+import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { toClassName, toDotNotation, toKebabCase, toSnakeCase } from "../../utils/names.js";
+import { getNpmScope } from "../../utils/npm-scope.js";
+import { addComponentGeneratorMetadata, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../utils/nx.js";
+import { sortObjectKeys } from "../../utils/object.js";
+import { toProjectRelativePath } from "../../utils/paths.js";
+import { addDependenciesToPyProjectToml } from "../../utils/py.js";
+import { sharedConstructsGenerator } from "../../utils/shared-constructs.js";
+export const LAMBDA_FUNCTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+const getLambdaFunctionDetails = (tree, schema)=>{
+    const scope = toSnakeCase(getNpmScope(tree));
+    const normalizedFunctionName = toSnakeCase(schema.name);
     const fullyQualifiedFunctionName = `${scope}.${normalizedFunctionName}`;
-    const normalizedFunctionPath = `${schema.moduleName}.${schema.functionPath ? `${(0, names_1.toDotNotation)(schema.functionPath)}.` : ''}${normalizedFunctionName}.lambda_handler`;
+    const normalizedFunctionPath = `${schema.moduleName}.${schema.functionPath ? `${toDotNotation(schema.functionPath)}.` : ''}${normalizedFunctionName}.lambda_handler`;
     return {
         fullyQualifiedFunctionName,
         normalizedFunctionName,
-        normalizedFunctionPath,
+        normalizedFunctionPath
     };
 };
 /**
  * Generates a Python Lambda Function to add to a python project
- */
-const pyLambdaFunctionGenerator = async (tree, schema) => {
-    const projectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, schema.project);
-    const pyProjectPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'pyproject.toml');
+ */ export const pyLambdaFunctionGenerator = async (tree, schema)=>{
+    const projectConfig = readProjectConfigurationUnqualified(tree, schema.project);
+    const pyProjectPath = joinPathFragments(projectConfig.root, 'pyproject.toml');
     // Check if the project has a pyproject.toml file
     if (!pyProjectPath) {
         throw new Error(`This generator does not support selected project ${schema.project}`);
@@ -46,70 +41,76 @@ const pyLambdaFunctionGenerator = async (tree, schema) => {
     }
     const dir = projectConfig.root;
     const projectNameWithOutScope = projectConfig.name.split('.').pop();
-    const normalizedProjectName = (0, names_1.toSnakeCase)(projectNameWithOutScope);
+    const normalizedProjectName = toSnakeCase(projectNameWithOutScope);
     // Module name is the last part of the source root,
     const sourceParts = projectConfig.sourceRoot.split('/');
     const moduleName = sourceParts[sourceParts.length - 1];
     const { normalizedFunctionName, normalizedFunctionPath } = getLambdaFunctionDetails(tree, {
         moduleName,
         name: schema.name,
-        functionPath: schema.functionPath,
+        functionPath: schema.functionPath
     });
     const constructFunctionName = `${normalizedProjectName}_${normalizedFunctionName}`;
-    const constructFunctionClassName = (0, names_1.toClassName)(constructFunctionName);
-    const constructFunctionKebabCase = (0, names_1.toKebabCase)(constructFunctionName);
-    const lambdaFunctionClassName = (0, names_1.toClassName)(schema.name);
-    const lambdaFunctionKebabCase = (0, names_1.toKebabCase)(schema.name);
-    const functionPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, schema.functionPath ?? '', `${normalizedFunctionName}.py`);
+    const constructFunctionClassName = toClassName(constructFunctionName);
+    const constructFunctionKebabCase = toKebabCase(constructFunctionName);
+    const lambdaFunctionClassName = toClassName(schema.name);
+    const lambdaFunctionKebabCase = toKebabCase(schema.name);
+    const functionPath = joinPathFragments(projectConfig.sourceRoot, schema.functionPath ?? '', `${normalizedFunctionName}.py`);
     const infra = schema.infra ?? 'lambda';
     const handlerAlreadyExists = tree.exists(functionPath);
     if (handlerAlreadyExists && infra === 'none') {
         throw new Error(`This project already has a lambda function with the name ${normalizedFunctionName}. Please remove the lambda function before running this generator or use a different name.`);
     }
     // Check if the project has a bundle target and if not add it
-    const { bundleOutputDir } = (0, bundle_1.addPythonBundleTarget)(projectConfig);
+    const { bundleOutputDir } = addPythonBundleTarget(projectConfig);
     if (infra !== 'none') {
-        const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
-        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
-            iac,
+        const iac = await resolveIac(tree, schema.iac);
+        await sharedConstructsGenerator(tree, {
+            iac
         });
-        await (0, function_constructs_1.addLambdaFunctionInfra)(tree, {
+        await addLambdaFunctionInfra(tree, {
             functionProjectName: projectConfig.name,
             nameClassName: constructFunctionClassName,
             nameKebabCase: constructFunctionKebabCase,
             handler: normalizedFunctionPath,
             bundlePathFromRoot: bundleOutputDir,
             runtime: 'python',
-            iac,
+            iac
         });
     }
     const enhancedOptions = {
         ...schema,
         dir,
         lambdaFunctionClassName,
-        lambdaFunctionSnakeCase: normalizedFunctionName,
+        lambdaFunctionSnakeCase: normalizedFunctionName
     };
-    projectConfig.targets = (0, object_1.sortObjectKeys)(projectConfig.targets);
-    (0, devkit_1.updateProjectConfiguration)(tree, projectConfig.name, projectConfig);
+    projectConfig.targets = sortObjectKeys(projectConfig.targets);
+    updateProjectConfiguration(tree, projectConfig.name, projectConfig);
     // Generate the lambda handler file
-    (0, devkit_1.generateFiles)(tree, // the virtual file system
-    (0, devkit_1.joinPathFragments)(__dirname, 'files', 'handler'), // path to the file templates
-    (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, schema.functionPath ?? ''), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite });
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'handler'), joinPathFragments(projectConfig.sourceRoot, schema.functionPath ?? ''), enhancedOptions, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
     // Generate the lambda handler test file
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'tests'), (0, devkit_1.joinPathFragments)(dir, 'tests'), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite });
-    (0, py_1.addDependenciesToPyProjectToml)(tree, dir, [
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'tests'), joinPathFragments(dir, 'tests'), enhancedOptions, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
+    addDependenciesToPyProjectToml(tree, dir, [
         'aws-lambda-powertools',
         'aws-lambda-powertools[tracer]',
-        'aws-lambda-powertools[parser]',
+        'aws-lambda-powertools[parser]'
     ]);
-    (0, nx_1.addComponentGeneratorMetadata)(tree, projectConfig.name, exports.LAMBDA_FUNCTION_GENERATOR_INFO, (0, paths_1.toProjectRelativePath)(projectConfig, functionPath), lambdaFunctionKebabCase);
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.LAMBDA_FUNCTION_GENERATOR_INFO]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return async () => {
-        await new nxlv_python_1.UVProvider(tree.root, new nxlv_python_1.Logger(), tree).install();
-        (0, devkit_1.installPackagesTask)(tree);
-    };
+    addComponentGeneratorMetadata(tree, projectConfig.name, LAMBDA_FUNCTION_GENERATOR_INFO, toProjectRelativePath(projectConfig, functionPath), lambdaFunctionKebabCase);
+    await addGeneratorMetricsIfApplicable(tree, [
+        LAMBDA_FUNCTION_GENERATOR_INFO
+    ]);
+    await formatFilesInSubtree(tree);
+    return ()=>installDependencies(tree, schema.preferInstallDependencies, {
+            languages: [
+                'typescript',
+                'python'
+            ]
+        });
 };
-exports.pyLambdaFunctionGenerator = pyLambdaFunctionGenerator;
-exports.default = exports.pyLambdaFunctionGenerator;
+export default pyLambdaFunctionGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/py/lambda-function/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/lambda-function/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/lambda-function/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addPythonBundleTarget } from '../../utils/bundle/bundle';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { addLambdaFunctionInfra } from '../../utils/function-constructs/function-constructs';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport {\n  toClassName,\n  toDotNotation,\n  toKebabCase,\n  toSnakeCase,\n} from '../../utils/names';\nimport { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addComponentGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { toProjectRelativePath } from '../../utils/paths';\nimport { addDependenciesToPyProjectToml } from '../../utils/py';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport type { PyLambdaFunctionGeneratorSchema } from './schema';\n\nexport const LAMBDA_FUNCTION_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport interface LambdaFunctionDetails {\n  /**\n   * The normalized name of the lambda handler project\n   */\n  readonly normalizedFunctionName: string;\n  /**\n   * The full package name of the lambda handler construct\n   */\n  readonly fullyQualifiedFunctionName: string;\n  /**\n   * The normalized python path to the lambda handler file in dot notation (e.g. `app.lambda_functions.lambda_handler`)\n   */\n  readonly normalizedFunctionPath: string;\n}\n\nconst getLambdaFunctionDetails = (\n  tree: Tree,\n  schema: { moduleName: string; name: string; functionPath?: string },\n): LambdaFunctionDetails => {\n  const scope = toSnakeCase(getNpmScope(tree));\n  const normalizedFunctionName = toSnakeCase(schema.name);\n  const fullyQualifiedFunctionName = `${scope}.${normalizedFunctionName}`;\n  const normalizedFunctionPath = `${schema.moduleName}.${schema.functionPath ? `${toDotNotation(schema.functionPath)}.` : ''}${normalizedFunctionName}.lambda_handler`;\n\n  return {\n    fullyQualifiedFunctionName,\n    normalizedFunctionName,\n    normalizedFunctionPath,\n  };\n};\n\n/**\n * Generates a Python Lambda Function to add to a python project\n */\nexport const pyLambdaFunctionGenerator = async (\n  tree: Tree,\n  schema: PyLambdaFunctionGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const projectConfig = readProjectConfigurationUnqualified(\n    tree,\n    schema.project,\n  );\n\n  const pyProjectPath = joinPathFragments(projectConfig.root, 'pyproject.toml');\n\n  // Check if the project has a pyproject.toml file\n  if (!pyProjectPath) {\n    throw new Error(\n      `This generator does not support selected project ${schema.project}`,\n    );\n  }\n\n  if (!projectConfig.sourceRoot) {\n    throw new Error(\n      `This project does not have a source root. Please add a source root to the project configuration before running this generator.`,\n    );\n  }\n\n  const dir = projectConfig.root;\n  const projectNameWithOutScope = projectConfig.name.split('.').pop();\n  const normalizedProjectName = toSnakeCase(projectNameWithOutScope);\n\n  // Module name is the last part of the source root,\n  const sourceParts = projectConfig.sourceRoot.split('/');\n  const moduleName = sourceParts[sourceParts.length - 1];\n\n  const { normalizedFunctionName, normalizedFunctionPath } =\n    getLambdaFunctionDetails(tree, {\n      moduleName,\n      name: schema.name,\n      functionPath: schema.functionPath,\n    });\n\n  const constructFunctionName = `${normalizedProjectName}_${normalizedFunctionName}`;\n  const constructFunctionClassName = toClassName(constructFunctionName);\n  const constructFunctionKebabCase = toKebabCase(constructFunctionName);\n  const lambdaFunctionClassName = toClassName(schema.name);\n  const lambdaFunctionKebabCase = toKebabCase(schema.name);\n\n  const functionPath = joinPathFragments(\n    projectConfig.sourceRoot,\n    schema.functionPath ?? '',\n    `${normalizedFunctionName}.py`,\n  );\n\n  const infra = schema.infra ?? 'lambda';\n  const handlerAlreadyExists = tree.exists(functionPath);\n\n  if (handlerAlreadyExists && infra === 'none') {\n    throw new Error(\n      `This project already has a lambda function with the name ${normalizedFunctionName}. Please remove the lambda function before running this generator or use a different name.`,\n    );\n  }\n\n  // Check if the project has a bundle target and if not add it\n  const { bundleOutputDir } = addPythonBundleTarget(projectConfig);\n\n  if (infra !== 'none') {\n    const iac = await resolveIac(tree, schema.iac);\n\n    await sharedConstructsGenerator(tree, {\n      iac,\n    });\n\n    await addLambdaFunctionInfra(tree, {\n      functionProjectName: projectConfig.name,\n      nameClassName: constructFunctionClassName,\n      nameKebabCase: constructFunctionKebabCase,\n      handler: normalizedFunctionPath,\n      bundlePathFromRoot: bundleOutputDir,\n      runtime: 'python',\n      iac,\n    });\n  }\n\n  const enhancedOptions = {\n    ...schema,\n    dir,\n    lambdaFunctionClassName,\n    lambdaFunctionSnakeCase: normalizedFunctionName,\n  };\n\n  projectConfig.targets = sortObjectKeys(projectConfig.targets);\n  updateProjectConfiguration(tree, projectConfig.name, projectConfig);\n\n  // Generate the lambda handler file\n  generateFiles(\n    tree, // the virtual file system\n    joinPathFragments(import.meta.dirname, 'files', 'handler'), // path to the file templates\n    joinPathFragments(projectConfig.sourceRoot, schema.functionPath ?? ''),\n    enhancedOptions,\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Generate the lambda handler test file\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'tests'),\n    joinPathFragments(dir, 'tests'),\n    enhancedOptions,\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  addDependenciesToPyProjectToml(tree, dir, [\n    'aws-lambda-powertools',\n    'aws-lambda-powertools[tracer]',\n    'aws-lambda-powertools[parser]',\n  ]);\n\n  addComponentGeneratorMetadata(\n    tree,\n    projectConfig.name,\n    LAMBDA_FUNCTION_GENERATOR_INFO,\n    toProjectRelativePath(projectConfig, functionPath),\n    lambdaFunctionKebabCase,\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [LAMBDA_FUNCTION_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript', 'python'],\n    });\n};\nexport default pyLambdaFunctionGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","addPythonBundleTarget","formatFilesInSubtree","addLambdaFunctionInfra","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","toClassName","toDotNotation","toKebabCase","toSnakeCase","getNpmScope","addComponentGeneratorMetadata","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","toProjectRelativePath","addDependenciesToPyProjectToml","sharedConstructsGenerator","LAMBDA_FUNCTION_GENERATOR_INFO","filename","getLambdaFunctionDetails","tree","schema","scope","normalizedFunctionName","name","fullyQualifiedFunctionName","normalizedFunctionPath","moduleName","functionPath","pyLambdaFunctionGenerator","projectConfig","project","pyProjectPath","root","Error","sourceRoot","dir","projectNameWithOutScope","split","pop","normalizedProjectName","sourceParts","length","constructFunctionName","constructFunctionClassName","constructFunctionKebabCase","lambdaFunctionClassName","lambdaFunctionKebabCase","infra","handlerAlreadyExists","exists","bundleOutputDir","iac","functionProjectName","nameClassName","nameKebabCase","handler","bundlePathFromRoot","runtime","enhancedOptions","lambdaFunctionSnakeCase","targets","dirname","overwriteStrategy","KeepExisting","preferInstallDependencies","languages"],"mappings":"AAAA;;;CAGC,GACD,SAEEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,qBAAqB,QAAQ,+BAA4B;AAClE,SAASC,oBAAoB,QAAQ,wBAAqB;AAC1D,SAASC,sBAAsB,QAAQ,yDAAsD;AAC7F,SAASC,UAAU,QAAQ,qBAAkB;AAC7C,SAASC,mBAAmB,QAAQ,yBAAsB;AAC1D,SAASC,+BAA+B,QAAQ,yBAAsB;AACtE,SACEC,WAAW,EACXC,aAAa,EACbC,WAAW,EACXC,WAAW,QACN,uBAAoB;AAC3B,SAASC,WAAW,QAAQ,2BAAwB;AACpD,SACEC,6BAA6B,EAC7BC,gBAAgB,EAEhBC,mCAAmC,QAC9B,oBAAiB;AACxB,SAASC,cAAc,QAAQ,wBAAqB;AACpD,SAASC,qBAAqB,QAAQ,uBAAoB;AAC1D,SAASC,8BAA8B,QAAQ,oBAAiB;AAChE,SAASC,yBAAyB,QAAQ,mCAAgC;AAG1E,OAAO,MAAMC,iCAAkDN,iBAC7D,YAAYO,QAAQ,EACpB;AAiBF,MAAMC,2BAA2B,CAC/BC,MACAC;IAEA,MAAMC,QAAQd,YAAYC,YAAYW;IACtC,MAAMG,yBAAyBf,YAAYa,OAAOG,IAAI;IACtD,MAAMC,6BAA6B,GAAGH,MAAM,CAAC,EAAEC,wBAAwB;IACvE,MAAMG,yBAAyB,GAAGL,OAAOM,UAAU,CAAC,CAAC,EAAEN,OAAOO,YAAY,GAAG,GAAGtB,cAAce,OAAOO,YAAY,EAAE,CAAC,CAAC,GAAG,KAAKL,uBAAuB,eAAe,CAAC;IAEpK,OAAO;QACLE;QACAF;QACAG;IACF;AACF;AAEA;;CAEC,GACD,OAAO,MAAMG,4BAA4B,OACvCT,MACAC;IAEA,MAAMS,gBAAgBlB,oCACpBQ,MACAC,OAAOU,OAAO;IAGhB,MAAMC,gBAAgBpC,kBAAkBkC,cAAcG,IAAI,EAAE;IAE5D,iDAAiD;IACjD,IAAI,CAACD,eAAe;QAClB,MAAM,IAAIE,MACR,CAAC,iDAAiD,EAAEb,OAAOU,OAAO,EAAE;IAExE;IAEA,IAAI,CAACD,cAAcK,UAAU,EAAE;QAC7B,MAAM,IAAID,MACR,CAAC,8HAA8H,CAAC;IAEpI;IAEA,MAAME,MAAMN,cAAcG,IAAI;IAC9B,MAAMI,0BAA0BP,cAAcN,IAAI,CAACc,KAAK,CAAC,KAAKC,GAAG;IACjE,MAAMC,wBAAwBhC,YAAY6B;IAE1C,mDAAmD;IACnD,MAAMI,cAAcX,cAAcK,UAAU,CAACG,KAAK,CAAC;IACnD,MAAMX,aAAac,WAAW,CAACA,YAAYC,MAAM,GAAG,EAAE;IAEtD,MAAM,EAAEnB,sBAAsB,EAAEG,sBAAsB,EAAE,GACtDP,yBAAyBC,MAAM;QAC7BO;QACAH,MAAMH,OAAOG,IAAI;QACjBI,cAAcP,OAAOO,YAAY;IACnC;IAEF,MAAMe,wBAAwB,GAAGH,sBAAsB,CAAC,EAAEjB,wBAAwB;IAClF,MAAMqB,6BAA6BvC,YAAYsC;IAC/C,MAAME,6BAA6BtC,YAAYoC;IAC/C,MAAMG,0BAA0BzC,YAAYgB,OAAOG,IAAI;IACvD,MAAMuB,0BAA0BxC,YAAYc,OAAOG,IAAI;IAEvD,MAAMI,eAAehC,kBACnBkC,cAAcK,UAAU,EACxBd,OAAOO,YAAY,IAAI,IACvB,GAAGL,uBAAuB,GAAG,CAAC;IAGhC,MAAMyB,QAAQ3B,OAAO2B,KAAK,IAAI;IAC9B,MAAMC,uBAAuB7B,KAAK8B,MAAM,CAACtB;IAEzC,IAAIqB,wBAAwBD,UAAU,QAAQ;QAC5C,MAAM,IAAId,MACR,CAAC,yDAAyD,EAAEX,uBAAuB,0FAA0F,CAAC;IAElL;IAEA,6DAA6D;IAC7D,MAAM,EAAE4B,eAAe,EAAE,GAAGpD,sBAAsB+B;IAElD,IAAIkB,UAAU,QAAQ;QACpB,MAAMI,MAAM,MAAMlD,WAAWkB,MAAMC,OAAO+B,GAAG;QAE7C,MAAMpC,0BAA0BI,MAAM;YACpCgC;QACF;QAEA,MAAMnD,uBAAuBmB,MAAM;YACjCiC,qBAAqBvB,cAAcN,IAAI;YACvC8B,eAAeV;YACfW,eAAeV;YACfW,SAAS9B;YACT+B,oBAAoBN;YACpBO,SAAS;YACTN;QACF;IACF;IAEA,MAAMO,kBAAkB;QACtB,GAAGtC,MAAM;QACTe;QACAU;QACAc,yBAAyBrC;IAC3B;IAEAO,cAAc+B,OAAO,GAAGhD,eAAeiB,cAAc+B,OAAO;IAC5D/D,2BAA2BsB,MAAMU,cAAcN,IAAI,EAAEM;IAErD,mCAAmC;IACnCnC,cACEyB,MACAxB,kBAAkB,YAAYkE,OAAO,EAAE,SAAS,YAChDlE,kBAAkBkC,cAAcK,UAAU,EAAEd,OAAOO,YAAY,IAAI,KACnE+B,iBACA;QAAEI,mBAAmBlE,kBAAkBmE,YAAY;IAAC;IAGtD,wCAAwC;IACxCrE,cACEyB,MACAxB,kBAAkB,YAAYkE,OAAO,EAAE,SAAS,UAChDlE,kBAAkBwC,KAAK,UACvBuB,iBACA;QAAEI,mBAAmBlE,kBAAkBmE,YAAY;IAAC;IAGtDjD,+BAA+BK,MAAMgB,KAAK;QACxC;QACA;QACA;KACD;IAED1B,8BACEU,MACAU,cAAcN,IAAI,EAClBP,gCACAH,sBAAsBgB,eAAeF,eACrCmB;IAGF,MAAM3C,gCAAgCgB,MAAM;QAACH;KAA+B;IAE5E,MAAMjB,qBAAqBoB;IAE3B,OAAO,IACLjB,oBAAoBiB,MAAMC,OAAO4C,yBAAyB,EAAE;YAC1DC,WAAW;gBAAC;gBAAc;aAAS;QACrC;AACJ,EAAE;AACF,eAAerC,0BAA0B"}

package/src/py/lambda-function/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/py/lambda-function/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/lambda-function/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { IacOption } from '../../utils/iac';\n\ntype EventSource =\n  | 'Any'\n  | 'AlbModel'\n  | 'APIGatewayProxyEventModel'\n  | 'ApiGatewayAuthorizerToken'\n  | 'ApiGatewayAuthorizerRequest'\n  | 'APIGatewayProxyEventV2Model'\n  | 'ApiGatewayAuthorizerRequestV2'\n  | 'APIGatewayWebSocketMessageEventModel'\n  | 'APIGatewayWebSocketConnectEventModel'\n  | 'APIGatewayWebSocketDisconnectEventModel'\n  | 'BedrockAgentEventModel'\n  | 'CloudFormationCustomResourceCreateModel'\n  | 'CloudFormationCustomResourceUpdateModel'\n  | 'CloudFormationCustomResourceDeleteModel'\n  | 'CloudwatchLogsModel'\n  | 'DynamoDBStreamModel'\n  | 'EventBridgeModel'\n  | 'IoTCoreThingEvent'\n  | 'IoTCoreThingTypeEvent'\n  | 'IoTCoreThingTypeAssociationEvent'\n  | 'IoTCoreThingGroupEvent'\n  | 'IoTCoreAddOrRemoveFromThingGroupEvent'\n  | 'IoTCoreAddOrDeleteFromThingGroupEvent'\n  | 'KafkaMskEventModel'\n  | 'KafkaSelfManagedEventModel'\n  | 'KinesisDataStreamModel'\n  | 'KinesisFirehoseModel'\n  | 'KinesisFirehoseSqsModel'\n  | 'LambdaFunctionUrlModel'\n  | 'S3BatchOperationModel'\n  | 'S3EventNotificationEventBridgeModel'\n  | 'S3Model'\n  | 'S3ObjectLambdaEvent'\n  | 'S3SqsEventNotificationModel'\n  | 'SesModel'\n  | 'SnsModel'\n  | 'SqsModel'\n  | 'TransferFamilyAuthorizer'\n  | 'VpcLatticeModel'\n  | 'VpcLatticeV2Model';\n\nexport type LambdaInfraOption = 'lambda' | 'none';\n\nexport interface PyLambdaFunctionGeneratorSchema {\n  readonly project: string;\n  readonly name: string;\n  readonly functionPath?: string;\n  readonly event?: EventSource;\n  readonly infra?: LambdaInfraOption;\n  readonly iac: IacOption;\n  readonly preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAgDD,WAQC"}

package/src/py/lambda-function/schema.d.ts

@@ -56,4 +56,5 @@ export interface PyLambdaFunctionGeneratorSchema {
   readonly event?: EventSource;
   readonly infra?: LambdaInfraOption;
   readonly iac: IacOption;
+  readonly preferInstallDependencies?: boolean;
 }

package/src/py/lambda-function/schema.json

@@ -90,6 +90,11 @@
       "x-priority": "important",
       "default": "inherit",
       "x-prompt": "Which provider would you like to manage your infrastructure? (default: inherit)"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["project", "name"]

package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap

@@ -44,6 +44,8 @@ export class SnapshotBedrockServer
 {
   public readonly dockerImage: AgentRuntimeArtifact;
   public readonly agentCoreRuntime: Runtime;
+  /** Default Gateway target name for this MCP server. */
+  public readonly mcpServerName = 'snapshot-bedrock-server';
 
   constructor(
     scope: Construct,
@@ -133,15 +135,15 @@ exports[`py#mcp-server generator > should match snapshot for Terraform generated
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.23"
+      version = "6.52.0"
     }
     null = {
       source  = "hashicorp/null"
-      version = ">= 3.0"
+      version = "3.3.0"
     }
     random = {
       source  = "hashicorp/random"
-      version = ">= 3.0"
+      version = "3.9.0"
     }
   }
 }
@@ -224,8 +226,7 @@ resource "aws_ecr_repository" "agent_core_repository" {
   #checkov:skip=CKV_AWS_136:AES256 encryption is sufficient for ECR repositories
   name = "\${lower(var.agent_runtime_name)}_repository_\${random_id.unique_suffix.hex}"
 
-  #checkov:skip=CKV_AWS_51:Image tag is reused for latest deployments
-  image_tag_mutability = "MUTABLE"
+  image_tag_mutability = "IMMUTABLE"
   force_delete         = true
 
   image_scanning_configuration {
@@ -399,25 +400,37 @@ data "external" "docker_digest" {
   program = ["sh", "-c", "echo '{\\"digest\\":\\"'$(docker inspect \${var.docker_image_tag} --format '{{.Id}}')'\\"}' "]
 }
 
+locals {
+  # Content-based, immutable image tag derived from the local image digest
+  image_tag = replace(data.external.docker_digest.result.digest, "sha256:", "")
+}
+
 # Null resource for container image publish
 resource "null_resource" "docker_publish" {
   triggers = {
     docker_digest    = data.external.docker_digest.result.digest
     repository_url   = aws_ecr_repository.agent_core_repository.repository_url
     docker_image_tag = var.docker_image_tag
+    image_tag        = local.image_tag
   }
 
   provisioner "local-exec" {
     command = <<-EOT
       # Get ECR login token
-      aws ecr get-login-password --region \${local.aws_region} | docker login --username AWS --password-stdin \${self.triggers.repository_url}
+      aws ecr get-login-password --region "$AWS_REGION" | docker login --username AWS --password-stdin "$REPOSITORY_URL"
 
-      # Tag the image
-      docker tag \${self.triggers.docker_image_tag} \${self.triggers.repository_url}:latest
+      # Tag the image with the immutable content-based tag
+      docker tag "$DOCKER_IMAGE_TAG" "$REPOSITORY_URL:$IMAGE_TAG"
 
       # Push the image
-      docker push \${self.triggers.repository_url}:latest
+      docker push "$REPOSITORY_URL:$IMAGE_TAG"
     EOT
+    environment = {
+      AWS_REGION       = local.aws_region
+      REPOSITORY_URL   = self.triggers.repository_url
+      DOCKER_IMAGE_TAG = self.triggers.docker_image_tag
+      IMAGE_TAG        = self.triggers.image_tag
+    }
   }
 
   depends_on = [aws_ecr_repository_policy.agent_core_ecr_policy]
@@ -431,7 +444,7 @@ resource "aws_bedrockagentcore_agent_runtime" "agent_runtime" {
 
   agent_runtime_artifact {
     container_configuration {
-      container_uri = "\${aws_ecr_repository.agent_core_repository.repository_url}:latest"
+      container_uri = "\${aws_ecr_repository.agent_core_repository.repository_url}:\${local.image_tag}"
     }
   }
 
@@ -464,6 +477,63 @@ resource "aws_bedrockagentcore_agent_runtime" "agent_runtime" {
   ]
 }
 
+# MCP consumers (e.g. gateway targets, which fetch tools at creation) can race
+# the runtime's first cold start, so probe it until it serves MCP. The ARN
+# output is routed through this resource so consumers wait for readiness.
+resource "null_resource" "runtime_ready" {
+  count = var.server_protocol == "MCP" ? 1 : 0
+
+  triggers = {
+    runtime_arn = aws_bedrockagentcore_agent_runtime.agent_runtime.agent_runtime_arn
+  }
+
+  provisioner "local-exec" {
+    command = <<-EOT
+      uv run --with boto3==1.43.37 python -c "
+import boto3
+import json
+import os
+import time
+import uuid
+
+runtime_arn = os.environ['RUNTIME_ARN']
+client = boto3.client('bedrock-agentcore')
+initialize_request = json.dumps({
+    'jsonrpc': '2.0',
+    'id': 1,
+    'method': 'initialize',
+    'params': {
+        'protocolVersion': '2025-03-26',
+        'capabilities': {},
+        'clientInfo': {'name': 'readiness-probe', 'version': '1.0'},
+    },
+})
+
+deadline = time.time() + 5 * 60
+while True:
+    try:
+        client.invoke_agent_runtime(
+            agentRuntimeArn=runtime_arn,
+            runtimeSessionId=f'readiness-probe-{uuid.uuid4()}',
+            contentType='application/json',
+            accept='application/json, text/event-stream',
+            payload=initialize_request,
+        )
+        break
+    except Exception:
+        if time.time() >= deadline:
+            raise
+        time.sleep(5)
+
+print(f'Runtime {runtime_arn} is serving MCP')
+"
+    EOT
+    environment = {
+      RUNTIME_ARN = self.triggers.runtime_arn
+    }
+  }
+}
+
 # Outputs
 output "agent_core_runtime_role_arn" {
   description = "ARN of the Agent Core Runtime IAM role"
@@ -481,8 +551,8 @@ output "agent_runtime_name" {
 }
 
 output "agent_core_runtime_arn" {
-  description = "ARN of the Bedrock Agent Core runtime"
-  value       = aws_bedrockagentcore_agent_runtime.agent_runtime.agent_runtime_arn
+  description = "ARN of the Bedrock Agent Core runtime. For MCP runtimes the value flows through the readiness probe, so consumers wait until the runtime serves MCP."
+  value       = var.server_protocol == "MCP" ? null_resource.runtime_ready[0].triggers.runtime_arn : aws_bedrockagentcore_agent_runtime.agent_runtime.agent_runtime_arn
 }
 
 output "agent_runtime_id" {
@@ -646,11 +716,11 @@ exports[`py#mcp-server generator > should match snapshot for generated files > u
 name = "proj.test_project"
 version = "0.1.0"
 dependencies = [
-  "aws-lambda-powertools==3.29.0",
-  "mcp==1.27.2",
-  "uvicorn==0.48.0",
-  "boto3==1.43.20",
-  "aws-opentelemetry-distro==0.17.1"
+  "aws-lambda-powertools==3.31.0",
+  "mcp==1.28.1",
+  "uvicorn==0.49.0",
+  "boto3==1.43.37",
+  "aws-opentelemetry-distro==0.18.0"
 ]
 
 [dependency-groups]

package/src/py/mcp-server/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { GeneratorCallback, Tree } from '@nx/devkit';
-import { PyMcpServerGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { PyMcpServerGeneratorSchema } from './schema';
 export declare const PY_MCP_SERVER_GENERATOR_INFO: NxGeneratorInfo;
 export declare const pyMcpServerGenerator: (tree: Tree, options: PyMcpServerGeneratorSchema) => Promise<GeneratorCallback>;
 export default pyMcpServerGenerator;