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

package/src/py/fast-api/generator.js

@@ -1,17 +1,17 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { generateFiles, installPackagesTask, joinPathFragments, OverwriteStrategy, readProjectConfiguration, updateProjectConfiguration } from "@nx/devkit";
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy, readProjectConfiguration, updateProjectConfiguration } from "@nx/devkit";
 import { addApiGatewayInfra } from "../../utils/api-constructs/api-constructs.js";
 import { addSharedConstructsOpenApiMetadataGenerateTarget } from "../../utils/api-constructs/open-api-metadata.js";
 import { addPythonBundleTarget } from "../../utils/bundle/bundle.js";
 import { formatFilesInSubtree } from "../../utils/format.js";
 import { FsCommands } from "../../utils/fs.js";
 import { resolveIac } from "../../utils/iac.js";
+import { installDependencies } from "../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
 import { toClassName, toKebabCase } from "../../utils/names.js";
 import { addGeneratorMetadata, getGeneratorInfo } from "../../utils/nx.js";
-import { Logger, UVProvider } from "../../utils/nxlv-python.js";
 import { sortObjectKeys } from "../../utils/object.js";
 import { assignPort } from "../../utils/port.js";
 import { addDependenciesToDependencyGroupInPyProjectToml, addDependenciesToPyProjectToml } from "../../utils/py.js";
@@ -44,7 +44,8 @@ export const FAST_API_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
             directory: schema.directory,
             subDirectory: schema.subDirectory,
             moduleName: normalizedModuleName,
-            type: 'application'
+            type: 'application',
+            preferInstallDependencies: false
         });
     }
     const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);
@@ -153,10 +154,12 @@ export const FAST_API_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
         FAST_API_GENERATOR_INFO
     ]);
     await formatFilesInSubtree(tree);
-    return async ()=>{
-        await new UVProvider(tree.root, new Logger(), tree).install();
-        installPackagesTask(tree);
-    };
+    return ()=>installDependencies(tree, schema.preferInstallDependencies, {
+            languages: [
+                'typescript',
+                'python'
+            ]
+        });
 };
 const getIntegrationPattern = (schema)=>schema.integrationPattern ?? 'isolated';
 export default pyFastApiProjectGenerator;

