awslabs.cdk-mcp-server 0.0.91005__tar.gz → 0.0.101004__tar.gz

{awslabs_cdk_mcp_server-0.0.91005 → awslabs_cdk_mcp_server-0.0.101004}/.pre-commit-config.yaml

@@ -11,4 +11,4 @@ repos:
     hooks:
       - id: commitizen
       - id: commitizen-branch
-        stages: [push]
+        stages: [pre-push]

awslabs_cdk_mcp_server-0.0.101004/CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Unreleased
+
+### Added
+
+- Initial project setup
+- New `GenerateLambdaLayerCode` tool for creating properly configured Lambda layers
+  - Extracts data directly from AWS documentation
+  - Provides smart fallback mechanisms for various AWS doc formats
+  - Integrates with CDK General Guidance flow
+
+
+### Changed
+
+- Reorganized CDK_GENERAL_GUIDANCE.md to eliminate duplication
+  - Created unified Implementation Approach and Workflow section
+  - Added clear separation between common and GenAI patterns
+  - Added section showing how both approaches can be used together
+- Improved Lambda Powertools documentation
+  - Centralized CDK integration guidance
+  - Added explicit Lambda layer requirement notices
+  - Removed duplicate code examples from feature-specific files
+  - Updated Bedrock integration examples with proper layer creation patterns

{awslabs_cdk_mcp_server-0.0.91005 → awslabs_cdk_mcp_server-0.0.101004}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: awslabs.cdk-mcp-server
-Version: 0.0.91005
+Version: 0.0.101004
 Summary: An AWS CDK MCP server that provides guidance on AWS Cloud Development Kit best practices, infrastructure as code patterns, and security compliance with CDK Nag. This server offers tools to validate infrastructure designs, explain CDK Nag rules, analyze suppressions, generate Bedrock Agent schemas, and discover Solutions Constructs patterns.
 Requires-Python: >=3.10
 Requires-Dist: aws-lambda-powertools>=2.30.0
+Requires-Dist: bs4>=0.0.2
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: mcp[cli]>=1.6.0
 Requires-Dist: pydantic>=2.10.6
@@ -39,6 +40,13 @@ MCP server for AWS Cloud Development Kit (CDK) best practices, infrastructure as
 - Discover specialized constructs for AI/ML workloads
 - Get implementation guidance for generative AI applications
 
+### Lambda Layer Documentation Provider
+
+- Access comprehensive documentation for AWS Lambda layers
+- Get code examples for generic Lambda layers and Python-specific layers
+- Retrieve directory structure information and implementation best practices
+- Seamless integration with AWS Documentation MCP Server for detailed documentation
+
 ### Amazon Bedrock Agent Schema Generation
 
 - Use this tool when creating Bedrock Agents with Action Groups that use Lambda functions
@@ -57,7 +65,8 @@ This diagram provides a comprehensive view of the recommended CDK implementation
 
 ```mermaid
 graph TD
-    Start([Start]) --> Init["cdk init app"]
+    Start([Start]) --> A["CDKGeneralGuidance"]
+    A --> Init["cdk init app"]
 
     Init --> B{Choose Approach}
     B -->|"Common Patterns"| C1["GetAwsSolutionsConstructPattern"]
@@ -85,11 +94,13 @@ graph TD
 
     %% Conditional Lambda Powertools implementation
     D1 & D2 & D3 --> HasLambda{"Using Lambda<br/>Functions?"}
-    HasLambda -->|"Yes"| L["Add Lambda Powertools<br/>and create Layer"]
-    HasLambda -->|"No"| SkipL["Skip Lambda<br/>Powertools"]
+    HasLambda --> UseLayer{"Using Lambda<br/>Layers?"}
+    UseLayer -->|"Yes"| LLDP["LambdaLayerDocumentationProvider"]
+
+    HasLambda -->|"No"| SkipL["Skip"]
 
     %% Rest of workflow
-    L --> Synth["cdk synth"]
+    LLDP["LambdaLayerDocumentationProvider"] --> Synth["cdk synth"]
     SkipL --> Synth
 
     Synth --> Nag{"CDK Nag<br/>warnings?"}
@@ -109,22 +120,33 @@ graph TD
     classDef decision fill:#5d4037,stroke:#ffffff,stroke-width:1px,color:#ffffff;
 
     class Init,Synth,Deploy,BSR cmd;
-    class C1,C2,BS,E,CN tool;
+    class A,C1,C2,BS,E,CN,LLDP tool;
     class JSON output;
-    class HasLambda,Nag decision;
+    class HasLambda,UseLayer,Nag decision;
 ```
 
