Resolve merge conflicts and readding miss configured files from develop branch

gudivt · gudivt · commit abc97f7bfe02 · 2025-09-11T11:53:27.000-05:00
diff --git a/docs/setup-development-env-WSL.md b/docs/setup-development-env-WSL.md
@@ -1,169 +1,126 @@
-# Development Environment Setup Guide on Windows using WSL(Windows Subsystem for Linux)
-# Introduction  
+# Development Environment Setup Guide on Windows using WSL
+
+## Introduction  
 This guide establishes a WSL-based development environment on Windows, specifically designed for the GenAI IDP accelerator.
 
-Purpose: Provides a Linux development environment directly on Windows without virtualization overhead, combining native Windows tools with a complete Linux 
-development stack. This approach eliminates cross-platform compatibility issues while maintaining familiar Windows workflows.
+**Purpose**: Provides a Linux development environment directly on Windows without virtualization overhead, combining native Windows tools with a complete Linux development stack.
+
+**When to use this guide**:
+- You're developing on Windows and need Linux compatibility
+- You want to avoid Docker Desktop or VM overhead
+- You need consistent behavior with the project's Linux-based AWS infrastructure
+- You prefer integrated Windows/Linux development workflows
+
+**What you'll achieve**: A seamless development setup where you can use Windows tools (VS Code, browsers, file explorers) while running the GenAI IDP accelerator in a native Linux environment.
 
-When to use this guide:
-• You're developing on Windows and need Linux compatibility
-• You want to avoid Docker Desktop or VM overhead
-• You need consistent behavior with the project's Linux-based AWS infrastructure
-• You prefer integrated Windows/Linux development workflows
+## Prerequisites
 
-What you'll achieve:
-A seamless development setup where you can use Windows tools (VS Code, browsers, file explorers) while running the GenAI IDP accelerator in a native Linux 
-environment, ensuring compatibility with AWS Lambda's Linux runtime and deployment targets.
-# Official Microsoft WSL Installation Guide:
-https://docs.microsoft.com/en-us/windows/wsl/install  
+**Official Microsoft WSL Installation Guide**: https://docs.microsoft.com/en-us/windows/wsl/install
 
-# Step 1: Enable WSL on Windows
-### 1.1 Enable WSL Feature for example Ubuntu
+## Step 1: Enable WSL on Windows
+
+### 1.1 Install WSL with Ubuntu
 1. Open PowerShell as Administrator
 2. Run the installation command:
-```
+```bash
 wsl --install -d Ubuntu 
 ```  
-3. Restart your computer when prompted
-4. Complete Ubuntu setup with username/password
-### 1.2 Verify Installation
-```
-wsl --version
-```
-# Step 2: Install Development Tools in WSL
-Open "Ubuntu" in local machine
-### 2.1 Update System Packages
-```
-sudo apt update && sudo apt upgrade -y
-```  
-### 2.2 Install Essential Tools
-### Install Git 
-```
-sudo apt install git -y
-```
-# Step 3: Clone and Setup Project
-### Clone Repository
+3. Complete Ubuntu setup with username/password 
+4. You will enter into linux shell directly, then go to your WSL home directory using ``` cd ~ ```
+
+## Step 2: Clone Repository and Run Setup Script
+
+### 2.1  Clone Repository
 ```
 git clone https://github.com/aws-solutions-library-samples/accelerated-intelligent-document-processing-on-aws
 ```
-### Go to directory  
 ```
 cd accelerated-intelligent-document-processing-on-aws
 ```
-### Install Python and pip 
-```
-sudo apt install python3 python3-pip -y
-```
-### Verify Python version
+
+### 2.2 Run Automated Setup Script
 ```
