@aws/nx-plugin 1.0.0-rc.7 → 1.0.0-rc.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE-THIRD-PARTY +386 -2723
- package/README.md +8 -8
- package/package.json +5 -5
- package/src/connection/agent-serve-local.js +1 -1
- package/src/connection/agent-serve-local.js.map +1 -1
- package/src/infra/app/__snapshots__/generator.spec.ts.snap +15 -15
- package/src/infra/app/generator.js +6 -4
- package/src/infra/app/generator.js.map +1 -1
- package/src/mcp-server/tools/create-workspace-command.js +2 -2
- package/src/mcp-server/tools/create-workspace-command.js.map +1 -1
- package/src/py/agent/__snapshots__/generator.spec.ts.snap +6 -4
- package/src/py/agent/files/common/agent.py.template +2 -0
- package/src/py/agent/generator.js +3 -1
- package/src/py/agent/generator.js.map +1 -1
- package/src/py/agent/mcp-connection/__snapshots__/generator.spec.ts.snap +4 -0
- package/src/py/fast-api/generator.js +11 -5
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/react/open-api.js +4 -1
- package/src/py/fast-api/react/open-api.js.map +1 -1
- package/src/py/lambda-function/generator.js +2 -2
- package/src/py/lambda-function/generator.js.map +1 -1
- package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap +2 -2
- package/src/py/mcp-server/generator.js +19 -15
- package/src/py/mcp-server/generator.js.map +1 -1
- package/src/py/project/generator.js +74 -62
- package/src/py/project/generator.js.map +1 -1
- package/src/smithy/project/__snapshots__/generator.spec.ts.snap +16 -16
- package/src/smithy/project/generator.js +25 -23
- package/src/smithy/project/generator.js.map +1 -1
- package/src/smithy/ts/api/generator.js +8 -0
- package/src/smithy/ts/api/generator.js.map +1 -1
- package/src/terraform/project/generator.js +7 -2
- package/src/terraform/project/generator.js.map +1 -1
- package/src/trpc/backend/generator.js +1 -0
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/ts/agent/__snapshots__/generator.spec.ts.snap +6 -2
- package/src/ts/agent/files/common/agent.ts.template +6 -2
- package/src/ts/agent/generator.js +8 -3
- package/src/ts/agent/generator.js.map +1 -1
- package/src/ts/agent/mcp-connection/__snapshots__/generator.spec.ts.snap +1 -0
- package/src/ts/astro-docs/__snapshots__/generator.spec.ts.snap +6 -6
- package/src/ts/astro-docs/generator.js +10 -7
- package/src/ts/astro-docs/generator.js.map +1 -1
- package/src/ts/lib/__snapshots__/generator.spec.ts.snap +9 -9
- package/src/ts/lib/biome.js +5 -2
- package/src/ts/lib/biome.js.map +1 -1
- package/src/ts/lib/generator.js +21 -17
- package/src/ts/lib/generator.js.map +1 -1
- package/src/ts/lib/ts-project-utils.d.ts +10 -0
- package/src/ts/lib/ts-project-utils.js +22 -8
- package/src/ts/lib/ts-project-utils.js.map +1 -1
- package/src/ts/mcp-server/__snapshots__/generator.spec.ts.snap +1 -1
- package/src/ts/mcp-server/generator.js +22 -3
- package/src/ts/mcp-server/generator.js.map +1 -1
- package/src/ts/nx-generator/generator.js +17 -13
- package/src/ts/nx-generator/generator.js.map +1 -1
- package/src/ts/nx-plugin/generator.js +7 -6
- package/src/ts/nx-plugin/generator.js.map +1 -1
- package/src/ts/nx-plugin/utils.js +9 -3
- package/src/ts/nx-plugin/utils.js.map +1 -1
- package/src/ts/rdb/__snapshots__/generator.spec.ts.snap +36 -18
- package/src/ts/rdb/generator.js +19 -14
- package/src/ts/rdb/generator.js.map +1 -1
- package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap +67 -67
- package/src/ts/react-website/app/generator.js +8 -4
- package/src/ts/react-website/app/generator.js.map +1 -1
- package/src/ts/react-website/cognito-auth/__snapshots__/generator.spec.ts.snap +0 -2
- package/src/ts/react-website/cognito-auth/__snapshots__/generator.ux-provider.spec.ts.snap +0 -20
- package/src/ts/react-website/cognito-auth/generator.js +0 -3
- package/src/ts/react-website/cognito-auth/generator.js.map +1 -1
- package/src/ts/react-website/cognito-auth/grit/cloudscape-auth-menu.grit +3 -1
- package/src/ts/react-website/cognito-auth/grit/none-auth-menu.grit +1 -0
- package/src/ts/react-website/cognito-auth/grit/shadcn-auth-menu.grit +3 -1
- package/src/ts/react-website/cognito-auth/grit/shadcn-state-declarations.grit +3 -1
- package/src/utils/agent-connection/agent-connection.js +8 -2
- package/src/utils/agent-connection/agent-connection.js.map +1 -1
- package/src/utils/agent-connection/files/core-runtime-config/model-errors.ts.template +36 -0
- package/src/utils/agent-connection/files/py-core-runtime-config/model_errors.py.template +40 -0
- package/src/utils/agent-core-constructs/agent-core-constructs.js +2 -10
- package/src/utils/agent-core-constructs/agent-core-constructs.js.map +1 -1
- package/src/utils/ast/website.js +1 -1
- package/src/utils/ast.d.ts +4 -0
- package/src/utils/ast.js +24 -1
- package/src/utils/ast.js.map +1 -1
- package/src/utils/dynamodb-constructs/dynamodb-constructs.js +2 -10
- package/src/utils/dynamodb-constructs/dynamodb-constructs.js.map +1 -1
- package/src/utils/metrics.d.ts +7 -1
- package/src/utils/metrics.js +58 -28
- package/src/utils/metrics.js.map +1 -1
- package/src/utils/nx.d.ts +5 -0
- package/src/utils/nx.js +44 -12
- package/src/utils/nx.js.map +1 -1
- package/src/utils/port.d.ts +25 -4
- package/src/utils/port.js +56 -9
- package/src/utils/port.js.map +1 -1
- package/src/utils/py.js +12 -5
- package/src/utils/py.js.map +1 -1
- package/src/utils/rdb-constructs/files/terraform/core/rdb/aurora/aurora.tf.template +18 -9
- package/src/utils/rdb-constructs/rdb-constructs.js +2 -10
- package/src/utils/rdb-constructs/rdb-constructs.js.map +1 -1
- package/src/utils/versions.d.ts +43 -43
- package/src/utils/versions.js +42 -42
- package/src/utils/versions.js.map +1 -1
package/README.md
CHANGED
|
@@ -133,20 +133,20 @@ Create a workspace and start adding components — zero configuration required:
|
|
|
133
133
|
|
|
134
134
|
```bash
|
|
135
135
|
# Create a new workspace
|
|
136
|
-
pnpm create @aws/nx-workspace my-project
|
|
136
|
+
pnpm create @aws/nx-workspace@next my-project
|
|
137
137
|
cd my-project
|
|
138
138
|
|
|
139
139
|
# Add a tRPC API
|
|
140
|
-
pnpm nx g @aws/nx-plugin:ts#trpc
|
|
140
|
+
pnpm nx g @aws/nx-plugin:ts#api --framework=trpc
|
|
141
141
|
|
|
142
142
|
# Add a Strands AI agent (Python)
|
|
143
143
|
pnpm nx g @aws/nx-plugin:py#agent
|
|
144
144
|
|
|
145
145
|
# Add a React website
|
|
146
|
-
pnpm nx g @aws/nx-plugin:ts#react
|
|
146
|
+
pnpm nx g @aws/nx-plugin:ts#website --framework=react
|
|
147
147
|
|
|
148
148
|
# Add authentication to your website
|
|
149
|
-
pnpm nx g @aws/nx-plugin:ts#
|
|
149
|
+
pnpm nx g @aws/nx-plugin:ts#website#auth
|
|
150
150
|
|
|
151
151
|
# Connect your website to your API and agent
|
|
152
152
|
pnpm nx g @aws/nx-plugin:connection
|
|
@@ -162,17 +162,17 @@ pnpm nx g @aws/nx-plugin:ts#infra
|
|
|
162
162
|
| Generator | Description |
|
|
163
163
|
| ----------------------- | ----------------------------------------------------------------------------------------------------------------- |
|
|
164
164
|
| `ts#project` | TypeScript library |
|
|
165
|
-
| `ts#
|
|
165
|
+
| `ts#api` | TypeScript API (tRPC or Smithy) with API Gateway + Lambda + [Powertools](https://github.com/aws-powertools/powertools-lambda-typescript) |
|
|
166
166
|
| `ts#rdb` | Relational databases with Aurora RDS |
|
|
167
|
-
| `ts#
|
|
168
|
-
| `ts#
|
|
167
|
+
| `ts#website` | React app (Vite) |
|
|
168
|
+
| `ts#website#auth` | Add Cognito auth to a website |
|
|
169
169
|
| `ts#infra` | AWS CDK infrastructure project |
|
|
170
170
|
| `ts#lambda-function` | TypeScript Lambda with type-safe event sources |
|
|
171
171
|
| `ts#mcp-server` | MCP server (TypeScript) |
|
|
172
172
|
| `ts#agent` | [Strands Agent](https://strandsagents.com/) (TypeScript) |
|
|
173
173
|
| `ts#nx-generator` | Nx generator scaffold |
|
|
174
174
|
| `py#project` | Python project (uv) |
|
|
175
|
-
| `py#
|
|
175
|
+
| `py#api` | Python API (FastAPI) with API Gateway + Lambda + [Powertools](https://github.com/aws-powertools/powertools-lambda-python) |
|
|
176
176
|
| `py#lambda-function` | Python Lambda with type-safe event sources |
|
|
177
177
|
| `py#mcp-server` | MCP server (Python) |
|
|
178
178
|
| `py#agent` | [Strands Agent](https://strandsagents.com/) (Python) |
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws/nx-plugin",
|
|
3
|
-
"version": "1.0.0-rc.
|
|
3
|
+
"version": "1.0.0-rc.9",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/awslabs/nx-plugin-for-aws.git",
|
|
@@ -37,11 +37,11 @@
|
|
|
37
37
|
"@types/estree": "1.0.9",
|
|
38
38
|
"@types/js-yaml": "4.0.9",
|
|
39
39
|
"@types/mdast": "4.0.4",
|
|
40
|
-
"@nxlv/python": "22.
|
|
40
|
+
"@nxlv/python": "22.2.0",
|
|
41
41
|
"@phenomnomnominal/tsquery": "6.2.0",
|
|
42
42
|
"enquirer": "2.4.1",
|
|
43
43
|
"fast-glob": "3.3.3",
|
|
44
|
-
"jiti": "2.
|
|
44
|
+
"jiti": "2.7.0",
|
|
45
45
|
"js-yaml": "4.2.0",
|
|
46
46
|
"license-checker-rseidelsohn": "4.4.2",
|
|
47
47
|
"lodash.camelcase": "4.3.0",
|
|
@@ -62,8 +62,8 @@
|
|
|
62
62
|
"typescript": "6.0.3",
|
|
63
63
|
"unified": "11.0.5",
|
|
64
64
|
"unist-util-visit": "5.1.0",
|
|
65
|
-
"vite": "8.0.
|
|
66
|
-
"vitest": "4.1.
|
|
65
|
+
"vite": "8.0.16",
|
|
66
|
+
"vitest": "4.1.8",
|
|
67
67
|
"zod": "4.4.3"
|
|
68
68
|
},
|
|
69
69
|
"types": "./src/index.d.ts"
|
|
@@ -41,7 +41,7 @@ const addAgentTargetToServeLocal = async (tree, sourceProjectName, targetProject
|
|
|
41
41
|
// Add an override to runtime-config for the serve-local target to use the local url
|
|
42
42
|
const runtimeConfigProvider = (0, devkit_1.joinPathFragments)(sourceProject.root, 'src', 'components', 'RuntimeConfig', 'index.tsx');
|
|
43
43
|
if (tree.exists(runtimeConfigProvider)) {
|
|
44
|
-
await (0, ast_1.applyGritQL)(tree, runtimeConfigProvider, `\`if ($cond) { $stmts }\` => raw\`if ($cond) {\n $stmts\n runtimeConfig.${options.runtimeConfigNamespace}.${options.agentNameClassName} = '${options.localUrl}';\n }\` where { $cond <: contains \`'serve-local'\`, $stmts <: within \`const applyOverrides = $_\` }`);
|
|
44
|
+
await (0, ast_1.applyGritQL)(tree, runtimeConfigProvider, `\`if ($cond) { $stmts }\` => raw\`if ($cond) {\n $stmts\n runtimeConfig.${options.runtimeConfigNamespace}.${options.agentNameClassName} = '${options.localUrl}';\n }\` where { $cond <: contains \`'serve-local'\`, $stmts <: within \`const applyOverrides = $_\`, $stmts <: not contains \`runtimeConfig.${options.runtimeConfigNamespace}.${options.agentNameClassName}\` }`);
|
|
45
45
|
}
|
|
46
46
|
};
|
|
47
47
|
exports.addAgentTargetToServeLocal = addAgentTargetToServeLocal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-serve-local.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/connection/agent-serve-local.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAIoB;AACpB,sCAA2C;AAC3C,oCAIqB;AAqBrB;;;;;;;GAOG;AACI,MAAM,0BAA0B,GAAG,KAAK,EAC7C,IAAU,EACV,iBAAyB,EACzB,iBAAyB,EACzB,OAA+B,EAC/B,EAAE;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IAEF,gEAAgE;IAChE,MAAM,yBAAyB,GAAG,OAAO,CAAC,eAAe,EAAE,IAAI;QAC7D,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,cAAc;QAC/C,CAAC,CAAC,mBAAmB,CAAC;IAExB,4EAA4E;IAC5E,IACE,CAAC,CACC,aAAa,CAAC,OAAO,EAAE,CAAC,yBAAyB,CAAC,EAAE,UAAU;QAC9D,aAAa,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC,CACvC,EACD,CAAC;QACD,OAAO;IACT,CAAC;IAED,wEAAwE;IACxE,uEAAuE;IACvE,IAAA,sCAAiC,EAAC,aAAa,EAAE,aAAa,EAAE;QAC9D,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;QAC9B,MAAM,EAAE,yBAAyB;KAClC,CAAC,CAAC;IACH,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,2BAA2B,IAAI,EAAE,EAAE,CAAC;QACnE,IAAA,sCAAiC,EAAC,aAAa,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC;IACD,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEpE,oFAAoF;IACpF,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,aAAa,CAAC,IAAI,EAClB,KAAK,EACL,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACvC,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,qBAAqB,EACrB,iFAAiF,OAAO,CAAC,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,OAAO,OAAO,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"agent-serve-local.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/connection/agent-serve-local.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAIoB;AACpB,sCAA2C;AAC3C,oCAIqB;AAqBrB;;;;;;;GAOG;AACI,MAAM,0BAA0B,GAAG,KAAK,EAC7C,IAAU,EACV,iBAAyB,EACzB,iBAAyB,EACzB,OAA+B,EAC/B,EAAE;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,iBAAiB,CAClB,CAAC;IAEF,gEAAgE;IAChE,MAAM,yBAAyB,GAAG,OAAO,CAAC,eAAe,EAAE,IAAI;QAC7D,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,cAAc;QAC/C,CAAC,CAAC,mBAAmB,CAAC;IAExB,4EAA4E;IAC5E,IACE,CAAC,CACC,aAAa,CAAC,OAAO,EAAE,CAAC,yBAAyB,CAAC,EAAE,UAAU;QAC9D,aAAa,CAAC,OAAO,EAAE,CAAC,aAAa,CAAC,CACvC,EACD,CAAC;QACD,OAAO;IACT,CAAC;IAED,wEAAwE;IACxE,uEAAuE;IACvE,IAAA,sCAAiC,EAAC,aAAa,EAAE,aAAa,EAAE;QAC9D,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;QAC9B,MAAM,EAAE,yBAAyB;KAClC,CAAC,CAAC;IACH,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,2BAA2B,IAAI,EAAE,EAAE,CAAC;QACnE,IAAA,sCAAiC,EAAC,aAAa,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC;IACD,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEpE,oFAAoF;IACpF,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,aAAa,CAAC,IAAI,EAClB,KAAK,EACL,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACvC,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,qBAAqB,EACrB,iFAAiF,OAAO,CAAC,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,OAAO,OAAO,CAAC,QAAQ,iJAAiJ,OAAO,CAAC,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,MAAM,CACxX,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAxDW,QAAA,0BAA0B,8BAwDrC"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
|
|
4
4
|
{
|
|
5
|
-
"aws-cdk": "2.
|
|
6
|
-
"aws-cdk-lib": "2.
|
|
5
|
+
"aws-cdk": "2.1126.0",
|
|
6
|
+
"aws-cdk-lib": "2.258.0",
|
|
7
7
|
"constructs": "10.6.0",
|
|
8
8
|
"esbuild": "0.28.0",
|
|
9
9
|
"source-map-support": "0.5.21",
|
|
@@ -17,21 +17,21 @@ exports[`infra generator > should add required dependencies to package.json > de
|
|
|
17
17
|
"@swc-node/register": "~1.11.1",
|
|
18
18
|
"@swc/core": "~1.15.5",
|
|
19
19
|
"@swc/helpers": "~0.5.18",
|
|
20
|
-
"@types/node": "25.9.
|
|
21
|
-
"@vitest/coverage-v8": "4.1.
|
|
20
|
+
"@types/node": "25.9.2",
|
|
21
|
+
"@vitest/coverage-v8": "4.1.8",
|
|
22
22
|
"jsdom": "^27.1.0",
|
|
23
23
|
"tsx": "4.22.4",
|
|
24
24
|
"typescript": "~5.9.2",
|
|
25
|
-
"vite": "8.0.
|
|
26
|
-
"vitest": "4.1.
|
|
25
|
+
"vite": "8.0.16",
|
|
26
|
+
"vitest": "4.1.8",
|
|
27
27
|
}
|
|
28
28
|
`;
|
|
29
29
|
|
|
30
30
|
exports[`infra generator > should add required dependencies to package.json > package-json 1`] = `
|
|
31
31
|
{
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"aws-cdk": "2.
|
|
34
|
-
"aws-cdk-lib": "2.
|
|
33
|
+
"aws-cdk": "2.1126.0",
|
|
34
|
+
"aws-cdk-lib": "2.258.0",
|
|
35
35
|
"constructs": "10.6.0",
|
|
36
36
|
"esbuild": "0.28.0",
|
|
37
37
|
"source-map-support": "0.5.21",
|
|
@@ -42,13 +42,13 @@ exports[`infra generator > should add required dependencies to package.json > pa
|
|
|
42
42
|
"@swc-node/register": "~1.11.1",
|
|
43
43
|
"@swc/core": "~1.15.5",
|
|
44
44
|
"@swc/helpers": "~0.5.18",
|
|
45
|
-
"@types/node": "25.9.
|
|
46
|
-
"@vitest/coverage-v8": "4.1.
|
|
45
|
+
"@types/node": "25.9.2",
|
|
46
|
+
"@vitest/coverage-v8": "4.1.8",
|
|
47
47
|
"jsdom": "^27.1.0",
|
|
48
48
|
"tsx": "4.22.4",
|
|
49
49
|
"typescript": "~5.9.2",
|
|
50
|
-
"vite": "8.0.
|
|
51
|
-
"vitest": "4.1.
|
|
50
|
+
"vite": "8.0.16",
|
|
51
|
+
"vitest": "4.1.8",
|
|
52
52
|
},
|
|
53
53
|
"name": "@proj/source",
|
|
54
54
|
"type": "module",
|
|
@@ -66,7 +66,7 @@ exports[`infra generator > should configure Checkov target correctly > checkov-t
|
|
|
66
66
|
"{workspaceRoot}/dist/{projectRoot}/cdk.out",
|
|
67
67
|
],
|
|
68
68
|
"options": {
|
|
69
|
-
"command": "uvx --from checkov==3.2.
|
|
69
|
+
"command": "uvx --from checkov==3.2.533 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
|
|
70
70
|
},
|
|
71
71
|
"outputs": [
|
|
72
72
|
"{workspaceRoot}/dist/{projectRoot}/checkov",
|
|
@@ -159,7 +159,7 @@ exports[`infra generator > should configure project.json with correct targets >
|
|
|
159
159
|
"{workspaceRoot}/dist/{projectRoot}/cdk.out",
|
|
160
160
|
],
|
|
161
161
|
"options": {
|
|
162
|
-
"command": "uvx --from checkov==3.2.
|
|
162
|
+
"command": "uvx --from checkov==3.2.533 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
|
|
163
163
|
},
|
|
164
164
|
"outputs": [
|
|
165
165
|
"{workspaceRoot}/dist/{projectRoot}/checkov",
|
|
@@ -724,7 +724,7 @@ exports[`infra generator > should handle custom project names correctly > custom
|
|
|
724
724
|
"{workspaceRoot}/dist/{projectRoot}/cdk.out",
|
|
725
725
|
],
|
|
726
726
|
"options": {
|
|
727
|
-
"command": "uvx --from checkov==3.2.
|
|
727
|
+
"command": "uvx --from checkov==3.2.533 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
|
|
728
728
|
},
|
|
729
729
|
"outputs": [
|
|
730
730
|
"{workspaceRoot}/dist/{projectRoot}/checkov",
|
|
@@ -10,6 +10,7 @@ const tslib_1 = require("tslib");
|
|
|
10
10
|
const devkit_1 = require("@nx/devkit");
|
|
11
11
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
12
12
|
const generator_1 = tslib_1.__importStar(require("../../ts/lib/generator"));
|
|
13
|
+
const ts_project_utils_1 = require("../../ts/lib/ts-project-utils");
|
|
13
14
|
const containers_1 = require("../../utils/containers");
|
|
14
15
|
const format_1 = require("../../utils/format");
|
|
15
16
|
const metrics_1 = require("../../utils/metrics");
|
|
@@ -27,7 +28,9 @@ const versions_1 = require("../../utils/versions");
|
|
|
27
28
|
exports.INFRA_APP_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
28
29
|
async function tsInfraGenerator(tree, schema) {
|
|
29
30
|
const lib = (0, generator_1.getTsLibDetails)(tree, schema);
|
|
30
|
-
|
|
31
|
+
if (!(0, nx_1.projectExists)(tree, lib.fullyQualifiedName)) {
|
|
32
|
+
await (0, generator_1.default)(tree, schema);
|
|
33
|
+
}
|
|
31
34
|
// CDK shells out to a container engine to build image assets. Default
|
|
32
35
|
// (docker) needs no env override; finch is set via CDK_DOCKER per
|
|
33
36
|
// https://docs.aws.amazon.com/cdk/v2/guide/build-containers.html#build-container-replace.
|
|
@@ -172,8 +175,7 @@ async function tsInfraGenerator(tree, schema) {
|
|
|
172
175
|
]), (0, versions_1.withVersions)(['tsx']));
|
|
173
176
|
(0, devkit_1.updateJson)(tree, `${libraryRoot}/tsconfig.lib.json`, (tsConfig) => ({
|
|
174
177
|
...tsConfig,
|
|
175
|
-
references: [
|
|
176
|
-
...(tsConfig.references || []),
|
|
178
|
+
references: (0, ts_project_utils_1.mergeTsReferences)(tsConfig.references, [
|
|
177
179
|
{
|
|
178
180
|
path: `${path_1.default.relative(libraryRoot, `${tree.root}/${shared_constructs_constants_1.PACKAGES_DIR}`)}/${shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR}/tsconfig.lib.json`,
|
|
179
181
|
},
|
|
@@ -184,7 +186,7 @@ async function tsInfraGenerator(tree, schema) {
|
|
|
184
186
|
},
|
|
185
187
|
]
|
|
186
188
|
: []),
|
|
187
|
-
],
|
|
189
|
+
]),
|
|
188
190
|
}));
|
|
189
191
|
await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.INFRA_APP_GENERATOR_INFO]);
|
|
190
192
|
await (0, format_1.formatFilesInSubtree)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ const addCreateWorkspaceCommandTool = (server) => {
|
|
|
20
20
|
text: `Run the following command to create a workspace:
|
|
21
21
|
|
|
22
22
|
\`\`\`bash
|
|
23
|
-
${(0, commands_1.buildCreateNxWorkspaceCommand)(packageManager, '<workspace-name>')} --no-interactive
|
|
23
|
+
${(0, commands_1.buildCreateNxWorkspaceCommand)(packageManager, '<workspace-name>', undefined, 'next')} --no-interactive
|
|
24
24
|
\`\`\`
|
|
25
25
|
|
|
26
26
|
This will create a new workspace within the \`<workspace-name>\` directory.
|
|
@@ -28,7 +28,7 @@ This will create a new workspace within the \`<workspace-name>\` directory.
|
|
|
28
28
|
If you are already inside an empty directory intended for this project, you can pass \`.\` as the workspace name to create the workspace in the current directory:
|
|
29
29
|
|
|
30
30
|
\`\`\`bash
|
|
31
|
-
${(0, commands_1.buildCreateNxWorkspaceCommand)(packageManager, '.')} --no-interactive
|
|
31
|
+
${(0, commands_1.buildCreateNxWorkspaceCommand)(packageManager, '.', undefined, 'next')} --no-interactive
|
|
32
32
|
\`\`\`
|
|
33
33
|
|
|
34
34
|
Note that this will prompt for an Infrastructure as Code provider (${iac_providers_1.IAC_PROVIDERS.join(', ')}).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-workspace-command.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/create-workspace-command.ts"],"names":[],"mappings":";;;AAKA,mDAAqE;AACrE,6DAA0D;AAC1D,sCAAiD;AAEjD;;GAEG;AACI,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,EAAE;IACjE,MAAM,CAAC,YAAY,CACjB,0BAA0B,EAC1B;QACE,WAAW,EACT,oEAAoE;QACtE,WAAW,EAAE;YACX,cAAc,EAAE,6BAAoB;SACrC;KACF,EACD,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACvB,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAe;gBACrB,IAAI,EAAE;;;EAGd,IAAA,wCAA6B,EAAC,cAAc,EAAE,kBAAkB,CAAC;;;;;;;;
|
|
1
|
+
{"version":3,"file":"create-workspace-command.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/create-workspace-command.ts"],"names":[],"mappings":";;;AAKA,mDAAqE;AACrE,6DAA0D;AAC1D,sCAAiD;AAEjD;;GAEG;AACI,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,EAAE;IACjE,MAAM,CAAC,YAAY,CACjB,0BAA0B,EAC1B;QACE,WAAW,EACT,oEAAoE;QACtE,WAAW,EAAE;YACX,cAAc,EAAE,6BAAoB;SACrC;KACF,EACD,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACvB,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAe;gBACrB,IAAI,EAAE;;;EAGd,IAAA,wCAA6B,EAAC,cAAc,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,CAAC;;;;;;;;EAQpF,IAAA,wCAA6B,EAAC,cAAc,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC;;;qEAGF,6BAAa,CAAC,IAAI,CAAC,IAAI,CAAC;yCACpD,6BAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;;;;;;GAMjG;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAxCW,QAAA,6BAA6B,iCAwCxC"}
|
|
@@ -633,6 +633,7 @@ exports[`py#agent generator > should match snapshot for generated files > agent-
|
|
|
633
633
|
|
|
634
634
|
from strands import Agent, tool
|
|
635
635
|
from strands_tools import current_time
|
|
636
|
+
from proj_agent_connection import log_model_errors
|
|
636
637
|
|
|
637
638
|
|
|
638
639
|
@tool
|
|
@@ -651,6 +652,7 @@ Use your tools for mathematical tasks.
|
|
|
651
652
|
Refer to tools as your 'spellbook'.
|
|
652
653
|
""",
|
|
653
654
|
tools=[subtract, current_time],
|
|
655
|
+
hooks=[log_model_errors],
|
|
654
656
|
)
|
|
655
657
|
"
|
|
656
658
|
`;
|
|
@@ -748,13 +750,13 @@ dependencies = [
|
|
|
748
750
|
"proj.agent_connection",
|
|
749
751
|
"aws-lambda-powertools==3.29.0",
|
|
750
752
|
"aws-opentelemetry-distro==0.17.1",
|
|
751
|
-
"bedrock-agentcore==1.
|
|
752
|
-
"boto3==1.43.
|
|
753
|
+
"bedrock-agentcore==1.14.0",
|
|
754
|
+
"boto3==1.43.24",
|
|
753
755
|
"fastapi==0.136.3",
|
|
754
756
|
"mcp==1.27.2",
|
|
755
757
|
"strands-agents==1.42.0",
|
|
756
|
-
"strands-agents-tools==0.
|
|
757
|
-
"uvicorn==0.
|
|
758
|
+
"strands-agents-tools==0.8.0",
|
|
759
|
+
"uvicorn==0.49.0"
|
|
758
760
|
]
|
|
759
761
|
|
|
760
762
|
[dependency-groups]
|
|
@@ -2,6 +2,7 @@ from contextlib import contextmanager
|
|
|
2
2
|
|
|
3
3
|
from strands import Agent, tool
|
|
4
4
|
from strands_tools import current_time
|
|
5
|
+
from <%- agentConnectionModuleName %> import log_model_errors
|
|
5
6
|
|
|
6
7
|
|
|
7
8
|
@tool
|
|
@@ -20,4 +21,5 @@ Use your tools for mathematical tasks.
|
|
|
20
21
|
Refer to tools as your 'spellbook'.
|
|
21
22
|
""",
|
|
22
23
|
tools=[subtract, current_time],
|
|
24
|
+
hooks=[log_model_errors],
|
|
23
25
|
)
|
|
@@ -145,7 +145,9 @@ const pyAgentGenerator = async (tree, options) => {
|
|
|
145
145
|
// A2A servers use port 9000 as per the Strands A2A SDK default and AgentCore A2A contract.
|
|
146
146
|
// HTTP and AG-UI agents use port 8081+ to avoid conflict with VS Code server on 8080.
|
|
147
147
|
const localDevPortStart = protocol === 'a2a' ? 9000 : 8081;
|
|
148
|
-
const localDevPort = (0, port_1.assignPort)(tree, project, localDevPortStart
|
|
148
|
+
const localDevPort = (0, port_1.assignPort)(tree, project, localDevPortStart, {
|
|
149
|
+
component: { info: exports.PY_AGENT_GENERATOR_INFO, name: agentTargetPrefix },
|
|
150
|
+
});
|
|
149
151
|
// All protocols use fastapi dev for hot reload:
|
|
150
152
|
// - HTTP: FastAPI app directly defined in init.py
|
|
151
153
|
// - A2A: A2AServer.to_fastapi_app() creates a FastAPI app in main.py
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/agent/generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/agent/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,9 @@ from .core.session_context import get_current_session_id, session_id_context
|
|
|
7
7
|
|
|
8
8
|
from .app.inventory_mcp_client import InventoryMcpClient
|
|
9
9
|
|
|
10
|
+
from .core.model_errors import log_model_errors
|
|
11
|
+
|
|
12
|
+
|
|
10
13
|
from .core.with_session_id import with_session_id
|
|
11
14
|
|
|
12
15
|
|
|
@@ -14,6 +17,7 @@ __all__ = [
|
|
|
14
17
|
"get_current_session_id",
|
|
15
18
|
"session_id_context",
|
|
16
19
|
"with_session_id",
|
|
20
|
+
"log_model_errors",
|
|
17
21
|
"InventoryMcpClient",
|
|
18
22
|
]
|
|
19
23
|
"
|
|
@@ -60,10 +60,13 @@ const pyFastApiProjectGenerator = async (tree, schema) => {
|
|
|
60
60
|
// Add a command to copy run.sh to the bundle output for Lambda Web Adapter
|
|
61
61
|
const fs = new fs_1.FsCommands(tree);
|
|
62
62
|
const bundleTarget = projectConfig.targets[bundleTargetName];
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
63
|
+
const copyRunShCommand = fs.cp(`{projectRoot}/run.sh`, `dist/{projectRoot}/${bundleTargetName}/run.sh`);
|
|
64
|
+
if (!bundleTarget.options.commands.includes(copyRunShCommand)) {
|
|
65
|
+
bundleTarget.options.commands = [
|
|
66
|
+
...bundleTarget.options.commands,
|
|
67
|
+
copyRunShCommand,
|
|
68
|
+
];
|
|
69
|
+
}
|
|
67
70
|
projectConfig.targets.serve = {
|
|
68
71
|
executor: '@nxlv/python:run-commands',
|
|
69
72
|
options: {
|
|
@@ -73,6 +76,7 @@ const pyFastApiProjectGenerator = async (tree, schema) => {
|
|
|
73
76
|
continuous: true,
|
|
74
77
|
};
|
|
75
78
|
projectConfig.targets['serve-local'] = {
|
|
79
|
+
...projectConfig.targets['serve-local'],
|
|
76
80
|
...projectConfig.targets.serve,
|
|
77
81
|
options: {
|
|
78
82
|
...projectConfig.targets.serve.options,
|
|
@@ -95,6 +99,8 @@ const pyFastApiProjectGenerator = async (tree, schema) => {
|
|
|
95
99
|
(0, devkit_1.joinPathFragments)(dir, normalizedModuleName, 'hello.py'),
|
|
96
100
|
(0, devkit_1.joinPathFragments)(dir, 'tests', 'test_hello.py'),
|
|
97
101
|
].forEach((f) => tree.delete(f));
|
|
102
|
+
// User-owned source files: preserve any existing copies so re-running does
|
|
103
|
+
// not clobber user edits (and does not reformat them nondeterministically).
|
|
98
104
|
(0, devkit_1.generateFiles)(tree, // the virtual file system
|
|
99
105
|
(0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), // path to the file templates
|
|
100
106
|
dir, // destination path of the files
|
|
@@ -103,7 +109,7 @@ const pyFastApiProjectGenerator = async (tree, schema) => {
|
|
|
103
109
|
apiNameClassName,
|
|
104
110
|
infra: schema.infra,
|
|
105
111
|
}, {
|
|
106
|
-
overwriteStrategy: devkit_1.OverwriteStrategy.
|
|
112
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
107
113
|
});
|
|
108
114
|
if (schema.infra !== 'none') {
|
|
109
115
|
const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/fast-api/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAUoB;AACpB,8EAA+E;AAC/E,oFAAgH;AAChH,sDAAkE;AAClE,+CAA0D;AAC1D,uCAA4C;AAC5C,yCAA6C;AAC7C,iDAAsE;AACtE,6CAA6D;AAC7D,uCAIwB;AACxB,yDAA6D;AAC7D,+CAAoD;AACpD,2CAA8C;AAC9C,uCAGwB;AACxB,qEAA0E;AAC1E,0EAA+E;AAC/E,+CAAwD;AAG3C,QAAA,uBAAuB,GAClC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAE/B;;GAEG;AACI,MAAM,yBAAyB,GAAG,KAAK,EAC5C,IAAU,EACV,MAAuC,EACX,EAAE;IAC9B,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IAEzD,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,GAAG,IAAA,+BAAmB,EAC3E,IAAI,EACJ;QACE,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,UAAU,EAAE,MAAM,CAAC,UAAU;KAC9B,CACF,CAAC;IACF,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClD,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAElD,IAAI,aAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,IAAA,iCAAwB,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QACnD,aAAa,GAAG,IAAI,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,aAAa,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAA,mBAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,UAAU,EAAE,oBAAoB;YAChC,IAAI,EAAE,aAAa;SACpB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;IAEnD,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GACzC,IAAA,8BAAqB,EAAC,aAAa,CAAC,CAAC;IAEvC,2EAA2E;IAC3E,MAAM,EAAE,GAAG,IAAI,eAAU,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7D,YAAY,CAAC,OAAO,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/fast-api/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,12 @@ const object_1 = require("../../../utils/object");
|
|
|
13
13
|
*/
|
|
14
14
|
const addOpenApiGeneration = (tree, { project }) => {
|
|
15
15
|
const moduleName = getFastApiModuleName(project);
|
|
16
|
-
// Add OpenAPI spec generation script to FastAPI spec
|
|
16
|
+
// Add OpenAPI spec generation script to FastAPI spec, preserving an existing
|
|
17
|
+
// copy so re-running does not reformat it nondeterministically
|
|
17
18
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/fast-api'), project.root, {
|
|
18
19
|
moduleName,
|
|
20
|
+
}, {
|
|
21
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
19
22
|
});
|
|
20
23
|
// Instrument the script as part of the fastapi project build
|
|
21
24
|
const fastApiOpenApiDist = (0, devkit_1.joinPathFragments)('dist', project.root, 'openapi');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-api.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/open-api.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,
|
|
1
|
+
{"version":3,"file":"open-api.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/open-api.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAOoB;AACpB,gDAAiD;AACjD,kDAAuD;AAMvD;;GAEG;AACI,MAAM,oBAAoB,GAAG,CAClC,IAAU,EACV,EAAE,OAAO,EAA+B,EAClB,EAAE;IACxB,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAEjD,6EAA6E;IAC7E,+DAA+D;IAC/D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,gBAAgB,CAAC,EAC9C,OAAO,CAAC,IAAI,EACZ;QACE,UAAU;KACX,EACD;QACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;KAClD,CACF,CAAC;IAEF,6DAA6D;IAC7D,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9E,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IACvE,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;QAC7C,GAAG,OAAO;QACV,OAAO,EAAE,IAAA,uBAAc,EAAC;YACtB,GAAG,OAAO,CAAC,OAAO;YAClB,KAAK,EAAE;gBACL,GAAG,OAAO,CAAC,OAAO,EAAE,KAAK;gBACzB,SAAS,EAAE;oBACT,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CACvB;oBACD,SAAS;iBACV;aACF;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE,CAAC,4CAA4C,CAAC;gBACvD,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,oGAAoG;qBACrG;iBACF;aACF;SACF,CAAC;KACH,CAAC,CAAC;IAEH,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC,CAAC;AAlDW,QAAA,oBAAoB,wBAkD/B;AAEF,MAAM,oBAAoB,GAAG,CAAC,aAAmC,EAAU,EAAE;IAC3E,IAAI,aAAa,CAAC,UAAU,EAAE,CAAC;QAC7B,MAAM,eAAe,GAAG,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5D,OAAO,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrD,CAAC;IACD,MAAM,OAAO,GAAI,aAAa,CAAC,QAAgB,EAAE,OAAO,CAAC;IACzD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,IAAI,KAAK,CAAC,8CAA8C,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;AAChF,CAAC,CAAC"}
|
|
@@ -94,9 +94,9 @@ const pyLambdaFunctionGenerator = async (tree, schema) => {
|
|
|
94
94
|
// Generate the lambda handler file
|
|
95
95
|
(0, devkit_1.generateFiles)(tree, // the virtual file system
|
|
96
96
|
(0, devkit_1.joinPathFragments)(__dirname, 'files', 'handler'), // path to the file templates
|
|
97
|
-
(0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, schema.functionPath ?? ''), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.
|
|
97
|
+
(0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, schema.functionPath ?? ''), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
|
|
98
98
|
// Generate the lambda handler test file
|
|
99
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'tests'), (0, devkit_1.joinPathFragments)(dir, 'tests'), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.
|
|
99
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'tests'), (0, devkit_1.joinPathFragments)(dir, 'tests'), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
|
|
100
100
|
(0, py_1.addDependenciesToPyProjectToml)(tree, dir, [
|
|
101
101
|
'aws-lambda-powertools',
|
|
102
102
|
'aws-lambda-powertools[tracer]',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/lambda-function/generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/lambda-function/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,20 +93,8 @@ const pyMcpServerGenerator = async (tree, options) => {
|
|
|
93
93
|
},
|
|
94
94
|
dependsOn: [bundleTargetName],
|
|
95
95
|
};
|
|
96
|
-
project
|
|
97
|
-
|
|
98
|
-
dependsOn: [
|
|
99
|
-
...(project.targets.docker?.dependsOn ?? []).filter((t) => t !== dockerTargetName),
|
|
100
|
-
dockerTargetName,
|
|
101
|
-
],
|
|
102
|
-
};
|
|
103
|
-
project.targets.build = {
|
|
104
|
-
...project.targets.build,
|
|
105
|
-
dependsOn: [
|
|
106
|
-
...(project.targets.build?.dependsOn ?? []).filter((t) => t !== 'docker'),
|
|
107
|
-
'docker',
|
|
108
|
-
],
|
|
109
|
-
};
|
|
96
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(project, 'docker', dockerTargetName);
|
|
97
|
+
(0, nx_1.addDependencyToTargetIfNotPresent)(project, 'build', 'docker');
|
|
110
98
|
// Add shared constructs
|
|
111
99
|
const iac = await (0, iac_1.resolveIac)(tree, options.iac);
|
|
112
100
|
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iac });
|
|
@@ -122,7 +110,9 @@ const pyMcpServerGenerator = async (tree, options) => {
|
|
|
122
110
|
containers,
|
|
123
111
|
});
|
|
124
112
|
}
|
|
125
|
-
const localDevPort = (0, port_1.assignPort)(tree, project, 8000
|
|
113
|
+
const localDevPort = (0, port_1.assignPort)(tree, project, 8000, {
|
|
114
|
+
component: { info: exports.PY_MCP_SERVER_GENERATOR_INFO, name: mcpTargetPrefix },
|
|
115
|
+
});
|
|
126
116
|
(0, devkit_1.updateProjectConfiguration)(tree, project.name, {
|
|
127
117
|
...project,
|
|
128
118
|
targets: {
|
|
@@ -164,6 +154,20 @@ const pyMcpServerGenerator = async (tree, options) => {
|
|
|
164
154
|
continuous: true,
|
|
165
155
|
},
|
|
166
156
|
[`${mcpTargetPrefix}-inspect`]: {
|
|
157
|
+
executor: 'nx:run-commands',
|
|
158
|
+
// Launch the inspector against the locally served (serve-local) HTTP
|
|
159
|
+
// server. serve-local starts the server and any connected dependencies
|
|
160
|
+
// (e.g. a local database).
|
|
161
|
+
dependsOn: [`${mcpTargetPrefix}-serve-local`],
|
|
162
|
+
options: {
|
|
163
|
+
commands: [
|
|
164
|
+
`mcp-inspector --transport http --server-url http://localhost:${localDevPort}/mcp`,
|
|
165
|
+
],
|
|
166
|
+
cwd: '{projectRoot}',
|
|
167
|
+
},
|
|
168
|
+
continuous: true,
|
|
169
|
+
},
|
|
170
|
+
[`${mcpTargetPrefix}-inspect-stdio`]: {
|
|
167
171
|
executor: 'nx:run-commands',
|
|
168
172
|
options: {
|
|
169
173
|
commands: [
|