@aws/nx-plugin 1.0.0-rc.22 → 1.0.0-rc.24

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 bundle_1 = require("../../utils/bundle/bundle");
-const format_1 = require("../../utils/format");
-const function_constructs_1 = require("../../utils/function-constructs/function-constructs");
-const iac_1 = require("../../utils/iac");
-const metrics_1 = require("../../utils/metrics");
-const names_1 = require("../../utils/names");
-const npm_scope_1 = require("../../utils/npm-scope");
-const nx_1 = require("../../utils/nx");
-const nxlv_python_1 = require("../../utils/nxlv-python");
-const object_1 = require("../../utils/object");
-const paths_1 = require("../../utils/paths");
-const py_1 = require("../../utils/py");
-const shared_constructs_1 = require("../../utils/shared-constructs");
-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, installPackagesTask, 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 { 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 { Logger, UVProvider } from "../../utils/nxlv-python.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,74 @@ 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.KeepExisting });
+    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.KeepExisting });
-    (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]'
+    ]);
+    addComponentGeneratorMetadata(tree, projectConfig.name, LAMBDA_FUNCTION_GENERATOR_INFO, toProjectRelativePath(projectConfig, functionPath), lambdaFunctionKebabCase);
+    await addGeneratorMetricsIfApplicable(tree, [
+        LAMBDA_FUNCTION_GENERATOR_INFO
     ]);
-    (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);
+    await formatFilesInSubtree(tree);
+    return async ()=>{
+        await new UVProvider(tree.root, new Logger(), tree).install();
+        installPackagesTask(tree);
     };
 };
-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  installPackagesTask,\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 { 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 { Logger, UVProvider } from '../../utils/nxlv-python';\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 async () => {\n    await new UVProvider(tree.root, new Logger(), tree).install();\n    installPackagesTask(tree);\n  };\n};\nexport default pyLambdaFunctionGenerator;\n"],"names":["generateFiles","installPackagesTask","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","addPythonBundleTarget","formatFilesInSubtree","addLambdaFunctionInfra","resolveIac","addGeneratorMetricsIfApplicable","toClassName","toDotNotation","toKebabCase","toSnakeCase","getNpmScope","addComponentGeneratorMetadata","getGeneratorInfo","readProjectConfigurationUnqualified","Logger","UVProvider","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","install"],"mappings":"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"}

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}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAgDD,WAOC"}

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

@@ -135,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"
     }
   }
 }
