@aws/nx-plugin 1.0.0-rc.7 → 1.0.0-rc.71

package/src/py/fast-api/files/app/__name__/init.py.template

@@ -8,7 +8,6 @@ from urllib.parse import urlparse
 from aws_lambda_powertools import Logger, Metrics, Tracer
 from aws_lambda_powertools.metrics import MetricUnit
 from fastapi import FastAPI, Request, Response
-from fastapi.openapi.utils import get_openapi
 from fastapi.responses import JSONResponse, StreamingResponse
 from fastapi.routing import APIRoute
 from pydantic import BaseModel
@@ -73,7 +72,11 @@ class JsonStreamingResponse(StreamingResponse):
         }
 
 
-app = FastAPI(title="<%= apiNameClassName %>", responses={500: {"model": InternalServerErrorDetails}})
+app = FastAPI(
+    title="<%= apiNameClassName %>",
+    responses={500: {"model": InternalServerErrorDetails}},
+    generate_unique_id_function=lambda route: route.name,
+)
 
 
 # Add cors middleware
@@ -174,23 +177,3 @@ class LoggerRouteHandler(APIRoute):
 
 
 app.router.route_class = LoggerRouteHandler
-
-
-def custom_openapi() -> dict[str, Any]:
-    if app.openapi_schema:
-        return app.openapi_schema
-    for route in app.routes:
-        if isinstance(route, APIRoute):
-            route.operation_id = route.name
-    openapi_schema = get_openapi(
-        title=app.title,
-        version=app.version,
-        openapi_version=app.openapi_version,
-        description=app.description,
-        routes=app.routes,
-    )
-    app.openapi_schema = openapi_schema
-    return app.openapi_schema
-
-
-app.openapi = custom_openapi  # ty: ignore[invalid-assignment]

package/src/py/fast-api/files/app/__name__/main.py.template

@@ -1,4 +1,7 @@
+from typing import Annotated
+
 import uvicorn
+from fastapi import Query
 from pydantic import BaseModel
 
 from .init import app, tracer
@@ -10,7 +13,7 @@ class EchoOutput(BaseModel):
 
 @app.get("/echo")
 @tracer.capture_method
-def echo(message: str) -> EchoOutput:
+def echo(message: Annotated[str, Query(max_length=1024)]) -> EchoOutput:
     return EchoOutput(message=f"{message}")
 
 

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

@@ -4,7 +4,79 @@
  */
 import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import { type NxGeneratorInfo } from '../../utils/nx';
+import type { IacMetadata } from '../../utils/shared-constructs-constants';
 import type { PyFastApiProjectGeneratorSchema } from './schema';
