awslabs.nova-canvas-mcp-server 0.2.1__tar.gz → 0.2.6__tar.gz

{awslabs_nova_canvas_mcp_server-0.2.1 → awslabs_nova_canvas_mcp_server-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.nova-canvas-mcp-server
-Version: 0.2.1
+Version: 0.2.6
 Summary: An AWS Labs Model Context Protocol (MCP) server for Amazon Nova Canvas
 Project-URL: Homepage, https://awslabs.github.io/mcp/
 Project-URL: Documentation, https://awslabs.github.io/mcp/servers/nova-mcp-server/
@@ -25,6 +25,10 @@ Requires-Dist: boto3>=1.37.24
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mcp[cli]>=1.6.0
 Requires-Dist: pydantic>=2.11.1
+Requires-Dist: pytest-asyncio>=0.26.0
+Requires-Dist: pytest-cov>=4.1.0
+Requires-Dist: pytest-mock>=3.12.0
+Requires-Dist: pytest>=8.0.0
 Description-Content-Type: text/markdown
 
 # Amazon Nova Canvas MCP Server

{awslabs_nova_canvas_mcp_server-0.2.1 → awslabs_nova_canvas_mcp_server-0.2.6}/awslabs/nova_canvas_mcp_server/models.py

@@ -198,7 +198,7 @@ class TextImageRequest(BaseModel):
             'textToImageParams': text_to_image_params,
             'imageGenerationConfig': self.imageGenerationConfig.model_dump()
             if self.imageGenerationConfig
-            else None,
+            else ImageGenerationConfig().model_dump(),  # Return default config instead of None
         }
 
 
@@ -237,7 +237,7 @@ class ColorGuidedRequest(BaseModel):
             'colorGuidedGenerationParams': color_guided_params,
             'imageGenerationConfig': self.imageGenerationConfig.model_dump()
             if self.imageGenerationConfig
-            else None,
+            else ImageGenerationConfig().model_dump(),  # Return default config instead of None
         }
 
 