-python3 --version
+./scripts/wsl_setup.sh
 ```
-### Create and setup Python Environment
+This script automatically installs:
+- Git, Python 3, pip, and build tools
+- Node.js 18
+- AWS CLI v2
+- AWS SAM CLI
+- Python dependencies
+
+After running the setup script, go to your WSL home directory using ```cd ~```
+
+## Step 3: Complete Manual Setup
+
+### 3.1 Create Python Virtual Environment
 ```
 python3 -m venv venv
 source venv/bin/activate
 ```
-### Build tools and make
-```
-sudo apt install build-essential make -y
-```
-### Install Node.js for UI development
-```
-curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
-```
-```
-sudo apt-get install -y nodejs
-```
-### AWS CLI
-#### Downloads the latest AWS CLI zip file for Linux x86_64 architecture
-```
-curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscli.zip"
-```
-#### Unzip aws-cli-linux-x86_64.zip -d 
-```
-unzip awscli.zip
-```
-#### Installation
-```
-sudo ./aws/install
-```
-#### Remove Zip file
-```
-rm -rf aws awscli.zip
-```
-### Verify AWS CLI installation
-```
-aws --version
-```
-### AWS SAM CLI
-#### Downloads the latest AWS SAM CLI zip file for Linux x86_64 architecture from GitHub releases
-```
-wget https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip
-```
-#### Unzip aws-sam-cli-linux-x86_64.zip -d sam-installation
-```
-unzip aws-sam-cli-linux-x86_64.zip -d sam-installation
-```
-#### Installation
-```
-sudo ./sam-installation/install
-```
-#### Remove Zip file
-```
-rm -rf sam-installation aws-sam-cli-linux-x86_64.zip
-```
-### Verify SAM Installation
-```
-sam --version
-```
-### Install package building tools
-```
-pip install setuptools wheel
-```
-### Install all dependencies required for python
-```
-pip install boto3 rich PyYAML botocore
-```
-### Install development tools
-```
-pip install ruff pytest
-```
-### Install IDP common package in development mode
+
+### 3.2 Install Python Dependencies
+```bash
+pip install setuptools wheel boto3 rich PyYAML botocore ruff pytest typer
 ```
-pip install -e lib/idp_common_pkg/
+### 3.3 Configure AWS CLI
+```bash
+aws configure
 ```
-# Step 4: AWS Configure
-### Refer this link for AWS configure
-https://docs.aws.amazon.com/cli/latest/userguide/getting-started-quickstart.html  
+Enter your AWS credentials when prompted. Refer to: https://docs.aws.amazon.com/cli/latest/userguide/getting-started-quickstart.html
 
-# Step 5: Run Publish Script 
-## Using publish.py (Recommended)
+## Step 4: Test the Setup
 
-### Test publish script help
+### 4.1 Verify All Tools
+```bash
+# Check versions
+python3 --version (Example: Python 3.12.3)
+aws --version (Example: aws-cli/2.28.26)
+sam --version (Example: SAM CLI, version 1.143.0)
+node --version (Example: v18.20.8)
+npm --version (Example: 10.8.2)
 ```
-python3 publish.py --help
+### 4.2 Test Build Process
 ```
-### Test build using publish.py
+cd accelerated-intelligent-document-processing-on-aws
 ```
-python3 publish.py bucket_name build-test us-east-1
 ```
-### Troubleshooting Build Issues
-If the build fails, use the `--verbose` flag to see detailed error messages:
+# Test publish script help
+python3 publish.py --help
+
+# Test build (replace with your S3 bucket name)
+python3 publish.py your-bucket-name build-test us-east-1
 ```
-python3 publish.py bucket_name build-test us-east-1 --verbose
+
+### 4.3 Troubleshooting Build Issues
+If the build fails, use the `--verbose` flag:
+```bash
+python3 publish.py your-bucket-name build-test us-east-1 --verbose
 ```
-The verbose flag will show:
+
+The verbose flag shows:
 - Exact SAM build commands being executed
 - Complete error output from failed builds
 - Python version compatibility issues
 - Missing dependencies or configuration problems
 
-## Using publish.sh (Legacy)
-### Test publish script help
-```
-./publish.sh --help
-```
-### Test build using publish.sh
+## Step 5: Install Visual Studio Code on Local Machine for using WSL as a terminal
+### Visit the official website: Go to [https://code.visualstudio.com/](https://code.visualstudio.com/)
+Download: Click the "Download for Windows" button 
+- This will download the User Installer (recommended for most users) 
+- File name will be something like VSCodeUserSetup-x64-1.x.x.exe  
+
+Install:   
+   - Run the downloaded installer  
+   - Choose installation location (default is recommended)  
+
+Launch: Click "Launch Visual Studio Code" when installation completes
+
+### Install VSCode Extensions
+Install **WSL** extension
+
+### Open Project in WSL
+From WSL terminal, navigate to project and open in VSCode
 ```