-## Tools and Resources
+## Available MCP Tools
+
+- **CDKGeneralGuidance**: Get prescriptive advice for building AWS applications with CDK
+- **GetAwsSolutionsConstructPattern**: Find vetted architecture patterns combining AWS services
+- **SearchGenAICDKConstructs**: Discover GenAI CDK constructs by name or features
+- **GenerateBedrockAgentSchema**: Create OpenAPI schemas for Bedrock Agent action groups
+- **LambdaLayerDocumentationProvider**: Access documentation for Lambda layers implementation
+- **ExplainCDKNagRule**: Get detailed guidance on CDK Nag security rules
+- **CheckCDKNagSuppressions**: Validate CDK Nag suppressions in your code
+
+## Available MCP Resources
 
 - **CDK Nag Rules**: Access rule packs via `cdk-nag://rules/{rule_pack}`
-- **Lambda Powertools**: Get guidance on Lambda Powertools via `lambda-powertools://{topic}`
 - **AWS Solutions Constructs**: Access patterns via `aws-solutions-constructs://{pattern_name}`
 - **GenAI CDK Constructs**: Access documentation via `genai-cdk-constructs://{construct_type}/{construct_name}`
+- **Lambda Powertools**: Get guidance on Lambda Powertools via `lambda-powertools://{topic}`
 
 ## Prerequisites
 
 1. Install `uv` from [Astral](https://docs.astral.sh/uv/getting-started/installation/) or the [GitHub README](https://github.com/astral-sh/uv#installation)
 2. Install Python using `uv python install 3.10`
+3. Install AWS CDK CLI using `npm install -g aws-cdk` (Note: The MCP server itself doesn't use the CDK CLI directly, but it guides users through CDK application development that requires the CLI)
 
 ## Installation
 

{awslabs_cdk_mcp_server-0.0.91005 → awslabs_cdk_mcp_server-0.0.101004}/README.md

@@ -28,6 +28,13 @@ MCP server for AWS Cloud Development Kit (CDK) best practices, infrastructure as
 - Discover specialized constructs for AI/ML workloads
 - Get implementation guidance for generative AI applications
 
+### Lambda Layer Documentation Provider
+
+- Access comprehensive documentation for AWS Lambda layers
+- Get code examples for generic Lambda layers and Python-specific layers
+- Retrieve directory structure information and implementation best practices
+- Seamless integration with AWS Documentation MCP Server for detailed documentation
+
 ### Amazon Bedrock Agent Schema Generation
 
 - Use this tool when creating Bedrock Agents with Action Groups that use Lambda functions
@@ -46,7 +53,8 @@ This diagram provides a comprehensive view of the recommended CDK implementation
 
 ```mermaid
 graph TD
-    Start([Start]) --> Init["cdk init app"]
+    Start([Start]) --> A["CDKGeneralGuidance"]
+    A --> Init["cdk init app"]
 
     Init --> B{Choose Approach}
     B -->|"Common Patterns"| C1["GetAwsSolutionsConstructPattern"]
@@ -74,11 +82,13 @@ graph TD
 
     %% Conditional Lambda Powertools implementation
     D1 & D2 & D3 --> HasLambda{"Using Lambda<br/>Functions?"}
-    HasLambda -->|"Yes"| L["Add Lambda Powertools<br/>and create Layer"]
-    HasLambda -->|"No"| SkipL["Skip Lambda<br/>Powertools"]
+    HasLambda --> UseLayer{"Using Lambda<br/>Layers?"}
+    UseLayer -->|"Yes"| LLDP["LambdaLayerDocumentationProvider"]
+
+    HasLambda -->|"No"| SkipL["Skip"]
 
     %% Rest of workflow
-    L --> Synth["cdk synth"]
+    LLDP["LambdaLayerDocumentationProvider"] --> Synth["cdk synth"]
     SkipL --> Synth
 
     Synth --> Nag{"CDK Nag<br/>warnings?"}
@@ -98,22 +108,33 @@ graph TD
     classDef decision fill:#5d4037,stroke:#ffffff,stroke-width:1px,color:#ffffff;
 
     class Init,Synth,Deploy,BSR cmd;
-    class C1,C2,BS,E,CN tool;
+    class A,C1,C2,BS,E,CN,LLDP tool;
     class JSON output;
-    class HasLambda,Nag decision;
+    class HasLambda,UseLayer,Nag decision;
 ```
 
-## Tools and Resources
+## Available MCP Tools
+
+- **CDKGeneralGuidance**: Get prescriptive advice for building AWS applications with CDK
+- **GetAwsSolutionsConstructPattern**: Find vetted architecture patterns combining AWS services
+- **SearchGenAICDKConstructs**: Discover GenAI CDK constructs by name or features
+- **GenerateBedrockAgentSchema**: Create OpenAPI schemas for Bedrock Agent action groups
+- **LambdaLayerDocumentationProvider**: Access documentation for Lambda layers implementation
+- **ExplainCDKNagRule**: Get detailed guidance on CDK Nag security rules
+- **CheckCDKNagSuppressions**: Validate CDK Nag suppressions in your code
+
+## Available MCP Resources
 
 - **CDK Nag Rules**: Access rule packs via `cdk-nag://rules/{rule_pack}`
-- **Lambda Powertools**: Get guidance on Lambda Powertools via `lambda-powertools://{topic}`
 - **AWS Solutions Constructs**: Access patterns via `aws-solutions-constructs://{pattern_name}`
 - **GenAI CDK Constructs**: Access documentation via `genai-cdk-constructs://{construct_type}/{construct_name}`
+- **Lambda Powertools**: Get guidance on Lambda Powertools via `lambda-powertools://{topic}`
 
 ## Prerequisites
 
 1. Install `uv` from [Astral](https://docs.astral.sh/uv/getting-started/installation/) or the [GitHub README](https://github.com/astral-sh/uv#installation)
 2. Install Python using `uv python install 3.10`
+3. Install AWS CDK CLI using `npm install -g aws-cdk` (Note: The MCP server itself doesn't use the CDK CLI directly, but it guides users through CDK application development that requires the CLI)
 
 ## Installation
 

{awslabs_cdk_mcp_server-0.0.91005 → awslabs_cdk_mcp_server-0.0.101004}/awslabs/cdk_mcp_server/core/server.py

@@ -63,6 +63,7 @@ mcp.tool(name='CheckCDKNagSuppressions')(tools.check_cdk_nag_suppressions_tool)
 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)
+mcp.tool(name='LambdaLayerDocumentationProvider')(tools.lambda_layer_documentation_provider)
 
 
 def main():

{awslabs_cdk_mcp_server-0.0.91005 → awslabs_cdk_mcp_server-0.0.101004}/awslabs/cdk_mcp_server/core/tools.py

@@ -22,6 +22,7 @@ from awslabs.cdk_mcp_server.data.cdk_nag_parser import (
 from awslabs.cdk_mcp_server.data.genai_cdk_loader import (
     list_available_constructs,
 )
+from awslabs.cdk_mcp_server.data.lambda_layer_parser import LambdaLayerParser
 from awslabs.cdk_mcp_server.data.schema_generator import generate_bedrock_schema_from_file
 from awslabs.cdk_mcp_server.data.solutions_constructs_parser import (
     fetch_pattern_list,
@@ -476,3 +477,55 @@ async def search_genai_cdk_constructs(
         }
     except Exception as e:
         return {'error': f'Error searching constructs: {str(e)}', 'status': 'error'}
+
+
+async def lambda_layer_documentation_provider(
+    ctx: Context,
+    layer_type: str,  # "generic" or "python"
+) -> Dict[str, Any]:
+    """Provide documentation sources for Lambda layers.
+
+    This tool returns information about where to find documentation for Lambda layers
+    and instructs the MCP Client to fetch and process this documentation.
+
+    Args:
+        ctx: MCP context
+        layer_type: Type of layer ("generic" or "python")
+
+    Returns:
+        Dictionary with documentation source information
+    """
+    if layer_type.lower() == 'python':
+        # For Python layers, use AWS Documentation MCP Server
+        return {
+            'layer_type': 'python',
+            'documentation_source': {
+                'server': 'awslabs.aws-documentation-mcp-server',
+                'tool': 'read_documentation',
+                'parameters': {'url': LambdaLayerParser.PYTHON_LAYER_URL, 'max_length': 10000},
+            },
+            'documentation_usage_guide': {
+                'when_to_fetch_full_docs': 'Fetch full documentation to view detailed property definitions, learn about optional parameters, and find additional code examples',
+                'contains_sample_code': True,
+                'contains_props_documentation': True,
+            },
+            'code_generation_guidance': {
+                'imports': [
+                    "import { PythonLayerVersion } from '@aws-cdk/aws-lambda-python-alpha'"
+                ],
+                'construct_types': {'python': 'PythonLayerVersion'},
+                'required_properties': {'python': ['entry']},
+                'sample_code': "new python.PythonLayerVersion(this, 'MyLayer', {\n  entry: '/path/to/my/layer', // point this to your library's directory\n})",
+            },
+        }
+    else:
+        # For all other layer types (including generic), use the existing parser
+        docs = await LambdaLayerParser.fetch_lambda_layer_docs()
+        layer_docs = docs['generic_layers']
+
+        return {
+            'layer_type': 'generic',
+            'code_examples': layer_docs['examples'],
+            'directory_structure': layer_docs['directory_structure'],
+            'source_url': layer_docs['url'],
+        }

awslabs_cdk_mcp_server-0.0.101004/awslabs/cdk_mcp_server/data/lambda_layer_parser.py

@@ -0,0 +1,231 @@
+# 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 layer documentation parser module."""
+
+import httpx
+import logging
+from bs4 import BeautifulSoup
+from bs4.element import Tag
+from typing import Any, Dict, List, Optional
+
+
+# Set up logging
+logger = logging.getLogger(__name__)
+
+
+class LambdaLayerParser:
+    """Parser for Lambda layer documentation from AWS docs."""
+
+    # Documentation URLs
+    GENERIC_LAYER_URL = (
+        'https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_lambda-readme.html#layers'
+    )
+    PYTHON_LAYER_URL = 'https://docs.aws.amazon.com/cdk/api/v2/docs/@aws-cdk_aws-lambda-python-alpha.PythonLayerVersion.html'
+
+    # Search patterns to directly find sections when headers aren't working
+    LAYER_SECTION_PATTERNS = ['layers', 'layer version', 'layerversion']
+
+    @classmethod
+    async def fetch_page(cls, url: str) -> Optional[str]:
+        """Fetch a page from AWS documentation."""
+        try:
+            async with httpx.AsyncClient() as client:
+                response = await client.get(url)
+                if response.status_code == 200:
+                    return response.text
+                else:
+                    logger.error(f'Failed to fetch {url}: HTTP {response.status_code}')
+                    return None
+        except Exception as e:
+            logger.error(f'Error fetching {url}: {str(e)}')
+            return None
+
+    @classmethod
+    def extract_code_examples(cls, html_section: Optional[str]) -> List[Dict[str, str]]:
+        """Extract code examples from an HTML section."""
+        if not html_section:
+            return []
+
+        soup = BeautifulSoup(html_section, 'html.parser')
+        code_blocks = soup.find_all('pre')
+
+        examples = []
+        for block in code_blocks:
+            # Make sure we're working with a Tag
+            if not isinstance(block, Tag):
+                continue
+
+            # Try to determine the language
+            language = 'typescript'  # Default
+            classes = block.attrs.get('class', [])
+
+            # Make sure classes is a list of strings
+            if not isinstance(classes, list):
+                classes = [str(classes)]
+
+            class_str = ' '.join(classes)
+
+            if 'python' in class_str.lower():
+                language = 'python'
+            elif 'javascript' in class_str.lower():
+                language = 'javascript'
+
+            # Get the code content
+            code = block.get_text()
+            examples.append({'language': language, 'code': code})
+
+        return examples
+
+    @classmethod
+    def extract_directory_structure(cls, html_section: Optional[str]) -> Optional[str]:
+        """Extract directory structure information from HTML section."""
+        if not html_section:
+            return None
+
+        soup = BeautifulSoup(html_section, 'html.parser')
+
+        # Look for pre blocks that might contain directory structure
+        pre_blocks = soup.find_all('pre')
+        for block in pre_blocks:
+            text = block.get_text()
+            if '/' in text and (
+                'directory' in text.lower()
+                or 'structure' in text.lower()
+                or 'layer' in text.lower()
+            ):
+                return text
+
+        # Look for paragraphs that might describe directory structure
+        paragraphs = soup.find_all('p')
+        for p in paragraphs:
+            text = p.get_text()
+            if (
+                'directory' in text.lower() and 'structure' in text.lower()
+            ) or 'layer' in text.lower():
+                return text
+
+        return None
+
+    @classmethod
+    def find_layer_content(cls, html: Optional[str]) -> Optional[str]:
+        """Find Lambda layer content using multiple strategies."""
+        if not html:
+            return None
+
+        soup = BeautifulSoup(html, 'html.parser')
+
+        # Strategy 1: Find section by id
+        section = soup.find(id='layers')
+        if section and isinstance(section, Tag):
+            # If we found an anchor, get its parent and look for the actual content
+            if section.name == 'a':
+                parent = section.parent
+                if parent and isinstance(parent, Tag) and parent.name and parent.name[0] == 'h':
+                    # We found a header, extract all content until the next header of same or higher level
+                    content = []
+                    content.append(str(parent))
+
+                    header_level = int(parent.name[1])
+                    sibling = parent.next_sibling
+
+                    while sibling:
+                        if (
+                            isinstance(sibling, Tag)
+                            and sibling.name
+                            and sibling.name[0] == 'h'
+                            and int(sibling.name[1]) <= header_level
+                        ):
+                            break
+                        if isinstance(sibling, Tag) and sibling.name:
+                            content.append(str(sibling))
+                        sibling = sibling.next_sibling
+
+                    return ''.join(content)
+
+        # Strategy 2: Look for headers containing layer keywords
+        for tag in ['h1', 'h2', 'h3', 'h4']:
+            headers = soup.find_all(tag)
+            for header in headers:
+                if not isinstance(header, Tag):
+                    continue
+
+                text = header.get_text().lower()
+                if any(pattern in text for pattern in cls.LAYER_SECTION_PATTERNS):
+                    # Found a relevant header, extract all content until the next header of same or higher level
+                    content = []
+                    content.append(str(header))
+
+                    if not header.name:
+                        continue
+
+                    header_level = int(header.name[1])
+                    sibling = header.next_sibling
+
+                    while sibling:
+                        if (
+                            isinstance(sibling, Tag)
+                            and sibling.name
+                            and sibling.name[0] == 'h'
+                            and int(sibling.name[1]) <= header_level
+                        ):
+                            break
+                        if isinstance(sibling, Tag) and sibling.name:
+                            content.append(str(sibling))
+                        sibling = sibling.next_sibling
+
+                    return ''.join(content)
+
+        # Strategy 3: Look for content div with class="api" or class="props"
+        content_divs = soup.find_all('div', class_=['api', 'props'])
+        if content_divs:
+            return ''.join(str(div) for div in content_divs)
+
+        # Strategy 4: Look for table with class containing 'cdk'
+        tables = soup.find_all('table')
+        for table in tables:
+            if not isinstance(table, Tag):
+                continue
+
+            classes = table.attrs.get('class', [])
+            if not isinstance(classes, list):
+                classes = [str(classes)]
+
+            if any('cdk' in str(cls_name) for cls_name in classes):
+                return str(table)
+
+        return None
+
+    @classmethod
+    async def fetch_lambda_layer_docs(cls) -> Dict[str, Any]:
+        """Fetch Lambda layer documentation from AWS docs."""
+        logger.info('Fetching Lambda layer documentation from AWS')
+
+        # Fetch only the generic page
+        generic_html = await cls.fetch_page(cls.GENERIC_LAYER_URL)
+
+        # Extract relevant sections using our specialized finder
+        generic_layers_section = cls.find_layer_content(generic_html)
+
+        # Extract code examples and directory structure
+        generic_examples = cls.extract_code_examples(generic_layers_section)
+        generic_dir_structure = cls.extract_directory_structure(generic_layers_section)
+
+        # Compile the results
+        result = {
+            'generic_layers': {
+                'examples': generic_examples,
+                'directory_structure': generic_dir_structure,
+                'url': cls.GENERIC_LAYER_URL,
+            }
+        }
+
+        return result

{awslabs_cdk_mcp_server-0.0.91005 → awslabs_cdk_mcp_server-0.0.101004}/awslabs/cdk_mcp_server/data/solutions_constructs_parser.py

@@ -288,7 +288,7 @@ def extract_services_from_pattern_name(pattern_name: str) -> List[str]:
         'iot': 'IoT Core',
         'elasticsearch': 'Elasticsearch',
         'opensearch': 'OpenSearch',
-        'secretsmanager': 'Secrets Manager',
+        'secretsmanager': 'Secrets Manager',  # pragma: allowlist secret
         'sagemakerendpoint': 'SageMaker Endpoint',
         'stepfunctions': 'Step Functions',
         'wafwebacl': 'WAF Web ACL',