awslabs.cdk-mcp-server 0.1.2__tar.gz → 0.1.4__tar.gz

awslabs_cdk_mcp_server-0.1.4/Dockerfile

@@ -0,0 +1,75 @@
+# 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.
+
+#FROM public.ecr.aws/sam/build-python3.10:1.137.1-20250411084548
+FROM public.ecr.aws/sam/build-python3.10@sha256:a40f492a0cd8d76557f8a187fc00e49e8864b3cea683e74718ce317790c1ce61 AS uv
+
+# Install the project into `/app`
+WORKDIR /app
+
+# Enable bytecode compilation
+ENV UV_COMPILE_BYTECODE=1
+
+# Copy from the cache instead of linking since it's a mounted volume
+ENV UV_LINK_MODE=copy
+
+# Prefer the system python
+ENV UV_PYTHON_PREFERENCE=only-system
+
+# Run without updating the uv.lock file like running with `--frozen`
+ENV UV_FROZEN=true
+
+# Copy the required files first
+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 && \
+    uv sync --frozen --no-install-project --no-dev --no-editable
+
+# Then, add the rest of the project source code and install it
+# Installing separately from its dependencies allows optimal layer caching
+COPY . /app
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --frozen --no-dev --no-editable
+
+# Make the directory just in case it doesn't exist
+RUN mkdir -p /root/.local
+
+FROM public.ecr.aws/sam/build-python3.10@sha256:a40f492a0cd8d76557f8a187fc00e49e8864b3cea683e74718ce317790c1ce61
+
+# Place executables in the environment at the front of the path and include other binaries
+ENV PATH="/app/.venv/bin:$PATH:/usr/sbin"
+
+# Install lsof for the healthcheck
+# Install other tools as needed for the MCP server
+# Add non-root user and ability to change directory into /root
+RUN yum update -y && \
+    yum install -y lsof && \
+    yum clean all -y && \
+    rm -rf /var/cache/yum && \
+    groupadd --force --system app && \
+    useradd app -g app -d /app && \
+    chmod o+x /root
+
+# Get the project from the uv layer
+COPY --from=uv --chown=app:app /root/.local /root/.local
+COPY --from=uv --chown=app:app /app/.venv /app/.venv
+
+# Get healthcheck script
+COPY ./docker-healthcheck.sh /usr/local/bin/docker-healthcheck.sh
+
+# Run as non-root
+USER app
+
+# When running the container, add --db-path and a bind mount to the host's db file
+HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD [ "docker-healthcheck.sh" ]
+ENTRYPOINT ["awslabs.cdk-mcp-server"]

{awslabs_cdk_mcp_server-0.1.2 → awslabs_cdk_mcp_server-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.cdk-mcp-server
-Version: 0.1.2
+Version: 0.1.4
 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/
@@ -186,6 +186,29 @@ Here are some ways you can work with MCP across AWS, and we'll be adding support
 }
 ```
 
+or docker after a succesful `docker build -t awslabs/cdk-mcp-server .`:
+
+```json
+  {
+    "mcpServers": {
+      "awslabs.cdk-mcp-server": {
+        "command": "docker",
+        "args": [
+          "run",
+          "--rm",
+          "--interactive",
+          "--env",
+          "FASTMCP_LOG_LEVEL=ERROR",
+          "awslabs/cdk-mcp-server:latest"
+        ],
+        "env": {},
+        "disabled": false,
+        "autoApprove": []
+      }
+    }
+  }
+```
+
 ## Security Considerations
 
 When using this MCP server, you should consider:

{awslabs_cdk_mcp_server-0.1.2 → awslabs_cdk_mcp_server-0.1.4}/README.md

@@ -156,6 +156,29 @@ Here are some ways you can work with MCP across AWS, and we'll be adding support
 }
 ```
 
+or docker after a succesful `docker build -t awslabs/cdk-mcp-server .`:
+
+```json
+  {
+    "mcpServers": {
+      "awslabs.cdk-mcp-server": {
+        "command": "docker",
+        "args": [
+          "run",
+          "--rm",
+          "--interactive",
+          "--env",
+          "FASTMCP_LOG_LEVEL=ERROR",
+          "awslabs/cdk-mcp-server:latest"
+        ],
+        "env": {},
+        "disabled": false,
+        "autoApprove": []
+      }
+    }
+  }
+```
+
 ## Security Considerations
 
 When using this MCP server, you should consider:

{awslabs_cdk_mcp_server-0.1.2 → awslabs_cdk_mcp_server-0.1.4}/awslabs/cdk_mcp_server/core/resources.py