package/src/py/fast-api/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/fast-api/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 ProjectConfiguration,\n  readProjectConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addApiGatewayInfra } from '../../utils/api-constructs/api-constructs';\nimport { addSharedConstructsOpenApiMetadataGenerateTarget } from '../../utils/api-constructs/open-api-metadata';\nimport { addPythonBundleTarget } from '../../utils/bundle/bundle';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { resolveIac } from '../../utils/iac';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { toClassName, toKebabCase } from '../../utils/names';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n} from '../../utils/nx';\nimport { Logger, UVProvider } from '../../utils/nxlv-python';\nimport { sortObjectKeys } from '../../utils/object';\nimport { assignPort } from '../../utils/port';\nimport {\n  addDependenciesToDependencyGroupInPyProjectToml,\n  addDependenciesToPyProjectToml,\n} from '../../utils/py';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport pyProjectGenerator, { getPyProjectDetails } from '../project/generator';\nimport { addOpenApiGeneration } from './react/open-api';\nimport type { PyFastApiProjectGeneratorSchema } from './schema';\n\nexport const FAST_API_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Generates a Python FastAPI project\n */\nexport const pyFastApiProjectGenerator = async (\n  tree: Tree,\n  schema: PyFastApiProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const integrationPattern = getIntegrationPattern(schema);\n\n  const { dir, normalizedModuleName, fullyQualifiedName } = getPyProjectDetails(\n    tree,\n    {\n      name: schema.name,\n      directory: schema.directory,\n      subDirectory: schema.subDirectory,\n      moduleName: schema.moduleName,\n    },\n  );\n  const apiNameKebabCase = toKebabCase(schema.name);\n  const apiNameClassName = toClassName(schema.name);\n\n  let projectExists: boolean;\n  try {\n    readProjectConfiguration(tree, fullyQualifiedName);\n    projectExists = true;\n  } catch {\n    projectExists = false;\n  }\n\n  if (!projectExists) {\n    await pyProjectGenerator(tree, {\n      name: schema.name,\n      directory: schema.directory,\n      subDirectory: schema.subDirectory,\n      moduleName: normalizedModuleName,\n      type: 'application',\n    });\n  }\n\n  const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);\n  const port = assignPort(tree, projectConfig, 8000);\n\n  const { bundleOutputDir, bundleTargetName } =\n    addPythonBundleTarget(projectConfig);\n\n  // Add a command to copy run.sh to the bundle output for Lambda Web Adapter\n  const fs = new FsCommands(tree);\n  const bundleTarget = projectConfig.targets[bundleTargetName];\n  const copyRunShCommand = fs.cp(\n    `{projectRoot}/run.sh`,\n    `dist/{projectRoot}/${bundleTargetName}/run.sh`,\n  );\n  if (!bundleTarget.options.commands.includes(copyRunShCommand)) {\n    bundleTarget.options.commands = [\n      ...bundleTarget.options.commands,\n      copyRunShCommand,\n    ];\n  }\n\n  projectConfig.targets.serve = {\n    executor: '@nxlv/python:run-commands',\n    continuous: true,\n    options: {\n      command: `uv run fastapi dev ${normalizedModuleName}/main.py --port ${port}`,\n      cwd: '{projectRoot}',\n    },\n  };\n\n  projectConfig.targets['dev'] = {\n    ...projectConfig.targets['dev'],\n    ...projectConfig.targets.serve,\n    options: {\n      ...projectConfig.targets.serve.options,\n      env: {\n        LOCAL_DEV: 'true',\n      },\n    },\n  };\n\n  projectConfig.metadata = {\n    ...projectConfig.metadata,\n    apiName: schema.name,\n    apiType: 'fast-api',\n    auth: schema.auth,\n  } as any;\n\n  projectConfig.targets = sortObjectKeys(projectConfig.targets);\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);\n\n  // Add OpenAPI spec generation to the project, run as part of build\n  const { specPath } = addOpenApiGeneration(tree, { project: projectConfig });\n\n  [\n    joinPathFragments(dir, normalizedModuleName, 'hello.py'),\n    joinPathFragments(dir, 'tests', 'test_hello.py'),\n  ].forEach((f) => tree.delete(f));\n\n  // User-owned source files: preserve any existing copies so re-running does\n  // not clobber user edits (and does not reformat them nondeterministically).\n  generateFiles(\n    tree, // the virtual file system\n    joinPathFragments(import.meta.dirname, 'files', 'app'), // path to the file templates\n    dir, // destination path of the files\n    {\n      name: normalizedModuleName,\n      apiNameClassName,\n      infra: schema.infra,\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  if (schema.infra !== 'none') {\n    const iac = await resolveIac(tree, schema.iac);\n\n    await sharedConstructsGenerator(tree, {\n      iac,\n    });\n\n    if (schema.auth === 'custom') {\n      const authorizerType = schema.infra === 'http-lambda' ? 'http' : 'rest';\n      generateFiles(\n        tree,\n        joinPathFragments(\n          import.meta.dirname,\n          '..',\n          '..',\n          'utils',\n          'api-constructs',\n          'files',\n          'py-authorizer',\n          authorizerType,\n        ),\n        joinPathFragments(dir, normalizedModuleName),\n        {},\n        {\n          overwriteStrategy: OverwriteStrategy.KeepExisting,\n        },\n      );\n    }\n\n    // Add the CDK construct to deploy the FastAPI to shared constructs\n    await addApiGatewayInfra(tree, {\n      apiProjectName: projectConfig.name,\n      apiNameClassName,\n      apiNameKebabCase,\n      constructType: schema.infra === 'http-lambda' ? 'http' : 'rest',\n      backend: {\n        type: 'fastapi',\n        moduleName: normalizedModuleName,\n        bundleOutputDir,\n        integrationPattern,\n      },\n      auth: schema.auth,\n      iac,\n    });\n\n    addSharedConstructsOpenApiMetadataGenerateTarget(tree, {\n      iac,\n      apiNameKebabCase,\n      specPath,\n      specBuildTargetName: `${projectConfig.name}:openapi`,\n    });\n  }\n\n  addDependenciesToPyProjectToml(tree, dir, [\n    'fastapi',\n    'uvicorn',\n    'aws-lambda-powertools',\n    'aws-lambda-powertools[tracer]',\n    ...(schema.auth === 'custom'\n      ? (['aws-lambda-powertools[parser]'] as const)\n      : []),\n  ]);\n  addDependenciesToDependencyGroupInPyProjectToml(tree, dir, 'dev', [\n    'fastapi[standard]',\n  ]);\n\n  addGeneratorMetadata(tree, fullyQualifiedName, FAST_API_GENERATOR_INFO);\n\n  await addGeneratorMetricsIfApplicable(tree, [FAST_API_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};\n\nconst getIntegrationPattern = (\n  schema: PyFastApiProjectGeneratorSchema,\n): 'isolated' | 'shared' => schema.integrationPattern ?? 'isolated';\n\nexport default pyFastApiProjectGenerator;\n"],"names":["generateFiles","installPackagesTask","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateProjectConfiguration","addApiGatewayInfra","addSharedConstructsOpenApiMetadataGenerateTarget","addPythonBundleTarget","formatFilesInSubtree","FsCommands","resolveIac","addGeneratorMetricsIfApplicable","toClassName","toKebabCase","addGeneratorMetadata","getGeneratorInfo","Logger","UVProvider","sortObjectKeys","assignPort","addDependenciesToDependencyGroupInPyProjectToml","addDependenciesToPyProjectToml","sharedConstructsGenerator","pyProjectGenerator","getPyProjectDetails","addOpenApiGeneration","FAST_API_GENERATOR_INFO","filename","pyFastApiProjectGenerator","tree","schema","integrationPattern","getIntegrationPattern","dir","normalizedModuleName","fullyQualifiedName","name","directory","subDirectory","moduleName","apiNameKebabCase","apiNameClassName","projectExists","type","projectConfig","port","bundleOutputDir","bundleTargetName","fs","bundleTarget","targets","copyRunShCommand","cp","options","commands","includes","serve","executor","continuous","command","cwd","env","LOCAL_DEV","metadata","apiName","apiType","auth","specPath","project","forEach","f","delete","dirname","infra","overwriteStrategy","KeepExisting","iac","authorizerType","apiProjectName","constructType","backend","specBuildTargetName","root","install"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/fast-api/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 ProjectConfiguration,\n  readProjectConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addApiGatewayInfra } from '../../utils/api-constructs/api-constructs';\nimport { addSharedConstructsOpenApiMetadataGenerateTarget } from '../../utils/api-constructs/open-api-metadata';\nimport { addPythonBundleTarget } from '../../utils/bundle/bundle';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { toClassName, toKebabCase } from '../../utils/names';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { assignPort } from '../../utils/port';\nimport {\n  addDependenciesToDependencyGroupInPyProjectToml,\n  addDependenciesToPyProjectToml,\n} from '../../utils/py';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport pyProjectGenerator, { getPyProjectDetails } from '../project/generator';\nimport { addOpenApiGeneration } from './react/open-api';\nimport type { PyFastApiProjectGeneratorSchema } from './schema';\n\nexport const FAST_API_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Generates a Python FastAPI project\n */\nexport const pyFastApiProjectGenerator = async (\n  tree: Tree,\n  schema: PyFastApiProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const integrationPattern = getIntegrationPattern(schema);\n\n  const { dir, normalizedModuleName, fullyQualifiedName } = getPyProjectDetails(\n    tree,\n    {\n      name: schema.name,\n      directory: schema.directory,\n      subDirectory: schema.subDirectory,\n      moduleName: schema.moduleName,\n    },\n  );\n  const apiNameKebabCase = toKebabCase(schema.name);\n  const apiNameClassName = toClassName(schema.name);\n\n  let projectExists: boolean;\n  try {\n    readProjectConfiguration(tree, fullyQualifiedName);\n    projectExists = true;\n  } catch {\n    projectExists = false;\n  }\n\n  if (!projectExists) {\n    await pyProjectGenerator(tree, {\n      name: schema.name,\n      directory: schema.directory,\n      subDirectory: schema.subDirectory,\n      moduleName: normalizedModuleName,\n      type: 'application',\n      preferInstallDependencies: false,\n    });\n  }\n\n  const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);\n  const port = assignPort(tree, projectConfig, 8000);\n\n  const { bundleOutputDir, bundleTargetName } =\n    addPythonBundleTarget(projectConfig);\n\n  // Add a command to copy run.sh to the bundle output for Lambda Web Adapter\n  const fs = new FsCommands(tree);\n  const bundleTarget = projectConfig.targets[bundleTargetName];\n  const copyRunShCommand = fs.cp(\n    `{projectRoot}/run.sh`,\n    `dist/{projectRoot}/${bundleTargetName}/run.sh`,\n  );\n  if (!bundleTarget.options.commands.includes(copyRunShCommand)) {\n    bundleTarget.options.commands = [\n      ...bundleTarget.options.commands,\n      copyRunShCommand,\n    ];\n  }\n\n  projectConfig.targets.serve = {\n    executor: '@nxlv/python:run-commands',\n    continuous: true,\n    options: {\n      command: `uv run fastapi dev ${normalizedModuleName}/main.py --port ${port}`,\n      cwd: '{projectRoot}',\n    },\n  };\n\n  projectConfig.targets['dev'] = {\n    ...projectConfig.targets['dev'],\n    ...projectConfig.targets.serve,\n    options: {\n      ...projectConfig.targets.serve.options,\n      env: {\n        LOCAL_DEV: 'true',\n      },\n    },\n  };\n\n  projectConfig.metadata = {\n    ...projectConfig.metadata,\n    apiName: schema.name,\n    apiType: 'fast-api',\n    auth: schema.auth,\n  } as any;\n\n  projectConfig.targets = sortObjectKeys(projectConfig.targets);\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);\n\n  // Add OpenAPI spec generation to the project, run as part of build\n  const { specPath } = addOpenApiGeneration(tree, { project: projectConfig });\n\n  [\n    joinPathFragments(dir, normalizedModuleName, 'hello.py'),\n    joinPathFragments(dir, 'tests', 'test_hello.py'),\n  ].forEach((f) => tree.delete(f));\n\n  // User-owned source files: preserve any existing copies so re-running does\n  // not clobber user edits (and does not reformat them nondeterministically).\n  generateFiles(\n    tree, // the virtual file system\n    joinPathFragments(import.meta.dirname, 'files', 'app'), // path to the file templates\n    dir, // destination path of the files\n    {\n      name: normalizedModuleName,\n      apiNameClassName,\n      infra: schema.infra,\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  if (schema.infra !== 'none') {\n    const iac = await resolveIac(tree, schema.iac);\n\n    await sharedConstructsGenerator(tree, {\n      iac,\n    });\n\n    if (schema.auth === 'custom') {\n      const authorizerType = schema.infra === 'http-lambda' ? 'http' : 'rest';\n      generateFiles(\n        tree,\n        joinPathFragments(\n          import.meta.dirname,\n          '..',\n          '..',\n          'utils',\n          'api-constructs',\n          'files',\n          'py-authorizer',\n          authorizerType,\n        ),\n        joinPathFragments(dir, normalizedModuleName),\n        {},\n        {\n          overwriteStrategy: OverwriteStrategy.KeepExisting,\n        },\n      );\n    }\n\n    // Add the CDK construct to deploy the FastAPI to shared constructs\n    await addApiGatewayInfra(tree, {\n      apiProjectName: projectConfig.name,\n      apiNameClassName,\n      apiNameKebabCase,\n      constructType: schema.infra === 'http-lambda' ? 'http' : 'rest',\n      backend: {\n        type: 'fastapi',\n        moduleName: normalizedModuleName,\n        bundleOutputDir,\n        integrationPattern,\n      },\n      auth: schema.auth,\n      iac,\n    });\n\n    addSharedConstructsOpenApiMetadataGenerateTarget(tree, {\n      iac,\n      apiNameKebabCase,\n      specPath,\n      specBuildTargetName: `${projectConfig.name}:openapi`,\n    });\n  }\n\n  addDependenciesToPyProjectToml(tree, dir, [\n    'fastapi',\n    'uvicorn',\n    'aws-lambda-powertools',\n    'aws-lambda-powertools[tracer]',\n    ...(schema.auth === 'custom'\n      ? (['aws-lambda-powertools[parser]'] as const)\n      : []),\n  ]);\n  addDependenciesToDependencyGroupInPyProjectToml(tree, dir, 'dev', [\n    'fastapi[standard]',\n  ]);\n\n  addGeneratorMetadata(tree, fullyQualifiedName, FAST_API_GENERATOR_INFO);\n\n  await addGeneratorMetricsIfApplicable(tree, [FAST_API_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript', 'python'],\n    });\n};\n\nconst getIntegrationPattern = (\n  schema: PyFastApiProjectGeneratorSchema,\n): 'isolated' | 'shared' => schema.integrationPattern ?? 'isolated';\n\nexport default pyFastApiProjectGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateProjectConfiguration","addApiGatewayInfra","addSharedConstructsOpenApiMetadataGenerateTarget","addPythonBundleTarget","formatFilesInSubtree","FsCommands","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","toClassName","toKebabCase","addGeneratorMetadata","getGeneratorInfo","sortObjectKeys","assignPort","addDependenciesToDependencyGroupInPyProjectToml","addDependenciesToPyProjectToml","sharedConstructsGenerator","pyProjectGenerator","getPyProjectDetails","addOpenApiGeneration","FAST_API_GENERATOR_INFO","filename","pyFastApiProjectGenerator","tree","schema","integrationPattern","getIntegrationPattern","dir","normalizedModuleName","fullyQualifiedName","name","directory","subDirectory","moduleName","apiNameKebabCase","apiNameClassName","projectExists","type","preferInstallDependencies","projectConfig","port","bundleOutputDir","bundleTargetName","fs","bundleTarget","targets","copyRunShCommand","cp","options","commands","includes","serve","executor","continuous","command","cwd","env","LOCAL_DEV","metadata","apiName","apiType","auth","specPath","project","forEach","f","delete","dirname","infra","overwriteStrategy","KeepExisting","iac","authorizerType","apiProjectName","constructType","backend","specBuildTargetName","languages"],"mappings":"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"}

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

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