@@ -489,7 +489,7 @@ resource "null_resource" "runtime_ready" {
 
   provisioner "local-exec" {
     command = <<-EOT
-      uv run --with boto3 python -c "
+      uv run --with boto3==1.43.29 python -c "
 import boto3
 import json
 import os
@@ -509,7 +509,7 @@ initialize_request = json.dumps({
     },
 })
 
-deadline = time.time() + 3 * 60
+deadline = time.time() + 5 * 60
 while True:
     try:
         client.invoke_agent_runtime(

package/src/py/mcp-server/generator.js

@@ -1,33 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pyMcpServerGenerator = exports.PY_MCP_SERVER_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 config_1 = require("../../license/config");
-const known_exceptions_1 = require("../../license/known-exceptions");
-const agent_core_constructs_1 = require("../../utils/agent-core-constructs/agent-core-constructs");
-const bundle_1 = require("../../utils/bundle/bundle");
-const containers_1 = require("../../utils/containers");
-const format_1 = require("../../utils/format");
-const fs_1 = require("../../utils/fs");
-const iac_1 = require("../../utils/iac");
-const metrics_1 = require("../../utils/metrics");
-const names_1 = require("../../utils/names");
-const npm_scope_1 = require("../../utils/npm-scope");
-const nx_1 = require("../../utils/nx");
-const nxlv_python_1 = require("../../utils/nxlv-python");
-const paths_1 = require("../../utils/paths");
-const port_1 = require("../../utils/port");
-const py_1 = require("../../utils/py");
-const shared_constructs_1 = require("../../utils/shared-constructs");
-const versions_1 = require("../../utils/versions");
-exports.PY_MCP_SERVER_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const pyMcpServerGenerator = async (tree, options) => {
-    const project = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
-    const pyProjectPath = (0, devkit_1.joinPathFragments)(project.root, 'pyproject.toml');
+ */ import { addDependenciesToPackageJson, generateFiles, installPackagesTask, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
+import { ensureLicenseExceptions } from "../../license/config.js";
+import { MCP_INSPECTOR_EXCEPTIONS } from "../../license/known-exceptions.js";
+import { addMcpServerInfra } from "../../utils/agent-core-constructs/agent-core-constructs.js";
+import { addPythonBundleTarget } from "../../utils/bundle/bundle.js";
+import { resolveContainers } from "../../utils/containers.js";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { FsCommands } from "../../utils/fs.js";
+import { resolveIac } from "../../utils/iac.js";
+import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { kebabCase, toClassName, toSnakeCase } from "../../utils/names.js";
+import { getNpmScope } from "../../utils/npm-scope.js";
+import { addComponentDevTarget, addComponentGeneratorMetadata, addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../utils/nx.js";
+import { Logger, UVProvider } from "../../utils/nxlv-python.js";
+import { toProjectRelativePath } from "../../utils/paths.js";
+import { assignPort } from "../../utils/port.js";
+import { addDependenciesToPyProjectToml } from "../../utils/py.js";
+import { sharedConstructsGenerator } from "../../utils/shared-constructs.js";
+import { withVersions } from "../../utils/versions.js";
+export const PY_MCP_SERVER_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const pyMcpServerGenerator = async (tree, options)=>{
+    const project = readProjectConfigurationUnqualified(tree, options.project);
+    const pyProjectPath = joinPathFragments(project.root, 'pyproject.toml');
     // Check if the project has a pyproject.toml file
     if (!pyProjectPath) {
         throw new Error(`Unsupported project ${options.project}. Expected a Python project (with a pyproject.toml)`);
@@ -38,46 +34,50 @@ const pyMcpServerGenerator = async (tree, options) => {
     // Module name is the last part of the source root,
     const sourceParts = project.sourceRoot.split('/');
     const moduleName = sourceParts[sourceParts.length - 1];
-    const name = (0, names_1.kebabCase)(options.name || `${(0, names_1.kebabCase)(project.name.split('.').pop())}-mcp-server`);
+    const name = kebabCase(options.name || `${kebabCase(project.name.split('.').pop())}-mcp-server`);
     const mcpTargetPrefix = options.name ? name : 'mcp-server';
-    const mcpServerNameSnakeCase = (0, names_1.toSnakeCase)(options.name || 'mcp-server');
-    const mcpServerNameClassName = (0, names_1.toClassName)(name);
-    const targetSourceDir = (0, devkit_1.joinPathFragments)(project.sourceRoot, mcpServerNameSnakeCase);
+    const mcpServerNameSnakeCase = toSnakeCase(options.name || 'mcp-server');
+    const mcpServerNameClassName = toClassName(name);
+    const targetSourceDir = joinPathFragments(project.sourceRoot, mcpServerNameSnakeCase);
     const infra = options.infra ?? 'agentcore';
     if (infra === 'none' && options.auth && options.auth !== 'iam') {
         console.warn('Warning: auth is ignored when no infrastructure is configured (no infrastructure is generated)');
     }
     const auth = options.auth ?? 'iam';
     // Generate example server
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), targetSourceDir, {
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'app'), targetSourceDir, {
         name,
         mcpServerNameSnakeCase,
         mcpServerNameClassName,
-        moduleName,
-    }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
-    (0, py_1.addDependenciesToPyProjectToml)(tree, project.root, [
+        moduleName
+    }, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
+    addDependenciesToPyProjectToml(tree, project.root, [
         'aws-lambda-powertools',
         'mcp',
         'uvicorn',
         'boto3',
-        'aws-opentelemetry-distro',
+        'aws-opentelemetry-distro'
     ]);
     if (infra === 'agentcore') {
-        const containers = await (0, containers_1.resolveContainers)(tree, 'inherit');
-        const dockerImageTag = `${(0, npm_scope_1.getNpmScope)(tree)}-${name}:latest`;
+        const containers = await resolveContainers(tree, 'inherit');
+        const dockerImageTag = `${getNpmScope(tree)}-${name}:latest`;
         // Add bundle target
-        const { bundleTargetName, bundleOutputDir } = (0, bundle_1.addPythonBundleTarget)(project, {
-            pythonPlatform: 'aarch64-manylinux_2_28',
+        const { bundleTargetName, bundleOutputDir } = addPythonBundleTarget(project, {
+            pythonPlatform: 'aarch64-manylinux_2_28'
         });
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'deploy'), targetSourceDir, {
+        generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'deploy'), targetSourceDir, {
             mcpServerNameSnakeCase,
             moduleName,
-            bundleOutputDir,
-        }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
-        const dockerOutputDir = (0, devkit_1.joinPathFragments)('dist', project.root, 'docker', name);
+            bundleOutputDir
+        }, {
+            overwriteStrategy: OverwriteStrategy.KeepExisting
+        });
+        const dockerOutputDir = joinPathFragments('dist', project.root, 'docker', name);
         const dockerTargetName = `${mcpTargetPrefix}-docker`;
         // Add a docker target that prepares the docker context and builds the image
-        const fs = new fs_1.FsCommands(tree);
+        const fs = new FsCommands(tree);
         project.targets[dockerTargetName] = {
             cache: true,
             executor: 'nx:run-commands',
@@ -87,19 +87,23 @@ const pyMcpServerGenerator = async (tree, options) => {
                     fs.mkdir(dockerOutputDir),
                     fs.cp(bundleOutputDir, dockerOutputDir),
                     fs.cp(`${targetSourceDir}/Dockerfile`, `${dockerOutputDir}/Dockerfile`),
-                    `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,
+                    `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`
                 ],
-                parallel: false,
+                parallel: false
             },
-            dependsOn: [bundleTargetName],
+            dependsOn: [
+                bundleTargetName
+            ]
         };
-        (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'docker', dockerTargetName);
-        (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'build', 'docker');
+        addDependencyToTargetIfNotPresent(project, 'docker', dockerTargetName);
+        addDependencyToTargetIfNotPresent(project, 'build', 'docker');
         // Add shared constructs
-        const iac = await (0, iac_1.resolveIac)(tree, options.iac);
-        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iac });
+        const iac = await resolveIac(tree, options.iac);
+        await sharedConstructsGenerator(tree, {
+            iac
+        });
         // Add the construct to deploy the mcp server
-        await (0, agent_core_constructs_1.addMcpServerInfra)(tree, {
+        await addMcpServerInfra(tree, {
             mcpServerNameKebabCase: name,
             mcpServerNameClassName,
             projectName: project.name,
@@ -107,92 +111,106 @@ const pyMcpServerGenerator = async (tree, options) => {
             dockerOutputDir,
             iac,
             auth,
-            containers,
+            containers
         });
     }
-    const localDevPort = (0, port_1.assignPort)(tree, project, 8000, {
-        component: { info: exports.PY_MCP_SERVER_GENERATOR_INFO, name: mcpTargetPrefix },
+    const localDevPort = assignPort(tree, project, 8000, {
+        component: {
+            info: PY_MCP_SERVER_GENERATOR_INFO,
+            name: mcpTargetPrefix
+        }
     });
-    (0, devkit_1.updateProjectConfiguration)(tree, project.name, {
-        ...project,
-        targets: {
-            ...project.targets,
-            // Add targets for running the MCP server
-            [`${mcpTargetPrefix}-serve-stdio`]: {
-                executor: 'nx:run-commands',
-                options: {
-                    commands: [`uv run -m ${moduleName}.${mcpServerNameSnakeCase}.stdio`],
-                    cwd: '{projectRoot}',
-                },
-                continuous: true,
-            },
-            [`${mcpTargetPrefix}-serve`]: {
-                executor: 'nx:run-commands',
-                options: {
-                    commands: [
-                        `uv run uvicorn --reload ${moduleName}.${mcpServerNameSnakeCase}.http:app --host 0.0.0.0 --port ${localDevPort}`,
-                    ],
-                    cwd: '{projectRoot}',
-                    env: {
-                        PORT: `${localDevPort}`,
-                    },
-                },
-                continuous: true,
-            },
-            [`${mcpTargetPrefix}-serve-local`]: {
-                executor: 'nx:run-commands',
-                options: {
-                    commands: [
-                        `uv run uvicorn --reload ${moduleName}.${mcpServerNameSnakeCase}.http:app --host 0.0.0.0 --port ${localDevPort}`,
-                    ],
-                    cwd: '{projectRoot}',
-                    env: {
-                        PORT: `${localDevPort}`,
-                        SERVE_LOCAL: 'true',
-                    },
-                },
-                continuous: true,
-            },
-            [`${mcpTargetPrefix}-inspect`]: {
-                executor: 'nx:run-commands',
-                // Launch the inspector against the locally served (serve-local) HTTP
-                // server. serve-local starts the server and any connected dependencies
-                // (e.g. a local database).
-                dependsOn: [`${mcpTargetPrefix}-serve-local`],
-                options: {
-                    commands: [
-                        `mcp-inspector --transport http --server-url http://localhost:${localDevPort}/mcp`,
-                    ],
-                    cwd: '{projectRoot}',
-                },
-                continuous: true,
-            },
-            [`${mcpTargetPrefix}-inspect-stdio`]: {
-                executor: 'nx:run-commands',
-                options: {
-                    commands: [
-                        `mcp-inspector -- uv run -m ${moduleName}.${mcpServerNameSnakeCase}.stdio`,
-                    ],
-                    cwd: '{projectRoot}',
-                },
-                continuous: true,
-            },
+    const mcpTargets = {
+        ...project.targets,
+        // Add targets for running the MCP server
+        [`${mcpTargetPrefix}-serve-stdio`]: {
+            executor: 'nx:run-commands',
+            continuous: true,
+            options: {
+                commands: [
+                    `uv run -m ${moduleName}.${mcpServerNameSnakeCase}.stdio`
+                ],
+                cwd: '{projectRoot}'
+            }
+        },
+        [`${mcpTargetPrefix}-serve`]: {
+            executor: 'nx:run-commands',
+            continuous: true,
+            options: {
+                commands: [
+                    `uv run uvicorn --reload ${moduleName}.${mcpServerNameSnakeCase}.http:app --host 0.0.0.0 --port ${localDevPort}`
+                ],
+                cwd: '{projectRoot}',
+                env: {
+                    PORT: `${localDevPort}`
+                }
+            }
         },
+        [`${mcpTargetPrefix}-dev`]: {
+            executor: 'nx:run-commands',
+            continuous: true,
+            options: {
+                commands: [
+                    `uv run uvicorn --reload ${moduleName}.${mcpServerNameSnakeCase}.http:app --host 0.0.0.0 --port ${localDevPort}`
+                ],
+                cwd: '{projectRoot}',
+                env: {
+                    PORT: `${localDevPort}`,
+                    LOCAL_DEV: 'true'
+                }
+            }
+        },
+        [`${mcpTargetPrefix}-inspect`]: {
+            executor: 'nx:run-commands',
+            continuous: true,
+            // Launch the inspector against the locally served HTTP server. The dev
+            // target starts the server and any connected dependencies (e.g. a local
+            // database).
+            dependsOn: [
+                `${mcpTargetPrefix}-dev`
+            ],
+            options: {
+                commands: [
+                    `mcp-inspector --transport http --server-url http://localhost:${localDevPort}/mcp`
+                ],
+                cwd: '{projectRoot}'
+            }
+        },
+        [`${mcpTargetPrefix}-inspect-stdio`]: {
+            executor: 'nx:run-commands',
+            continuous: true,
+            options: {
+                commands: [
+                    `mcp-inspector -- uv run -m ${moduleName}.${mcpServerNameSnakeCase}.stdio`
+                ],
+                cwd: '{projectRoot}'
+            }
+        }
+    };
+    // Aggregate `<mcp>-dev` under the project-level `dev` target.
+    addComponentDevTarget(mcpTargets, `${mcpTargetPrefix}-dev`);
+    updateProjectConfiguration(tree, project.name, {
+        ...project,
+        targets: mcpTargets
     });
-    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['@modelcontextprotocol/inspector']));
-    (0, nx_1.addComponentGeneratorMetadata)(tree, project.name, exports.PY_MCP_SERVER_GENERATOR_INFO, (0, paths_1.toProjectRelativePath)(project, targetSourceDir), mcpTargetPrefix, {
+    addDependenciesToPackageJson(tree, {}, withVersions([
+        '@modelcontextprotocol/inspector'
+    ]));
+    addComponentGeneratorMetadata(tree, project.name, PY_MCP_SERVER_GENERATOR_INFO, toProjectRelativePath(project, targetSourceDir), mcpTargetPrefix, {
         port: localDevPort,
         rc: mcpServerNameClassName,
-        auth,
+        auth
     });
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.PY_MCP_SERVER_GENERATOR_INFO]);
-    await (0, config_1.ensureLicenseExceptions)(tree, known_exceptions_1.MCP_INSPECTOR_EXCEPTIONS);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return async () => {
-        (0, devkit_1.installPackagesTask)(tree);
-        await new nxlv_python_1.UVProvider(tree.root, new nxlv_python_1.Logger(), tree).install();
+    await addGeneratorMetricsIfApplicable(tree, [
+        PY_MCP_SERVER_GENERATOR_INFO
+    ]);
+    await ensureLicenseExceptions(tree, MCP_INSPECTOR_EXCEPTIONS);
+    await formatFilesInSubtree(tree);
+    return async ()=>{
+        installPackagesTask(tree);
+        await new UVProvider(tree.root, new Logger(), tree).install();
     };
 };
-exports.pyMcpServerGenerator = pyMcpServerGenerator;
-exports.default = exports.pyMcpServerGenerator;
+export default pyMcpServerGenerator;
+
 //# sourceMappingURL=generator.js.map