update to UV

Author: kazmer97

.gitignore

@@ -1,26 +1,50 @@
+# Environment
 .env
+.venv/
+venv/
+
+# AWS SAM
 .aws-sam
 build.toml
+
+# Build artifacts
 model.tar.gz
 .checksum
 .checksums/
 .build_checksum
 .lib_checksum
+dist/
+build/
+*.egg-info/
+
+# Python
+__pycache__
+*.py[cod]
+*$py.class
+*.so
+.Python
+
+# UV specific
+.python-version
+
+# Ruff
+.ruff_cache
+
+# IDEs
 .vscode/
+.idea/
+*.code-workspace
+
+# OS
 .DS_Store
-dist/
+
+# Project specific
 .sav/
 .delete/
 .data/
-*.egg-info/
-build/
-__pycache__
-*.code-workspace
-.ruff_cache
 .kiro
 rvl_cdip_*
 notebooks/examples/data
-.idea/
 .dsr/
 *tmp-dev-assets*
 scratch/

Dockerfile.optimized

@@ -1,5 +1,5 @@
-# Optimized Dockerfile for Lambda functions with minimal dependencies
-# This builds each function with ONLY the dependencies it needs
+# Optimized Dockerfile for Lambda functions with UV and pyproject.toml dependency groups
+# This builds each function with ONLY the dependencies it needs from the root pyproject.toml
 
 # checkov:skip=CKV_DOCKER_3: "The Dockerfile uses the official AWS Lambda Python base image (public.ecr.aws/lambda/python:3.12-arm64), which already configures the appropriate non-root user for Lambda execution"
 # checkov:skip=CKV_DOCKER_2: "The Dockerfile.optimized is specifically designed for AWS Lambda container images, which don't use Docker HEALTHCHECK instructions."
@@ -10,25 +10,24 @@ FROM public.ecr.aws/lambda/python:3.12-arm64 AS builder
 # Copy uv from official distroless image
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 
-# Build argument for function path
+# Build argument for dependency group from root pyproject.toml
+ARG DEPENDENCY_GROUP
 ARG FUNCTION_PATH
-ARG INSTALL_IDP_COMMON=true
 
 # Create working directory
 WORKDIR /build
 
-# Copy idp_common_pkg and requirements for installation
-COPY lib/idp_common_pkg /tmp/idp_common_pkg
-COPY ${FUNCTION_PATH}/requirements.txt* /build/
+# Copy root pyproject.toml, uv.lock, and idp_common_pkg
+COPY pyproject.toml uv.lock /build/
+COPY lib/idp_common_pkg /build/lib/idp_common_pkg
 
-# Install all dependencies including idp_common_pkg in one step
+# Install dependencies from the specified dependency group
 RUN --mount=type=cache,target=/root/.cache/uv \
-    if [ -f /build/requirements.txt ]; then \
-        sed 's|^\.\./\.\.\(/\.\.\)\?/lib/idp_common_pkg|/tmp/idp_common_pkg|' /build/requirements.txt > /tmp/requirements.txt && \
-        uv pip install --python python3.12 --target /opt/python -r /tmp/requirements.txt && \
-        rm /tmp/requirements.txt; \
-    fi && \
-    rm -rf /tmp/idp_common_pkg
+    if [ -n "$DEPENDENCY_GROUP" ]; then \
+        uv pip install --python python3.12 --target /opt/python "/build[${DEPENDENCY_GROUP}]"; \
+    else \
+        echo "ERROR: DEPENDENCY_GROUP not specified" && exit 1; \
+    fi
 
 # Final stage - minimal runtime
 FROM public.ecr.aws/lambda/python:3.12-arm64

Makefile