{awslabs_nova_canvas_mcp_server-0.2.1 → awslabs_nova_canvas_mcp_server-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "awslabs.nova-canvas-mcp-server"
-version = "0.2.1"
+version = "0.2.6"
 description = "An AWS Labs Model Context Protocol (MCP) server for Amazon Nova Canvas"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -9,6 +9,10 @@ dependencies = [
     "loguru>=0.7.3",
     "mcp[cli]>=1.6.0",
     "pydantic>=2.11.1",
+    "pytest>=8.0.0",
+    "pytest-asyncio>=0.26.0",
+    "pytest-cov>=4.1.0",
+    "pytest-mock>=3.12.0",
 ]
 license = {text = "Apache-2.0"}
 license-files = ["LICENSE", "NOTICE" ]
@@ -45,6 +49,7 @@ dev = [
     "pre-commit>=4.2.0",
     "pyright>=1.1.398",
     "pytest>=8.0.0",
+    "pytest-asyncio>=0.26.0",
     "pytest-cov>=4.1.0",
     "ruff>=0.11.2",
 ]
@@ -112,3 +117,11 @@ exclude_dirs = ["venv","tests"]
 
 [tool.coverage.run]
 source = ["awslabs"]
+
+[tool.pytest.ini_options]
+testpaths = "tests"
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
+markers = [
+    "asyncio: mark a test as an asyncio coroutine",
+]

awslabs_nova_canvas_mcp_server-0.2.6/run_tests.sh

@@ -0,0 +1,156 @@
+#!/bin/bash
+# Script to run the nova-canvas-mcp-server tests
+
+# Set the Python path to include the current directory and the parent directory
+export PYTHONPATH=$PYTHONPATH:$(pwd):$(pwd)/..
+
+# Check if we're in a virtual environment
+if [ -z "$VIRTUAL_ENV" ]; then
+    echo "Warning: You are not running in a virtual environment."
+    echo "It's recommended to create and activate a virtual environment before running tests."
+    echo "You can create one with: python -m venv venv"
+    echo "And activate it with: source venv/bin/activate (Linux/Mac) or venv\\Scripts\\activate (Windows)"
+    echo "Continuing without a virtual environment..."
+    echo ""
+fi
+
+# Always use python -m pytest to ensure we use the correct pytest
+PYTEST_CMD="python -m pytest"
+
+# Check if pytest and other dependencies are installed
+echo "Checking for required packages..."
+MISSING_PACKAGES=()
+
+# Check for pytest
+python -c "import pytest" 2>/dev/null
+if [ $? -ne 0 ]; then
+    MISSING_PACKAGES+=("pytest pytest-asyncio pytest-cov")
+fi
+
+# Check for boto3 package
+python -c "import boto3" 2>/dev/null
+if [ $? -ne 0 ]; then
+    MISSING_PACKAGES+=("boto3")
+fi
+
+# Check for loguru package
+python -c "import loguru" 2>/dev/null
+if [ $? -ne 0 ]; then
+    MISSING_PACKAGES+=("loguru")
+fi
+
+# Check for pydantic package
+python -c "import pydantic" 2>/dev/null
+if [ $? -ne 0 ]; then
+    MISSING_PACKAGES+=("pydantic")
+fi
+
+# Install missing packages
+if [ ${#MISSING_PACKAGES[@]} -gt 0 ]; then
+    echo "Installing missing packages: ${MISSING_PACKAGES[*]}"
+
+    # Try pip first (more reliable)
+    if command -v pip &> /dev/null; then
+        echo "Using pip to install packages..."
+        pip install ${MISSING_PACKAGES[*]} -v
+    # Try pip3 if pip is not available
+    elif command -v pip3 &> /dev/null; then
+        echo "Using pip3 to install packages..."
+        pip3 install ${MISSING_PACKAGES[*]} -v
+    # Try uv as a last resort
+    elif command -v uv &> /dev/null; then
+        echo "Using uv to install packages..."
+        uv pip install ${MISSING_PACKAGES[*]} -v
+    else
+        echo "Error: No package manager (pip, pip3, or uv) is available. Please install the missing packages manually."
+        exit 1
+    fi
+
+    # Verify installation with more verbose output
+    echo "Verifying package installations..."
+    for pkg in "pytest" "boto3" "loguru" "pydantic"; do
+        echo "Checking for $pkg..."
+        python -c "import $pkg; print(f'$pkg version: {$pkg.__version__}')" 2>/dev/null
+        if [ $? -ne 0 ]; then
+            echo "Failed to install $pkg. Trying to install it individually..."
+            pip install $pkg -v || pip3 install $pkg -v || echo "Failed to install $pkg. Please install it manually."
+
+            # Check again
+            python -c "import $pkg" 2>/dev/null
+            if [ $? -ne 0 ]; then
+                echo "Still failed to install $pkg. Please install it manually."
+                echo "You can try: pip install $pkg"
+                exit 1
+            fi
+        fi
+    done
+fi
+
+# Print debug information
+echo "Debug information:"
+echo "Python version: $(python --version)"
+echo "Python path: $PYTHONPATH"
+echo "Current directory: $(pwd)"
+echo "Python executable: $(which python)"
+echo "Pytest module location: $(python -c "import pytest; print(pytest.__file__)" 2>/dev/null || echo "Not found")"
+
+# Check if nova_canvas_mcp_server module can be imported
+echo "Checking if nova_canvas_mcp_server module can be imported..."
+python -c "import awslabs.nova_canvas_mcp_server; print(f'nova_canvas_mcp_server module found at: {awslabs.nova_canvas_mcp_server.__file__}')" 2>/dev/null
+if [ $? -ne 0 ]; then
+    echo "Warning: nova_canvas_mcp_server module cannot be imported. This may cause test failures."
+    echo "Installing the package in development mode..."
+
+    # Check if uv is available
+    if command -v uv &> /dev/null; then
+        uv pip install -e .
+    # Check if pip is available
+    elif command -v pip &> /dev/null; then
+        pip install -e .
+    else
+        echo "Neither uv nor pip is available. Creating a symbolic link instead..."
+        # Create a symbolic link to the module in the current directory
+        ln -sf $(pwd)/awslabs/nova_canvas_mcp_server $(pwd)/nova_canvas_mcp_server 2>/dev/null
+    fi
+
+    echo "Trying again..."
+    python -c "import awslabs.nova_canvas_mcp_server; print(f'nova_canvas_mcp_server module found at: {awslabs.nova_canvas_mcp_server.__file__}')" 2>/dev/null
+    if [ $? -ne 0 ]; then
+        echo "Still cannot import nova_canvas_mcp_server module. Tests may fail."
+        echo "Directory structure:"
+        ls -la
+        echo "awslabs directory:"
+        ls -la awslabs 2>/dev/null || echo "awslabs directory not found"
+    fi
+fi
+
+# Check if tests directory exists
+if [ -d "tests" ]; then
+    # List test files
+    echo "Test files found:"
+    find tests -name "test_*.py" | sort
+
+    # Run the tests
+    echo "Running tests..."
+    $PYTEST_CMD -xvs tests/
+
+    # If pytest fails, try using unittest as a fallback
+    if [ $? -ne 0 ]; then
+        echo "Pytest failed. Trying to run tests with unittest as a fallback..."
+        python -m unittest discover -s tests
+    fi
+
+    # Run tests with coverage
+    echo "Running tests with coverage..."
+    $PYTEST_CMD --cov --cov-branch --cov-report=term-missing tests/
+
+    # For GitHub Actions, provide an alternative command that uses python -m pytest
+    if [ -n "$GITHUB_ACTIONS" ]; then
+        echo "Running tests with python -m pytest for GitHub Actions..."
+        python -m pytest --cov --cov-branch --cov-report=term-missing --cov-report=xml:nova-canvas-mcp-server-coverage.xml tests/
+    fi
+else
+    echo "No tests directory found, skipping tests"
+fi
+
+echo "Test run completed."

awslabs_nova_canvas_mcp_server-0.2.6/tests/.gitignore

@@ -0,0 +1,25 @@
+# Pytest cache
+__pycache__/
+.pytest_cache/
+
+# Coverage reports
+.coverage
+htmlcov/
+coverage.xml
+
+# Test output
+output/
+
+# Temporary files
+*.tmp
+*.log
+
+# Virtual environment
+venv/
+.venv/
+
+# IDE files
+.idea/
+.vscode/
+*.swp
+*.swo

awslabs_nova_canvas_mcp_server-0.2.6/tests/README.md

@@ -0,0 +1,51 @@
+# Nova Canvas MCP Server Tests
+
+This directory contains tests for the Nova Canvas MCP Server, which provides tools for generating images using Amazon Nova Canvas through Amazon Bedrock.
+
+## Test Structure
+
+The test suite is organized as follows:
+
+- `conftest.py`: Contains pytest fixtures used across the test suite
+- `test_models.py`: Tests for the Pydantic models used for request/response handling
+- `test_novacanvas.py`: Tests for the Nova Canvas API interaction functions
+- `test_server.py`: Tests for the MCP server functionality
+
+## Running Tests
+
+You can run the tests using the provided `run_tests.sh` script in the parent directory:
+
+```bash
+cd src/nova-canvas-mcp-server
+./run_tests.sh
+```
+
+This script will:
+1. Set up the Python environment
+2. Install any missing dependencies
+3. Run the tests with pytest
+4. Generate a coverage report
+5. Run code quality checks (ruff format, ruff lint, pyright)
+
+## Test Coverage
+
+The test suite aims to provide comprehensive coverage of the Nova Canvas MCP Server functionality, including:
+
+- Validation of input parameters
+- Error handling
+- API interaction
+- Image generation with text prompts
+- Image generation with color guidance
+- File saving functionality
+- MCP server integration
+
+## Adding New Tests
+
+When adding new tests, please follow these guidelines:
+
+1. Use the appropriate test file based on what you're testing
+2. Follow the existing test patterns
+3. Use descriptive test names that clearly indicate what is being tested
+4. Use fixtures from `conftest.py` where appropriate
+5. Mock external dependencies (e.g., Bedrock runtime client)
+6. Test both success and error cases

awslabs_nova_canvas_mcp_server-0.2.6/tests/__init__.py

@@ -0,0 +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.
+"""Tests for the nova-canvas-mcp-server."""

awslabs_nova_canvas_mcp_server-0.2.6/tests/conftest.py

@@ -0,0 +1,97 @@
+# 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.
+"""Test fixtures for the nova-canvas-mcp-server tests."""
+
+import base64
+import json
+import pytest
+import tempfile
+from typing import Dict, Generator, List
+from unittest.mock import AsyncMock, MagicMock
+
+
+@pytest.fixture
+def temp_workspace_dir() -> Generator[str, None, None]:
+    """Create a temporary directory for image output."""
+    with tempfile.TemporaryDirectory() as temp_dir:
+        yield temp_dir
+
+
+@pytest.fixture
+def mock_bedrock_runtime_client() -> MagicMock:
+    """Create a mock Bedrock runtime client for testing."""
+    mock_client = MagicMock()
+
+    # Mock the invoke_model method
+    mock_response = {'body': MagicMock()}
+    mock_response['body'].read.return_value = json.dumps(
+        {
+            'images': [
+                base64.b64encode(b'mock_image_data_1').decode('utf-8'),
+                base64.b64encode(b'mock_image_data_2').decode('utf-8'),
+            ]
+        }
+    ).encode('utf-8')
+
+    mock_client.invoke_model.return_value = mock_response
+    return mock_client
+
+
+@pytest.fixture
+def sample_text_prompt() -> str:
+    """Return a sample text prompt for testing."""
+    return 'A beautiful mountain landscape with a lake and trees'
+
+
+@pytest.fixture
+def sample_negative_prompt() -> str:
+    """Return a sample negative prompt for testing."""
+    return 'people, anatomy, hands, low quality, low resolution, low detail'
+
+
+@pytest.fixture
+def sample_colors() -> List[str]:
+    """Return a sample list of colors for testing."""
+    return ['#FF5733', '#33FF57', '#3357FF']
+
+
+@pytest.fixture
+def sample_base64_images() -> List[str]:
+    """Return a list of sample base64-encoded images for testing."""
+    return [
+        base64.b64encode(b'mock_image_data_1').decode('utf-8'),
+        base64.b64encode(b'mock_image_data_2').decode('utf-8'),
+    ]
+
+
+@pytest.fixture
+def mock_successful_response() -> Dict:
+    """Return a mock successful response from the Nova Canvas API."""
+    return {
+        'images': [
+            base64.b64encode(b'mock_image_data_1').decode('utf-8'),
+            base64.b64encode(b'mock_image_data_2').decode('utf-8'),
+        ]
+    }
+
+
+@pytest.fixture
+def mock_error_response() -> Dict:
+    """Return a mock error response from the Nova Canvas API."""
+    return {'error': 'An error occurred during image generation'}
+
+
+@pytest.fixture
+def mock_context() -> AsyncMock:
+    """Create a mock MCP context for testing."""
+    context = AsyncMock()
+    context.error = AsyncMock()
+    return context