+/** The metadata this generator records, which its predicates read. */
+export interface PyFastApiMetadata extends IacMetadata {
+    readonly apiName: string;
+    readonly apiType: string;
+    readonly auth: PyFastApiProjectGeneratorSchema['auth'];
+}
+export declare const DEPENDENCIES: import("../../utils/declared-dependencies").DependencyDeclaration<readonly [{
+    readonly name: "ncp";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "rimraf";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "make-dir-cli";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "cpy-cli";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "constructs";
+    readonly when: (m: IacMetadata) => boolean;
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "aws-cdk-lib";
+    readonly when: (m: IacMetadata) => boolean;
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "@types/node";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "@aws-sdk/client-api-gateway";
+    readonly when: (m: IacMetadata) => boolean;
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "@aws-sdk/client-iam";
+    readonly when: (m: IacMetadata) => boolean;
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "@trpc/server";
+    readonly when: (m: IacMetadata) => boolean;
+} & {
+    versionOnly: true;
+}], readonly [{
+    readonly name: "fastapi";
+}, {
+    readonly name: "uvicorn";
+}, {
+    readonly name: "aws-lambda-powertools";
+}, {
+    readonly name: "aws-lambda-powertools[tracer]";
+}, {
+    readonly name: "aws-lambda-powertools[parser]";
+    readonly when: (m: PyFastApiMetadata) => boolean;
+}, {
+    readonly name: "fastapi[standard]";
+    readonly group: "dev";
+}, {
+    readonly name: "boto3";
+    readonly when: (m: IacMetadata) => boolean;
+} & {
+    versionOnly: true;
+}]>;
 export declare const FAST_API_GENERATOR_INFO: NxGeneratorInfo;
 /**
  * Generates a Python FastAPI project

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

@@ -1,123 +1,166 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pyFastApiProjectGenerator = exports.FAST_API_GENERATOR_INFO = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const api_constructs_1 = require("../../utils/api-constructs/api-constructs");
-const open_api_metadata_1 = require("../../utils/api-constructs/open-api-metadata");
-const bundle_1 = require("../../utils/bundle/bundle");
-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 nx_1 = require("../../utils/nx");
-const nxlv_python_1 = require("../../utils/nxlv-python");
-const object_1 = require("../../utils/object");
-const port_1 = require("../../utils/port");
-const py_1 = require("../../utils/py");
-const shared_constructs_1 = require("../../utils/shared-constructs");
-const generator_1 = tslib_1.__importStar(require("../project/generator"));
-const open_api_1 = require("./react/open-api");
-exports.FAST_API_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy, readProjectConfiguration, updateProjectConfiguration } from "@nx/devkit";
+import { addPyDependencies } from "../../utils/add-dependencies.js";
+import { API_CONSTRUCTS_DEPENDENCIES, API_CONSTRUCTS_PY_DEPENDENCIES, 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 { declareDependencies, ownedElsewhere } from "../../utils/declared-dependencies.js";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { FS_DEPENDENCIES, 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 { sortObjectKeys } from "../../utils/object.js";
+import { assignPort } from "../../utils/port.js";
+import { SHARED_CONSTRUCTS_DEPENDENCIES, sharedConstructsGenerator } from "../../utils/shared-constructs.js";
+import pyProjectGenerator, { getPyProjectDetails } from "../project/generator.js";
+import { addOpenApiGeneration } from "./react/open-api.js";
+export const DEPENDENCIES = declareDependencies()({
+    ts: [
+        ...ownedElsewhere(FS_DEPENDENCIES),
+        ...ownedElsewhere(SHARED_CONSTRUCTS_DEPENDENCIES),
+        ...ownedElsewhere(API_CONSTRUCTS_DEPENDENCIES)
+    ],
+    py: [
+        {
+            name: 'fastapi'
+        },
+        {
+            name: 'uvicorn'
+        },
+        {
+            name: 'aws-lambda-powertools'
+        },
+        {
+            name: 'aws-lambda-powertools[tracer]'
+        },
+        // The custom authorizer handler parses its event with the parser extra.
+        {
+            name: 'aws-lambda-powertools[parser]',
+            when: (m)=>m.auth === 'custom'
+        },
+        // `fastapi dev` runs the local server.
+        {
+            name: 'fastapi[standard]',
+            group: 'dev'
+        },
+        ...ownedElsewhere(API_CONSTRUCTS_PY_DEPENDENCIES)
+    ]
+});
+export const FAST_API_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
 /**
  * Generates a Python FastAPI project
- */
-const pyFastApiProjectGenerator = async (tree, schema) => {
+ */ export const pyFastApiProjectGenerator = async (tree, schema)=>{
     const integrationPattern = getIntegrationPattern(schema);
-    const { dir, normalizedModuleName, fullyQualifiedName } = (0, generator_1.getPyProjectDetails)(tree, {
+    const { dir, normalizedModuleName, fullyQualifiedName } = getPyProjectDetails(tree, {
         name: schema.name,
         directory: schema.directory,
         subDirectory: schema.subDirectory,
-        moduleName: schema.moduleName,
+        moduleName: schema.moduleName
     });
-    const apiNameKebabCase = (0, names_1.toKebabCase)(schema.name);
-    const apiNameClassName = (0, names_1.toClassName)(schema.name);
+    const apiNameKebabCase = toKebabCase(schema.name);
+    const apiNameClassName = toClassName(schema.name);
     let projectExists;
     try {
-        (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
+        readProjectConfiguration(tree, fullyQualifiedName);
         projectExists = true;
-    }
-    catch {
+    } catch  {
         projectExists = false;
     }
     if (!projectExists) {
-        await (0, generator_1.default)(tree, {
+        await pyProjectGenerator(tree, {
             name: schema.name,
             directory: schema.directory,
             subDirectory: schema.subDirectory,
             moduleName: normalizedModuleName,
             type: 'application',
+            preferInstallDependencies: false
         });
     }
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
-    const port = (0, port_1.assignPort)(tree, projectConfig, 8000);
-    const { bundleOutputDir, bundleTargetName } = (0, bundle_1.addPythonBundleTarget)(projectConfig);
+    const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);
+    const port = assignPort(tree, projectConfig, 8000);
+    const { bundleOutputDir, bundleTargetName } = addPythonBundleTarget(projectConfig);
     // Add a command to copy run.sh to the bundle output for Lambda Web Adapter
-    const fs = new fs_1.FsCommands(tree);
+    const fs = new FsCommands(tree, DEPENDENCIES);
     const bundleTarget = projectConfig.targets[bundleTargetName];
-    bundleTarget.options.commands = [
-        ...bundleTarget.options.commands,
-        fs.cp(`{projectRoot}/run.sh`, `dist/{projectRoot}/${bundleTargetName}/run.sh`),
-    ];
+    const copyRunShCommand = fs.cp(`{projectRoot}/run.sh`, `dist/{projectRoot}/${bundleTargetName}/run.sh`);
+    if (!bundleTarget.options.commands.includes(copyRunShCommand)) {
+        bundleTarget.options.commands = [
+            ...bundleTarget.options.commands,
+            copyRunShCommand
+        ];
+    }
     projectConfig.targets.serve = {
         executor: '@nxlv/python:run-commands',
+        continuous: true,
         options: {
             command: `uv run fastapi dev ${normalizedModuleName}/main.py --port ${port}`,
-            cwd: '{projectRoot}',
-        },
-        continuous: true,
+            cwd: '{projectRoot}'
+        }
     };
-    projectConfig.targets['serve-local'] = {
+    projectConfig.targets['dev'] = {
+        ...projectConfig.targets['dev'],
         ...projectConfig.targets.serve,
         options: {
             ...projectConfig.targets.serve.options,
             env: {
-                SERVE_LOCAL: 'true',
-            },
-        },
+                LOCAL_DEV: 'true'
+            }
+        }
     };
-    projectConfig.metadata = {
-        ...projectConfig.metadata,
+    // Recorded in the metadata below so the version sync can tell a CDK
+    // project from a Terraform one; undefined when no infrastructure was
+    // generated, in which case neither provider's packages were added.
+    const iac = schema.infra !== 'none' ? await resolveIac(tree, schema.iac) : undefined;
+    // Recorded below and read by the declaration's predicates, so the packages
+    // added here are exactly the ones the version sync will own.
+    const metadata = {
         apiName: schema.name,
         apiType: 'fast-api',
         auth: schema.auth,
+        ...iac ? {
+            iac
+        } : {}
     };
-    projectConfig.targets = (0, object_1.sortObjectKeys)(projectConfig.targets);
-    (0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfig);
+    projectConfig.metadata = {
+        ...projectConfig.metadata,
+        ...metadata
+    };
+    projectConfig.targets = sortObjectKeys(projectConfig.targets);
+    updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);
     // Add OpenAPI spec generation to the project, run as part of build
-    const { specPath } = (0, open_api_1.addOpenApiGeneration)(tree, { project: projectConfig });
+    const { specPath } = addOpenApiGeneration(tree, {
+        project: projectConfig
+    });
     [
-        (0, devkit_1.joinPathFragments)(dir, normalizedModuleName, 'hello.py'),
-        (0, devkit_1.joinPathFragments)(dir, 'tests', 'test_hello.py'),
-    ].forEach((f) => tree.delete(f));
-    (0, devkit_1.generateFiles)(tree, // the virtual file system
-    (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), // path to the file templates
-    dir, // destination path of the files
-    {
+        joinPathFragments(dir, normalizedModuleName, 'hello.py'),
+        joinPathFragments(dir, 'tests', 'test_hello.py')
+    ].forEach((f)=>tree.delete(f));
+    // User-owned source files: preserve any existing copies so re-running does
+    // not clobber user edits (and does not reformat them nondeterministically).
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'app'), dir, {
         name: normalizedModuleName,
         apiNameClassName,
-        infra: schema.infra,
+        infra: schema.infra
     }, {
-        overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
+        overwriteStrategy: OverwriteStrategy.KeepExisting
     });
     if (schema.infra !== 'none') {
-        const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
-        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
-            iac,
-        });
+        await sharedConstructsGenerator(tree, {
+            iac
+        }, DEPENDENCIES);
         if (schema.auth === 'custom') {
             const authorizerType = schema.infra === 'http-lambda' ? 'http' : 'rest';
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', '..', 'utils', 'api-constructs', 'files', 'py-authorizer', authorizerType), (0, devkit_1.joinPathFragments)(dir, normalizedModuleName), {}, {
-                overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            generateFiles(tree, joinPathFragments(import.meta.dirname, '..', '..', 'utils', 'api-constructs', 'files', 'py-authorizer', authorizerType), joinPathFragments(dir, normalizedModuleName), {}, {
+                overwriteStrategy: OverwriteStrategy.KeepExisting
             });
         }
         // Add the CDK construct to deploy the FastAPI to shared constructs
-        await (0, api_constructs_1.addApiGatewayInfra)(tree, {
+        await addApiGatewayInfra(tree, {
             apiProjectName: projectConfig.name,
             apiNameClassName,
             apiNameKebabCase,
@@ -126,39 +169,35 @@ const pyFastApiProjectGenerator = async (tree, schema) => {
                 type: 'fastapi',
                 moduleName: normalizedModuleName,
                 bundleOutputDir,
-                integrationPattern,
+                integrationPattern
             },
             auth: schema.auth,
-            iac,
-        });
-        (0, open_api_metadata_1.addSharedConstructsOpenApiMetadataGenerateTarget)(tree, {
+            iac
+        }, DEPENDENCIES);
+        addSharedConstructsOpenApiMetadataGenerateTarget(tree, {
             iac,
             apiNameKebabCase,
             specPath,
-            specBuildTargetName: `${projectConfig.name}:openapi`,
+            specBuildTargetName: `${projectConfig.name}:openapi`
         });
     }
-    (0, py_1.addDependenciesToPyProjectToml)(tree, dir, [
-        'fastapi',
-        'uvicorn',
-        'aws-lambda-powertools',
-        'aws-lambda-powertools[tracer]',
-        ...(schema.auth === 'custom'
-            ? ['aws-lambda-powertools[parser]']
-            : []),
-    ]);
-    (0, py_1.addDependenciesToDependencyGroupInPyProjectToml)(tree, dir, 'dev', [
-        'fastapi[standard]',
+    addPyDependencies(tree, DEPENDENCIES, {
+        metadata,
+        projectRoot: dir
+    });
+    addGeneratorMetadata(tree, fullyQualifiedName, FAST_API_GENERATOR_INFO);
+    await addGeneratorMetricsIfApplicable(tree, [
+        FAST_API_GENERATOR_INFO
     ]);
-    (0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.FAST_API_GENERATOR_INFO);
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.FAST_API_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 ()=>installDependencies(tree, schema.preferInstallDependencies, {
+            languages: [
+                'typescript',
+                'python'
+            ]
+        });
 };
-exports.pyFastApiProjectGenerator = pyFastApiProjectGenerator;
-const getIntegrationPattern = (schema) => schema.integrationPattern ?? 'isolated';
-exports.default = exports.pyFastApiProjectGenerator;
+const getIntegrationPattern = (schema)=>schema.integrationPattern ?? 'isolated';
+export default pyFastApiProjectGenerator;
+
 //# sourceMappingURL=generator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/fast-api/generator.ts"],"names":[],"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 { addPyDependencies } from '../../utils/add-dependencies';\nimport {\n  API_CONSTRUCTS_DEPENDENCIES,\n  API_CONSTRUCTS_PY_DEPENDENCIES,\n  addApiGatewayInfra,\n} from '../../utils/api-constructs/api-constructs';\nimport { addSharedConstructsOpenApiMetadataGenerateTarget } from '../../utils/api-constructs/open-api-metadata';\nimport { addPythonBundleTarget } from '../../utils/bundle/bundle';\nimport {\n  declareDependencies,\n  ownedElsewhere,\n} from '../../utils/declared-dependencies';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FS_DEPENDENCIES, 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  SHARED_CONSTRUCTS_DEPENDENCIES,\n  sharedConstructsGenerator,\n} from '../../utils/shared-constructs';\nimport type { IacMetadata } from '../../utils/shared-constructs-constants';\nimport pyProjectGenerator, { getPyProjectDetails } from '../project/generator';\nimport { addOpenApiGeneration } from './react/open-api';\nimport type { PyFastApiProjectGeneratorSchema } from './schema';\n\n/** The metadata this generator records, which its predicates read. */\nexport interface PyFastApiMetadata extends IacMetadata {\n  readonly apiName: string;\n  readonly apiType: string;\n  readonly auth: PyFastApiProjectGeneratorSchema['auth'];\n}\n\nexport const DEPENDENCIES = declareDependencies<PyFastApiMetadata>()({\n  ts: [\n    ...ownedElsewhere(FS_DEPENDENCIES),\n    ...ownedElsewhere(SHARED_CONSTRUCTS_DEPENDENCIES),\n    ...ownedElsewhere(API_CONSTRUCTS_DEPENDENCIES),\n  ],\n  py: [\n    { name: 'fastapi' },\n    { name: 'uvicorn' },\n    { name: 'aws-lambda-powertools' },\n    { name: 'aws-lambda-powertools[tracer]' },\n    // The custom authorizer handler parses its event with the parser extra.\n    {\n      name: 'aws-lambda-powertools[parser]',\n      when: (m) => m.auth === 'custom',\n    },\n    // `fastapi dev` runs the local server.\n    { name: 'fastapi[standard]', group: 'dev' },\n    ...ownedElsewhere(API_CONSTRUCTS_PY_DEPENDENCIES),\n  ],\n});\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, DEPENDENCIES);\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  // Recorded in the metadata below so the version sync can tell a CDK\n  // project from a Terraform one; undefined when no infrastructure was\n  // generated, in which case neither provider's packages were added.\n  const iac =\n    schema.infra !== 'none' ? await resolveIac(tree, schema.iac) : undefined;\n\n  // Recorded below and read by the declaration's predicates, so the packages\n  // added here are exactly the ones the version sync will own.\n  const metadata: PyFastApiMetadata = {\n    apiName: schema.name,\n    apiType: 'fast-api',\n    auth: schema.auth,\n    ...(iac ? { iac } : {}),\n  };\n\n  projectConfig.metadata = {\n    ...projectConfig.metadata,\n    ...metadata,\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    await sharedConstructsGenerator(\n      tree,\n      {\n        iac,\n      },\n      DEPENDENCIES,\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(\n      tree,\n      {\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      DEPENDENCIES,\n    );\n\n    addSharedConstructsOpenApiMetadataGenerateTarget(tree, {\n      iac,\n      apiNameKebabCase,\n      specPath,\n      specBuildTargetName: `${projectConfig.name}:openapi`,\n    });\n  }\n\n  addPyDependencies(tree, DEPENDENCIES, { metadata, projectRoot: dir });\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","addPyDependencies","API_CONSTRUCTS_DEPENDENCIES","API_CONSTRUCTS_PY_DEPENDENCIES","addApiGatewayInfra","addSharedConstructsOpenApiMetadataGenerateTarget","addPythonBundleTarget","declareDependencies","ownedElsewhere","formatFilesInSubtree","FS_DEPENDENCIES","FsCommands","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","toClassName","toKebabCase","addGeneratorMetadata","getGeneratorInfo","sortObjectKeys","assignPort","SHARED_CONSTRUCTS_DEPENDENCIES","sharedConstructsGenerator","pyProjectGenerator","getPyProjectDetails","addOpenApiGeneration","DEPENDENCIES","ts","py","name","when","m","auth","group","FAST_API_GENERATOR_INFO","filename","pyFastApiProjectGenerator","tree","schema","integrationPattern","getIntegrationPattern","dir","normalizedModuleName","fullyQualifiedName","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","iac","infra","undefined","metadata","apiName","apiType","specPath","project","forEach","f","delete","dirname","overwriteStrategy","KeepExisting","authorizerType","apiProjectName","constructType","backend","specBuildTargetName","projectRoot","languages"],"mappings":"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"}

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

@@ -1,11 +1,12 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`fastapi react generator > should generate OpenAPI spec script > generate_open_api.py 1`] = `
-"from src.main import app
-import json
+"import json
 import os
 import sys
 
+from src.main import app
+
 os.makedirs(os.path.dirname(sys.argv[1]), exist_ok=True)
 with open(sys.argv[1], "w") as f:
     json.dump(app.openapi(), f)
@@ -114,7 +115,7 @@ const useCreateTestApiClient = (): TestApi => {
   const user = auth?.user;
   const cognitoClient: typeof fetch = (url, init) => {
     const headers = new Headers(init?.headers);
-    headers.set('Authorization', \`Bearer \${user?.id_token}\`);
+    headers.set('Authorization', \`Bearer \${user?.access_token}\`);
     return fetch(url, { ...init, headers });
   };
   return useMemo(

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

@@ -5,6 +5,21 @@
 import { type Tree } from '@nx/devkit';
 import { type NxGeneratorInfo } from '../../../utils/nx';
 import type { FastApiReactGeneratorSchema } from './schema';
+export declare const DEPENDENCIES: import("../../../utils/declared-dependencies").DependencyDeclaration<readonly [{
+    readonly name: "oidc-client-ts";
+}, {
+    readonly name: "react-oidc-context";
+}, {
+    readonly name: "@aws-sdk/credential-provider-cognito-identity";
+}, {
+    readonly name: "aws4fetch";
+}, {
+    readonly name: "@tanstack/react-query";
+}, {
+    readonly name: "@tanstack/react-query-devtools";
+}, {
+    readonly name: "@smithy/types";
+}], readonly import("../../../utils/declared-dependencies").DeclaredPyDependency<"a2a-sdk" | "ag-ui-langgraph" | "ag-ui-protocol" | "ag-ui-strands" | "aws-lambda-powertools" | "aws-lambda-powertools[tracer]" | "aws-lambda-powertools[parser]" | "aws-opentelemetry-distro" | "bedrock-agentcore" | "boto3" | "checkov" | "fastapi" | "fastapi[standard]" | "httpx" | "langchain" | "langchain-aws" | "langchain-mcp-adapters" | "langgraph" | "mcp" | "pip-check-updates" | "pip-licenses" | "ruff" | "strands-agents" | "strands-agents[a2a]" | "strands-agents-tools" | "ty" | "pynamodb" | "uvicorn" | "sqlmodel" | "alembic" | "aiomysql" | "asyncpg" | "greenlet", Record<string, never>>[]>;
 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,29 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fastApiReactGenerator = exports.FAST_API_REACT_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 react_1 = require("../../../utils/connection/open-api/react");
-const format_1 = require("../../../utils/format");
-const metrics_1 = require("../../../utils/metrics");
-const nx_1 = require("../../../utils/nx");
-const open_api_1 = require("./open-api");
-exports.FAST_API_REACT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const fastApiReactGenerator = async (tree, options) => {
-    const frontendProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.frontendProjectName);
-    const fastApiProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.fastApiProjectName);
+ */ import { joinPathFragments } from "@nx/devkit";
+import { addOpenApiReactClient, OPEN_API_REACT_DEPENDENCIES } from "../../../utils/connection/open-api/react.js";
+import { declareDependencies } from "../../../utils/declared-dependencies.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { installDependencies } from "../../../utils/install.js";
+import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
+import { toClassName } from "../../../utils/names.js";
+import { addComponentGeneratorMetadata, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
+import { toProjectRelativePath } from "../../../utils/paths.js";
+import { addOpenApiGeneration } from "./open-api.js";
+export const DEPENDENCIES = declareDependencies()({
+    ts: [
+        ...OPEN_API_REACT_DEPENDENCIES
+    ]
+});
+export const FAST_API_REACT_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const fastApiReactGenerator = async (tree, options)=>{
+    const frontendProjectConfig = readProjectConfigurationUnqualified(tree, options.frontendProjectName);
+    const fastApiProjectConfig = readProjectConfigurationUnqualified(tree, options.fastApiProjectName);
     // Add OpenAPI spec generation to the project, run as part of build
-    const { specPath } = (0, open_api_1.addOpenApiGeneration)(tree, {
-        project: fastApiProjectConfig,
+    const { specPath } = addOpenApiGeneration(tree, {
+        project: fastApiProjectConfig
     });
     const metadata = fastApiProjectConfig.metadata;
     const apiName = metadata?.apiName;
     const auth = (metadata?.auth ?? 'iam').toLowerCase();
     const port = metadata?.port ?? metadata?.ports?.[0] ?? 8000;
-    await (0, react_1.addOpenApiReactClient)(tree, {
+    await addOpenApiReactClient(tree, {
         apiName,
         frontendProjectConfig,
         backendProjectConfig: fastApiProjectConfig,
@@ -31,14 +36,21 @@ const fastApiReactGenerator = async (tree, options) => {
         specPath,
         specBuildTargetName: `${fastApiProjectConfig.name}:openapi`,
         auth,
-        port,
-    });
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.FAST_API_REACT_GENERATOR_INFO]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
-    };
+        port
+    }, DEPENDENCIES);
+    const apiNameClassName = toClassName(apiName);
+    // Recorded so the version sync knows this connection's dependencies are ours.
+    addComponentGeneratorMetadata(tree, frontendProjectConfig.name, FAST_API_REACT_GENERATOR_INFO, toProjectRelativePath(frontendProjectConfig, joinPathFragments(frontendProjectConfig.sourceRoot, 'components', `${apiNameClassName}Provider`)), apiNameClassName);
+    await addGeneratorMetricsIfApplicable(tree, [
+        FAST_API_REACT_GENERATOR_INFO
+    ]);
+    await formatFilesInSubtree(tree);
+    return ()=>installDependencies(tree, options.preferInstallDependencies, {
+            languages: [
+                'typescript'
+            ]
+        });
 };
-exports.fastApiReactGenerator = fastApiReactGenerator;
-exports.default = exports.fastApiReactGenerator;
+export default fastApiReactGenerator;
+
 //# sourceMappingURL=generator.js.map