@@ -14,10 +14,8 @@
 import logging
 from awslabs.cdk_mcp_server.data.cdk_nag_parser import get_errors, get_rule_pack, get_warnings
 from awslabs.cdk_mcp_server.data.genai_cdk_loader import (
-    get_genai_cdk_construct,
-    get_genai_cdk_construct_section,
-    get_genai_cdk_overview,
-    list_available_sections,
+    get_section,
+    list_sections,
 )
 from awslabs.cdk_mcp_server.data.lambda_powertools_loader import get_lambda_powertools_section
 from awslabs.cdk_mcp_server.data.solutions_constructs_parser import get_pattern_raw
@@ -182,19 +180,29 @@ async def get_genai_cdk_construct_section_resource(
     """Get a specific section of documentation for a GenAI CDK construct.
 
     Example URIs:
-    - genai-cdk-constructs://bedrock/agent/actiongroups
-    - genai-cdk-constructs://bedrock/agent/alias
+    - genai-cdk-constructs://bedrock/agents/actiongroups
+    - genai-cdk-constructs://bedrock/agents/alias
     - genai-cdk-constructs://bedrock/knowledgebases/chunking
 
     Args:
         construct_type: Type of the construct (e.g., 'bedrock')
-        construct_name: Name of the construct (e.g., 'agent', 'knowledgebases')
+        construct_name: Name of the construct (e.g., 'agents', 'knowledgebases')
         section: Section of the documentation (e.g., 'actiongroups', 'chunking')
 
     Returns:
         String containing the requested section of documentation
     """
-    return get_genai_cdk_construct_section(construct_type, construct_name, section)
+    # Fetch section from GitHub
+    result = await get_section(construct_type, construct_name, section)
+
+    # Check for error
+    if result.get('status') == 'error' or result.get('status') == 'not_found':
+        if 'error' in result:
+            return f'Error fetching section from GitHub: {result["error"]}'
+        else:
+            return f"Error: Section '{section}' not found in {construct_type}/{construct_name}"
+
+    return result['content']
 
 
 async def get_genai_cdk_construct_nested_section_resource(
@@ -215,26 +223,55 @@ async def get_genai_cdk_construct_nested_section_resource(
     Returns:
         String containing the requested nested section of documentation
     """
+    # First try to use parent as the section name and child as a subsection
     section = f'{parent}/{child}'
-    return get_genai_cdk_construct_section(construct_type, construct_name, section)
+    result = await get_section(construct_type, construct_name, section)
+
+    # Check if the first attempt succeeded
+    if result.get('status') == 'success':
+        return result['content']
+
+    # If that fails, try as a combined section name
+    section = f'{parent} {child}'
+    result = await get_section(construct_type, construct_name, section)
+
+    # Check for errors in both attempts
+    if result.get('status') == 'error' or result.get('status') == 'not_found':
+        if 'error' in result:
+            return f'Error fetching nested section from GitHub: {result["error"]}'
+        else:
+            return (
+                f"Error: Section '{parent}/{child}' not found in {construct_type}/{construct_name}"
+            )
+
+    return result['content']
 
 
 async def get_available_sections_resource(construct_type: str, construct_name: str) -> str:
     """Get available sections for a specific construct.
 
     Example URI:
-    - genai-cdk-constructs://bedrock/agent/sections
+    - genai-cdk-constructs://bedrock/agents/sections
     - genai-cdk-constructs://bedrock/knowledgebases/sections
 
     Args:
         construct_type: Type of the construct (e.g., 'bedrock')
-        construct_name: Name of the construct (e.g., 'agent', 'knowledgebases')
+        construct_name: Name of the construct (e.g., 'agents', 'knowledgebases')
 
     Returns:
         String containing available sections in markdown format
     """
-    sections = list_available_sections(construct_type, construct_name)
+    # Handle singular/plural conversion for agent
+    if construct_name.lower() == 'agent':
+        construct_name = 'agents'
 
+    # List sections from GitHub
+    result = await list_sections(construct_type, construct_name)
+
+    if 'error' in result:
+        return f'Error fetching sections from GitHub: {result["error"]}'
+
+    sections = result['sections']
     if not sections:
         return f'No sections found for {construct_name} in {construct_type}.'
 
@@ -252,8 +289,9 @@ async def get_genai_cdk_construct_resource(construct_type: str, construct_name:
     """Get essential information about a GenAI CDK construct.
 
     Example URIs:
-    - genai-cdk-constructs://bedrock/Agent
+    - genai-cdk-constructs://bedrock/Agents
     - genai-cdk-constructs://bedrock/KnowledgeBase
+    - genai-cdk-constructs://bedrock/Amazon Bedrock Knowledge BasesVectorKnowledgeBase (from search results)
 
     Args:
         construct_type: Type of the construct (e.g., 'bedrock')
@@ -262,7 +300,50 @@ async def get_genai_cdk_construct_resource(construct_type: str, construct_name:
     Returns:
         String containing formatted properties and code examples in markdown
     """
-    return get_genai_cdk_construct(construct_type, construct_name)
+    from awslabs.cdk_mcp_server.data.genai_cdk_loader import fetch_readme as get_readme
+
+    # Handle search result format (e.g., "Amazon Bedrock Knowledge BasesVectorKnowledgeBase")
+    if construct_name.startswith('Amazon Bedrock Knowledge Bases'):
+        # Extract the section name that comes after "Amazon Bedrock Knowledge Bases"
+        # This is for the special case of knowledge-bases subdirectory in bedrock
+        section_name = construct_name.replace('Amazon Bedrock Knowledge Bases', '').strip()
+        if section_name:
+            # Get the section from the knowledge-bases README
+            result = await get_section('bedrock', 'knowledge-bases', section_name)
+            if 'error' not in result:
+                return result['content']
+
+        # If no section specified or section not found, get the whole README
+        result = await get_readme('bedrock', 'knowledge-bases')
+        if 'error' not in result:
+            return result['content']
+
+    # Normalize construct name
+    construct_name_lower = construct_name.lower()
+
+    # If the construct is Agent, use agents for GitHub
+    if construct_name_lower == 'agent':
+        construct_name_lower = 'agents'
+
+    # If it looks like a "knowledge base" reference, try the subdirectory
+    if 'knowledge' in construct_name_lower and 'base' in construct_name_lower:
+        result = await get_readme('bedrock', 'knowledge-bases')
+        if 'error' not in result:
+            return result['content']
+
+    # Fetch the entire README from GitHub
+    result = await get_readme(construct_type)
+
+    if 'error' not in result:
+        return result['content']
+
+    # If that fails, try to fetch a specific construct README
+    result = await get_readme(construct_type, construct_name_lower)
+
+    if 'error' in result:
+        return f'Error fetching construct from GitHub: {result["error"]}'
+
+    return result['content']
 
 
 async def get_genai_cdk_overview_resource(construct_type: str) -> str:
@@ -279,4 +360,12 @@ async def get_genai_cdk_overview_resource(construct_type: str) -> str:
     Returns:
         String containing overview documentation in markdown
     """
-    return get_genai_cdk_overview(construct_type)
+    from awslabs.cdk_mcp_server.data.genai_cdk_loader import fetch_readme as get_readme
+
+    # Fetch README from GitHub
+    result = await get_readme(construct_type)
+
+    if 'error' in result:
+        return f'Error fetching overview from GitHub: {result["error"]}'
+
+    return result['content']

{awslabs_cdk_mcp_server-0.1.2 → awslabs_cdk_mcp_server-0.1.4}/awslabs/cdk_mcp_server/core/server.py

@@ -41,15 +41,16 @@ mcp.resource('lambda-powertools://')(resources.get_lambda_powertools_index)
 mcp.resource('aws-solutions-constructs://{pattern_name}')(
     resources.get_solutions_construct_pattern_resource
 )
+# Fixed the ordering - more specific routes first
+mcp.resource('genai-cdk-constructs://{construct_type}/{construct_name}/sections')(
+    resources.get_available_sections_resource
+)
 mcp.resource('genai-cdk-constructs://{construct_type}/{construct_name}/{section}')(
     resources.get_genai_cdk_construct_section_resource
 )
 mcp.resource('genai-cdk-constructs://{construct_type}/{construct_name}/{parent}/{child}')(
     resources.get_genai_cdk_construct_nested_section_resource
 )
-mcp.resource('genai-cdk-constructs://{construct_type}/{construct_name}/sections')(
-    resources.get_available_sections_resource
-)
 mcp.resource('genai-cdk-constructs://{construct_type}/{construct_name}')(
     resources.get_genai_cdk_construct_resource
 )

{awslabs_cdk_mcp_server-0.1.2 → awslabs_cdk_mcp_server-0.1.4}/awslabs/cdk_mcp_server/core/tools.py

@@ -396,11 +396,16 @@ async def search_genai_cdk_constructs(
 
     The search is flexible and will match any of your search terms (OR logic).
     It handles common variations like singular/plural forms and terms with/without spaces.
+    Content is fetched dynamically from GitHub to ensure the most up-to-date documentation.
 
     Examples:
     - "bedrock agent" - Returns all agent-related constructs
     - "knowledgebase vector" - Returns knowledge base constructs related to vector stores
     - "agent actiongroups" - Returns action groups for agents
+    - "opensearch vector" - Returns OpenSearch vector constructs
+
+    The search supports subdirectory content (like knowledge bases and their sections)
+    and will find matches across all available content.
 
     Args:
         ctx: MCP context
@@ -412,7 +417,7 @@ async def search_genai_cdk_constructs(
     """
     try:
         # Get list of constructs
-        constructs = list_available_constructs(construct_type)
+        constructs = await list_available_constructs(construct_type)
 
         # If no query, return all constructs
         if not query: