awslabs.cdk-mcp-server 1.0.1__tar.gz → 1.0.2__tar.gz

{awslabs_cdk_mcp_server-1.0.1 → awslabs_cdk_mcp_server-1.0.2}/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 #FROM public.ecr.aws/sam/build-python3.10:1.137.1-20250411084548
-FROM public.ecr.aws/sam/build-python3.10@sha256:e78695db10ca8cb129e59e30f7dc9789b0dbd0181dba195d68419c72bac51ac1 AS uv
+FROM public.ecr.aws/sam/build-python3.10@sha256:d821662474d65f3cf2fc97dba2fa807a3adb580d02895fc4545527812550ea65 AS uv
 
 # Install the project into `/app`
 WORKDIR /app
@@ -35,7 +35,7 @@ COPY pyproject.toml uv.lock ./
 
 # Install the project's dependencies using the lockfile and settings
 RUN --mount=type=cache,target=/root/.cache/uv \
-    pip install uv && \
+    pip install uv==0.7.11 && \
     uv sync --frozen --no-install-project --no-dev --no-editable
 
 # Then, add the rest of the project source code and install it
@@ -47,7 +47,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
 # Make the directory just in case it doesn't exist
 RUN mkdir -p /root/.local
 
-FROM public.ecr.aws/sam/build-python3.10@sha256:e78695db10ca8cb129e59e30f7dc9789b0dbd0181dba195d68419c72bac51ac1
+FROM public.ecr.aws/sam/build-python3.10@sha256:d821662474d65f3cf2fc97dba2fa807a3adb580d02895fc4545527812550ea65
 
 # Place executables in the environment at the front of the path and include other binaries
 ENV PATH="/app/.venv/bin:$PATH:/usr/sbin"

