@aws/nx-plugin 0.122.0 → 0.123.1
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/package.json +1 -1
- package/src/py/agent/__snapshots__/generator.spec.ts.snap +2 -2
- package/src/py/agent/a2a-connection/generator.js +1 -2
- package/src/py/agent/a2a-connection/generator.js.map +1 -1
- package/src/py/agent/generator.js +1 -2
- package/src/py/agent/generator.js.map +1 -1
- package/src/py/agent/mcp-connection/generator.js +1 -2
- package/src/py/agent/mcp-connection/generator.js.map +1 -1
- package/src/py/agent/react-connection/__snapshots__/generator.spec.ts.snap +7 -16
- package/src/py/project/generator.d.ts +14 -1
- package/src/py/project/generator.js +12 -2
- package/src/py/project/generator.js.map +1 -1
- package/src/ts/rdb/__snapshots__/generator.spec.ts.snap +36 -18
- package/src/ts/react-website/agui/files/common/src/hooks/useAgui__agentNameClassName__.tsx.template +1 -16
- package/src/ts/react-website/agui/generator.js +0 -1
- package/src/ts/react-website/agui/generator.js.map +1 -1
- package/src/utils/agent-connection/agent-connection.d.ts +8 -2
- package/src/utils/agent-connection/agent-connection.js +8 -5
- package/src/utils/agent-connection/agent-connection.js.map +1 -1
- package/src/utils/names.d.ts +16 -0
- package/src/utils/names.js +18 -1
- package/src/utils/names.js.map +1 -1
- package/src/utils/py.d.ts +14 -1
- package/src/utils/py.js +34 -7
- 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/versions.d.ts +5 -5
- package/src/utils/versions.js +4 -4
package/package.json
CHANGED
|
@@ -745,7 +745,7 @@ exports[`py#agent generator > should match snapshot for generated files > update
|
|
|
745
745
|
name = "proj.test_project"
|
|
746
746
|
version = "0.1.0"
|
|
747
747
|
dependencies = [
|
|
748
|
-
"proj
|
|
748
|
+
"proj-agent-connection",
|
|
749
749
|
"aws-lambda-powertools==3.29.0",
|
|
750
750
|
"aws-opentelemetry-distro==0.17.1",
|
|
751
751
|
"bedrock-agentcore==1.13.0",
|
|
@@ -763,7 +763,7 @@ dev = [ "fastapi[standard]==0.136.3" ]
|
|
|
763
763
|
[tool.uv]
|
|
764
764
|
dev-dependencies = [ ]
|
|
765
765
|
|
|
766
|
-
[tool.uv.sources.
|
|
766
|
+
[tool.uv.sources.proj-agent-connection]
|
|
767
767
|
workspace = true
|
|
768
768
|
"
|
|
769
769
|
`;
|
|
@@ -41,7 +41,6 @@ const pyAgentA2aConnectionGenerator = async (tree, options) => {
|
|
|
41
41
|
(0, agent_connection_1.addPythonCoreClient)(tree, 'a2a');
|
|
42
42
|
const agentConnectionProjectDir = (0, agent_connection_1.getPythonAgentConnectionProjectDir)(tree);
|
|
43
43
|
const agentConnectionModuleName = (0, agent_connection_1.getPythonAgentConnectionModuleName)(tree);
|
|
44
|
-
const agentConnectionPackageName = (0, agent_connection_1.getPythonAgentConnectionPackageName)(tree);
|
|
45
44
|
// Python deps required by the A2A core client + shared auth helper.
|
|
46
45
|
(0, py_1.addDependenciesToPyProjectToml)(tree, agentConnectionProjectDir, [
|
|
47
46
|
'boto3',
|
|
@@ -76,7 +75,7 @@ const pyAgentA2aConnectionGenerator = async (tree, options) => {
|
|
|
76
75
|
await addClientToolToGetAgent(tree, agentFilePath, clientClassName, clientVarName, toolName, targetAgentClassName);
|
|
77
76
|
}
|
|
78
77
|
// 4. Add workspace dependency from agent project to agent-connection project
|
|
79
|
-
(0, py_1.addWorkspaceDependencyToPyProject)(tree, sourceProject
|
|
78
|
+
(0, py_1.addWorkspaceDependencyToPyProject)(tree, sourceProject, (0, agent_connection_1.getPythonAgentConnectionProject)(tree));
|
|
80
79
|
// 5. Set up serve-local target dependencies — chain onto the target agent
|
|
81
80
|
const agentName = agentComponent.name ?? 'agent';
|
|
82
81
|
const serveLocalTargetName = `${agentName}-serve-local`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/agent/a2a-connection/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAQoB;AAEpB,0CAK2B;AAC3B,oDAAyE;AACzE,kDAA6D;AAC7D,gDAAiD;AACjD,0CAG2B;AAC3B,uFAO0D;AAC1D,4CAI4B;AAE5B,qDAAqD;AACrD,MAAM,EAAE,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,oBAAoB,OAAO,EAAE,CAAC;AAEjD,QAAA,sCAAsC,GACjD,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,6BAA6B,GAAG,KAAK,EAChD,IAAU,EACV,OAA4C,EAChB,EAAE;IAC9B,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IAEF,MAAM,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAC/C,MAAM,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC;IAErD,IAAI,CAAC,cAAc,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;IACJ,CAAC;IAED,IAAI,oBAAoB,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CACb,iBAAiB,oBAAoB,CAAC,IAAI,cAAc,oBAAoB,CAAC,QAAQ,IAAI,MAAM,wDAAwD,CACxJ,CAAC;IACJ,CAAC;IAED,IAAI,oBAAoB,CAAC,IAAI,IAAI,oBAAoB,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACrE,MAAM,IAAI,KAAK,CACb,yEAAyE,oBAAoB,CAAC,IAAI,WAAW,oBAAoB,CAAC,IAAI,mBAAmB,CAC1J,CAAC;IACJ,CAAC;IAED,MAAM,wBAAwB,GAAG,oBAAoB,CAAC,IAAI,IAAI,OAAO,CAAC;IACtE,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,EAAY,CAAC;IAC/D,MAAM,oBAAoB,GAAG,IAAA,iBAAS,EAAC,oBAAoB,CAAC,CAAC;IAC7D,MAAM,eAAe,GAAG,oBAAoB,CAAC,IAAI,IAAI,IAAI,CAAC;IAE1D,wEAAwE;IACxE,uDAAuD;IACvD,MAAM,IAAA,qDAAkC,EAAC,IAAI,CAAC,CAAC;IAC/C,IAAA,sCAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAClC,IAAA,sCAAmB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAEjC,MAAM,yBAAyB,GAAG,IAAA,qDAAkC,EAAC,IAAI,CAAC,CAAC;IAC3E,MAAM,yBAAyB,GAAG,IAAA,qDAAkC,EAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/agent/a2a-connection/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,8 +57,7 @@ const pyAgentGenerator = async (tree, options) => {
|
|
|
57
57
|
// generator wires into this agent.
|
|
58
58
|
await (0, agent_connection_1.ensurePythonAgentConnectionProject)(tree);
|
|
59
59
|
const agentConnectionModuleName = (0, agent_connection_1.getPythonAgentConnectionModuleName)(tree);
|
|
60
|
-
|
|
61
|
-
(0, py_2.addWorkspaceDependencyToPyProject)(tree, project.root, agentConnectionPackageName);
|
|
60
|
+
(0, py_2.addWorkspaceDependencyToPyProject)(tree, project, (0, agent_connection_1.getPythonAgentConnectionProject)(tree));
|
|
62
61
|
const templateContext = {
|
|
63
62
|
name,
|
|
64
63
|
agentNameSnakeCase,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/agent/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCASoB;AACpB,mDAAoD;AACpD,yCAAkD;AAClD,+CAAoD;AAEpD,uCAMwB;AACxB,iDAAsE;AACtE,+CAA0D;AAC1D,6CAAwE;AACxE,uCAGwB;AACxB,mGAAwF;AACxF,oFAIuD;AACvD,uCAAmE;AAEnE,sDAAkE;AAClE,uCAA4C;AAC5C,qDAAoD;AACpD,qEAA0E;AAC1E,yDAA6D;AAC7D,yCAAqD;AACrD,uDAAgE;AAChE,2CAA8C;AAC9C,6CAA0D;AAE7C,QAAA,uBAAuB,GAClC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,gBAAgB,GAAG,KAAK,EACnC,IAAU,EACV,OAA+B,EACH,EAAE;IAC9B,MAAM,OAAO,GAAG,IAAA,wCAAmC,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3E,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAExE,iDAAiD;IACjD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CACb,uBAAuB,OAAO,CAAC,OAAO,qDAAqD,CAC5F,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,gIAAgI,CACjI,CAAC;IACJ,CAAC;IAED,mDAAmD;IACnD,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEvD,MAAM,IAAI,GAAG,IAAA,iBAAS,EACpB,OAAO,CAAC,IAAI,IAAI,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,CACpE,CAAC;IACF,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IAExD,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,OAAO,CAAC,UAAU,EAClB,kBAAkB,CACnB,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,yBAAyB,CAAC;IACrE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC;IAE5C,IAAI,WAAW,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACrE,OAAO,CAAC,IAAI,CACV,8FAA8F,CAC/F,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,KAAK,CAAC;IAEnC,wEAAwE;IACxE,oEAAoE;IACpE,oEAAoE;IACpE,mCAAmC;IACnC,MAAM,IAAA,qDAAkC,EAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,yBAAyB,GAAG,IAAA,qDAAkC,EAAC,IAAI,CAAC,CAAC;IAC3E,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/agent/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,6 @@ const pyAgentMcpConnectionGenerator = async (tree, options) => {
|
|
|
38
38
|
(0, agent_connection_1.addPythonCoreClient)(tree, 'mcp');
|
|
39
39
|
const agentConnectionProjectDir = (0, agent_connection_1.getPythonAgentConnectionProjectDir)(tree);
|
|
40
40
|
const agentConnectionModuleName = (0, agent_connection_1.getPythonAgentConnectionModuleName)(tree);
|
|
41
|
-
const agentConnectionPackageName = (0, agent_connection_1.getPythonAgentConnectionPackageName)(tree);
|
|
42
41
|
// Python deps required by the MCP core client + shared auth helper.
|
|
43
42
|
(0, py_1.addDependenciesToPyProjectToml)(tree, agentConnectionProjectDir, [
|
|
44
43
|
'boto3',
|
|
@@ -73,7 +72,7 @@ const pyAgentMcpConnectionGenerator = async (tree, options) => {
|
|
|
73
72
|
await addMcpClientToGetAgent(tree, agentFilePath, clientClassName, clientVarName);
|
|
74
73
|
}
|
|
75
74
|
// 4. Add workspace dependency from agent project to agent-connection project
|
|
76
|
-
(0, py_1.addWorkspaceDependencyToPyProject)(tree, sourceProject
|
|
75
|
+
(0, py_1.addWorkspaceDependencyToPyProject)(tree, sourceProject, (0, agent_connection_1.getPythonAgentConnectionProject)(tree));
|
|
77
76
|
// 5. Set up serve-local target dependencies
|
|
78
77
|
const agentName = agentComponent.name ?? 'agent';
|
|
79
78
|
const serveLocalTargetName = `${agentName}-serve-local`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/agent/mcp-connection/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAQoB;AAEpB,0CAK2B;AAC3B,oDAAyE;AACzE,kDAA6D;AAC7D,gDAAiD;AACjD,0CAG2B;AAC3B,uFAO0D;AAC1D,4CAI4B;AAE5B,qDAAqD;AACrD,MAAM,EAAE,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,oBAAoB,OAAO,EAAE,CAAC;AAEjD,QAAA,sCAAsC,GACjD,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,6BAA6B,GAAG,KAAK,EAChD,IAAU,EACV,OAA4C,EAChB,EAAE;IAC9B,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IAEF,MAAM,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAC/C,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAE7C,IAAI,CAAC,cAAc,IAAI,CAAC,YAAY,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CACb,0EAA0E,YAAY,CAAC,IAAI,WAAW,YAAY,CAAC,IAAI,mBAAmB,CAC3I,CAAC;IACJ,CAAC;IAED,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,IAAI,YAAY,CAAC;IAC3D,MAAM,kBAAkB,GAAG,YAAY,CAAC,EAAY,CAAC;IACrD,MAAM,kBAAkB,GAAG,IAAA,iBAAS,EAAC,kBAAkB,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC;IAEhD,wEAAwE;IACxE,uDAAuD;IACvD,MAAM,IAAA,qDAAkC,EAAC,IAAI,CAAC,CAAC;IAC/C,IAAA,sCAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAClC,IAAA,sCAAmB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAEjC,MAAM,yBAAyB,GAAG,IAAA,qDAAkC,EAAC,IAAI,CAAC,CAAC;IAC3E,MAAM,yBAAyB,GAAG,IAAA,qDAAkC,EAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/agent/mcp-connection/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAQoB;AAEpB,0CAK2B;AAC3B,oDAAyE;AACzE,kDAA6D;AAC7D,gDAAiD;AACjD,0CAG2B;AAC3B,uFAO0D;AAC1D,4CAI4B;AAE5B,qDAAqD;AACrD,MAAM,EAAE,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,oBAAoB,OAAO,EAAE,CAAC;AAEjD,QAAA,sCAAsC,GACjD,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,6BAA6B,GAAG,KAAK,EAChD,IAAU,EACV,OAA4C,EAChB,EAAE;IAC9B,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,aAAa,CACtB,CAAC;IAEF,MAAM,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAC/C,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC;IAE7C,IAAI,CAAC,cAAc,IAAI,CAAC,YAAY,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC,IAAI,IAAI,YAAY,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CACb,0EAA0E,YAAY,CAAC,IAAI,WAAW,YAAY,CAAC,IAAI,mBAAmB,CAC3I,CAAC;IACJ,CAAC;IAED,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,IAAI,YAAY,CAAC;IAC3D,MAAM,kBAAkB,GAAG,YAAY,CAAC,EAAY,CAAC;IACrD,MAAM,kBAAkB,GAAG,IAAA,iBAAS,EAAC,kBAAkB,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC;IAEhD,wEAAwE;IACxE,uDAAuD;IACvD,MAAM,IAAA,qDAAkC,EAAC,IAAI,CAAC,CAAC;IAC/C,IAAA,sCAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAClC,IAAA,sCAAmB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAEjC,MAAM,yBAAyB,GAAG,IAAA,qDAAkC,EAAC,IAAI,CAAC,CAAC;IAC3E,MAAM,yBAAyB,GAAG,IAAA,qDAAkC,EAAC,IAAI,CAAC,CAAC;IAE3E,oEAAoE;IACpE,IAAA,mCAA8B,EAAC,IAAI,EAAE,yBAAyB,EAAE;QAC9D,OAAO;QACP,OAAO;QACP,KAAK;QACL,gBAAgB;KACjB,CAAC,CAAC;IAEH,iFAAiF;IACjF,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAC9B,yBAAyB,EACzB,yBAAyB,EACzB,KAAK,CACN,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,CAAC,EAChE,MAAM,EACN;QACE,kBAAkB;QAClB,kBAAkB;QAClB,aAAa;QACb,yBAAyB;KAC1B,EACD,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,gCAAgC;IAChC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC7D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,sCAAsC;IACtC,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,yBAAyB,EACzB,yBAAyB,EACzB,aAAa,CACd,CAAC;IACF,MAAM,IAAA,oCAAiB,EACrB,IAAI,EACJ,cAAc,EACd,QAAQ,kBAAkB,SAAS,EACnC,GAAG,kBAAkB,QAAQ,CAC9B,CAAC;IAEF,2DAA2D;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,aAAa,CAAC,IAAI,EAClB,cAAc,CAAC,IAAI,IAAI,KAAK,CAC7B,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAEpE,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/B,MAAM,eAAe,GAAG,GAAG,kBAAkB,QAAQ,CAAC;QACtD,MAAM,aAAa,GAAG,kBAAkB,CAAC;QAEzC,MAAM,oBAAoB,CACxB,IAAI,EACJ,aAAa,EACb,yBAAyB,EACzB,eAAe,CAChB,CAAC;QACF,MAAM,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;QAC7D,MAAM,sBAAsB,CAC1B,IAAI,EACJ,aAAa,EACb,eAAe,EACf,aAAa,CACd,CAAC;IACJ,CAAC;IAED,6EAA6E;IAC7E,IAAA,sCAAiC,EAC/B,IAAI,EACJ,aAAa,EACb,IAAA,kDAA+B,EAAC,IAAI,CAAC,CACtC,CAAC;IAEF,4CAA4C;IAC5C,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,IAAI,OAAO,CAAC;IACjD,MAAM,oBAAoB,GAAG,GAAG,SAAS,cAAc,CAAC;IACxD,MAAM,uBAAuB,GAAG,GAAG,gBAAgB,cAAc,CAAC;IAElE,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAClD,IAAA,sCAAiC,EAAC,aAAa,EAAE,oBAAoB,EAAE;YACrE,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;YAC9B,MAAM,EAAE,uBAAuB;SAChC,CAAC,CAAC;QACH,IAAA,mCAA0B,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE;QAC1C,8CAAsC;KACvC,CAAC,CAAC;IAEH,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC,CAAC;AA9IW,QAAA,6BAA6B,iCA8IxC;AAEF;;;;;;GAMG;AACH,MAAM,oBAAoB,GAAG,KAAK,EAChC,IAAU,EACV,QAAgB,EAChB,yBAAiC,EACjC,eAAuB,EACR,EAAE;IACjB,MAAM,IAAA,iCAA2B,EAC/B,IAAI,EACJ,QAAQ,EACR,CAAC,eAAe,CAAC,EACjB,yBAAyB,CAC1B,CAAC;AACJ,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,KAAK,EAC9B,IAAU,EACV,QAAgB,EAChB,aAAqB,EACN,EAAE;IACjB,IACE,MAAM,IAAA,iBAAW,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,aAAa,sBAAsB,CAAC,EAC3E,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,QAAQ,EACR,EAAE,CAAC;2BACoB,aAAa;;kBAEtB,aAAa;;kDAEmB,aAAa;;EAE7D,CAAC,CACA,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,sBAAsB,GAAG,KAAK,EAClC,IAAU,EACV,QAAgB,EAChB,eAAuB,EACvB,aAAqB,EACN,EAAE;IACjB,IAAI,MAAM,IAAA,iBAAW,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,eAAe,eAAe,CAAC,EAAE,CAAC;QAC3E,OAAO;IACT,CAAC;IAED,sDAAsD;IACtD,6EAA6E;IAC7E,MAAM,WAAW,GAAG,MAAM,IAAA,iBAAW,EACnC,IAAI,EACJ,QAAQ,EACR,EAAE,CAAC;6BACsB,aAAa;kBACxB,aAAa;EAC7B,CAAC,CACA,CAAC;IAEF,IAAI,WAAW,EAAE,CAAC;QAChB,wEAAwE;QACxE,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,QAAQ,EACR,EAAE,CAAC;+BACsB,eAAe;iBAC7B,aAAa,MAAM,eAAe;EACjD,CAAC,CACE,CAAC;QACF,OAAO;IACT,CAAC;IAED,0EAA0E;IAC1E,uEAAuE;IACvE,uEAAuE;IACvE,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,QAAQ,EACR,EAAE,CAAC;;;;;MAKD,aAAa,MAAM,eAAe;;UAE9B,aAAa;;gBAEP,CAAC,CACd,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,qCAA6B,CAAC"}
|
|
@@ -257,7 +257,6 @@ export default AguiProvider;
|
|
|
257
257
|
exports[`py strands agent react connection generator - AG-UI protocol > should generate a shared AguiProvider and a per-agent hook for AG-UI agents > useAguiTestAgent.tsx 1`] = `
|
|
258
258
|
"import { HttpAgent } from '@ag-ui/client';
|
|
259
259
|
import type { AbstractAgent, RunAgentInput } from '@ag-ui/client';
|
|
260
|
-
import { Observable } from 'rxjs';
|
|
261
260
|
import { useMemo } from 'react';
|
|
262
261
|
import { useRuntimeConfig } from './useRuntimeConfig';
|
|
263
262
|
import { useSigV4, type SigV4Client } from './useSigV4';
|
|
@@ -279,7 +278,13 @@ class SigV4HttpAgent extends HttpAgent {
|
|
|
279
278
|
config: ConstructorParameters<typeof HttpAgent>[0],
|
|
280
279
|
sigV4Client: SigV4Client,
|
|
281
280
|
) {
|
|
282
|
-
super(
|
|
281
|
+
super({
|
|
282
|
+
...config,
|
|
283
|
+
fetch: sigV4Client.fetch as (
|
|
284
|
+
url: string,
|
|
285
|
+
init: RequestInit,
|
|
286
|
+
) => Promise<Response>,
|
|
287
|
+
});
|
|
283
288
|
this.sigV4Client = sigV4Client;
|
|
284
289
|
}
|
|
285
290
|
|
|
@@ -292,20 +297,6 @@ class SigV4HttpAgent extends HttpAgent {
|
|
|
292
297
|
return init;
|
|
293
298
|
}
|
|
294
299
|
|
|
295
|
-
// Remove this override once https://github.com/ag-ui-protocol/ag-ui/issues/1316 is fixed.
|
|
296
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
297
|
-
override run(input: RunAgentInput): any {
|
|
298
|
-
const sigV4Fetch = this.sigV4Client.fetch as typeof window.fetch;
|
|
299
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
300
|
-
return new Observable<any>((subscriber) => {
|
|
301
|
-
const originalFetch = window.fetch;
|
|
302
|
-
window.fetch = sigV4Fetch;
|
|
303
|
-
const sub = super.run(input).subscribe(subscriber);
|
|
304
|
-
window.fetch = originalFetch;
|
|
305
|
-
return () => sub.unsubscribe();
|
|
306
|
-
});
|
|
307
|
-
}
|
|
308
|
-
|
|
309
300
|
override clone(): SigV4HttpAgent {
|
|
310
301
|
const cloned = super.clone() as SigV4HttpAgent;
|
|
311
302
|
cloned.sigV4Client = this.sigV4Client;
|
|
@@ -8,9 +8,22 @@ import { NxGeneratorInfo } from '../../utils/nx';
|
|
|
8
8
|
export declare const PY_PROJECT_GENERATOR_INFO: NxGeneratorInfo;
|
|
9
9
|
export interface PyProjectDetails {
|
|
10
10
|
/**
|
|
11
|
-
*
|
|
11
|
+
* Fully qualified Nx project id including scope, in dot notation (eg foo.bar).
|
|
12
|
+
* This is the identifier Nx uses (readProjectConfiguration, the project
|
|
13
|
+
* graph, target references) and is intentionally kept dotted.
|
|
12
14
|
*/
|
|
13
15
|
readonly fullyQualifiedName: string;
|
|
16
|
+
/**
|
|
17
|
+
* PEP 503 normalised Python distribution name (eg foo-bar). This is the name
|
|
18
|
+
* written to the project's `[project].name`, the root `[tool.uv.sources]`
|
|
19
|
+
* key, and any inter-project dependency string. It is hyphenated (not dotted)
|
|
20
|
+
* so `uv` and `@nxlv/python` can match it: uv writes `uv.lock` keyed by the
|
|
21
|
+
* PEP 503 hyphenated name, and `@nxlv/python`'s dependency inference splits a
|
|
22
|
+
* dotted name on `.` and so would otherwise drop the edge entirely. Keeping
|
|
23
|
+
* the distribution name decoupled from `fullyQualifiedName` is what lets the
|
|
24
|
+
* workspace dependency edge appear in the Nx project graph.
|
|
25
|
+
*/
|
|
26
|
+
readonly distributionName: string;
|
|
14
27
|
/**
|
|
15
28
|
* Directory of the library relative to the root
|
|
16
29
|
*/
|
|
@@ -25,16 +25,19 @@ const getPyProjectDetails = (tree, schema) => {
|
|
|
25
25
|
const normalizedName = (0, names_1.toSnakeCase)(schema.name);
|
|
26
26
|
const normalizedModuleName = (0, names_1.toSnakeCase)(schema.moduleName ?? `${scope}_${normalizedName}`);
|
|
27
27
|
const fullyQualifiedName = `${scope}.${normalizedName}`;
|
|
28
|
+
// The Python distribution name is the PEP 503 normalised form of the
|
|
29
|
+
// fully qualified name: hyphenated, never dotted. See PyProjectDetails.
|
|
30
|
+
const distributionName = (0, names_1.normalizeDistributionName)(fullyQualifiedName);
|
|
28
31
|
// NB: interactive nx generator cli can pass empty string
|
|
29
32
|
const dir = (0, devkit_1.joinPathFragments)(schema.directory || '.', schema.subDirectory || normalizedName);
|
|
30
|
-
return { dir, fullyQualifiedName, normalizedModuleName };
|
|
33
|
+
return { dir, fullyQualifiedName, distributionName, normalizedModuleName };
|
|
31
34
|
};
|
|
32
35
|
exports.getPyProjectDetails = getPyProjectDetails;
|
|
33
36
|
/**
|
|
34
37
|
* Generates a Python project
|
|
35
38
|
*/
|
|
36
39
|
const pyProjectGenerator = async (tree, schema) => {
|
|
37
|
-
const { dir, normalizedModuleName, fullyQualifiedName } = (0, exports.getPyProjectDetails)(tree, schema);
|
|
40
|
+
const { dir, normalizedModuleName, fullyQualifiedName, distributionName } = (0, exports.getPyProjectDetails)(tree, schema);
|
|
38
41
|
const pythonPlugin = (0, versions_1.withVersions)(['@nxlv/python']);
|
|
39
42
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, pythonPlugin);
|
|
40
43
|
Object.entries(pythonPlugin).forEach(([name, version]) => (0, devkit_1.ensurePackage)(name, version));
|
|
@@ -63,7 +66,14 @@ const pyProjectGenerator = async (tree, schema) => {
|
|
|
63
66
|
});
|
|
64
67
|
}
|
|
65
68
|
await (0, nxlv_python_1.uvProjectGenerator)(tree, {
|
|
69
|
+
// The Nx project id (and `uv.workspace.members` etc.) keys off `name`, so
|
|
70
|
+
// keep it dotted. `packageName` is the separate PEP 503 distribution name
|
|
71
|
+
// written to `[project].name` and the root `[tool.uv.sources]` key; it is
|
|
72
|
+
// hyphenated so `@nxlv/python` infers the workspace dependency edge (it
|
|
73
|
+
// splits a dotted name on `.` and would otherwise drop it). This split is
|
|
74
|
+
// the whole fix (see PyProjectDetails.distributionName).
|
|
66
75
|
name: fullyQualifiedName,
|
|
76
|
+
packageName: distributionName,
|
|
67
77
|
publishable: false,
|
|
68
78
|
buildLockedVersions: true,
|
|
69
79
|
buildBundleLocalDependencies: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/project/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAWoB;AAEpB,yDAKiC;AACjC,mDAAoD;AACpD,qDAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/project/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1063,10 +1063,19 @@ variable "tags" {
|
|
|
1063
1063
|
default = {}
|
|
1064
1064
|
}
|
|
1065
1065
|
|
|
1066
|
+
# Suffix appended to physical resource names so that multiple deployments
|
|
1067
|
+
# (e.g. separate environments in the same account and region) don't collide.
|
|
1068
|
+
resource "random_string" "suffix" {
|
|
1069
|
+
length = 8
|
|
1070
|
+
special = false
|
|
1071
|
+
upper = false
|
|
1072
|
+
}
|
|
1073
|
+
|
|
1066
1074
|
locals {
|
|
1067
1075
|
default_port = var.engine == "aurora-mysql" ? 3306 : 5432
|
|
1068
1076
|
default_engine_version = var.engine == "aurora-mysql" ? "8.0.mysql_aurora.3.12.0" : "17.7"
|
|
1069
1077
|
parameter_group_family = var.engine == "aurora-mysql" ? "aurora-mysql8.0" : "aurora-postgresql\${split(".", coalesce(var.engine_version, local.default_engine_version))[0]}"
|
|
1078
|
+
cluster_name = "\${var.name}-aurora-\${random_string.suffix.result}"
|
|
1070
1079
|
}
|
|
1071
1080
|
|
|
1072
1081
|
resource "aws_rds_cluster_parameter_group" "database" {
|
|
@@ -1164,7 +1173,7 @@ resource "aws_security_group" "database" {
|
|
|
1164
1173
|
}
|
|
1165
1174
|
|
|
1166
1175
|
resource "aws_db_subnet_group" "database" {
|
|
1167
|
-
name =
|
|
1176
|
+
name = local.cluster_name
|
|
1168
1177
|
subnet_ids = var.subnet_ids
|
|
1169
1178
|
|
|
1170
1179
|
tags = merge(var.tags, {
|
|
@@ -1204,7 +1213,7 @@ resource "aws_secretsmanager_secret_version" "credentials" {
|
|
|
1204
1213
|
resource "aws_rds_cluster" "database" {
|
|
1205
1214
|
#checkov:skip=CKV2_AWS_27:Query logging can be enabled with enable_cloudwatch_logs; this module defaults to CDK-equivalent behavior unless logging is requested
|
|
1206
1215
|
#checkov:skip=CKV_AWS_139:Deletion protection is enabled but checkov is unable to detect it correctly
|
|
1207
|
-
cluster_identifier =
|
|
1216
|
+
cluster_identifier = local.cluster_name
|
|
1208
1217
|
engine = var.engine
|
|
1209
1218
|
engine_version = coalesce(var.engine_version, local.default_engine_version)
|
|
1210
1219
|
database_name = var.database_name
|
|
@@ -1218,7 +1227,7 @@ resource "aws_rds_cluster" "database" {
|
|
|
1218
1227
|
kms_key_id = aws_kms_key.database.arn
|
|
1219
1228
|
deletion_protection = var.deletion_protection
|
|
1220
1229
|
skip_final_snapshot = var.skip_final_snapshot
|
|
1221
|
-
final_snapshot_identifier = var.skip_final_snapshot ? null : "\${
|
|
1230
|
+
final_snapshot_identifier = var.skip_final_snapshot ? null : "\${local.cluster_name}-final-snapshot"
|
|
1222
1231
|
iam_database_authentication_enabled = true
|
|
1223
1232
|
monitoring_interval = 5
|
|
1224
1233
|
monitoring_role_arn = aws_iam_role.enhanced_monitoring.arn
|
|
@@ -1238,7 +1247,7 @@ resource "aws_rds_cluster" "database" {
|
|
|
1238
1247
|
resource "aws_rds_cluster_instance" "database" {
|
|
1239
1248
|
count = var.instance_count
|
|
1240
1249
|
|
|
1241
|
-
identifier = "\${
|
|
1250
|
+
identifier = "\${local.cluster_name}-\${count.index + 1}"
|
|
1242
1251
|
cluster_identifier = aws_rds_cluster.database.id
|
|
1243
1252
|
instance_class = "db.serverless"
|
|
1244
1253
|
engine = aws_rds_cluster.database.engine
|
|
@@ -1292,7 +1301,7 @@ resource "aws_vpc_security_group_ingress_rule" "rotation_to_database" {
|
|
|
1292
1301
|
resource "aws_cloudformation_stack" "credentials_rotation" {
|
|
1293
1302
|
#checkov:skip=CKV_AWS_124:SNS event notifications are not required for the credentials rotation stack
|
|
1294
1303
|
count = var.enable_credential_rotation ? 1 : 0
|
|
1295
|
-
name = "\${
|
|
1304
|
+
name = "\${local.cluster_name}-credentials-rotation"
|
|
1296
1305
|
|
|
1297
1306
|
capabilities = ["CAPABILITY_IAM", "CAPABILITY_AUTO_EXPAND"]
|
|
1298
1307
|
|
|
@@ -1306,7 +1315,7 @@ resource "aws_cloudformation_stack" "credentials_rotation" {
|
|
|
1306
1315
|
SecretId = aws_secretsmanager_secret.credentials.arn
|
|
1307
1316
|
HostedRotationLambda = {
|
|
1308
1317
|
RotationType = var.engine == "aurora-mysql" ? "MySQLSingleUser" : "PostgreSQLSingleUser"
|
|
1309
|
-
RotationLambdaName = "\${
|
|
1318
|
+
RotationLambdaName = "\${local.cluster_name}-credentials-rotation"
|
|
1310
1319
|
VpcSecurityGroupIds = aws_security_group.rotation[0].id
|
|
1311
1320
|
VpcSubnetIds = join(",", var.lambda_subnet_ids)
|
|
1312
1321
|
}
|
|
@@ -1386,7 +1395,7 @@ resource "aws_security_group" "proxy" {
|
|
|
1386
1395
|
resource "aws_db_proxy" "aurora" {
|
|
1387
1396
|
count = var.enable_rds_proxy ? 1 : 0
|
|
1388
1397
|
|
|
1389
|
-
name = "\${var.name}-proxy"
|
|
1398
|
+
name = "\${var.name}-proxy-\${random_string.suffix.result}"
|
|
1390
1399
|
default_auth_scheme = "IAM_AUTH"
|
|
1391
1400
|
engine_family = var.engine == "aurora-mysql" ? "MYSQL" : "POSTGRESQL"
|
|
1392
1401
|
role_arn = aws_iam_role.proxy[0].arn
|
|
@@ -1532,7 +1541,7 @@ resource "aws_iam_role_policy_attachment" "backup" {
|
|
|
1532
1541
|
resource "aws_backup_vault" "database" {
|
|
1533
1542
|
count = var.enable_backup ? 1 : 0
|
|
1534
1543
|
|
|
1535
|
-
name = "\${
|
|
1544
|
+
name = "\${local.cluster_name}-backup"
|
|
1536
1545
|
kms_key_arn = aws_kms_key.database.arn
|
|
1537
1546
|
tags = var.tags
|
|
1538
1547
|
}
|
|
@@ -1540,7 +1549,7 @@ resource "aws_backup_vault" "database" {
|
|
|
1540
1549
|
resource "aws_backup_plan" "database" {
|
|
1541
1550
|
count = var.enable_backup ? 1 : 0
|
|
1542
1551
|
|
|
1543
|
-
name = "\${
|
|
1552
|
+
name = "\${local.cluster_name}-backup"
|
|
1544
1553
|
|
|
1545
1554
|
rule {
|
|
1546
1555
|
rule_name = "daily-backup"
|
|
@@ -2513,10 +2522,19 @@ variable "tags" {
|
|
|
2513
2522
|
default = {}
|
|
2514
2523
|
}
|
|
2515
2524
|
|
|
2525
|
+
# Suffix appended to physical resource names so that multiple deployments
|
|
2526
|
+
# (e.g. separate environments in the same account and region) don't collide.
|
|
2527
|
+
resource "random_string" "suffix" {
|
|
2528
|
+
length = 8
|
|
2529
|
+
special = false
|
|
2530
|
+
upper = false
|
|
2531
|
+
}
|
|
2532
|
+
|
|
2516
2533
|
locals {
|
|
2517
2534
|
default_port = var.engine == "aurora-mysql" ? 3306 : 5432
|
|
2518
2535
|
default_engine_version = var.engine == "aurora-mysql" ? "8.0.mysql_aurora.3.12.0" : "17.7"
|
|
2519
2536
|
parameter_group_family = var.engine == "aurora-mysql" ? "aurora-mysql8.0" : "aurora-postgresql\${split(".", coalesce(var.engine_version, local.default_engine_version))[0]}"
|
|
2537
|
+
cluster_name = "\${var.name}-aurora-\${random_string.suffix.result}"
|
|
2520
2538
|
}
|
|
2521
2539
|
|
|
2522
2540
|
resource "aws_rds_cluster_parameter_group" "database" {
|
|
@@ -2614,7 +2632,7 @@ resource "aws_security_group" "database" {
|
|
|
2614
2632
|
}
|
|
2615
2633
|
|
|
2616
2634
|
resource "aws_db_subnet_group" "database" {
|
|
2617
|
-
name =
|
|
2635
|
+
name = local.cluster_name
|
|
2618
2636
|
subnet_ids = var.subnet_ids
|
|
2619
2637
|
|
|
2620
2638
|
tags = merge(var.tags, {
|
|
@@ -2654,7 +2672,7 @@ resource "aws_secretsmanager_secret_version" "credentials" {
|
|
|
2654
2672
|
resource "aws_rds_cluster" "database" {
|
|
2655
2673
|
#checkov:skip=CKV2_AWS_27:Query logging can be enabled with enable_cloudwatch_logs; this module defaults to CDK-equivalent behavior unless logging is requested
|
|
2656
2674
|
#checkov:skip=CKV_AWS_139:Deletion protection is enabled but checkov is unable to detect it correctly
|
|
2657
|
-
cluster_identifier =
|
|
2675
|
+
cluster_identifier = local.cluster_name
|
|
2658
2676
|
engine = var.engine
|
|
2659
2677
|
engine_version = coalesce(var.engine_version, local.default_engine_version)
|
|
2660
2678
|
database_name = var.database_name
|
|
@@ -2668,7 +2686,7 @@ resource "aws_rds_cluster" "database" {
|
|
|
2668
2686
|
kms_key_id = aws_kms_key.database.arn
|
|
2669
2687
|
deletion_protection = var.deletion_protection
|
|
2670
2688
|
skip_final_snapshot = var.skip_final_snapshot
|
|
2671
|
-
final_snapshot_identifier = var.skip_final_snapshot ? null : "\${
|
|
2689
|
+
final_snapshot_identifier = var.skip_final_snapshot ? null : "\${local.cluster_name}-final-snapshot"
|
|
2672
2690
|
iam_database_authentication_enabled = true
|
|
2673
2691
|
monitoring_interval = 5
|
|
2674
2692
|
monitoring_role_arn = aws_iam_role.enhanced_monitoring.arn
|
|
@@ -2688,7 +2706,7 @@ resource "aws_rds_cluster" "database" {
|
|
|
2688
2706
|
resource "aws_rds_cluster_instance" "database" {
|
|
2689
2707
|
count = var.instance_count
|
|
2690
2708
|
|
|
2691
|
-
identifier = "\${
|
|
2709
|
+
identifier = "\${local.cluster_name}-\${count.index + 1}"
|
|
2692
2710
|
cluster_identifier = aws_rds_cluster.database.id
|
|
2693
2711
|
instance_class = "db.serverless"
|
|
2694
2712
|
engine = aws_rds_cluster.database.engine
|
|
@@ -2742,7 +2760,7 @@ resource "aws_vpc_security_group_ingress_rule" "rotation_to_database" {
|
|
|
2742
2760
|
resource "aws_cloudformation_stack" "credentials_rotation" {
|
|
2743
2761
|
#checkov:skip=CKV_AWS_124:SNS event notifications are not required for the credentials rotation stack
|
|
2744
2762
|
count = var.enable_credential_rotation ? 1 : 0
|
|
2745
|
-
name = "\${
|
|
2763
|
+
name = "\${local.cluster_name}-credentials-rotation"
|
|
2746
2764
|
|
|
2747
2765
|
capabilities = ["CAPABILITY_IAM", "CAPABILITY_AUTO_EXPAND"]
|
|
2748
2766
|
|
|
@@ -2756,7 +2774,7 @@ resource "aws_cloudformation_stack" "credentials_rotation" {
|
|
|
2756
2774
|
SecretId = aws_secretsmanager_secret.credentials.arn
|
|
2757
2775
|
HostedRotationLambda = {
|
|
2758
2776
|
RotationType = var.engine == "aurora-mysql" ? "MySQLSingleUser" : "PostgreSQLSingleUser"
|
|
2759
|
-
RotationLambdaName = "\${
|
|
2777
|
+
RotationLambdaName = "\${local.cluster_name}-credentials-rotation"
|
|
2760
2778
|
VpcSecurityGroupIds = aws_security_group.rotation[0].id
|
|
2761
2779
|
VpcSubnetIds = join(",", var.lambda_subnet_ids)
|
|
2762
2780
|
}
|
|
@@ -2836,7 +2854,7 @@ resource "aws_security_group" "proxy" {
|
|
|
2836
2854
|
resource "aws_db_proxy" "aurora" {
|
|
2837
2855
|
count = var.enable_rds_proxy ? 1 : 0
|
|
2838
2856
|
|
|
2839
|
-
name = "\${var.name}-proxy"
|
|
2857
|
+
name = "\${var.name}-proxy-\${random_string.suffix.result}"
|
|
2840
2858
|
default_auth_scheme = "IAM_AUTH"
|
|
2841
2859
|
engine_family = var.engine == "aurora-mysql" ? "MYSQL" : "POSTGRESQL"
|
|
2842
2860
|
role_arn = aws_iam_role.proxy[0].arn
|
|
@@ -2982,7 +3000,7 @@ resource "aws_iam_role_policy_attachment" "backup" {
|
|
|
2982
3000
|
resource "aws_backup_vault" "database" {
|
|
2983
3001
|
count = var.enable_backup ? 1 : 0
|
|
2984
3002
|
|
|
2985
|
-
name = "\${
|
|
3003
|
+
name = "\${local.cluster_name}-backup"
|
|
2986
3004
|
kms_key_arn = aws_kms_key.database.arn
|
|
2987
3005
|
tags = var.tags
|
|
2988
3006
|
}
|
|
@@ -2990,7 +3008,7 @@ resource "aws_backup_vault" "database" {
|
|
|
2990
3008
|
resource "aws_backup_plan" "database" {
|
|
2991
3009
|
count = var.enable_backup ? 1 : 0
|
|
2992
3010
|
|
|
2993
|
-
name = "\${
|
|
3011
|
+
name = "\${local.cluster_name}-backup"
|
|
2994
3012
|
|
|
2995
3013
|
rule {
|
|
2996
3014
|
rule_name = "daily-backup"
|
package/src/ts/react-website/agui/files/common/src/hooks/useAgui__agentNameClassName__.tsx.template
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
<%_ if (auth === 'IAM') { _%>
|
|
2
2
|
import { HttpAgent } from '@ag-ui/client';
|
|
3
3
|
import type { AbstractAgent, RunAgentInput } from '@ag-ui/client';
|
|
4
|
-
import { Observable } from 'rxjs';
|
|
5
4
|
import { useMemo } from 'react';
|
|
6
5
|
import { useRuntimeConfig } from './useRuntimeConfig';
|
|
7
6
|
import { useSigV4, type SigV4Client } from './useSigV4';
|
|
@@ -36,7 +35,7 @@ class SigV4HttpAgent extends HttpAgent {
|
|
|
36
35
|
config: ConstructorParameters<typeof HttpAgent>[0],
|
|
37
36
|
sigV4Client: SigV4Client,
|
|
38
37
|
) {
|
|
39
|
-
super(config);
|
|
38
|
+
super({ ...config, fetch: sigV4Client.fetch as (url: string, init: RequestInit) => Promise<Response> });
|
|
40
39
|
this.sigV4Client = sigV4Client;
|
|
41
40
|
}
|
|
42
41
|
|
|
@@ -49,20 +48,6 @@ class SigV4HttpAgent extends HttpAgent {
|
|
|
49
48
|
return init;
|
|
50
49
|
}
|
|
51
50
|
|
|
52
|
-
// Remove this override once https://github.com/ag-ui-protocol/ag-ui/issues/1316 is fixed.
|
|
53
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
54
|
-
override run(input: RunAgentInput): any {
|
|
55
|
-
const sigV4Fetch = this.sigV4Client.fetch as typeof window.fetch;
|
|
56
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
57
|
-
return new Observable<any>((subscriber) => {
|
|
58
|
-
const originalFetch = window.fetch;
|
|
59
|
-
window.fetch = sigV4Fetch;
|
|
60
|
-
const sub = super.run(input).subscribe(subscriber);
|
|
61
|
-
window.fetch = originalFetch;
|
|
62
|
-
return () => sub.unsubscribe();
|
|
63
|
-
});
|
|
64
|
-
}
|
|
65
|
-
|
|
66
51
|
override clone(): SigV4HttpAgent {
|
|
67
52
|
const cloned = super.clone() as SigV4HttpAgent;
|
|
68
53
|
cloned.sigV4Client = this.sigV4Client;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/agui/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAOoB;AACpB,2DAAqE;AACrE,sDAAuD;AACvD,4CAI4B;AAC5B,mFAAgG;AAChG,gDAAiD;AACjD,gEAAqE;AACrE,wDAA2E;AAC3E,kEAA8E;AAiB9E;;;;;;;;;;;GAWG;AACI,MAAM,sBAAsB,GAAG,KAAK,EACzC,IAAU,EACV,OAAmC,EACnC,EAAE;IACF,MAAM,EAAE,qBAAqB,EAAE,SAAS,EAAE,kBAAkB,EAAE,IAAI,EAAE,GAClE,OAAO,CAAC;IAEV,MAAM,KAAK,GAAG,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,wBAAY,EAAC,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC,CAAC;IAEzD,8DAA8D;IAC9D,4EAA4E;IAC5E,+BAA+B;IAC/B,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,EAC/C,qBAAqB,CAAC,IAAI,EAC1B,EAAE,SAAS,EAAE,kBAAkB,EAAE,IAAI,EAAE,EACvC,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,yEAAyE;IACzE,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvB,MAAM,IAAA,qCAAqB,EAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IACD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,EAC5C,qBAAqB,CAAC,IAAI,EAC1B,EAAE,UAAU,EAAE,EACd,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,0CAA0C,CAAC,EACxE,IAAA,0BAAiB,EAAC,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAAC,EAC5D,EAAE,EACF,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IACJ,CAAC;IAED,MAAM,IAAA,kCAAsB,EAAC,IAAI,EAAE;QACjC,OAAO,EAAE,qBAAqB,CAAC,IAAI;KACpC,CAAC,CAAC;IAEH,uDAAuD;IACvD,MAAM,2BAA2B,CAC/B,IAAI,EACJ,qBAAqB,EACrB,kBAAkB,CACnB,CAAC;IAEF,0DAA0D;IAC1D,MAAM,WAAW,GAAG,IAAA,0BAAiB,EACnC,qBAAqB,CAAC,UAAU,EAChC,UAAU,CACX,CAAC;IACF,MAAM,IAAA,qBAAe,EACnB,IAAI,EACJ,WAAW,EACX,cAAc,EACd,2BAA2B,CAC5B,CAAC;IACF,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,WAAW,EACX,gIAAgI,CACjI,CAAC;IAEF,yEAAyE;IACzE,0DAA0D;IAC1D,2EAA2E;IAC3E,yEAAyE;IACzE,4DAA4D;IAC5D,IAAA,8CAA6B,EAAC,IAAI,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;IAE/D,IAAA,qCAA4B,EAC1B,IAAI,EACJ,IAAA,uBAAY,EAAC;QACX,wBAAwB;QACxB,eAAe;QACf,GAAI,CAAC,KAAK,KAAK,YAAY;YACzB,CAAC,CAAC,CAAC,oCAAoC,CAAC;YACxC,CAAC,CAAC,EAAE,CAAS;QACf,GAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAS;QACxD,GAAI,CAAC,IAAI,KAAK,KAAK;YACjB,CAAC,CAAC;gBACE,gBAAgB;gBAChB,WAAW;gBACX,+CAA+C;gBAC/C,oBAAoB;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/agui/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,15 @@ export declare function getPythonAgentConnectionProjectDir(tree: Tree): string;
|
|
|
13
13
|
*/
|
|
14
14
|
export declare function getPythonAgentConnectionModuleName(tree: Tree): string;
|
|
15
15
|
/**
|
|
16
|
-
* Get the
|
|
16
|
+
* Get the shared agent-connection project as `{ name, root }`, suitable for
|
|
17
|
+
* passing to {@link addWorkspaceDependencyToPyProject} (which derives the
|
|
18
|
+
* dependency's PEP 503 distribution name from the project itself, so callers
|
|
19
|
+
* never construct the name).
|
|
17
20
|
*/
|
|
18
|
-
export declare function
|
|
21
|
+
export declare function getPythonAgentConnectionProject(tree: Tree): {
|
|
22
|
+
name: string;
|
|
23
|
+
root: string;
|
|
24
|
+
};
|
|
19
25
|
/**
|
|
20
26
|
* Directories (relative to this file) holding per-protocol core client
|
|
21
27
|
* template files. Per-connection generators select which set to emit so
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PY_CORE_TEMPLATES = exports.TS_CORE_TEMPLATES = exports.AGENT_CONNECTION_PROJECT_DIR = void 0;
|
|
4
4
|
exports.getPythonAgentConnectionProjectDir = getPythonAgentConnectionProjectDir;
|
|
5
5
|
exports.getPythonAgentConnectionModuleName = getPythonAgentConnectionModuleName;
|
|
6
|
-
exports.
|
|
6
|
+
exports.getPythonAgentConnectionProject = getPythonAgentConnectionProject;
|
|
7
7
|
exports.ensureTypeScriptAgentConnectionProject = ensureTypeScriptAgentConnectionProject;
|
|
8
8
|
exports.addTypeScriptCoreClient = addTypeScriptCoreClient;
|
|
9
9
|
exports.ensurePythonAgentConnectionProject = ensurePythonAgentConnectionProject;
|
|
@@ -47,14 +47,17 @@ function getPythonAgentConnectionModuleName(tree) {
|
|
|
47
47
|
return normalizedModuleName;
|
|
48
48
|
}
|
|
49
49
|
/**
|
|
50
|
-
* Get the
|
|
50
|
+
* Get the shared agent-connection project as `{ name, root }`, suitable for
|
|
51
|
+
* passing to {@link addWorkspaceDependencyToPyProject} (which derives the
|
|
52
|
+
* dependency's PEP 503 distribution name from the project itself, so callers
|
|
53
|
+
* never construct the name).
|
|
51
54
|
*/
|
|
52
|
-
function
|
|
53
|
-
const { fullyQualifiedName } = (0, generator_2.getPyProjectDetails)(tree, {
|
|
55
|
+
function getPythonAgentConnectionProject(tree) {
|
|
56
|
+
const { fullyQualifiedName, dir } = (0, generator_2.getPyProjectDetails)(tree, {
|
|
54
57
|
name: PY_AGENT_CONNECTION_NAME,
|
|
55
58
|
directory: (0, devkit_1.joinPathFragments)(PACKAGES_DIR, COMMON_DIR),
|
|
56
59
|
});
|
|
57
|
-
return fullyQualifiedName;
|
|
60
|
+
return { name: fullyQualifiedName, root: dir };
|
|
58
61
|
}
|
|
59
62
|
/**
|
|
60
63
|
* Directories (relative to this file) holding per-protocol core client
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-connection.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/agent-connection/agent-connection.ts"],"names":[],"mappings":";;;AAmCA,gFAMC;AAKD,gFAMC;
|
|
1
|
+
{"version":3,"file":"agent-connection.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/agent-connection/agent-connection.ts"],"names":[],"mappings":"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"}
|
package/src/utils/names.d.ts
CHANGED
|
@@ -5,4 +5,20 @@ export declare const upperFirst: (str: string) => string;
|
|
|
5
5
|
export declare const pascalCase: (str: string) => string;
|
|
6
6
|
export declare const snakeCase: (str: string) => string;
|
|
7
7
|
export declare const kebabCase: (str: string) => string;
|
|
8
|
+
/**
|
|
9
|
+
* Normalise a string to a PEP 503 distribution name.
|
|
10
|
+
*
|
|
11
|
+
* PEP 503 (https://peps.python.org/pep-0503/#normalized-names) defines the
|
|
12
|
+
* canonical form of a Python project distribution name: lower-cased, with any
|
|
13
|
+
* run of `.`, `_` or `-` collapsed to a single `-`. This is the name uv writes
|
|
14
|
+
* into `uv.lock` and the form `@nxlv/python` expects when inferring workspace
|
|
15
|
+
* dependency edges from `[project].dependencies` / `[tool.uv.sources]`.
|
|
16
|
+
*
|
|
17
|
+
* Importantly this is NOT kebab-case: it does not split on camelCase humps,
|
|
18
|
+
* spaces or other punctuation, so a dotted nx id like `scope.my_lib` becomes
|
|
19
|
+
* `scope-my-lib` (and only those three separators are touched).
|
|
20
|
+
*
|
|
21
|
+
* eg. `sojourner.agent_connection` -> `sojourner-agent-connection`
|
|
22
|
+
*/
|
|
23
|
+
export declare const normalizeDistributionName: (str: string) => string;
|
|
8
24
|
export declare const toDotNotation: (str: string) => string;
|
package/src/utils/names.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.toDotNotation = exports.kebabCase = exports.snakeCase = exports.pascalCase = exports.upperFirst = exports.toSnakeCase = exports.toKebabCase = exports.toClassName = void 0;
|
|
3
|
+
exports.toDotNotation = exports.normalizeDistributionName = exports.kebabCase = exports.snakeCase = exports.pascalCase = exports.upperFirst = exports.toSnakeCase = exports.toKebabCase = exports.toClassName = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
/**
|
|
6
6
|
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
@@ -55,6 +55,23 @@ const kebabCase = (str) => {
|
|
|
55
55
|
.replace(/^-+|-+$/g, ''));
|
|
56
56
|
};
|
|
57
57
|
exports.kebabCase = kebabCase;
|
|
58
|
+
/**
|
|
59
|
+
* Normalise a string to a PEP 503 distribution name.
|
|
60
|
+
*
|
|
61
|
+
* PEP 503 (https://peps.python.org/pep-0503/#normalized-names) defines the
|
|
62
|
+
* canonical form of a Python project distribution name: lower-cased, with any
|
|
63
|
+
* run of `.`, `_` or `-` collapsed to a single `-`. This is the name uv writes
|
|
64
|
+
* into `uv.lock` and the form `@nxlv/python` expects when inferring workspace
|
|
65
|
+
* dependency edges from `[project].dependencies` / `[tool.uv.sources]`.
|
|
66
|
+
*
|
|
67
|
+
* Importantly this is NOT kebab-case: it does not split on camelCase humps,
|
|
68
|
+
* spaces or other punctuation, so a dotted nx id like `scope.my_lib` becomes
|
|
69
|
+
* `scope-my-lib` (and only those three separators are touched).
|
|
70
|
+
*
|
|
71
|
+
* eg. `sojourner.agent_connection` -> `sojourner-agent-connection`
|
|
72
|
+
*/
|
|
73
|
+
const normalizeDistributionName = (str) => str.toLowerCase().replace(/[._-]+/g, '-');
|
|
74
|
+
exports.normalizeDistributionName = normalizeDistributionName;
|
|
58
75
|
// Convert a string to a dot notation string (eg. lambda_handler/my_handler.py -> lambda_handler.my_handler)
|
|
59
76
|
const toDotNotation = (str) => str
|
|
60
77
|
?.replace(/^\/|\/$/g, '') // Remove leading/trailing slashes
|
package/src/utils/names.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/names.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/names.ts"],"names":[],"mappings":"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"}
|
package/src/utils/py.d.ts
CHANGED
|
@@ -19,5 +19,18 @@ export declare const uvxCommand: (dep: IPyDepVersion, args?: string, withDeps?:
|
|
|
19
19
|
/**
|
|
20
20
|
* Add a workspace dependency from one Python project to another.
|
|
21
21
|
* Adds the dependency to [project].dependencies and [tool.uv.sources].
|
|
22
|
+
*
|
|
23
|
+
* Both projects are passed as Nx project configurations (not names): the
|
|
24
|
+
* dependency's PEP 503 distribution name is derived from its own
|
|
25
|
+
* `pyproject.toml` here, so callers cannot accidentally pass the dotted Nx id
|
|
26
|
+
* (which @nxlv/python splits on `.` and drops, losing the project-graph edge).
|
|
27
|
+
* This is the single entry point all generators use to wire a Python workspace
|
|
28
|
+
* dependency.
|
|
22
29
|
*/
|
|
23
|
-
export declare const addWorkspaceDependencyToPyProject: (tree: Tree,
|
|
30
|
+
export declare const addWorkspaceDependencyToPyProject: (tree: Tree, dependentProject: {
|
|
31
|
+
name?: string;
|
|
32
|
+
root: string;
|
|
33
|
+
}, dependencyProject: {
|
|
34
|
+
name?: string;
|
|
35
|
+
root: string;
|
|
36
|
+
}) => void;
|
package/src/utils/py.js
CHANGED
|
@@ -7,6 +7,7 @@ exports.addWorkspaceDependencyToPyProject = exports.uvxCommand = exports.addDepe
|
|
|
7
7
|
*/
|
|
8
8
|
const toml_1 = require("@iarna/toml");
|
|
9
9
|
const devkit_1 = require("@nx/devkit");
|
|
10
|
+
const names_1 = require("./names");
|
|
10
11
|
const versions_1 = require("./versions");
|
|
11
12
|
const pip_requirements_js_1 = require("pip-requirements-js");
|
|
12
13
|
const toml_2 = require("./toml");
|
|
@@ -59,28 +60,54 @@ const uvxCommand = (dep, args, withDeps) => {
|
|
|
59
60
|
: ''}${dep}${args ? ` ${args}` : ''}`;
|
|
60
61
|
};
|
|
61
62
|
exports.uvxCommand = uvxCommand;
|
|
63
|
+
/**
|
|
64
|
+
* Resolve the PEP 503 distribution name of a Python project from its
|
|
65
|
+
* `pyproject.toml` `[project].name`, falling back to normalising the supplied
|
|
66
|
+
* Nx project id when the project has no readable pyproject yet.
|
|
67
|
+
*
|
|
68
|
+
* This is the authoritative name uv writes into `uv.lock`, so it is the value
|
|
69
|
+
* that must appear in a dependent's `[project].dependencies` /
|
|
70
|
+
* `[tool.uv.sources]` for `@nxlv/python` to infer the workspace dependency
|
|
71
|
+
* edge. Always normalised so the result is a valid distribution name even if
|
|
72
|
+
* an older project still carries a dotted `[project].name`.
|
|
73
|
+
*/
|
|
74
|
+
const getPyDistributionName = (tree, project) => {
|
|
75
|
+
const pyprojectPath = (0, devkit_1.joinPathFragments)(project.root, 'pyproject.toml');
|
|
76
|
+
const projectName = tree.exists(pyprojectPath)
|
|
77
|
+
? (0, toml_2.readToml)(tree, pyprojectPath).project?.name
|
|
78
|
+
: undefined;
|
|
79
|
+
return (0, names_1.normalizeDistributionName)(projectName ?? project.name ?? '');
|
|
80
|
+
};
|
|
62
81
|
/**
|
|
63
82
|
* Add a workspace dependency from one Python project to another.
|
|
64
83
|
* Adds the dependency to [project].dependencies and [tool.uv.sources].
|
|
84
|
+
*
|
|
85
|
+
* Both projects are passed as Nx project configurations (not names): the
|
|
86
|
+
* dependency's PEP 503 distribution name is derived from its own
|
|
87
|
+
* `pyproject.toml` here, so callers cannot accidentally pass the dotted Nx id
|
|
88
|
+
* (which @nxlv/python splits on `.` and drops, losing the project-graph edge).
|
|
89
|
+
* This is the single entry point all generators use to wire a Python workspace
|
|
90
|
+
* dependency.
|
|
65
91
|
*/
|
|
66
|
-
const addWorkspaceDependencyToPyProject = (tree,
|
|
67
|
-
const pyprojectPath = (0, devkit_1.joinPathFragments)(
|
|
92
|
+
const addWorkspaceDependencyToPyProject = (tree, dependentProject, dependencyProject) => {
|
|
93
|
+
const pyprojectPath = (0, devkit_1.joinPathFragments)(dependentProject.root, 'pyproject.toml');
|
|
68
94
|
if (!tree.exists(pyprojectPath)) {
|
|
69
95
|
return;
|
|
70
96
|
}
|
|
97
|
+
const distributionName = getPyDistributionName(tree, dependencyProject);
|
|
71
98
|
(0, toml_2.updateToml)(tree, pyprojectPath, (toml) => {
|
|
72
99
|
// Add to [project].dependencies if not already present
|
|
73
100
|
const deps = toml.project?.dependencies ?? [];
|
|
74
|
-
if (!deps.some((d) => d ===
|
|
75
|
-
d.startsWith(`${
|
|
76
|
-
d.startsWith(`${
|
|
77
|
-
toml.project.dependencies = [...deps,
|
|
101
|
+
if (!deps.some((d) => d === distributionName ||
|
|
102
|
+
d.startsWith(`${distributionName}>=`) ||
|
|
103
|
+
d.startsWith(`${distributionName}==`))) {
|
|
104
|
+
toml.project.dependencies = [...deps, distributionName];
|
|
78
105
|
}
|
|
79
106
|
// Add to [tool.uv.sources] with workspace = true
|
|
80
107
|
toml.tool = toml.tool ?? {};
|
|
81
108
|
toml.tool.uv = toml.tool.uv ?? {};
|
|
82
109
|
toml.tool.uv.sources = toml.tool.uv.sources ?? {};
|
|
83
|
-
toml.tool.uv.sources[
|
|
110
|
+
toml.tool.uv.sources[distributionName] = {
|
|
84
111
|
workspace: true,
|
|
85
112
|
};
|
|
86
113
|
return toml;
|
package/src/utils/py.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"py.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,sCAA+C;AAC/C,uCAAqD;
|
|
1
|
+
{"version":3,"file":"py.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,sCAA+C;AAC/C,uCAAqD;AACrD,mCAAoD;AAEpD,yCAA2D;AAC3D,6DAA+D;AAC/D,iCAA8C;AAE9C,wEAAwE;AACxE,yEAAyE;AACzE,wCAAwC;AACxC,MAAM,MAAM,GAAG,CAAC,GAAW,EAAU,EAAE;IACrC,MAAM,MAAM,GAAG,IAAA,8CAAwB,EAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,MAAM,EAAE,IAAI,KAAK,aAAa,EAAE,CAAC;QACnC,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3D,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAChB,QAAuC,EACvC,IAAqB,EACX,EAAE;IACZ,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/C,OAAO;QACL,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,GAAG,IAAA,yBAAc,EAAC,IAAI,CAAC;KACxB,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACI,MAAM,8BAA8B,GAAG,CAC5C,IAAU,EACV,WAAmB,EACnB,IAAqB,EACrB,EAAE;IACF,MAAM,WAAW,GAAG,IAAA,YAAK,EACvB,IAAI,CAAC,IAAI,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CACjD,CAAC;IACrB,WAAW,CAAC,OAAO,CAAC,YAAY,GAAG,SAAS,CAC1C,WAAW,CAAC,OAAO,EAAE,YAAY,EACjC,IAAI,CACL,CAAC;IACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,EAChD,IAAA,gBAAS,EAAC,WAAW,CAAC,CACvB,CAAC;AACJ,CAAC,CAAC;AAhBW,QAAA,8BAA8B,kCAgBzC;AAEK,MAAM,+CAA+C,GAAG,CAC7D,IAAU,EACV,WAAmB,EACnB,KAAa,EACb,IAAqB,EACrB,EAAE;IACF,MAAM,WAAW,GAAG,IAAA,YAAK,EACvB,IAAI,CAAC,IAAI,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CACjD,CAAC;IACrB,WAAW,CAAC,mBAAmB,CAAC,GAAG;QACjC,GAAG,WAAW,CAAC,mBAAmB,CAAC;QACnC,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,WAAW,CAAC,mBAAmB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC;KACpE,CAAC;IACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,EAChD,IAAA,gBAAS,EAAC,WAAW,CAAC,CACvB,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,+CAA+C,mDAiB1D;AAQF;;;;GAIG;AACI,MAAM,UAAU,GAAG,CACxB,GAAkB,EAClB,IAAa,EACb,QAAuB,EACf,EAAE;IACV,OAAO,cAAc,IAAA,yBAAc,EAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAC3C,QAAQ;QACN,CAAC,CAAC,GAAG,QAAQ;aACR,GAAG,CACF,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAC9B,UAAU,GAAG,GAAG,SAAS,IAAI,IAAI,GAAG,OAAO,EAAE,CAChD;aACA,IAAI,CAAC,GAAG,CAAC,GAAG;QACjB,CAAC,CAAC,EACN,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AACpC,CAAC,CAAC;AAfW,QAAA,UAAU,cAerB;AAEF;;;;;;;;;;GAUG;AACH,MAAM,qBAAqB,GAAG,CAC5B,IAAU,EACV,OAAwC,EAChC,EAAE;IACV,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;QAC5C,CAAC,CAAE,IAAA,eAAQ,EAAC,IAAI,EAAE,aAAa,CAAgC,CAAC,OAAO,EAAE,IAAI;QAC7E,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,IAAA,iCAAyB,EAAC,WAAW,IAAI,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AACtE,CAAC,CAAC;AAEF;;;;;;;;;;GAUG;AACI,MAAM,iCAAiC,GAAG,CAC/C,IAAU,EACV,gBAAiD,EACjD,iBAAkD,EAC5C,EAAE;IACR,MAAM,aAAa,GAAG,IAAA,0BAAiB,EACrC,gBAAgB,CAAC,IAAI,EACrB,gBAAgB,CACjB,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAChC,OAAO;IACT,CAAC;IAED,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAExE,IAAA,iBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAqB,EAAE,EAAE;QACxD,uDAAuD;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,YAAY,IAAI,EAAE,CAAC;QAC9C,IACE,CAAC,IAAI,CAAC,IAAI,CACR,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,KAAK,gBAAgB;YACtB,CAAC,CAAC,UAAU,CAAC,GAAG,gBAAgB,IAAI,CAAC;YACrC,CAAC,CAAC,UAAU,CAAC,GAAG,gBAAgB,IAAI,CAAC,CACxC,EACD,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,YAAY,GAAG,CAAC,GAAG,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAC1D,CAAC;QAED,iDAAiD;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAY,CAAC,EAAE,GAAI,IAAI,CAAC,IAAY,CAAC,EAAE,IAAI,EAAE,CAAC;QACnD,IAAI,CAAC,IAAY,CAAC,EAAE,CAAC,OAAO,GAAI,IAAI,CAAC,IAAY,CAAC,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC;QACnE,IAAI,CAAC,IAAY,CAAC,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG;YAChD,SAAS,EAAE,IAAI;SAChB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAvCW,QAAA,iCAAiC,qCAuC5C"}
|
|
@@ -159,10 +159,19 @@ variable "tags" {
|
|
|
159
159
|
default = {}
|
|
160
160
|
}
|
|
161
161
|
|
|
162
|
+
# Suffix appended to physical resource names so that multiple deployments
|
|
163
|
+
# (e.g. separate environments in the same account and region) don't collide.
|
|
164
|
+
resource "random_string" "suffix" {
|
|
165
|
+
length = 8
|
|
166
|
+
special = false
|
|
167
|
+
upper = false
|
|
168
|
+
}
|
|
169
|
+
|
|
162
170
|
locals {
|
|
163
171
|
default_port = var.engine == "aurora-mysql" ? 3306 : 5432
|
|
164
172
|
default_engine_version = var.engine == "aurora-mysql" ? "8.0.mysql_aurora.3.12.0" : "17.7"
|
|
165
173
|
parameter_group_family = var.engine == "aurora-mysql" ? "aurora-mysql8.0" : "aurora-postgresql${split(".", coalesce(var.engine_version, local.default_engine_version))[0]}"
|
|
174
|
+
cluster_name = "${var.name}-aurora-${random_string.suffix.result}"
|
|
166
175
|
}
|
|
167
176
|
|
|
168
177
|
resource "aws_rds_cluster_parameter_group" "database" {
|
|
@@ -260,7 +269,7 @@ resource "aws_security_group" "database" {
|
|
|
260
269
|
}
|
|
261
270
|
|
|
262
271
|
resource "aws_db_subnet_group" "database" {
|
|
263
|
-
name =
|
|
272
|
+
name = local.cluster_name
|
|
264
273
|
subnet_ids = var.subnet_ids
|
|
265
274
|
|
|
266
275
|
tags = merge(var.tags, {
|
|
@@ -300,7 +309,7 @@ resource "aws_secretsmanager_secret_version" "credentials" {
|
|
|
300
309
|
resource "aws_rds_cluster" "database" {
|
|
301
310
|
#checkov:skip=CKV2_AWS_27:Query logging can be enabled with enable_cloudwatch_logs; this module defaults to CDK-equivalent behavior unless logging is requested
|
|
302
311
|
#checkov:skip=CKV_AWS_139:Deletion protection is enabled but checkov is unable to detect it correctly
|
|
303
|
-
cluster_identifier =
|
|
312
|
+
cluster_identifier = local.cluster_name
|
|
304
313
|
engine = var.engine
|
|
305
314
|
engine_version = coalesce(var.engine_version, local.default_engine_version)
|
|
306
315
|
database_name = var.database_name
|
|
@@ -314,7 +323,7 @@ resource "aws_rds_cluster" "database" {
|
|
|
314
323
|
kms_key_id = aws_kms_key.database.arn
|
|
315
324
|
deletion_protection = var.deletion_protection
|
|
316
325
|
skip_final_snapshot = var.skip_final_snapshot
|
|
317
|
-
final_snapshot_identifier = var.skip_final_snapshot ? null : "${
|
|
326
|
+
final_snapshot_identifier = var.skip_final_snapshot ? null : "${local.cluster_name}-final-snapshot"
|
|
318
327
|
iam_database_authentication_enabled = true
|
|
319
328
|
monitoring_interval = 5
|
|
320
329
|
monitoring_role_arn = aws_iam_role.enhanced_monitoring.arn
|
|
@@ -334,7 +343,7 @@ resource "aws_rds_cluster" "database" {
|
|
|
334
343
|
resource "aws_rds_cluster_instance" "database" {
|
|
335
344
|
count = var.instance_count
|
|
336
345
|
|
|
337
|
-
identifier = "${
|
|
346
|
+
identifier = "${local.cluster_name}-${count.index + 1}"
|
|
338
347
|
cluster_identifier = aws_rds_cluster.database.id
|
|
339
348
|
instance_class = "db.serverless"
|
|
340
349
|
engine = aws_rds_cluster.database.engine
|
|
@@ -388,7 +397,7 @@ resource "aws_vpc_security_group_ingress_rule" "rotation_to_database" {
|
|
|
388
397
|
resource "aws_cloudformation_stack" "credentials_rotation" {
|
|
389
398
|
#checkov:skip=CKV_AWS_124:SNS event notifications are not required for the credentials rotation stack
|
|
390
399
|
count = var.enable_credential_rotation ? 1 : 0
|
|
391
|
-
name = "${
|
|
400
|
+
name = "${local.cluster_name}-credentials-rotation"
|
|
392
401
|
|
|
393
402
|
capabilities = ["CAPABILITY_IAM", "CAPABILITY_AUTO_EXPAND"]
|
|
394
403
|
|
|
@@ -402,7 +411,7 @@ resource "aws_cloudformation_stack" "credentials_rotation" {
|
|
|
402
411
|
SecretId = aws_secretsmanager_secret.credentials.arn
|
|
403
412
|
HostedRotationLambda = {
|
|
404
413
|
RotationType = var.engine == "aurora-mysql" ? "MySQLSingleUser" : "PostgreSQLSingleUser"
|
|
405
|
-
RotationLambdaName = "${
|
|
414
|
+
RotationLambdaName = "${local.cluster_name}-credentials-rotation"
|
|
406
415
|
VpcSecurityGroupIds = aws_security_group.rotation[0].id
|
|
407
416
|
VpcSubnetIds = join(",", var.lambda_subnet_ids)
|
|
408
417
|
}
|
|
@@ -482,7 +491,7 @@ resource "aws_security_group" "proxy" {
|
|
|
482
491
|
resource "aws_db_proxy" "aurora" {
|
|
483
492
|
count = var.enable_rds_proxy ? 1 : 0
|
|
484
493
|
|
|
485
|
-
name = "${var.name}-proxy"
|
|
494
|
+
name = "${var.name}-proxy-${random_string.suffix.result}"
|
|
486
495
|
default_auth_scheme = "IAM_AUTH"
|
|
487
496
|
engine_family = var.engine == "aurora-mysql" ? "MYSQL" : "POSTGRESQL"
|
|
488
497
|
role_arn = aws_iam_role.proxy[0].arn
|
|
@@ -628,7 +637,7 @@ resource "aws_iam_role_policy_attachment" "backup" {
|
|
|
628
637
|
resource "aws_backup_vault" "database" {
|
|
629
638
|
count = var.enable_backup ? 1 : 0
|
|
630
639
|
|
|
631
|
-
name = "${
|
|
640
|
+
name = "${local.cluster_name}-backup"
|
|
632
641
|
kms_key_arn = aws_kms_key.database.arn
|
|
633
642
|
tags = var.tags
|
|
634
643
|
}
|
|
@@ -636,7 +645,7 @@ resource "aws_backup_vault" "database" {
|
|
|
636
645
|
resource "aws_backup_plan" "database" {
|
|
637
646
|
count = var.enable_backup ? 1 : 0
|
|
638
647
|
|
|
639
|
-
name = "${
|
|
648
|
+
name = "${local.cluster_name}-backup"
|
|
640
649
|
|
|
641
650
|
rule {
|
|
642
651
|
rule_name = "daily-backup"
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -33,11 +33,11 @@ export declare const TS_VERSIONS: {
|
|
|
33
33
|
readonly '@modelcontextprotocol/sdk': "1.29.0";
|
|
34
34
|
readonly '@modelcontextprotocol/inspector': "0.19.0";
|
|
35
35
|
readonly '@ag-ui/aws-strands': "0.1.0";
|
|
36
|
-
readonly '@ag-ui/client': "0.0.
|
|
37
|
-
readonly '@ag-ui/core': "0.0.
|
|
38
|
-
readonly '@ag-ui/encoder': "0.0.
|
|
36
|
+
readonly '@ag-ui/client': "0.0.56";
|
|
37
|
+
readonly '@ag-ui/core': "0.0.56";
|
|
38
|
+
readonly '@ag-ui/encoder': "0.0.56";
|
|
39
39
|
readonly 'agent-chat-cli': "0.2.0";
|
|
40
|
-
readonly '@copilotkit/react-core': "1.
|
|
40
|
+
readonly '@copilotkit/react-core': "1.60.0";
|
|
41
41
|
readonly rxjs: "7.8.2";
|
|
42
42
|
readonly '@strands-agents/sdk': "1.3.0";
|
|
43
43
|
readonly '@tanstack/react-router': "1.170.10";
|
|
@@ -131,7 +131,7 @@ export type ITsDepVersion = keyof typeof TS_VERSIONS;
|
|
|
131
131
|
* Add versions to the given dependencies
|
|
132
132
|
*/
|
|
133
133
|
export declare const withVersions: (deps: ITsDepVersion[]) => {
|
|
134
|
-
[k: string]: "22.7.5" | "3.8.3" | "1.29.0" | "22.1.4" | "3.3.3" | "4.3.0" | "6.0.3" | "8.0.14" | "4.1.7" | "4.4.3" | "0.3.13" | "0.11.0" | "3.1058.0" | "3.972.38" | "1.0.0-alpha.10" | "2.33.1" | "7.6.5" | "10.2.1" | "0.19.0" | "0.1.0" | "0.0.
|
|
134
|
+
[k: string]: "22.7.5" | "3.8.3" | "1.29.0" | "22.1.4" | "3.3.3" | "4.3.0" | "6.0.3" | "8.0.14" | "4.1.7" | "4.4.3" | "0.3.13" | "0.11.0" | "3.1058.0" | "3.972.38" | "1.0.0-alpha.10" | "2.33.1" | "7.6.5" | "10.2.1" | "0.19.0" | "0.1.0" | "0.0.56" | "0.2.0" | "1.60.0" | "7.8.2" | "1.3.0" | "1.170.10" | "1.168.13" | "1.167.12" | "1.162.0" | "1.162.1" | "3.0.187" | "1.0.136" | "3.0.1304" | "1.0.59" | "5.100.14" | "11.17.0" | "25.9.1" | "8.10.161" | "2.8.19" | "8.20.0" | "8.18.1" | "5.0.6" | "4.5.6" | "4.4.6" | "4.7.6" | "4.14.3" | "0.39.2" | "6.4.2" | "1.0.20" | "2.1125.0" | "2.257.0" | "3.12.0" | "10.6.0" | "2.8.6" | "5.6.2" | "0.7.1" | "2.1.1" | "14.0.3" | "3.9.0" | "0.28.0" | "1.0.31" | "1.0.5" | "8.60.1" | "7.8.0" | "5.5.6" | "5.2.1" | "9.1.7" | "11.3.5" | "11.0.4" | "3.1.0" | "4.0.0" | "3.5.2" | "2.0.0" | "19.6.6" | "3.5.0" | "8.21.0" | "3.3.1" | "19.2.7" | "6.1.3" | "1.0.2" | "3.36.0" | "0.5.21" | "0.26.1" | "4.22.4" | "1.17.0" | "1.4.3" | "4.10.0" | "1.4.0" | "3.6.0";
|
|
135
135
|
};
|
|
136
136
|
/**
|
|
137
137
|
* Versions for Python dependencies added by generators
|
package/src/utils/versions.js
CHANGED
|
@@ -36,11 +36,11 @@ exports.TS_VERSIONS = {
|
|
|
36
36
|
'@modelcontextprotocol/sdk': '1.29.0',
|
|
37
37
|
'@modelcontextprotocol/inspector': '0.19.0',
|
|
38
38
|
'@ag-ui/aws-strands': '0.1.0',
|
|
39
|
-
'@ag-ui/client': '0.0.
|
|
40
|
-
'@ag-ui/core': '0.0.
|
|
41
|
-
'@ag-ui/encoder': '0.0.
|
|
39
|
+
'@ag-ui/client': '0.0.56',
|
|
40
|
+
'@ag-ui/core': '0.0.56',
|
|
41
|
+
'@ag-ui/encoder': '0.0.56',
|
|
42
42
|
'agent-chat-cli': '0.2.0',
|
|
43
|
-
'@copilotkit/react-core': '1.
|
|
43
|
+
'@copilotkit/react-core': '1.60.0',
|
|
44
44
|
rxjs: '7.8.2',
|
|
45
45
|
'@strands-agents/sdk': '1.3.0',
|
|
46
46
|
'@tanstack/react-router': '1.170.10',
|