awslabs.cdk-mcp-server 0.0.62303__py3-none-any.whl → 0.0.81004__py3-none-any.whl

awslabs/__init__.py

@@ -1,2 +1,10 @@
-# This file is part of the awslabs namespace.
-# It is intentionally minimal to support PEP 420 namespace packages.
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.

awslabs/cdk_mcp_server/__init__.py

@@ -1,3 +1,13 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
 """AWS CDK MCP server package."""
 
 # Import the minimal set of essential functions

awslabs/cdk_mcp_server/core/__init__.py

@@ -1 +1,11 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
 """Core modules for the AWS CDK MCP server."""

awslabs/cdk_mcp_server/core/resources.py

@@ -1,3 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
 """AWS CDK MCP resource handlers."""
 
 import logging

awslabs/cdk_mcp_server/core/search_utils.py

@@ -1,3 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
 """Common search utilities for AWS CDK MCP Server."""
 
 import re

awslabs/cdk_mcp_server/core/server.py

@@ -1,3 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
 """AWS CDK MCP server implementation."""
 
 import argparse
@@ -49,7 +60,7 @@ mcp.resource('genai-cdk-constructs://{construct_type}')(resources.get_genai_cdk_
 mcp.tool(name='CDKGeneralGuidance')(tools.cdk_guidance)
 mcp.tool(name='ExplainCDKNagRule')(tools.explain_cdk_nag_rule)
 mcp.tool(name='CheckCDKNagSuppressions')(tools.check_cdk_nag_suppressions_tool)
-mcp.tool(name='GenerateBedrockAgentSchemaFromFile')(tools.bedrock_schema_generator_from_file)
+mcp.tool(name='GenerateBedrockAgentSchema')(tools.bedrock_schema_generator_from_file)
 mcp.tool(name='GetAwsSolutionsConstructPattern')(tools.get_aws_solutions_construct_pattern)
 mcp.tool(name='SearchGenAICDKConstructs')(tools.search_genai_cdk_constructs)
 

awslabs/cdk_mcp_server/core/tools.py

@@ -1,3 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
 """AWS CDK MCP tool handlers."""
 
 import logging
@@ -142,6 +153,65 @@ async def check_cdk_nag_suppressions_tool(
     return check_cdk_nag_suppressions(code=code, file_path=file_path)
 
 
+def save_fallback_script_to_file(
+    script_content: str, lambda_code_path: str, output_path: str
+) -> str:
+    """Save fallback script to a file instead of including it in the response.
+
+    Args:
+        script_content: The script content to save
+        lambda_code_path: Original Lambda file path (used for naming)
+        output_path: Schema output path (used for directory)
+
+    Returns:
+        Path to the saved script file
+    """
+    # Sanitize paths to prevent path traversal attacks
+    output_dir = os.path.dirname(os.path.abspath(output_path))
+
+    # Create scripts directory in the same directory as the output file
+    scripts_dir = os.path.join(output_dir, 'scripts')
+
+    try:
+        os.makedirs(scripts_dir, exist_ok=True)
+    except (OSError, IOError) as e:
+        logger.error(f'Failed to create scripts directory: {e}')
+        # Fall back to output directory if scripts dir creation fails
+        scripts_dir = output_dir
+
+    # Sanitize file name - remove any path components and ensure it's just a base name
+    lambda_file_name = os.path.basename(lambda_code_path)
+    # Remove extension and any potentially problematic characters
+    sanitized_name = os.path.splitext(lambda_file_name)[0]
+    sanitized_name = re.sub(r'[^a-zA-Z0-9_-]', '', sanitized_name)
+
+    # Generate script name
+    script_file_name = f'generate_schema_{sanitized_name}.py'
+    script_path = os.path.join(scripts_dir, script_file_name)
+
+    # Validate the resulting path is still within the expected directory
+    if not os.path.abspath(script_path).startswith(os.path.abspath(scripts_dir)):
+        logger.error(f'Path traversal attempt detected: {script_path}')
+        # Fall back to a safe default
+        script_path = os.path.join(scripts_dir, 'generate_schema.py')
+
+    try:
+        # Write the script to file with restricted permissions
+        # Open with restricted permissions from the start (only owner can read/write)
+        with open(os.open(script_path, os.O_CREAT | os.O_WRONLY, 0o600), 'w') as f:
+            f.write(script_content)
+
+        # Update to executable permissions (only for the owner)
+        os.chmod(script_path, 0o700)  # rwx------ permissions (owner only)
+
+        logger.info(f'Successfully created script at {script_path}')
+        return script_path
+
+    except (OSError, IOError) as e:
+        logger.error(f'Failed to save script: {e}')
+        return f'Error saving script: {str(e)}'
+
+
 async def bedrock_schema_generator_from_file(
     ctx: Context, lambda_code_path: str, output_path: str
 ) -> Dict[str, Any]:
@@ -171,6 +241,90 @@ async def bedrock_schema_generator_from_file(
         output_path=output_path,
     )
 
+    # Add comprehensive next steps for successful schema generation
+    if result.get('status') == 'success':
+        output_filename = os.path.basename(output_path)
+        output_dir = os.path.dirname(output_path)
+        lambda_dir = os.path.dirname(os.path.abspath(lambda_code_path))
+        lambda_name = os.path.basename(os.path.dirname(lambda_code_path))
+
+        # Create a more comprehensive integration example
+        result['next_steps'] = {
+            'success_message': f'Schema successfully generated and saved to {output_path}',
+            'integration_steps': [
+                '1. Ensure your Lambda function has the right permissions:',
+                '   - Add bedrock.amazonaws.com as a principal in permissions',
+                '   - Include Lambda Powertools and Pydantic as layers',
+                '2. Add the ActionGroup to your Bedrock Agent:',
+                '   - Create an action group with your Lambda as the executor',
+                '   - Use the generated schema with ApiSchema.fromLocalAsset()',
+                '3. Deploy your CDK stack',
+            ],
+            'cdk_example': [
+                '// Add the Action Group to your agent',
+                'agent.addActionGroup(new bedrock.AgentActionGroup({',
+                f"  name: '{lambda_name}-action-group',",
+                f"  description: 'Action group for {lambda_name}',",
+                '  executor: bedrock.ActionGroupExecutor.fromlambdaFunction(yourLambdaFunction),',
+                '  apiSchema: bedrock.ApiSchema.fromLocalAsset(',
+                f"    path.join(__dirname, '{os.path.relpath(output_dir, lambda_dir)}', '{output_filename}')",
+                '  )',
+                '}));',
+            ],
+        }
+
+    # If fallback script was generated, save it to a file instead of returning it in the response
+    if result.get('status') == 'error' and result.get('fallback_script'):
+        # Save the script to a file
+        script_path = save_fallback_script_to_file(
+            result['fallback_script'], lambda_code_path, output_path
+        )
+
+        # Get the output filename for use in examples
+        output_filename = os.path.basename(output_path)
+        output_dir = os.path.dirname(output_path)
+
+        # Update the result dictionary to include the script path instead of script content
+        result['fallback_script_path'] = script_path
+
+        # Remove the full script content to avoid verbose responses
+        del result['fallback_script']
+
+        # Enhanced client instructions with CDK integration example
+        result['client_instructions'] = {
+            'title': 'Schema Generation and Integration Guide',
+            'steps': [
+                f"1. Run the script at '{script_path}'",
+                f"2. The script will generate the schema file at '{output_path}'",
+                '3. In your CDK code, reference this exact schema file as shown below:',
+            ],
+            'command_suggestion': f'python {script_path}',
+            'cdk_integration_example': f"// Assuming your Lambda function is named '{os.path.basename(lambda_code_path).replace('.py', 'Lambda')}'\n"
+            f'const {os.path.basename(lambda_code_path).replace(".py", "ActionGroup")} = new bedrock.AgentActionGroup({{\n'
+            f'  name: "{os.path.basename(lambda_code_path).replace(".py", "ActionGroup")}",\n'
+            f'  description: "This action group is used for {os.path.basename(lambda_code_path).replace(".py", "")}",\n'
+            f'  executor: bedrock.ActionGroupExecutor.fromlambdaFunction({os.path.basename(lambda_code_path).replace(".py", "Lambda")}),\n'
+            f'  apiSchema: bedrock.ApiSchema.fromLocalAsset(\n'
+            f'    path.join(__dirname, "{os.path.relpath(output_dir, os.path.dirname(lambda_code_path))}", "{output_filename}")\n'
+            f'  )\n'
+            f'}});\n'
+            f'agent.addActionGroup({os.path.basename(lambda_code_path).replace(".py", "ActionGroup")});',
+            'important_notes': [
+                '✅ Use the exact openapi.json file generated by the script',
+                '✅ Adjust the path in fromLocalAsset() to point to where the schema was generated',
+                '❌ Do NOT regenerate or modify the schema manually',
+            ],
+        }
+
+        if 'instructions' in result:
+            result['instructions'] = result['instructions'].replace(
+                'save the fallback script to a file',
+                f'run the fallback script located at {script_path}',
+            )
+
+        # Update the solution message
+        result['solution'] = f'Use the fallback script at {script_path} to generate the schema'
+
     return result
 
 

awslabs/cdk_mcp_server/data/__init__.py

@@ -1 +1,11 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
 """Data modules for the AWS CDK MCP server."""

awslabs/cdk_mcp_server/data/cdk_nag_parser.py

@@ -1,3 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
 """CDK Nag rules parsing utilities."""
 
 import httpx

awslabs/cdk_mcp_server/data/construct_descriptions.py

@@ -1,3 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
 """GenAI CDK construct descriptions."""
 
 from typing import Dict

awslabs/cdk_mcp_server/data/genai_cdk_loader.py

@@ -1,3 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
 """GenAI CDK constructs static content loader."""
 
 import logging

awslabs/cdk_mcp_server/data/lambda_powertools_loader.py

@@ -1,3 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
 """Lambda Powertools guidance loader module."""
 
 import os
@@ -34,14 +45,16 @@ def get_lambda_powertools_section(topic: str = '') -> str:
         topic = 'index'
 
     if topic.lower() in topic_map:
-        file_path = os.path.join(
-            os.path.dirname(__file__), 'static', 'lambda_powertools', f'{topic.lower()}.md'
-        )
+        # Fix the path to correctly point to the static directory (parent of 'data')
+        base_dir = os.path.dirname(
+            os.path.dirname(__file__)
+        )  # Go up from 'data' to get to the package root
+        file_path = os.path.join(base_dir, 'static', 'lambda_powertools', f'{topic.lower()}.md')
         try:
             with open(file_path, 'r') as f:
                 return f.read()
         except FileNotFoundError:
-            return f"Error: File for topic '{topic}' not found."
+            return f"Error: File for topic '{topic}' not found. (Looking in: {file_path})"
     else:
         # Topic not found
         topic_list = '\n'.join([f'- {t}: {desc}' for t, desc in topic_map.items() if t != 'index'])

awslabs/cdk_mcp_server/data/schema_generator.py

@@ -1,3 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
 """Schema generator for Bedrock Agent Action Groups."""
 
 import importlib.util
@@ -121,12 +132,13 @@ def main():
 
             # Generate the OpenAPI schema
             print("Generating OpenAPI schema...")
+            # Note: This might show a UserWarning about Pydantic v2 and OpenAPI versions
             openapi_schema = json.loads(app.get_openapi_json_schema(openapi_version="3.0.0"))
 
             # Fix Pydantic v2 issue (forcing OpenAPI 3.0.0)
             if openapi_schema.get("openapi") != "3.0.0":
                 openapi_schema["openapi"] = "3.0.0"
-                print("Fixed OpenAPI version to 3.0.0 (Pydantic v2 issue)")
+                print("Note: Adjusted OpenAPI version for compatibility with Bedrock Agents")
 
             # Fix operationIds
             for path in openapi_schema['paths']:
@@ -158,12 +170,19 @@ def main():
                 json.dump(openapi_schema, f, indent=2)
 
             print(f"Schema successfully generated and saved to {{OUTPUT_PATH}}")
+            print("Next steps: Use this schema in your CDK code with bedrock.ApiSchema.fromLocalAsset()")
             return True
 
         except Exception as simplified_error:
             print(f"Error with simplified version: {{str(simplified_error)}}")
-            print("You may need to manually modify the script to handle this error.")
-            print("Focus on preserving the BedrockAgentResolver app definition and routes.")
+            if "No module named" in str(simplified_error):
+                missing_dep = str(simplified_error).split("'")[-2] if "'" in str(simplified_error) else str(simplified_error).split("No module named ")[-1].strip()
+                print("To resolve this error, install the missing dependency:")
+                print("    pip install " + missing_dep.replace('_', '-'))
+                print("Then run this script again.")
+            else:
+                print("You may need to manually modify the script to handle this error.")
+                print("Focus on preserving the BedrockAgentResolver app definition and routes.")
             return False
 
     except Exception as e:

awslabs/cdk_mcp_server/data/solutions_constructs_parser.py

@@ -1,3 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
 """AWS Solutions Constructs patterns parser module."""
 
 import httpx

awslabs/cdk_mcp_server/server.py

@@ -1,3 +1,14 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+# with the License. A copy of the License is located at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
+# and limitations under the License.
+
 """AWS CDK MCP server implementation."""
 
 from awslabs.cdk_mcp_server.core.server import main