package/src/py/fast-api/react/generator.js

@@ -1,9 +1,9 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { installPackagesTask } from "@nx/devkit";
-import { addOpenApiReactClient } from "../../../utils/connection/open-api/react.js";
+ */ import { addOpenApiReactClient } from "../../../utils/connection/open-api/react.js";
 import { formatFilesInSubtree } from "../../../utils/format.js";
+import { installDependencies } from "../../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
 import { getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
 import { addOpenApiGeneration } from "./open-api.js";
@@ -33,9 +33,11 @@ export const fastApiReactGenerator = async (tree, options)=>{
         FAST_API_REACT_GENERATOR_INFO
     ]);
     await formatFilesInSubtree(tree);
-    return ()=>{
-        installPackagesTask(tree);
-    };
+    return ()=>installDependencies(tree, options.preferInstallDependencies, {
+            languages: [
+                'typescript'
+            ]
+        });
 };
 export default fastApiReactGenerator;
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { installPackagesTask, type Tree } from '@nx/devkit';\nimport { addOpenApiReactClient } from '../../../utils/connection/open-api/react';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport {\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { addOpenApiGeneration } from './open-api';\nimport type { FastApiReactGeneratorSchema } from './schema';\n\nexport const FAST_API_REACT_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const fastApiReactGenerator = async (\n  tree: Tree,\n  options: FastApiReactGeneratorSchema,\n) => {\n  const frontendProjectConfig = readProjectConfigurationUnqualified(\n    tree,\n    options.frontendProjectName,\n  );\n  const fastApiProjectConfig = readProjectConfigurationUnqualified(\n    tree,\n    options.fastApiProjectName,\n  );\n\n  // Add OpenAPI spec generation to the project, run as part of build\n  const { specPath } = addOpenApiGeneration(tree, {\n    project: fastApiProjectConfig,\n  });\n\n  const metadata = fastApiProjectConfig.metadata as any;\n  const apiName = metadata?.apiName;\n  const auth = (metadata?.auth ?? 'iam').toLowerCase();\n  const port = metadata?.port ?? metadata?.ports?.[0] ?? 8000;\n\n  await addOpenApiReactClient(tree, {\n    apiName,\n    frontendProjectConfig,\n    backendProjectConfig: fastApiProjectConfig,\n    specBuildProject: fastApiProjectConfig,\n    specPath,\n    specBuildTargetName: `${fastApiProjectConfig.name}:openapi`,\n    auth,\n    port,\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [FAST_API_REACT_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () => {\n    installPackagesTask(tree);\n  };\n};\n\nexport default fastApiReactGenerator;\n"],"names":["installPackagesTask","addOpenApiReactClient","formatFilesInSubtree","addGeneratorMetricsIfApplicable","getGeneratorInfo","readProjectConfigurationUnqualified","addOpenApiGeneration","FAST_API_REACT_GENERATOR_INFO","filename","fastApiReactGenerator","tree","options","frontendProjectConfig","frontendProjectName","fastApiProjectConfig","fastApiProjectName","specPath","project","metadata","apiName","auth","toLowerCase","port","ports","backendProjectConfig","specBuildProject","specBuildTargetName","name"],"mappings":"AAAA;;;CAGC,GACD,SAASA,mBAAmB,QAAmB,aAAa;AAC5D,SAASC,qBAAqB,QAAQ,8CAA2C;AACjF,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SACEC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAC3B,SAASC,oBAAoB,QAAQ,gBAAa;AAGlD,OAAO,MAAMC,gCAAiDH,iBAC5D,YAAYI,QAAQ,EACpB;AAEF,OAAO,MAAMC,wBAAwB,OACnCC,MACAC;IAEA,MAAMC,wBAAwBP,oCAC5BK,MACAC,QAAQE,mBAAmB;IAE7B,MAAMC,uBAAuBT,oCAC3BK,MACAC,QAAQI,kBAAkB;IAG5B,mEAAmE;IACnE,MAAM,EAAEC,QAAQ,EAAE,GAAGV,qBAAqBI,MAAM;QAC9CO,SAASH;IACX;IAEA,MAAMI,WAAWJ,qBAAqBI,QAAQ;IAC9C,MAAMC,UAAUD,UAAUC;IAC1B,MAAMC,OAAO,AAACF,CAAAA,UAAUE,QAAQ,KAAI,EAAGC,WAAW;IAClD,MAAMC,OAAOJ,UAAUI,QAAQJ,UAAUK,OAAO,CAAC,EAAE,IAAI;IAEvD,MAAMtB,sBAAsBS,MAAM;QAChCS;QACAP;QACAY,sBAAsBV;QACtBW,kBAAkBX;QAClBE;QACAU,qBAAqB,GAAGZ,qBAAqBa,IAAI,CAAC,QAAQ,CAAC;QAC3DP;QACAE;IACF;IAEA,MAAMnB,gCAAgCO,MAAM;QAACH;KAA8B;IAE3E,MAAML,qBAAqBQ;IAC3B,OAAO;QACLV,oBAAoBU;IACtB;AACF,EAAE;AAEF,eAAeD,sBAAsB"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { Tree } from '@nx/devkit';\nimport { addOpenApiReactClient } from '../../../utils/connection/open-api/react';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { installDependencies } from '../../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport {\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { addOpenApiGeneration } from './open-api';\nimport type { FastApiReactGeneratorSchema } from './schema';\n\nexport const FAST_API_REACT_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const fastApiReactGenerator = async (\n  tree: Tree,\n  options: FastApiReactGeneratorSchema,\n) => {\n  const frontendProjectConfig = readProjectConfigurationUnqualified(\n    tree,\n    options.frontendProjectName,\n  );\n  const fastApiProjectConfig = readProjectConfigurationUnqualified(\n    tree,\n    options.fastApiProjectName,\n  );\n\n  // Add OpenAPI spec generation to the project, run as part of build\n  const { specPath } = addOpenApiGeneration(tree, {\n    project: fastApiProjectConfig,\n  });\n\n  const metadata = fastApiProjectConfig.metadata as any;\n  const apiName = metadata?.apiName;\n  const auth = (metadata?.auth ?? 'iam').toLowerCase();\n  const port = metadata?.port ?? metadata?.ports?.[0] ?? 8000;\n\n  await addOpenApiReactClient(tree, {\n    apiName,\n    frontendProjectConfig,\n    backendProjectConfig: fastApiProjectConfig,\n    specBuildProject: fastApiProjectConfig,\n    specPath,\n    specBuildTargetName: `${fastApiProjectConfig.name}:openapi`,\n    auth,\n    port,\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [FAST_API_REACT_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default fastApiReactGenerator;\n"],"names":["addOpenApiReactClient","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","getGeneratorInfo","readProjectConfigurationUnqualified","addOpenApiGeneration","FAST_API_REACT_GENERATOR_INFO","filename","fastApiReactGenerator","tree","options","frontendProjectConfig","frontendProjectName","fastApiProjectConfig","fastApiProjectName","specPath","project","metadata","apiName","auth","toLowerCase","port","ports","backendProjectConfig","specBuildProject","specBuildTargetName","name","preferInstallDependencies","languages"],"mappings":"AAAA;;;CAGC,GAED,SAASA,qBAAqB,QAAQ,8CAA2C;AACjF,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,mBAAmB,QAAQ,4BAAyB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SACEC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAC3B,SAASC,oBAAoB,QAAQ,gBAAa;AAGlD,OAAO,MAAMC,gCAAiDH,iBAC5D,YAAYI,QAAQ,EACpB;AAEF,OAAO,MAAMC,wBAAwB,OACnCC,MACAC;IAEA,MAAMC,wBAAwBP,oCAC5BK,MACAC,QAAQE,mBAAmB;IAE7B,MAAMC,uBAAuBT,oCAC3BK,MACAC,QAAQI,kBAAkB;IAG5B,mEAAmE;IACnE,MAAM,EAAEC,QAAQ,EAAE,GAAGV,qBAAqBI,MAAM;QAC9CO,SAASH;IACX;IAEA,MAAMI,WAAWJ,qBAAqBI,QAAQ;IAC9C,MAAMC,UAAUD,UAAUC;IAC1B,MAAMC,OAAO,AAACF,CAAAA,UAAUE,QAAQ,KAAI,EAAGC,WAAW;IAClD,MAAMC,OAAOJ,UAAUI,QAAQJ,UAAUK,OAAO,CAAC,EAAE,IAAI;IAEvD,MAAMvB,sBAAsBU,MAAM;QAChCS;QACAP;QACAY,sBAAsBV;QACtBW,kBAAkBX;QAClBE;QACAU,qBAAqB,GAAGZ,qBAAqBa,IAAI,CAAC,QAAQ,CAAC;QAC3DP;QACAE;IACF;IAEA,MAAMnB,gCAAgCO,MAAM;QAACH;KAA8B;IAE3E,MAAMN,qBAAqBS;IAC3B,OAAO,IACLR,oBAAoBQ,MAAMC,QAAQiB,yBAAyB,EAAE;YAC3DC,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAEF,eAAepB,sBAAsB"}

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

@@ -1 +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}\n"],"names":[],"mappings":"AAAA;;;CAGC,GACD,WAGC"}
+{"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.map

@@ -1 +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}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAID,WASC"}
+{"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/generator.js

@@ -1,16 +1,16 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { generateFiles, installPackagesTask, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
+ */ 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 { 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";
@@ -104,10 +104,12 @@ const getLambdaFunctionDetails = (tree, schema)=>{
         LAMBDA_FUNCTION_GENERATOR_INFO
     ]);
     await formatFilesInSubtree(tree);
-    return async ()=>{
-        await new UVProvider(tree.root, new Logger(), tree).install();
-        installPackagesTask(tree);
-    };
+    return ()=>installDependencies(tree, schema.preferInstallDependencies, {
+            languages: [
+                'typescript',
+                'python'
+            ]
+        });
 };
 export default pyLambdaFunctionGenerator;
 

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

@@ -1 +1 @@
-{"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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"}
+{"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":"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"}

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

@@ -1 +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"}
+{"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

@@ -489,7 +489,7 @@ resource "null_resource" "runtime_ready" {
 
   provisioner "local-exec" {
     command = <<-EOT
-      uv run --with boto3==1.43.29 python -c "
+      uv run --with boto3==1.43.37 python -c "
 import boto3
 import json
 import os
@@ -716,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",
+  "aws-lambda-powertools==3.31.0",
+  "mcp==1.28.1",
   "uvicorn==0.49.0",
-  "boto3==1.43.29",
-  "aws-opentelemetry-distro==0.17.1"
+  "boto3==1.43.37",
+  "aws-opentelemetry-distro==0.18.0"
 ]
 
 [dependency-groups]

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

@@ -1,7 +1,7 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { addDependenciesToPackageJson, generateFiles, installPackagesTask, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
+ */ import { addDependenciesToPackageJson, generateFiles, 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";
@@ -10,11 +10,11 @@ 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 { installDependencies } from "../../utils/install.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";
@@ -206,10 +206,12 @@ export const pyMcpServerGenerator = async (tree, options)=>{
     ]);
     await ensureLicenseExceptions(tree, MCP_INSPECTOR_EXCEPTIONS);
     await formatFilesInSubtree(tree);
-    return async ()=>{
-        installPackagesTask(tree);
-        await new UVProvider(tree.root, new Logger(), tree).install();
-    };
+    return ()=>installDependencies(tree, options.preferInstallDependencies, {
+            languages: [
+                'typescript',
+                'python'
+            ]
+        });
 };
 export default pyMcpServerGenerator;
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/mcp-server/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  type GeneratorCallback,\n  generateFiles,\n  installPackagesTask,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { ensureLicenseExceptions } from '../../license/config';\nimport { MCP_INSPECTOR_EXCEPTIONS } from '../../license/known-exceptions';\nimport { addMcpServerInfra } from '../../utils/agent-core-constructs/agent-core-constructs';\nimport { addPythonBundleTarget } from '../../utils/bundle/bundle';\nimport { resolveContainers } from '../../utils/containers';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { resolveIac } from '../../utils/iac';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { kebabCase, toClassName, toSnakeCase } from '../../utils/names';\nimport { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addComponentDevTarget,\n  addComponentGeneratorMetadata,\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { Logger, UVProvider } from '../../utils/nxlv-python';\nimport { toProjectRelativePath } from '../../utils/paths';\nimport { assignPort } from '../../utils/port';\nimport { addDependenciesToPyProjectToml } from '../../utils/py';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport { withVersions } from '../../utils/versions';\nimport type { PyMcpServerGeneratorSchema } from './schema';\n\nexport const PY_MCP_SERVER_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const pyMcpServerGenerator = async (\n  tree: Tree,\n  options: PyMcpServerGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const project = readProjectConfigurationUnqualified(tree, options.project);\n\n  const pyProjectPath = joinPathFragments(project.root, 'pyproject.toml');\n\n  // Check if the project has a pyproject.toml file\n  if (!pyProjectPath) {\n    throw new Error(\n      `Unsupported project ${options.project}. Expected a Python project (with a pyproject.toml)`,\n    );\n  }\n\n  if (!project.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  // Module name is the last part of the source root,\n  const sourceParts = project.sourceRoot.split('/');\n  const moduleName = sourceParts[sourceParts.length - 1];\n\n  const name = kebabCase(\n    options.name || `${kebabCase(project.name.split('.').pop())}-mcp-server`,\n  );\n  const mcpTargetPrefix = options.name ? name : 'mcp-server';\n\n  const mcpServerNameSnakeCase = toSnakeCase(options.name || 'mcp-server');\n  const mcpServerNameClassName = toClassName(name);\n\n  const targetSourceDir = joinPathFragments(\n    project.sourceRoot,\n    mcpServerNameSnakeCase,\n  );\n\n  const infra = options.infra ?? 'agentcore';\n\n  if (infra === 'none' && options.auth && options.auth !== 'iam') {\n    console.warn(\n      'Warning: auth is ignored when no infrastructure is configured (no infrastructure is generated)',\n    );\n  }\n\n  const auth = options.auth ?? 'iam';\n\n  // Generate example server\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'app'),\n    targetSourceDir,\n    {\n      name,\n      mcpServerNameSnakeCase,\n      mcpServerNameClassName,\n      moduleName,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  addDependenciesToPyProjectToml(tree, project.root, [\n    'aws-lambda-powertools',\n    'mcp',\n    'uvicorn',\n    'boto3',\n    'aws-opentelemetry-distro',\n  ]);\n\n  if (infra === 'agentcore') {\n    const containers = await resolveContainers(tree, 'inherit');\n    const dockerImageTag = `${getNpmScope(tree)}-${name}:latest`;\n\n    // Add bundle target\n    const { bundleTargetName, bundleOutputDir } = addPythonBundleTarget(\n      project,\n      {\n        pythonPlatform: 'aarch64-manylinux_2_28',\n      },\n    );\n\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'deploy'),\n      targetSourceDir,\n      {\n        mcpServerNameSnakeCase,\n        moduleName,\n        bundleOutputDir,\n      },\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n\n    const dockerOutputDir = joinPathFragments(\n      'dist',\n      project.root,\n      'docker',\n      name,\n    );\n    const dockerTargetName = `${mcpTargetPrefix}-docker`;\n\n    // Add a docker target that prepares the docker context and builds the image\n    const fs = new FsCommands(tree);\n    project.targets[dockerTargetName] = {\n      cache: true,\n      executor: 'nx:run-commands',\n      options: {\n        commands: [\n          fs.rm(dockerOutputDir),\n          fs.mkdir(dockerOutputDir),\n          fs.cp(bundleOutputDir, dockerOutputDir),\n          fs.cp(\n            `${targetSourceDir}/Dockerfile`,\n            `${dockerOutputDir}/Dockerfile`,\n          ),\n          `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,\n        ],\n        parallel: false,\n      },\n      dependsOn: [bundleTargetName],\n    };\n\n    addDependencyToTargetIfNotPresent(project, 'docker', dockerTargetName);\n    addDependencyToTargetIfNotPresent(project, 'build', 'docker');\n\n    // Add shared constructs\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n\n    // Add the construct to deploy the mcp server\n    await addMcpServerInfra(tree, {\n      mcpServerNameKebabCase: name,\n      mcpServerNameClassName,\n      projectName: project.name,\n      dockerImageTag,\n      dockerOutputDir,\n      iac,\n      auth,\n      containers,\n    });\n  }\n\n  const localDevPort = assignPort(tree, project, 8000, {\n    component: { info: PY_MCP_SERVER_GENERATOR_INFO, name: mcpTargetPrefix },\n  });\n\n  const mcpTargets = {\n    ...project.targets,\n    // Add targets for running the MCP server\n    [`${mcpTargetPrefix}-serve-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`uv run -m ${moduleName}.${mcpServerNameSnakeCase}.stdio`],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-serve`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [\n          `uv run uvicorn --reload ${moduleName}.${mcpServerNameSnakeCase}.http:app --host 0.0.0.0 --port ${localDevPort}`,\n        ],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-dev`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [\n          `uv run uvicorn --reload ${moduleName}.${mcpServerNameSnakeCase}.http:app --host 0.0.0.0 --port ${localDevPort}`,\n        ],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n          LOCAL_DEV: 'true',\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-inspect`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      // Launch the inspector against the locally served HTTP server. The dev\n      // target starts the server and any connected dependencies (e.g. a local\n      // database).\n      dependsOn: [`${mcpTargetPrefix}-dev`],\n      options: {\n        commands: [\n          `mcp-inspector --transport http --server-url http://localhost:${localDevPort}/mcp`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-inspect-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [\n          `mcp-inspector -- uv run -m ${moduleName}.${mcpServerNameSnakeCase}.stdio`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n  };\n\n  // Aggregate `<mcp>-dev` under the project-level `dev` target.\n  addComponentDevTarget(mcpTargets, `${mcpTargetPrefix}-dev`);\n\n  updateProjectConfiguration(tree, project.name, {\n    ...project,\n    targets: mcpTargets,\n  });\n\n  addDependenciesToPackageJson(\n    tree,\n    {},\n    withVersions(['@modelcontextprotocol/inspector']),\n  );\n\n  addComponentGeneratorMetadata(\n    tree,\n    project.name,\n    PY_MCP_SERVER_GENERATOR_INFO,\n    toProjectRelativePath(project, targetSourceDir),\n    mcpTargetPrefix,\n    {\n      port: localDevPort,\n      rc: mcpServerNameClassName,\n      auth,\n    },\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [PY_MCP_SERVER_GENERATOR_INFO]);\n\n  await ensureLicenseExceptions(tree, MCP_INSPECTOR_EXCEPTIONS);\n\n  await formatFilesInSubtree(tree);\n  return async () => {\n    installPackagesTask(tree);\n    await new UVProvider(tree.root, new Logger(), tree).install();\n  };\n};\n\nexport default pyMcpServerGenerator;\n"],"names":["addDependenciesToPackageJson","generateFiles","installPackagesTask","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","ensureLicenseExceptions","MCP_INSPECTOR_EXCEPTIONS","addMcpServerInfra","addPythonBundleTarget","resolveContainers","formatFilesInSubtree","FsCommands","resolveIac","addGeneratorMetricsIfApplicable","kebabCase","toClassName","toSnakeCase","getNpmScope","addComponentDevTarget","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","Logger","UVProvider","toProjectRelativePath","assignPort","addDependenciesToPyProjectToml","sharedConstructsGenerator","withVersions","PY_MCP_SERVER_GENERATOR_INFO","filename","pyMcpServerGenerator","tree","options","project","pyProjectPath","root","Error","sourceRoot","sourceParts","split","moduleName","length","name","pop","mcpTargetPrefix","mcpServerNameSnakeCase","mcpServerNameClassName","targetSourceDir","infra","auth","console","warn","dirname","overwriteStrategy","KeepExisting","containers","dockerImageTag","bundleTargetName","bundleOutputDir","pythonPlatform","dockerOutputDir","dockerTargetName","fs","targets","cache","executor","commands","rm","mkdir","cp","parallel","dependsOn","iac","mcpServerNameKebabCase","projectName","localDevPort","component","info","mcpTargets","continuous","cwd","env","PORT","LOCAL_DEV","port","rc","install"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/mcp-server/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { ensureLicenseExceptions } from '../../license/config';\nimport { MCP_INSPECTOR_EXCEPTIONS } from '../../license/known-exceptions';\nimport { addMcpServerInfra } from '../../utils/agent-core-constructs/agent-core-constructs';\nimport { addPythonBundleTarget } from '../../utils/bundle/bundle';\nimport { resolveContainers } from '../../utils/containers';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { kebabCase, toClassName, toSnakeCase } from '../../utils/names';\nimport { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addComponentDevTarget,\n  addComponentGeneratorMetadata,\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { toProjectRelativePath } from '../../utils/paths';\nimport { assignPort } from '../../utils/port';\nimport { addDependenciesToPyProjectToml } from '../../utils/py';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport { withVersions } from '../../utils/versions';\nimport type { PyMcpServerGeneratorSchema } from './schema';\n\nexport const PY_MCP_SERVER_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const pyMcpServerGenerator = async (\n  tree: Tree,\n  options: PyMcpServerGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const project = readProjectConfigurationUnqualified(tree, options.project);\n\n  const pyProjectPath = joinPathFragments(project.root, 'pyproject.toml');\n\n  // Check if the project has a pyproject.toml file\n  if (!pyProjectPath) {\n    throw new Error(\n      `Unsupported project ${options.project}. Expected a Python project (with a pyproject.toml)`,\n    );\n  }\n\n  if (!project.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  // Module name is the last part of the source root,\n  const sourceParts = project.sourceRoot.split('/');\n  const moduleName = sourceParts[sourceParts.length - 1];\n\n  const name = kebabCase(\n    options.name || `${kebabCase(project.name.split('.').pop())}-mcp-server`,\n  );\n  const mcpTargetPrefix = options.name ? name : 'mcp-server';\n\n  const mcpServerNameSnakeCase = toSnakeCase(options.name || 'mcp-server');\n  const mcpServerNameClassName = toClassName(name);\n\n  const targetSourceDir = joinPathFragments(\n    project.sourceRoot,\n    mcpServerNameSnakeCase,\n  );\n\n  const infra = options.infra ?? 'agentcore';\n\n  if (infra === 'none' && options.auth && options.auth !== 'iam') {\n    console.warn(\n      'Warning: auth is ignored when no infrastructure is configured (no infrastructure is generated)',\n    );\n  }\n\n  const auth = options.auth ?? 'iam';\n\n  // Generate example server\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'app'),\n    targetSourceDir,\n    {\n      name,\n      mcpServerNameSnakeCase,\n      mcpServerNameClassName,\n      moduleName,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  addDependenciesToPyProjectToml(tree, project.root, [\n    'aws-lambda-powertools',\n    'mcp',\n    'uvicorn',\n    'boto3',\n    'aws-opentelemetry-distro',\n  ]);\n\n  if (infra === 'agentcore') {\n    const containers = await resolveContainers(tree, 'inherit');\n    const dockerImageTag = `${getNpmScope(tree)}-${name}:latest`;\n\n    // Add bundle target\n    const { bundleTargetName, bundleOutputDir } = addPythonBundleTarget(\n      project,\n      {\n        pythonPlatform: 'aarch64-manylinux_2_28',\n      },\n    );\n\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'deploy'),\n      targetSourceDir,\n      {\n        mcpServerNameSnakeCase,\n        moduleName,\n        bundleOutputDir,\n      },\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n\n    const dockerOutputDir = joinPathFragments(\n      'dist',\n      project.root,\n      'docker',\n      name,\n    );\n    const dockerTargetName = `${mcpTargetPrefix}-docker`;\n\n    // Add a docker target that prepares the docker context and builds the image\n    const fs = new FsCommands(tree);\n    project.targets[dockerTargetName] = {\n      cache: true,\n      executor: 'nx:run-commands',\n      options: {\n        commands: [\n          fs.rm(dockerOutputDir),\n          fs.mkdir(dockerOutputDir),\n          fs.cp(bundleOutputDir, dockerOutputDir),\n          fs.cp(\n            `${targetSourceDir}/Dockerfile`,\n            `${dockerOutputDir}/Dockerfile`,\n          ),\n          `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,\n        ],\n        parallel: false,\n      },\n      dependsOn: [bundleTargetName],\n    };\n\n    addDependencyToTargetIfNotPresent(project, 'docker', dockerTargetName);\n    addDependencyToTargetIfNotPresent(project, 'build', 'docker');\n\n    // Add shared constructs\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n\n    // Add the construct to deploy the mcp server\n    await addMcpServerInfra(tree, {\n      mcpServerNameKebabCase: name,\n      mcpServerNameClassName,\n      projectName: project.name,\n      dockerImageTag,\n      dockerOutputDir,\n      iac,\n      auth,\n      containers,\n    });\n  }\n\n  const localDevPort = assignPort(tree, project, 8000, {\n    component: { info: PY_MCP_SERVER_GENERATOR_INFO, name: mcpTargetPrefix },\n  });\n\n  const mcpTargets = {\n    ...project.targets,\n    // Add targets for running the MCP server\n    [`${mcpTargetPrefix}-serve-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`uv run -m ${moduleName}.${mcpServerNameSnakeCase}.stdio`],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-serve`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [\n          `uv run uvicorn --reload ${moduleName}.${mcpServerNameSnakeCase}.http:app --host 0.0.0.0 --port ${localDevPort}`,\n        ],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-dev`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [\n          `uv run uvicorn --reload ${moduleName}.${mcpServerNameSnakeCase}.http:app --host 0.0.0.0 --port ${localDevPort}`,\n        ],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n          LOCAL_DEV: 'true',\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-inspect`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      // Launch the inspector against the locally served HTTP server. The dev\n      // target starts the server and any connected dependencies (e.g. a local\n      // database).\n      dependsOn: [`${mcpTargetPrefix}-dev`],\n      options: {\n        commands: [\n          `mcp-inspector --transport http --server-url http://localhost:${localDevPort}/mcp`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-inspect-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [\n          `mcp-inspector -- uv run -m ${moduleName}.${mcpServerNameSnakeCase}.stdio`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n  };\n\n  // Aggregate `<mcp>-dev` under the project-level `dev` target.\n  addComponentDevTarget(mcpTargets, `${mcpTargetPrefix}-dev`);\n\n  updateProjectConfiguration(tree, project.name, {\n    ...project,\n    targets: mcpTargets,\n  });\n\n  addDependenciesToPackageJson(\n    tree,\n    {},\n    withVersions(['@modelcontextprotocol/inspector']),\n  );\n\n  addComponentGeneratorMetadata(\n    tree,\n    project.name,\n    PY_MCP_SERVER_GENERATOR_INFO,\n    toProjectRelativePath(project, targetSourceDir),\n    mcpTargetPrefix,\n    {\n      port: localDevPort,\n      rc: mcpServerNameClassName,\n      auth,\n    },\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [PY_MCP_SERVER_GENERATOR_INFO]);\n\n  await ensureLicenseExceptions(tree, MCP_INSPECTOR_EXCEPTIONS);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript', 'python'],\n    });\n};\n\nexport default pyMcpServerGenerator;\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","ensureLicenseExceptions","MCP_INSPECTOR_EXCEPTIONS","addMcpServerInfra","addPythonBundleTarget","resolveContainers","formatFilesInSubtree","FsCommands","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","kebabCase","toClassName","toSnakeCase","getNpmScope","addComponentDevTarget","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","toProjectRelativePath","assignPort","addDependenciesToPyProjectToml","sharedConstructsGenerator","withVersions","PY_MCP_SERVER_GENERATOR_INFO","filename","pyMcpServerGenerator","tree","options","project","pyProjectPath","root","Error","sourceRoot","sourceParts","split","moduleName","length","name","pop","mcpTargetPrefix","mcpServerNameSnakeCase","mcpServerNameClassName","targetSourceDir","infra","auth","console","warn","dirname","overwriteStrategy","KeepExisting","containers","dockerImageTag","bundleTargetName","bundleOutputDir","pythonPlatform","dockerOutputDir","dockerTargetName","fs","targets","cache","executor","commands","rm","mkdir","cp","parallel","dependsOn","iac","mcpServerNameKebabCase","projectName","localDevPort","component","info","mcpTargets","continuous","cwd","env","PORT","LOCAL_DEV","port","rc","preferInstallDependencies","languages"],"mappings":"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"}

package/src/py/mcp-server/schema.d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/mcp-server/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 type PyMcpServerInfra = 'none' | 'agentcore';\n\nexport type PyMcpServerAuth = 'iam' | 'cognito';\n\nexport interface PyMcpServerGeneratorSchema {\n  project: string;\n  name?: string;\n  infra?: PyMcpServerInfra;\n  auth?: PyMcpServerAuth;\n  iac: IacOption;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAQD,WAMC"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/mcp-server/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 type PyMcpServerInfra = 'none' | 'agentcore';\n\nexport type PyMcpServerAuth = 'iam' | 'cognito';\n\nexport interface PyMcpServerGeneratorSchema {\n  project: string;\n  name?: string;\n  infra?: PyMcpServerInfra;\n  auth?: PyMcpServerAuth;\n  iac: IacOption;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAQD,WAOC"}

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

@@ -15,4 +15,5 @@ export interface PyMcpServerGeneratorSchema {
   infra?: PyMcpServerInfra;
   auth?: PyMcpServerAuth;
   iac: IacOption;
+  preferInstallDependencies?: boolean;
 }

package/src/py/mcp-server/schema.json

@@ -43,6 +43,11 @@
       "enum": ["agentcore", "none"],
       "default": "agentcore",
       "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": ["project"]

package/src/py/project/generator.js

@@ -1,14 +1,15 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { addDependenciesToPackageJson, ensurePackage, installPackagesTask, joinPathFragments, readNxJson, readProjectConfiguration, updateNxJson, updateProjectConfiguration } from "@nx/devkit";
+ */ import { addDependenciesToPackageJson, ensurePackage, joinPathFragments, readNxJson, readProjectConfiguration, updateNxJson, updateProjectConfiguration } from "@nx/devkit";
 import { addLicenseCheckToLintTarget, ensurePythonLicenseCollector } from "../../license/config.js";
 import { updateGitIgnore } from "../../utils/git.js";
+import { installDependencies } from "../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
 import { normalizeDistributionName, toSnakeCase } from "../../utils/names.js";
 import { getNpmScope } from "../../utils/npm-scope.js";
 import { addDependencyToTargetIfNotPresent, addGeneratorMetadata, getGeneratorInfo, projectExists } from "../../utils/nx.js";
-import { Logger, migrateToSharedVenvGenerator, UVProvider, uvProjectGenerator } from "../../utils/nxlv-python.js";
+import { migrateToSharedVenvGenerator, uvProjectGenerator } from "../../utils/nxlv-python.js";
 import { sortObjectKeys } from "../../utils/object.js";
 import { addDependenciesToDependencyGroupInPyProjectToml } from "../../utils/py.js";
 import { updateToml } from "../../utils/toml.js";
@@ -242,10 +243,12 @@ const PYTHON_TRANSIENT_ARTIFACTS = [
     // the license generator wires up existing projects itself, so the dependency
     // is added regardless of which generator runs first.
     addLicenseCheckToLintTarget(tree, fullyQualifiedName);
-    return async ()=>{
-        installPackagesTask(tree);
-        await new UVProvider(tree.root, new Logger(), tree).install();
-    };
+    return ()=>installDependencies(tree, schema.preferInstallDependencies, {
+            languages: [
+                'typescript',
+                'python'
+            ]
+        });
 };
 export default pyProjectGenerator;