Merge branch 'develop' into feature/idp-cli-doc-status

Author: Bob Strahan

CHANGELOG.md

@@ -34,6 +34,21 @@ SPDX-License-Identifier: MIT-0
   - JSON format output (`--format json`) provides structured data for parsing in CI/CD pipelines and scripts
   - Live monitoring support with `--wait` flag works for both batch and single document status checks
   - Mutual exclusion validation ensures only one of `--batch-id` or `--document-id` is specified
+- **Error Analyzer CloudWatch Tool Enhancements**
+  - Enhanced CloudWatch log filtering with request ID-based filtering for more targeted error analysis
+  - Improved XRay tool tracing and logging capabilities for better diagnostic accuracy
+  - Enhanced error context correlation between CloudWatch logs and X-Ray traces
+  - Consolidated and renamed tools
+  - Provided tools access to agent
+  - Updated system prompt
+
+- **Error Analyzer CloudWatch Tool Enhancements**
+  - Enhanced CloudWatch log filtering with request ID-based filtering for more targeted error analysis
+  - Improved XRay tool tracing and logging capabilities for better diagnostic accuracy
+  - Enhanced error context correlation between CloudWatch logs and X-Ray traces
+  - Consolidated and renamed tools
+  - Provided tools access to agent
+  - Updated system prompt
 
 
 ### Fixed
@@ -45,6 +60,7 @@ SPDX-License-Identifier: MIT-0
   - **Enhanced Debugging**: Added detailed console logging with full PK/SK information for both list entries and expected document entries to facilitate cleanup of orphaned records
   - **User Impact**: All valid documents now display correctly even when orphaned list entries exist; debugging information available in browser console for identifying problematic entries
 
+
 ## [0.3.21]
 
 ### Added

lib/idp_common_pkg/idp_common/assessment/service.py

@@ -93,15 +93,22 @@ def __init__(
             region: AWS region for Bedrock
             config: Configuration dictionary or IDPConfig model
         """
-        # Convert dict to IDPConfig if needed
-        if config is not None and isinstance(config, dict):
-            config_model: IDPConfig = IDPConfig(**config)
-
-        if not isinstance(config, IDPConfig) and config is not None:
-            config_model = IDPConfig(**config)
-
+        # Convert config to IDPConfig if needed
         if config is None:
             config_model = IDPConfig()
+        elif isinstance(config, IDPConfig):
+            config_model = config
+        elif isinstance(config, dict):
+            config_model = IDPConfig(**config)
+        else:
+            # Fallback: attempt conversion for other types
+            try:
+                config_model = IDPConfig(**config)
+            except Exception as e:
+                logger.error(f"Failed to convert config to IDPConfig: {e}")
+                raise ValueError(
+                    f"Invalid config type: {type(config)}. Expected None, dict, or IDPConfig instance."
+                )
 
         self.config = config_model
         self.region = region or os.environ.get("AWS_REGION")

lib/idp_common_pkg/tests/unit/assessment/test_assessment_service.py

@@ -23,6 +23,7 @@
 
 # Finally import application modules
 from idp_common.assessment.service import AssessmentService
+from idp_common.config.models import IDPConfig
 from idp_common.models import Document, Section, Status, Page
 
 
@@ -482,3 +483,45 @@ def test_process_document_section_empty_extraction_results(
         # Should return without error but log warning
         assert len(result.errors) == 0
         mock_get_json_content.assert_called_once()
+
+    def test_init_with_none_config(self):
+        """Test initialization with None config creates default IDPConfig."""
+        service = AssessmentService(region="us-east-1", config=None)
+
+        assert service.region == "us-east-1"
+        assert isinstance(service.config, IDPConfig)
+        # Verify default config has assessment settings
+        assert hasattr(service.config, "assessment")
+
+    def test_init_with_dict_config(self, mock_config):
+        """Test initialization with dict config converts to IDPConfig."""
+        service = AssessmentService(region="us-east-1", config=mock_config)
+
+        assert service.region == "us-east-1"
+        assert isinstance(service.config, IDPConfig)
+        # Verify config was properly converted
+        assert service.config.assessment.model == mock_config["assessment"]["model"]
+
+    def test_init_with_idpconfig_instance(self, mock_config):
+        """Test initialization with IDPConfig instance (the previously failing case)."""
+        # Create an IDPConfig instance first
+        config_instance = IDPConfig(**mock_config)
+
+        # Initialize service with IDPConfig instance
+        service = AssessmentService(region="us-east-1", config=config_instance)
+
+        assert service.region == "us-east-1"
+        assert isinstance(service.config, IDPConfig)
+        # Should use the same instance
+        assert service.config is config_instance
+        # Verify config properties are accessible
+        assert service.config.assessment.model == mock_config["assessment"]["model"]
+
+    def test_init_with_invalid_config_type(self):
+        """Test initialization with invalid config type raises ValueError."""
+        # Try to initialize with an invalid config type (e.g., a string)
+        with pytest.raises(ValueError) as exc_info:
+            AssessmentService(region="us-east-1", config="invalid_config")
+
+        # Verify error message mentions the invalid type
+        assert "Invalid config type" in str(exc_info.value)