-./publish.sh bucket_name build-test us-east-1
+cd accelerated-intelligent-document-processing-on-aws
 ```
diff --git a/lib/idp_common_pkg/idp_common/assessment/granular_service.py b/lib/idp_common_pkg/idp_common/assessment/granular_service.py
@@ -1435,11 +1435,9 @@ def process_document_section(self, document: Document, section_id: str) -> Docum
                 f"Assessment completed: {len(successful_tasks)}/{len(tasks)} tasks successful"
             )
             if failed_tasks:
-                logger.warning(f"Failed tasks: {[t.task_id for t in failed_tasks]}")
                 error_message = self._handle_parsing_errors(
                     document, failed_tasks, document_text, extraction_results
                 )
-                logger.info(f"error_message: {error_message}")
                 if error_message:
                     logger.error(f"Error: {error_message}")
                     document.status = Status.FAILED
diff --git a/patterns/pattern-2/src/assessment_function/assessment_validator.py b/patterns/pattern-2/src/assessment_function/assessment_validator.py
@@ -138,7 +138,7 @@ def validate_all(self):
         else:
             logger.debug("Skipping missing explainability check is disabled.")
 
-        # Check count (only if enabled)
+        # Check count if enabled
         if self.enable_count_check:
             count_result = self.check_explainability_count()
             if not count_result['is_valid']:
@@ -148,12 +148,12 @@ def validate_all(self):
         else:
             logger.debug("Skipping explainability count check disabled.")
         
-        # Check top_k configuration
-        top_k_result = self.check_top_k_config()
-        if not top_k_result['is_valid']:
+        # Check explainability exists
+        exists_result = self.check_explainability_exists()
+        if not exists_result['is_valid']:
             validation_results['is_valid'] = False
-            validation_results['failed_attributes'].extend(top_k_result['failed_attributes'])
-            validation_results['validation_errors'].append(top_k_result['error_message'])
+            validation_results['failed_attributes'].extend(exists_result['failed_attributes'])
+            validation_results['validation_errors'].append(exists_result['error_message'])
         
         # Log final validation result
         if validation_results['is_valid']:
diff --git a/patterns/pattern-2/src/assessment_function/index.py b/patterns/pattern-2/src/assessment_function/index.py
@@ -78,7 +78,8 @@ def handler(event, context):
             extraction_data = s3.get_json_content(section.extraction_result_uri)
             validator = AssessmentValidator(extraction_data,
                                             assessment_config=config.get('assessment', {}),
-                                            enable_missing_check=True)
+                                            enable_missing_check=False,
+                                            enable_count_check=False)
             validation_results = validator.validate_all()
             if not validation_results['is_valid']:
                 # Handle validation failure
@@ -88,12 +89,6 @@ def handler(event, context):
                 logger.error(f"Validation Error: {validation_errors}")
     logger.info("---   End: Assessment Validation ---")
 
-    # # Check if document processing failed
-    # if updated_document.status == Status.FAILED:
-    #     error_message = f"Assessment failed for document {updated_document.id}, section {section_id}"
-    #     logger.error(error_message)
-    #     raise Exception(error_message)
-    
     # Prepare output with automatic compression if needed
     result = {
         'document': updated_document.serialize_document(working_bucket, f"assessment_{section_id}", logger),
diff --git a/scripts/wsl_setup.sh b/scripts/wsl_setup.sh
@@ -21,7 +21,7 @@ set -ex
 sudo apt update && sudo apt upgrade -y
 
 # Install essential tools
-sudo apt install git -y
+sudo apt install git unzip -y
 sudo apt install python3 python3-pip python3-venv python3-full -y
 sudo apt install build-essential make -y
 
@@ -50,4 +50,10 @@ rm -rf sam-installation aws-sam-cli-linux-x86_64.zip
 # Verify SAM installation
 sam --version
 
-echo "Packages setup complete."
+echo "DONE - WSL development environment setup complete."
+echo "Next steps:"
+echo "1. Create Python virtual environment: python3 -m venv venv"
+echo "2. Activate virtual environment: source venv/bin/activate"
+echo "3. Install Python packages: pip install setuptools wheel boto3 rich PyYAML botocore ruff pytest"
+echo "4. Install IDP common package: pip install -e lib/idp_common_pkg/"
+echo "5. Configure AWS CLI: aws configure"
diff --git a/template.yaml b/template.yaml

Original file line number	Diff line number	Diff line change
`@@ -1435,11 +1435,9 @@ def process_document_section(self, document: Document, section_id: str) -> Docum`
`1435`	`1435`	`f"Assessment completed: {len(successful_tasks)}/{len(tasks)} tasks successful"`
`1436`	`1436`	`)`
`1437`	`1437`	`if failed_tasks:`
`1438`		`- logger.warning(f"Failed tasks: {[t.task_id for t in failed_tasks]}")`
`1439`	`1438`	`error_message = self._handle_parsing_errors(`
`1440`	`1439`	`document, failed_tasks, document_text, extraction_results`
`1441`	`1440`	`)`
`1442`		`- logger.info(f"error_message: {error_message}")`
`1443`	`1441`	`if error_message:`
`1444`	`1442`	`logger.error(f"Error: {error_message}")`
`1445`	`1443`	`document.status = Status.FAILED`