@aws/nx-plugin 0.87.0 → 0.88.0

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.
Files changed (107) hide show
  1. package/generators.json +7 -0
  2. package/package.json +2 -1
  3. package/src/connection/generator.js +5 -0
  4. package/src/connection/generator.js.map +1 -1
  5. package/src/connection/serve-local.d.ts +1 -1
  6. package/src/connection/serve-local.js +5 -7
  7. package/src/connection/serve-local.js.map +1 -1
  8. package/src/preset/generator.js +0 -2
  9. package/src/preset/generator.js.map +1 -1
  10. package/src/py/fast-api/__snapshots__/generator.spec.ts.snap +17 -8
  11. package/src/py/fast-api/generator.js +1 -1
  12. package/src/py/fast-api/generator.js.map +1 -1
  13. package/src/py/fast-api/react/__snapshots__/generator.spec.ts.snap +5 -3
  14. package/src/py/lambda-function/__snapshots__/generator.spec.ts.snap +2 -1
  15. package/src/py/lambda-function/generator.js +1 -1
  16. package/src/py/lambda-function/generator.js.map +1 -1
  17. package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap +1 -1
  18. package/src/py/mcp-server/generator.js +1 -1
  19. package/src/py/mcp-server/generator.js.map +1 -1
  20. package/src/py/strands-agent/__snapshots__/generator.spec.ts.snap +11 -2
  21. package/src/py/strands-agent/generator.js +1 -1
  22. package/src/py/strands-agent/generator.js.map +1 -1
  23. package/src/py/strands-agent/mcp-connection/__snapshots__/generator.spec.ts.snap +211 -0
  24. package/src/py/strands-agent/mcp-connection/files/agent-connection/app/__mcpServerSnakeCase___client.py.template +45 -0
  25. package/src/py/strands-agent/mcp-connection/generator.d.ts +10 -0
  26. package/src/py/strands-agent/mcp-connection/generator.js +171 -0
  27. package/src/py/strands-agent/mcp-connection/generator.js.map +1 -0
  28. package/src/py/strands-agent/mcp-connection/schema.d.ts +15 -0
  29. package/src/py/strands-agent/mcp-connection/schema.json +26 -0
  30. package/src/smithy/ts/api/generator.js +1 -1
  31. package/src/smithy/ts/api/generator.js.map +1 -1
  32. package/src/trpc/backend/generator.js +1 -1
  33. package/src/trpc/backend/generator.js.map +1 -1
  34. package/src/trpc/react/generator.js +3 -3
  35. package/src/trpc/react/generator.js.map +1 -1
  36. package/src/ts/lambda-function/generator.js +1 -1
  37. package/src/ts/lambda-function/generator.js.map +1 -1
  38. package/src/ts/lib/eslint.d.ts +1 -1
  39. package/src/ts/lib/eslint.js +4 -3
  40. package/src/ts/lib/eslint.js.map +1 -1
  41. package/src/ts/lib/generator.js +1 -1
  42. package/src/ts/lib/generator.js.map +1 -1
  43. package/src/ts/lib/ts-project-utils.d.ts +1 -1
  44. package/src/ts/lib/ts-project-utils.js +4 -3
  45. package/src/ts/lib/ts-project-utils.js.map +1 -1
  46. package/src/ts/mcp-server/generator.js +1 -1
  47. package/src/ts/mcp-server/generator.js.map +1 -1
  48. package/src/ts/nx-generator/generator.js +1 -1
  49. package/src/ts/nx-generator/generator.js.map +1 -1
  50. package/src/ts/react-website/app/generator.js +7 -7
  51. package/src/ts/react-website/app/generator.js.map +1 -1
  52. package/src/ts/react-website/cognito-auth/generator.js +7 -7
  53. package/src/ts/react-website/cognito-auth/generator.js.map +1 -1
  54. package/src/ts/react-website/cognito-auth/grit/cloudscape-auth-menu.grit +19 -0
  55. package/src/ts/react-website/cognito-auth/grit/none-auth-menu.grit +24 -0
  56. package/src/ts/react-website/cognito-auth/grit/shadcn-auth-menu.grit +39 -0
  57. package/src/ts/react-website/cognito-auth/grit/shadcn-state-declarations.grit +15 -0
  58. package/src/ts/react-website/cognito-auth/utils.d.ts +3 -3
  59. package/src/ts/react-website/cognito-auth/utils.js +18 -186
  60. package/src/ts/react-website/cognito-auth/utils.js.map +1 -1
  61. package/src/ts/react-website/runtime-config/generator.js +4 -14
  62. package/src/ts/react-website/runtime-config/generator.js.map +1 -1
  63. package/src/ts/strands-agent/generator.js +1 -1
  64. package/src/ts/strands-agent/generator.js.map +1 -1
  65. package/src/ts/strands-agent/mcp-connection/generator.js +15 -41
  66. package/src/ts/strands-agent/mcp-connection/generator.js.map +1 -1
  67. package/src/utils/agent-connection/agent-connection.d.ts +24 -0
  68. package/src/utils/agent-connection/agent-connection.js +112 -0
  69. package/src/utils/agent-connection/agent-connection.js.map +1 -1
  70. package/src/{py/strands-agent/files/app → utils/agent-connection/files/py-core}/agentcore_mcp_client.py.template +33 -14
  71. package/src/utils/agent-core-constructs/agent-core-constructs.d.ts +2 -2
  72. package/src/utils/agent-core-constructs/agent-core-constructs.js +14 -13
  73. package/src/utils/agent-core-constructs/agent-core-constructs.js.map +1 -1
  74. package/src/utils/api-constructs/api-constructs.d.ts +1 -1
  75. package/src/utils/api-constructs/api-constructs.js +8 -7
  76. package/src/utils/api-constructs/api-constructs.js.map +1 -1
  77. package/src/utils/ast/website.d.ts +1 -1
  78. package/src/utils/ast/website.js +4 -3
  79. package/src/utils/ast/website.js.map +1 -1
  80. package/src/utils/ast.d.ts +12 -3
  81. package/src/utils/ast.js +88 -54
  82. package/src/utils/ast.js.map +1 -1
  83. package/src/utils/connection/open-api/react.js +3 -3
  84. package/src/utils/connection/open-api/react.js.map +1 -1
  85. package/src/utils/files/terraform/src/metrics/metrics.tf.template +7 -1
  86. package/src/utils/format.d.ts +2 -1
  87. package/src/utils/format.js +81 -8
  88. package/src/utils/format.js.map +1 -1
  89. package/src/utils/function-constructs/function-constructs.d.ts +1 -1
  90. package/src/utils/function-constructs/function-constructs.js +8 -7
  91. package/src/utils/function-constructs/function-constructs.js.map +1 -1
  92. package/src/utils/identity-constructs/identity-constructs.d.ts +1 -1
  93. package/src/utils/identity-constructs/identity-constructs.js +7 -6
  94. package/src/utils/identity-constructs/identity-constructs.js.map +1 -1
  95. package/src/utils/metrics.d.ts +0 -1
  96. package/src/utils/metrics.js +23 -39
  97. package/src/utils/metrics.js.map +1 -1
  98. package/src/utils/py.d.ts +5 -0
  99. package/src/utils/py.js +31 -1
  100. package/src/utils/py.js.map +1 -1
  101. package/src/utils/shared-constructs.js +1 -5
  102. package/src/utils/shared-constructs.js.map +1 -1
  103. package/src/utils/shared-shadcn.js +1 -1
  104. package/src/utils/shared-shadcn.js.map +1 -1
  105. package/src/utils/website-constructs/website-constructs.d.ts +1 -1
  106. package/src/utils/website-constructs/website-constructs.js +9 -8
  107. package/src/utils/website-constructs/website-constructs.js.map +1 -1