{awslabs_cdk_mcp_server-1.0.1 → awslabs_cdk_mcp_server-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.cdk-mcp-server
-Version: 1.0.1
+Version: 1.0.2
 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.
 Project-URL: Homepage, https://awslabs.github.io/mcp/
 Project-URL: Documentation, https://awslabs.github.io/mcp/servers/cdk-mcp-server/
@@ -168,7 +168,7 @@ graph TD
 
 ## Installation
 
-Here are some ways you can work with MCP across AWS, and we'll be adding support to more products including Amazon Q Developer CLI soon: (e.g. for Amazon Q Developer CLI MCP, `~/.aws/amazonq/mcp.json`):
+Configure the MCP server in your MCP client configuration (e.g., for Amazon Q Developer CLI, edit `~/.aws/amazonq/mcp.json`):
 
 ```json
 {

{awslabs_cdk_mcp_server-1.0.1 → awslabs_cdk_mcp_server-1.0.2}/README.md

@@ -138,7 +138,7 @@ graph TD
 
 ## Installation
 
-Here are some ways you can work with MCP across AWS, and we'll be adding support to more products including Amazon Q Developer CLI soon: (e.g. for Amazon Q Developer CLI MCP, `~/.aws/amazonq/mcp.json`):
+Configure the MCP server in your MCP client configuration (e.g., for Amazon Q Developer CLI, edit `~/.aws/amazonq/mcp.json`):
 
 ```json
 {

{awslabs_cdk_mcp_server-1.0.1 → awslabs_cdk_mcp_server-1.0.2}/awslabs/cdk_mcp_server/data/solutions_constructs_parser.py

@@ -23,6 +23,40 @@ from datetime import datetime, timedelta
 from typing import Any, Dict, List
 
 
+# Regular expression patterns for parsing documentation
+# AsciiDoc patterns
+# Matches a Description section in AsciiDoc format: "= Description" followed by text until the next section or end
+ADOC_DESCRIPTION_SECTION_PATTERN = r'= Description\s*\n+(.*?)(?=\n=|\Z)'
+
+# Matches an Overview section in AsciiDoc format: "= Overview" followed by text until the next section or end
+ADOC_OVERVIEW_SECTION_PATTERN = r'= Overview\s*\n+(.*?)(?=\n=|\Z)'
+
+# Matches the first paragraph in a section: start of text until first blank line or end
+FIRST_PARAGRAPH_PATTERN = r'^(.*?)(?=\n\n|\Z)'
+
+# Matches a title and the following paragraph in AsciiDoc: "= Title" followed by blank line and text
+ADOC_TITLE_AND_PARAGRAPH_PATTERN = r'= ([^\n]+)\s*\n\n(.*?)(?=\n\n|\n=|\Z)'
+
+# Markdown patterns
+# Matches a Description section in Markdown: "## Description" followed by text until the next section or end
+MD_DESCRIPTION_SECTION_PATTERN = r'## Description\s*\n+(.*?)(?=\n##|\Z)'
+
+# Matches an Overview section in Markdown: "## Overview" followed by text until the next section or end
+MD_OVERVIEW_SECTION_PATTERN = r'## Overview\s*\n+(.*?)(?=\n##|\Z)'
+
+# Matches the first paragraph after a title in Markdown: "# Title" followed by blank line and text
+MD_TITLE_AND_PARAGRAPH_PATTERN = r'# [^\n]*\n\n(.*?)(?=\n\n|\n##|\Z)'
+
+# Matches any text before the first ## heading
+MD_TEXT_BEFORE_FIRST_HEADING_PATTERN = r'\n\n(.*?)(?=\n##|\Z)'
+
+# Matches a title in Markdown: "# Title"
+MD_TITLE_PATTERN = r'# ([^\n]+)'
+
+# Pattern to replace multiple whitespace characters with a single space
+WHITESPACE_CLEANUP_PATTERN = r'\s+'
+
+
 # Set up logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -115,22 +149,32 @@ async def get_pattern_info(pattern_name: str) -> Dict[str, Any]:
             logger.info(f'Using cached info for {pattern_name}')
             return _pattern_details_cache[pattern_name]['data']
 
-        # Fetch README.md content
+        # Try to fetch README.adoc first (preferred)
         async with httpx.AsyncClient() as client:
-            readme_url = f'{GITHUB_RAW_CONTENT_URL}/{REPO_OWNER}/{REPO_NAME}/main/{PATTERNS_PATH}/{pattern_name}/README.md'
-            logger.info(f'Fetching README from {readme_url}')
-            response = await client.get(readme_url)
-
-            if response.status_code != 200:
-                logger.warning(
-                    f'Failed to fetch README for {pattern_name}: HTTP {response.status_code}'
-                )
-                return {
-                    'error': f'Pattern {pattern_name} not found or README.md not available',
-                    'status_code': response.status_code,
-                }
+            readme_adoc_url = f'{GITHUB_RAW_CONTENT_URL}/{REPO_OWNER}/{REPO_NAME}/main/{PATTERNS_PATH}/{pattern_name}/README.adoc'
+            logger.info(f'Fetching README.adoc from {readme_adoc_url}')
+            adoc_response = await client.get(readme_adoc_url)
+
+            if adoc_response.status_code == 200:
+                readme_content = adoc_response.text
+                logger.info(f'Successfully fetched README.adoc for {pattern_name}')
+            else:
+                # Fall back to README.md (if README.adoc is not available)
+                readme_md_url = f'{GITHUB_RAW_CONTENT_URL}/{REPO_OWNER}/{REPO_NAME}/main/{PATTERNS_PATH}/{pattern_name}/README.md'
+                logger.info(f'README.adoc not found, trying README.md from {readme_md_url}')
+                md_response = await client.get(readme_md_url)
+
+                if md_response.status_code != 200:
+                    logger.warning(
+                        f'Failed to fetch README for {pattern_name}: HTTP {md_response.status_code}'
+                    )
+                    return {
+                        'error': f'Pattern {pattern_name} not found or README not available',
+                        'status_code': md_response.status_code,
+                    }
 
-            readme_content = response.text
+                readme_content = md_response.text
+                logger.info(f'Successfully fetched README.md for {pattern_name}')
 
         # Extract only metadata
         services = extract_services_from_pattern_name(pattern_name)
@@ -313,41 +357,69 @@ def extract_services_from_pattern_name(pattern_name: str) -> List[str]:
 
 
 def extract_description(content: str) -> str:
-    """Extract the pattern description from README.md content.
+    """Extract the pattern description from README content.
 
     Args:
-        content: README.md content
+        content: README content (can be .md or .adoc format)
 
     Returns:
         Pattern description
     """
+    # Check if this is an AsciiDoc (.adoc) file
+    if any(marker in content for marker in ['= Overview', '= Description']):
+        # First, try to find a dedicated Description section in AsciiDoc
+        desc_section_match = re.search(ADOC_DESCRIPTION_SECTION_PATTERN, content, re.DOTALL)
+        if desc_section_match:
+            desc_text = desc_section_match.group(1).strip()
+            # Replace newlines with spaces to ensure a single line description
+            return re.sub(WHITESPACE_CLEANUP_PATTERN, ' ', desc_text)
+
+        # Next, try to find an Overview section in AsciiDoc
+        overview_section_match = re.search(ADOC_OVERVIEW_SECTION_PATTERN, content, re.DOTALL)
+        if overview_section_match:
+            # Take the first paragraph of the overview
+            overview = overview_section_match.group(1).strip()
+            first_para_match = re.search(FIRST_PARAGRAPH_PATTERN, overview, re.DOTALL)
+            if first_para_match:
+                # Replace newlines with spaces to ensure a single line description
+                return re.sub(WHITESPACE_CLEANUP_PATTERN, ' ', first_para_match.group(1).strip())
+            # Replace newlines with spaces to ensure a single line description
+            return re.sub(WHITESPACE_CLEANUP_PATTERN, ' ', overview)
+
+        # Try to find the first paragraph after a title in AsciiDoc format
+        title_match = re.search(ADOC_TITLE_AND_PARAGRAPH_PATTERN, content, re.DOTALL)
+        if title_match:
+            # Replace newlines with spaces to ensure a single line description
+            return re.sub(WHITESPACE_CLEANUP_PATTERN, ' ', title_match.group(2).strip())
+
+    # For Markdown format
     # First, try to find a dedicated Description section
-    desc_section_match = re.search(r'## Description\s*\n+(.*?)(?=\n##|\Z)', content, re.DOTALL)
+    desc_section_match = re.search(MD_DESCRIPTION_SECTION_PATTERN, content, re.DOTALL)
     if desc_section_match:
         return desc_section_match.group(1).strip()
 
     # Next, try to find an Overview section
-    overview_section_match = re.search(r'## Overview\s*\n+(.*?)(?=\n##|\Z)', content, re.DOTALL)
+    overview_section_match = re.search(MD_OVERVIEW_SECTION_PATTERN, content, re.DOTALL)
     if overview_section_match:
         # Take the first paragraph of the overview
         overview = overview_section_match.group(1).strip()
-        first_para_match = re.search(r'^(.*?)(?=\n\n|\Z)', overview, re.DOTALL)
+        first_para_match = re.search(FIRST_PARAGRAPH_PATTERN, overview, re.DOTALL)
         if first_para_match:
             return first_para_match.group(1).strip()
         return overview
 
     # Try to find the first paragraph after the title
-    match = re.search(r'# [^\n]*\n\n(.*?)(?=\n\n|\n##|\Z)', content, re.DOTALL)
+    match = re.search(MD_TITLE_AND_PARAGRAPH_PATTERN, content, re.DOTALL)
     if match:
         return match.group(1).strip()
 
     # Fallback: Try to find any text before the first ## heading
-    match = re.search(r'\n\n(.*?)(?=\n##|\Z)', content, re.DOTALL)
+    match = re.search(MD_TEXT_BEFORE_FIRST_HEADING_PATTERN, content, re.DOTALL)
     if match:
         return match.group(1).strip()
 
     # If all else fails, extract the title as a fallback
-    title_match = re.search(r'# ([^\n]+)', content)
+    title_match = re.search(MD_TITLE_PATTERN, content)
     if title_match:
         pattern_name = title_match.group(1).strip()
         return f'A pattern for integrating {pattern_name} services'

{awslabs_cdk_mcp_server-1.0.1 → awslabs_cdk_mcp_server-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "awslabs.cdk-mcp-server"
-version = "1.0.1"
+version = "1.0.2"
 description = "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."
 readme = "README.md"
 requires-python = ">=3.10"