@@ -1,29 +1,100 @@
-# Makefile for code quality and formatting
+# Makefile for IDP Accelerator - UV + Hatchling build system
 
 # Define color codes
 RED := \033[0;31m
 GREEN := \033[0;32m
 YELLOW := \033[1;33m
+BLUE := \033[0;34m
 NC := \033[0m  # No Color
 
+# Check for UV
+UV := $(shell command -v uv 2> /dev/null)
+
 # Default target - run both lint and test
-all: lint test
+all: check-uv lint test
+
+# Ensure UV is installed
+check-uv:
+ifndef UV
+	@echo -e "$(RED)❌ ERROR: uv is not installed$(NC)"
+	@echo -e "$(YELLOW)Install from: https://astral.sh/uv$(NC)"
+	@echo "  curl -LsSf https://astral.sh/uv/install.sh | sh"
+	@exit 1
+endif
+	@echo -e "$(GREEN)✅ UV is installed: $(UV)$(NC)"
+
+# Initialize UV environment
+init: check-uv
+	@echo -e "$(BLUE)🚀 Initializing UV workspace...$(NC)"
+	$(UV) sync --all-extras
+	@echo -e "$(GREEN)✅ Workspace initialized$(NC)"
+
+# Lock dependencies
+lock: check-uv
+	@echo -e "$(BLUE)🔒 Locking dependencies...$(NC)"
+	$(UV) lock
+	@echo -e "$(GREEN)✅ Dependencies locked (uv.lock updated)$(NC)"
+
+# Sync local development environment
+sync: check-uv
+	@echo -e "$(BLUE)📦 Syncing development environment...$(NC)"
+	$(UV) sync --all-extras
+	@echo -e "$(GREEN)✅ Environment synced$(NC)"
+
+# Update dependencies
+update: check-uv
+	@echo -e "$(BLUE)⬆️  Updating dependencies...$(NC)"
+	$(UV) lock --upgrade
+	@echo -e "$(GREEN)✅ Dependencies updated$(NC)"
+
+# Update specific package
+update-package: check-uv
+ifndef PKG
+	@echo -e "$(RED)❌ ERROR: PKG variable not set$(NC)"
+	@echo "Usage: make update-package PKG=boto3"
+	@exit 1
+endif
+	@echo -e "$(BLUE)⬆️  Updating $(PKG)...$(NC)"
+	$(UV) lock --upgrade-package $(PKG)
+	@echo -e "$(GREEN)✅ $(PKG) updated$(NC)"
+
+# Build idp_common package
+build-idp-common: check-uv
+	@echo -e "$(BLUE)🔨 Building idp_common package...$(NC)"
+	cd lib/idp_common_pkg && $(UV) build
+	@echo -e "$(GREEN)✅ idp_common built$(NC)"
+
+# Build idp_cli package
+build-idp-cli: check-uv
+	@echo -e "$(BLUE)🔨 Building idp_cli package...$(NC)"
+	cd idp_cli && $(UV) build
+	@echo -e "$(GREEN)✅ idp_cli built$(NC)"
+
+# Build all Python packages
+build-packages: build-idp-common build-idp-cli
+	@echo -e "$(GREEN)✅ All packages built$(NC)"
 
 # Run tests in idp_common_pkg and idp_cli directories
-test:
+test: check-uv
+	@echo -e "$(BLUE)🧪 Running tests...$(NC)"
 	$(MAKE) -C lib/idp_common_pkg test
-	cd idp_cli && python -m pytest -v
-
-# Run both linting and formatting in one command
-lint: ruff-lint format check-arn-partitions
+	cd idp_cli && $(UV) run pytest -v
+	@echo -e "$(GREEN)✅ All tests passed$(NC)"
 
 # Run linting checks and fix issues automatically
-ruff-lint:
-	ruff check --fix
+ruff-lint: check-uv
+	@echo -e "$(BLUE)🔍 Running ruff linting...$(NC)"
+	$(UV) run ruff check --fix
+	@echo -e "$(GREEN)✅ Linting complete$(NC)"
 
 # Format code according to project standards
-format:
-	ruff format
+format: check-uv
+	@echo -e "$(BLUE)✨ Formatting code...$(NC)"
+	$(UV) run ruff format
+	@echo -e "$(GREEN)✅ Formatting complete$(NC)"
+
+# Run both linting and formatting in one command
+lint: ruff-lint format check-arn-partitions
 
 # CI/CD version of lint that only checks but doesn't modify files
 # Used in CI pipelines to verify code quality without making changes

docs/lambda-dependency-groups.md

@@ -0,0 +1,130 @@
+# Lambda Dependency Groups
+
+This document maps each Lambda function to its dependency group defined in the root `pyproject.toml`.
+
+## Dependency Group Reference
+
+All dependency groups are defined in `/pyproject.toml` under `[dependency-groups]`.
+
+## Pattern 1 Lambdas (BDA)
+
+| Lambda Function | Directory | Dependency Group |
+|----------------|-----------|------------------|
+| BDA Discovery | `patterns/pattern-1/src/bda_discovery_function` | `lambda-bda-discovery` |
+| BDA Invoke | `patterns/pattern-1/src/bda_invoke_function` | `lambda-bda-invoke` |
+| BDA Completion | `patterns/pattern-1/src/bda_completion_function` | `lambda-bda-completion` |
+| Summarization | `patterns/pattern-1/src/summarization_function` | `lambda-summarization` |
+| Process Results | `patterns/pattern-1/src/processresults_function` | `lambda-process-results` |
+| HITL Process | `patterns/pattern-1/src/hitl-process-function` | `lambda-hitl` |
+| HITL Status Update | `patterns/pattern-1/src/hitl-status-update-function` | `lambda-hitl` |
+| HITL Wait | `patterns/pattern-1/src/hitl-wait-function` | `lambda-hitl` |
+
+## Pattern 2 Lambdas (Bedrock)
+
+| Lambda Function | Directory | Dependency Group |
+|----------------|-----------|------------------|
+| OCR | `patterns/pattern-2/src/ocr_function` | `lambda-ocr` |
+| Classification | `patterns/pattern-2/src/classification_function` | `lambda-classification` |
+| Extraction | `patterns/pattern-2/src/extraction_function` | `lambda-extraction` |
+| Assessment | `patterns/pattern-2/src/assessment_function` | `lambda-assessment` |
+| Summarization | `patterns/pattern-2/src/summarization_function` | `lambda-summarization` |
+| Process Results | `patterns/pattern-2/src/processresults_function` | `lambda-process-results` |
+| HITL Process | `patterns/pattern-2/src/hitl-process-function` | `lambda-hitl` |
+| HITL Status Update | `patterns/pattern-2/src/hitl-status-update-function` | `lambda-hitl` |
+| HITL Wait | `patterns/pattern-2/src/hitl-wait-function` | `lambda-hitl` |
+
+## Pattern 3 Lambdas (UDOP)
+
+| Lambda Function | Directory | Dependency Group |
+|----------------|-----------|------------------|
+| OCR | `patterns/pattern-3/src/ocr_function` | `lambda-ocr` |
+| Classification | `patterns/pattern-3/src/classification_function` | `lambda-classification` |
+| Extraction | `patterns/pattern-3/src/extraction_function` | `lambda-extraction` |
+| Assessment | `patterns/pattern-3/src/assessment_function` | `lambda-assessment` |
+| Summarization | `patterns/pattern-3/src/summarization_function` | `lambda-summarization` |
+| Process Results | `patterns/pattern-3/src/processresults_function` | `lambda-process-results` |
+
+## Main Lambdas (src/lambda)
+
+| Lambda Function | Directory | Dependency Group |
+|----------------|-----------|------------------|
+| Agent Processor | `src/lambda/agent_processor` | `lambda-agent-processor` |
+| Agent Request Handler | `src/lambda/agent_request_handler` | `lambda-agent-request` |
+| Chat with Document | `src/lambda/chat_with_document_resolver` | `lambda-chat-document` |
+| Configuration Resolver | `src/lambda/configuration_resolver` | `lambda-configuration` |
+| Copy to Baseline | `src/lambda/copy_to_baseline_resolver` | `lambda-document-resolver` |
+| Create Document | `src/lambda/create_document_resolver` | `lambda-document-resolver` |
+| Dashboard Merger | `src/lambda/dashboard_merger` | `lambda-dashboard` |
+| Delete Document | `src/lambda/delete_document_resolver` | `lambda-document-resolver` |
+| Discovery Processor | `src/lambda/discovery_processor` | `lambda-discovery-processor` |
+| Discovery Upload | `src/lambda/discovery_upload_resolver` | `lambda-document-resolver` |
+| Evaluation | `src/lambda/evaluation_function` | `lambda-evaluation` |
+| Get File Contents | `src/lambda/get_file_contents_resolver` | `lambda-document-resolver` |
+| Process Changes | `src/lambda/process_changes_resolver` | `lambda-document-resolver` |
+| Queue Processor | `src/lambda/queue_processor` | `lambda-queue` |
+| Queue Sender | `src/lambda/queue_sender` | `lambda-queue` |
+| Reprocess Document | `src/lambda/reprocess_document_resolver` | `lambda-document-resolver` |
+| Cognito Updater HITL | `src/lambda/cognito_updater_hitl` | `lambda-cognito` |
+| IPSet Updater | `src/lambda/ipset_updater` | `lambda-ipset` |
+| Initialize Counter | `src/lambda/initialize_counter` | `lambda-minimal` |
+| Save Reporting Data | `src/lambda/save_reporting_data` | `lambda-minimal` |
+| Get Workforce URL | `src/lambda/get-workforce-url` | `lambda-minimal` |
+| Create A2I Resources | `src/lambda/create_a2i_resources` | `lambda-minimal` |
+| Get StepFunction Execution | `src/lambda/get_stepfunction_execution_resolver` | `lambda-document-resolver` |
+| List Available Agents | `src/lambda/list_available_agents` | `lambda-document-resolver` |
+| Lookup Function | `src/lambda/lookup_function` | `lambda-document-resolver` |
+| Start CodeBuild | `src/lambda/start_codebuild` | `lambda-minimal` |
+| Update Configuration | `src/lambda/update_configuration` | `lambda-configuration` |
+| Update Settings | `src/lambda/update_settings` | `lambda-document-resolver` |
+| Workflow Tracker | `src/lambda/workflow_tracker` | `lambda-document-resolver` |
+
+## Makefile Template
+
+Each lambda directory should have a `Makefile` with the following structure:
+
+```makefile
+# Makefile for <FunctionName>
+build-<FunctionName>:
+	uv pip install --target "$(ARTIFACTS_DIR)" --python 3.12 "../../../..[<dependency-group>]"
+	cp *.py "$(ARTIFACTS_DIR)/"
+	rm -rf "$(ARTIFACTS_DIR)"/__pycache__
+
+.PHONY: build-<FunctionName>
+```
+
+Example for OCR Function:
+
+```makefile
+# Makefile for OCRFunction
+build-OCRFunction:
+	uv pip install --target "$(ARTIFACTS_DIR)" --python 3.12 "../../../../[lambda-ocr]"
+	cp *.py "$(ARTIFACTS_DIR)/"
+	rm -rf "$(ARTIFACTS_DIR)"/__pycache__
+
+.PHONY: build-OCRFunction
+```
+
+## SAM Template Metadata
+
+Each Lambda in the SAM template must include:
+
+```yaml
+Metadata:
+  BuildMethod: makefile
+```
+
+## Adding a New Lambda
+
+1. Add the lambda's dependency group to `/pyproject.toml` under `[dependency-groups]`
+2. Run `uv lock` to update the lock file
+3. Create a `Makefile` in the lambda directory
+4. Update the SAM template with `BuildMethod: makefile` metadata
+5. Add entry to this documentation
+
+## Updating Dependencies
+
+To update dependencies for a lambda:
+
+1. Edit the dependency group in `/pyproject.toml`
+2. Run `uv lock` to update the lock file
+3. Rebuild the lambda: `sam build <FunctionName>`

idp_cli/pyproject.toml

@@ -2,14 +2,15 @@
 # SPDX-License-Identifier: MIT-0
 
 [build-system]
-requires = ["setuptools>=64", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [project]
 name = "idp-cli"
 version = "1.0.0"
 description = "Command-line interface for IDP Accelerator batch document processing"
-authors = [{name = "AWS"}]
+authors = [{name = "AWS", email = "[email protected]"}]
+readme = "README.md"
 license = {text = "MIT-0"}
 requires-python = ">=3.9"
 classifiers = [
@@ -39,8 +40,13 @@ test = [
 [project.scripts]
 idp-cli = "idp_cli.cli:main"
 
-[tool.setuptools]
+[project.urls]
+Homepage = "https://github.com/aws-samples/accelerated-intelligent-document-processing-on-aws"
+
+# Hatchling configuration
+[tool.hatch.build.targets.wheel]
 packages = ["idp_cli"]
 
-[tool.setuptools.package-dir]
-idp_cli = "idp_cli"
+# UV configuration
+[tool.uv]
+package = true