@@ -0,0 +1,211 @@
1
+ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
2
+
3
+ exports[`py#strands-agent#mcp-connection generator > should match snapshot for generated files > agent-connection-init.py 1`] = `
4
+ """"Automatically generated by Nx."""
5
+
6
+ from .app.inventory_mcp_client import InventoryMcpClient
7
+
8
+ __all__ = ["InventoryMcpClient"]
9
+ "
10
+ `;
11
+
12
+ exports[`py#strands-agent#mcp-connection generator > should match snapshot for generated files > agentcore_mcp_client.py 1`] = `
13
+ "import hashlib
14
+ from collections.abc import Generator
15
+ from typing import Any
16
+
17
+ import boto3
18
+ import httpx
19
+ from botocore.auth import SigV4Auth
20
+ from botocore.awsrequest import AWSRequest
21
+ from mcp.client.streamable_http import streamablehttp_client
22
+ from strands.tools.mcp.mcp_client import MCPClient
23
+
24
+
25
+ class SigV4HTTPXAuth(httpx.Auth):
26
+ """HTTPX Auth class that signs requests with AWS SigV4."""
27
+
28
+ def __init__(self, credentials: Any, region: str):
29
+ self.credentials = credentials
30
+ self.service = "bedrock-agentcore"
31
+ self.region = region
32
+ self.signer = SigV4Auth(credentials, self.service, region)
33
+
34
+ def auth_flow(
35
+ self, request: httpx.Request
36
+ ) -> Generator[httpx.Request, httpx.Response, None]:
37
+ headers = dict(request.headers)
38
+
39
+ headers.pop("connection", None)
40
+ headers["x-amz-content-sha256"] = hashlib.sha256(
41
+ request.content if request.content else b""
42
+ ).hexdigest()
43
+
44
+ aws_request = AWSRequest(
45
+ method=request.method,
46
+ url=str(request.url),
47
+ data=request.content,
48
+ headers=headers,
49
+ )
50
+
51
+ self.signer.add_auth(aws_request)
52
+
53
+ request.headers.clear()
54
+ request.headers.update(dict(aws_request.headers))
55
+
56
+ yield request
57
+
58
+
59
+ class AgentCoreMCPClient:
60
+ """Factory for clients to call MCP servers hosted on Bedrock AgentCore Runtime."""
61
+
62
+ @staticmethod
63
+ def _build_url(agent_runtime_arn: str) -> tuple[str, str]:
64
+ """Extract region from ARN and construct the invocation URL.
65
+
66
+ ARN format: arn:partition:service:region:account-id:resource
67
+ """
68
+ region = agent_runtime_arn.split(":")[3]
69
+ encoded_arn = agent_runtime_arn.replace(":", "%3A").replace("/", "%2F")
70
+ url = f"https://bedrock-agentcore.{region}.amazonaws.com/runtimes/{encoded_arn}/invocations?qualifier=DEFAULT"
71
+ return region, url
72
+
73
+ @staticmethod
74
+ def _create(
75
+ agent_runtime_arn: str,
76
+ session_id: str,
77
+ headers: dict = None,
78
+ auth_handler: httpx.Auth = None,
79
+ ) -> MCPClient:
80
+ _, url = AgentCoreMCPClient._build_url(agent_runtime_arn)
81
+ return MCPClient(
82
+ lambda: streamablehttp_client(
83
+ url,
84
+ auth=auth_handler,
85
+ timeout=120,
86
+ terminate_on_close=False,
87
+ headers={
88
+ "X-Amzn-Bedrock-AgentCore-Runtime-Session-Id": session_id,
89
+ **(headers if headers is not None else {}),
90
+ },
91
+ )
92
+ )
93
+
94
+ @staticmethod
95
+ def with_iam_auth(agent_runtime_arn: str, session_id: str) -> MCPClient:
96
+ """Create an MCP client with IAM (SigV4) authentication.
97
+
98
+ Region and credentials are derived automatically from the ARN
99
+ and the default credential provider chain.
100
+ """
101
+ region, _ = AgentCoreMCPClient._build_url(agent_runtime_arn)
102
+ boto_session = boto3.Session(region_name=region)
103
+ credentials = boto_session.get_credentials()
104
+ return AgentCoreMCPClient._create(
105
+ agent_runtime_arn=agent_runtime_arn,
106
+ session_id=session_id,
107
+ auth_handler=SigV4HTTPXAuth(credentials, region),
108
+ )
109
+
110
+ @staticmethod
111
+ def with_jwt_auth(
112
+ agent_runtime_arn: str, access_token_provider: callable, session_id: str
113
+ ) -> MCPClient:
114
+ """Create an MCP client with JWT authentication.
115
+
116
+ Args:
117
+ agent_runtime_arn: The ARN of the AgentCore runtime.
118
+ access_token_provider: A callable that returns the JWT access token.
119
+ session_id: Session ID for the connection.
120
+ """
121
+ access_token = access_token_provider()
122
+ return AgentCoreMCPClient._create(
123
+ agent_runtime_arn=agent_runtime_arn,
124
+ session_id=session_id,
125
+ headers={
126
+ "Authorization": f"Bearer {access_token}",
127
+ },
128
+ )
129
+ "
130
+ `;
131
+
132
+ exports[`py#strands-agent#mcp-connection generator > should match snapshot for generated files > inventory_mcp_client.py 1`] = `
133
+ "import os
134
+
135
+ from aws_lambda_powertools.utilities import parameters
136
+ from botocore.config import Config
137
+ from mcp.client.streamable_http import streamablehttp_client
138
+ from strands.tools.mcp.mcp_client import MCPClient
139
+
140
+ from proj_agent_connection.core.agentcore_mcp_client import AgentCoreMCPClient
141
+
142
+
143
+ class InventoryMcpClient:
144
+ """Client for connecting to the InventoryMcp MCP server.
145
+
146
+ In deployed mode: resolves the AgentCore runtime ARN from runtime config
147
+ and uses SigV4-authenticated AgentCore transport.
148
+
149
+ In local mode (SERVE_LOCAL env var set): connects directly
150
+ to the local MCP server via Streamable HTTP.
151
+ """
152
+
153
+ @staticmethod
154
+ def create(session_id: str) -> MCPClient:
155
+ if os.environ.get("SERVE_LOCAL") == "true":
156
+ return MCPClient(lambda: streamablehttp_client("http://localhost:8082/mcp"))
157
+
158
+ arn = InventoryMcpClient._get_arn()
159
+ return AgentCoreMCPClient.with_iam_auth(
160
+ agent_runtime_arn=arn,
161
+ session_id=session_id,
162
+ )
163
+
164
+ @staticmethod
165
+ def _get_arn() -> str:
166
+ """Resolve the InventoryMcp ARN from runtime config (AppConfig)."""
167
+ region = os.environ.get("AWS_REGION", os.environ.get("AWS_DEFAULT_REGION"))
168
+ provider_kwargs = {}
169
+ if region:
170
+ provider_kwargs["config"] = Config(region_name=region)
171
+ provider = parameters.AppConfigProvider(
172
+ environment="default",
173
+ application=os.environ["RUNTIME_CONFIG_APP_ID"],
174
+ **provider_kwargs,
175
+ )
176
+ config = provider.get("connection", transform="json")
177
+ return config["agentRuntimes"]["InventoryMcp"]
178
+ "
179
+ `;
180
+
181
+ exports[`py#strands-agent#mcp-connection generator > should match snapshot for generated files > transformed-agent.py 1`] = `
182
+ "from contextlib import contextmanager
183
+
184
+ from proj_agent_connection import InventoryMcpClient
185
+
186
+ from strands import Agent, tool
187
+ from strands_tools import current_time
188
+
189
+
190
+ # Define a custom tool
191
+ @tool
192
+ def subtract(a: int, b: int) -> int:
193
+ return a - b
194
+
195
+
196
+ @contextmanager
197
+ def get_agent(session_id: str):
198
+ inventory_mcp = InventoryMcpClient.create(session_id=session_id)
199
+ with (
200
+ inventory_mcp,
201
+ ):
202
+ yield Agent(
203
+ system_prompt="""
204
+ You are a mathematical wizard.
205
+ Use your tools for mathematical tasks.
206
+ Refer to tools as your 'spellbook'.
207
+ """,
208
+ tools=[subtract, current_time, *inventory_mcp.list_tools_sync()],
209
+ )
210
+ "
211
+ `;
@@ -0,0 +1,45 @@
1
+ import os
2
+
3
+ from aws_lambda_powertools.utilities import parameters
4
+ from botocore.config import Config
5
+ from mcp.client.streamable_http import streamablehttp_client
6
+ from strands.tools.mcp.mcp_client import MCPClient
7
+
8
+ from <%- agentConnectionModuleName %>.core.agentcore_mcp_client import AgentCoreMCPClient
9
+
10
+
11
+ class <%- mcpServerClassName %>Client:
12
+ """Client for connecting to the <%- mcpServerClassName %> MCP server.
13
+
14
+ In deployed mode: resolves the AgentCore runtime ARN from runtime config
15
+ and uses SigV4-authenticated AgentCore transport.
16
+
17
+ In local mode (SERVE_LOCAL env var set): connects directly
18
+ to the local MCP server via Streamable HTTP.
19
+ """
20
+
21
+ @staticmethod
22
+ def create(session_id: str) -> MCPClient:
23
+ if os.environ.get("SERVE_LOCAL") == "true":
24
+ return MCPClient(lambda: streamablehttp_client("http://localhost:<%- mcpServerPort %>/mcp"))
25
+
26
+ arn = <%- mcpServerClassName %>Client._get_arn()
27
+ return AgentCoreMCPClient.with_iam_auth(
28
+ agent_runtime_arn=arn,
29
+ session_id=session_id,
30
+ )
31
+
32
+ @staticmethod
33
+ def _get_arn() -> str:
34
+ """Resolve the <%- mcpServerClassName %> ARN from runtime config (AppConfig)."""
35
+ region = os.environ.get("AWS_REGION", os.environ.get("AWS_DEFAULT_REGION"))
36
+ provider_kwargs = {}
37
+ if region:
38
+ provider_kwargs["config"] = Config(region_name=region)
39
+ provider = parameters.AppConfigProvider(
40
+ environment="default",
41
+ application=os.environ["RUNTIME_CONFIG_APP_ID"],
42
+ **provider_kwargs,
43
+ )
44
+ config = provider.get("connection", transform="json")
45
+ return config["agentRuntimes"]["<%- mcpServerClassName %>"]
@@ -0,0 +1,10 @@
1
+ /**
2
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3
+ * SPDX-License-Identifier: Apache-2.0
4
+ */
5
+ import { GeneratorCallback, Tree } from '@nx/devkit';
6
+ import { PyStrandsAgentMcpConnectionGeneratorSchema } from './schema';
7
+ import { NxGeneratorInfo } from '../../../utils/nx';
8
+ export declare const PY_STRANDS_AGENT_MCP_CONNECTION_GENERATOR_INFO: NxGeneratorInfo;
9
+ export declare const pyStrandsAgentMcpConnectionGenerator: (tree: Tree, options: PyStrandsAgentMcpConnectionGeneratorSchema) => Promise<GeneratorCallback>;
10
+ export default pyStrandsAgentMcpConnectionGenerator;
@@ -0,0 +1,171 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.pyStrandsAgentMcpConnectionGenerator = exports.PY_STRANDS_AGENT_MCP_CONNECTION_GENERATOR_INFO = void 0;
4
+ const tslib_1 = require("tslib");
5
+ /**
6
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
7
+ * SPDX-License-Identifier: Apache-2.0
8
+ */
9
+ const devkit_1 = require("@nx/devkit");
10
+ const nx_1 = require("../../../utils/nx");
11
+ const metrics_1 = require("../../../utils/metrics");
12
+ const format_1 = require("../../../utils/format");
13
+ const names_1 = require("../../../utils/names");
14
+ const py_1 = require("../../../utils/py");
15
+ const agent_connection_1 = require("../../../utils/agent-connection/agent-connection");
16
+ const ast_1 = require("../../../utils/ast");
17
+ /** Prefix a GritQL pattern with `language python` */
18
+ const py = (pattern) => `language python\n${pattern}`;
19
+ exports.PY_STRANDS_AGENT_MCP_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
20
+ const pyStrandsAgentMcpConnectionGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
21
+ var _a, _b, _c, _d, _e, _f;
22
+ const sourceProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.sourceProject);
23
+ const targetProject = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.targetProject);
24
+ const agentComponent = options.sourceComponent;
25
+ const mcpComponent = options.targetComponent;
26
+ if (!agentComponent || !mcpComponent) {
27
+ throw new Error('Both sourceComponent and targetComponent must be provided for py#strands-agent -> mcp connections');
28
+ }
29
+ const mcpComponentName = (_a = mcpComponent.name) !== null && _a !== void 0 ? _a : 'mcp-server';
30
+ const mcpServerClassName = mcpComponent.rc;
31
+ const mcpServerSnakeCase = (0, names_1.snakeCase)(mcpServerClassName);
32
+ const mcpServerPort = (_b = mcpComponent.port) !== null && _b !== void 0 ? _b : 8000;
33
+ // 1. Ensure the shared Python agent-connection project exists
34
+ yield (0, agent_connection_1.ensurePythonAgentConnectionProject)(tree);
35
+ const agentConnectionProjectDir = (0, agent_connection_1.getPythonAgentConnectionProjectDir)(tree);
36
+ const agentConnectionModuleName = (0, agent_connection_1.getPythonAgentConnectionModuleName)(tree);
37
+ const agentConnectionPackageName = (0, agent_connection_1.getPythonAgentConnectionPackageName)(tree);
38
+ // 2. Generate the per-connection client into the shared agent-connection project
39
+ const appDir = (0, devkit_1.joinPathFragments)(agentConnectionProjectDir, agentConnectionModuleName, 'app');
40
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'agent-connection', 'app'), appDir, {
41
+ mcpServerSnakeCase,
42
+ mcpServerClassName,
43
+ mcpServerPort,
44
+ agentConnectionModuleName,
45
+ }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
46
+ // Ensure app/__init__.py exists
47
+ const appInitPath = (0, devkit_1.joinPathFragments)(appDir, '__init__.py');
48
+ if (!tree.exists(appInitPath)) {
49
+ tree.write(appInitPath, '');
50
+ }
51
+ // Add re-export to module __init__.py
52
+ const moduleInitPath = (0, devkit_1.joinPathFragments)(agentConnectionProjectDir, agentConnectionModuleName, '__init__.py');
53
+ yield (0, agent_connection_1.addPythonReExport)(tree, moduleInitPath, `.app.${mcpServerSnakeCase}_client`, `${mcpServerClassName}Client`);
54
+ // Add aws-lambda-powertools dependency to the agent-connection project
55
+ (0, py_1.addDependenciesToPyProjectToml)(tree, agentConnectionProjectDir, [
56
+ 'aws-lambda-powertools',
57
+ ]);
58
+ // 3. Transform agent.py to add MCP client import and usage
59
+ const agentSourceDir = (0, devkit_1.joinPathFragments)(sourceProject.root, (_c = agentComponent.path) !== null && _c !== void 0 ? _c : 'src');
60
+ const agentFilePath = (0, devkit_1.joinPathFragments)(agentSourceDir, 'agent.py');
61
+ if (tree.exists(agentFilePath)) {
62
+ const clientClassName = `${mcpServerClassName}Client`;
63
+ const clientVarName = mcpServerSnakeCase;
64
+ yield addImportToAgentFile(tree, agentFilePath, agentConnectionModuleName, clientClassName);
65
+ yield addMcpToolsToAgent(tree, agentFilePath, clientVarName);
66
+ yield addMcpClientToGetAgent(tree, agentFilePath, clientClassName, clientVarName);
67
+ }
68
+ // 4. Add workspace dependency from agent project to agent-connection project
69
+ (0, py_1.addWorkspaceDependencyToPyProject)(tree, sourceProject.root, agentConnectionPackageName);
70
+ // 5. Set up serve-local target dependencies
71
+ const agentName = (_d = agentComponent.name) !== null && _d !== void 0 ? _d : 'agent';
72
+ const serveLocalTargetName = `${agentName}-serve-local`;
73
+ const mcpServeLocalTargetName = `${mcpComponentName}-serve-local`;
74
+ if ((_e = sourceProject.targets) === null || _e === void 0 ? void 0 : _e[serveLocalTargetName]) {
75
+ const target = sourceProject.targets[serveLocalTargetName];
76
+ target.dependsOn = [
77
+ ...((_f = target.dependsOn) !== null && _f !== void 0 ? _f : []),
78
+ {
79
+ projects: [targetProject.name],
80
+ target: mcpServeLocalTargetName,
81
+ },
82
+ ];
83
+ (0, devkit_1.updateProjectConfiguration)(tree, sourceProject.name, sourceProject);
84
+ }
85
+ yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
86
+ exports.PY_STRANDS_AGENT_MCP_CONNECTION_GENERATOR_INFO,
87
+ ]);
88
+ yield (0, format_1.formatFilesInSubtree)(tree);
89
+ return () => {
90
+ (0, devkit_1.installPackagesTask)(tree);
91
+ };
92
+ });
93
+ exports.pyStrandsAgentMcpConnectionGenerator = pyStrandsAgentMcpConnectionGenerator;
94
+ /**
95
+ * Add an import for the MCP client class to agent.py using GritQL.
96
+ *
97
+ * If the agent-connection module is already imported, appends the new client
98
+ * using +=. Otherwise adds a new import statement after contextlib.
99
+ * Ruff will sort imports correctly when formatFilesInSubtree runs.
100
+ */
101
+ const addImportToAgentFile = (tree, filePath, agentConnectionModuleName, clientClassName) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
102
+ if (yield (0, ast_1.hasGritQLMatch)(tree, filePath, `\`${clientClassName}\``)) {
103
+ return;
104
+ }
105
+ // Try to append to existing import from the same module using +=
106
+ const appended = yield (0, ast_1.applyGritQLTransform)(tree, filePath, py(`\`from ${agentConnectionModuleName} import $names\` where { $names += \`, ${clientClassName}\` }`));
107
+ if (!appended) {
108
+ // No existing import — add a new one after the first import.
109
+ // Ruff will sort it into the correct position.
110
+ yield (0, ast_1.applyGritQLTransform)(tree, filePath, py(`\`from contextlib import contextmanager\` as $imp => \`$imp\nfrom ${agentConnectionModuleName} import ${clientClassName}\``));
111
+ }
112
+ });
113
+ /**
114
+ * Add MCP tools to the Agent's tools array using GritQL.
115
+ * Appends `*<clientVarName>.list_tools_sync()` to the tools list.
116
+ * Handles both empty and non-empty arrays using if/else.
117
+ */
118
+ const addMcpToolsToAgent = (tree, filePath, clientVarName) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
119
+ if (yield (0, ast_1.hasGritQLMatch)(tree, filePath, `\`${clientVarName}.list_tools_sync()\``)) {
120
+ return;
121
+ }
122
+ yield (0, ast_1.applyGritQLTransform)(tree, filePath, py(`\`tools=$old\` where {
123
+ $old <: not contains \`${clientVarName}\`,
124
+ if ($old <: \`[]\`) {
125
+ $old => \`[*${clientVarName}.list_tools_sync()]\`
126
+ } else {
127
+ $old <: \`[$items]\` where { $items += \`, *${clientVarName}.list_tools_sync()\` }
128
+ }
129
+ }`));
130
+ });
131
+ /**
132
+ * Add MCP client creation and with-block wrapping to the get_agent function
133
+ * using GritQL transforms.
134
+ *
135
+ * First connection: Rewrites `def get_agent` to wrap $body in a with block.
136
+ * Subsequent connections: Uses += to add to existing with items and creation lines.
137
+ */
138
+ const addMcpClientToGetAgent = (tree, filePath, clientClassName, clientVarName) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
139
+ if (yield (0, ast_1.hasGritQLMatch)(tree, filePath, `\`${clientClassName}.create($_)\``)) {
140
+ return;
141
+ }
142
+ // Try the "add to existing with block" pattern first.
143
+ // If it succeeds, there was already a with block from a previous connection.
144
+ const addedToWith = yield (0, ast_1.applyGritQLTransform)(tree, filePath, py(`\`with ($items,): $body\` where {
145
+ $items <: not contains \`${clientVarName}\`,
146
+ $items += \`, ${clientVarName}\`
147
+ }`));
148
+ if (addedToWith) {
149
+ // Subsequent connection — also add creation line after the existing one
150
+ yield (0, ast_1.applyGritQLTransform)(tree, filePath, py(`\`$var = $cls.create(session_id=session_id)\` as $stmt where {
151
+ $program <: not contains \`${clientClassName}.create\`,
152
+ $stmt += \`\n${clientVarName} = ${clientClassName}.create(session_id=session_id)\`
153
+ }`));
154
+ return;
155
+ }
156
+ // First connection — rewrite the function body to include client creation
157
+ // and wrap $body in a with block. GritQL handles indentation correctly
158
+ // when the replacement is structured as a proper Python function body.
159
+ yield (0, ast_1.applyGritQLTransform)(tree, filePath, py(`\`def get_agent($params):
160
+ $body\` where {
161
+ $body <: contains \`yield Agent($_)\`,
162
+ $body <: not contains \`with ($_, ): $_\`
163
+ } => \`def get_agent($params):
164
+ ${clientVarName} = ${clientClassName}.create(session_id=session_id)
165
+ with (
166
+ ${clientVarName},
167
+ ):
168
+ $body\``));
169
+ });
170
+ exports.default = exports.pyStrandsAgentMcpConnectionGenerator;
171
+ //# sourceMappingURL=generator.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/strands-agent/mcp-connection/generator.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,15 @@
1
+ /**
2
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3
+ * SPDX-License-Identifier: Apache-2.0
4
+ */
5
+ import { ComponentMetadata } from '../../../utils/nx';
6
+
7
+ /**
8
+ * TypeScript types for options defined in schema.json
9
+ */
10
+ export interface PyStrandsAgentMcpConnectionGeneratorSchema {
11
+ sourceProject: string;
12
+ targetProject: string;
13
+ sourceComponent?: ComponentMetadata;
14
+ targetComponent?: ComponentMetadata;
15
+ }
@@ -0,0 +1,26 @@
1
+ {
2
+ "$schema": "https://json-schema.org/schema",
3
+ "$id": "py#strands-agent#mcp-connection",
4
+ "title": "py#strands-agent#mcp-connection",
5
+ "description": "Connect a Python Strands Agent to an MCP server",
6
+ "type": "object",
7
+ "properties": {
8
+ "sourceProject": {
9
+ "type": "string",
10
+ "description": "The project containing the Strands Agent"
11
+ },
12
+ "targetProject": {
13
+ "type": "string",
14
+ "description": "The project containing the MCP server"
15
+ },
16
+ "sourceComponent": {
17
+ "type": "string",
18
+ "description": "The agent component name"
19
+ },
20
+ "targetComponent": {
21
+ "type": "string",
22
+ "description": "The MCP server component name"
23
+ }
24
+ },
25
+ "required": ["sourceProject", "targetProject"]
26
+ }
@@ -65,7 +65,7 @@ const tsSmithyApiGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0
65
65
  yield (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
66
66
  iacProvider,
67
67
  });
68
- (0, api_constructs_1.addApiGatewayInfra)(tree, {
68
+ yield (0, api_constructs_1.addApiGatewayInfra)(tree, {
69
69
  iacProvider,
70
70
  apiProjectName: backendFullyQualifiedName,
71
71
  apiNameClassName,
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/smithy/ts/api/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/smithy/ts/api/generator.ts"],"names":[],"mappings":"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"}
@@ -52,7 +52,7 @@ function tsTrpcApiGenerator(tree, options) {
52
52
  const enhancedOptions = Object.assign({ backendProjectName, backendProjectAlias: (0, npm_scope_1.toScopeAlias)(backendProjectName), apiNameKebabCase,
53
53
  apiNameClassName,
54
54
  backendRoot, pkgMgrCmd: (0, pkg_manager_1.getPackageManagerDisplayCommands)().exec, apiGatewayEventType: getApiGatewayEventType(options), port }, options);
55
- (0, api_constructs_1.addApiGatewayInfra)(tree, {
55
+ yield (0, api_constructs_1.addApiGatewayInfra)(tree, {
56
56
  apiProjectName: backendProjectName,
57
57
  apiNameClassName,
58
58
  apiNameKebabCase,
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}
@@ -50,9 +50,9 @@ function reactGenerator(tree, options) {
50
50
  });
51
51
  // update main.tsx
52
52
  const mainTsxPath = (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, 'main.tsx');
53
- (0, ast_1.addSingleImport)(tree, mainTsxPath, 'QueryClientProvider', './components/QueryClientProvider');
53
+ yield (0, ast_1.addSingleImport)(tree, mainTsxPath, 'QueryClientProvider', './components/QueryClientProvider');
54
54
  const clientProviderName = `${apiNameClassName}ClientProvider`;
55
- (0, ast_1.addSingleImport)(tree, mainTsxPath, clientProviderName, `./components/${clientProviderName}`);
55
+ yield (0, ast_1.addSingleImport)(tree, mainTsxPath, clientProviderName, `./components/${clientProviderName}`);
56
56
  // Check if QueryClientProvider already exists
57
57
  const hasQueryClientProvider = (0, ast_1.query)(tree, mainTsxPath, 'JsxOpeningElement[tagName.name="QueryClientProvider"]').length > 0;
58
58
  if (!hasQueryClientProvider) {
@@ -63,7 +63,7 @@ function reactGenerator(tree, options) {
63
63
  if (!hasProvider) {
64
64
  (0, ast_1.replace)(tree, mainTsxPath, 'JsxSelfClosingElement[tagName.name="App"]', (node) => (0, ast_1.createJsxElementFromIdentifier)(clientProviderName, [node]));
65
65
  }
66
- (0, serve_local_1.addTargetToServeLocal)(tree, frontendProjectConfig.name, backendProjectConfig.name, {
66
+ yield (0, serve_local_1.addTargetToServeLocal)(tree, frontendProjectConfig.name, backendProjectConfig.name, {
67
67
  url: `http://localhost:${port}/`,
68
68
  apiName,
69
69
  });
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":"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"}
@@ -54,7 +54,7 @@ const tsLambdaFunctionGenerator = (tree, schema) => tslib_1.__awaiter(void 0, vo
54
54
  iacProvider,
55
55
  });
56
56
  const bundleOutputDir = (0, devkit_1.joinPathFragments)('lambda', lambdaFunctionKebabCase);
57
- (0, function_constructs_1.addLambdaFunctionInfra)(tree, {
57
+ yield (0, function_constructs_1.addLambdaFunctionInfra)(tree, {
58
58
  functionProjectName: projectConfig.name,
59
59
  functionNameClassName: constructFunctionClassName,
60
60
  functionNameKebabCase: constructFunctionNameKebabCase,
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lambda-function/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lambda-function/generator.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@
4
4
  */
5
5
  import { Tree } from '@nx/devkit';
6
6
  import { ConfigureProjectOptions } from './types';
7
- export declare const configureEslint: (tree: Tree, options: ConfigureProjectOptions) => void;
7
+ export declare const configureEslint: (tree: Tree, options: ConfigureProjectOptions) => Promise<void>;
8
8
  /**
9
9
  * Adds ignore patterns to the eslint config file
10
10
  * @param tree - The file system tree