Merge branch 'develop' into feature/evaluation-inside-workflow

Bob Strahan · Bob Strahan · commit eab008789f25 · 2025-10-26T16:41:50.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,14 @@ SPDX-License-Identifier: MIT-0
   - Simplified CloudWatch results structure for improved readability and analysis
   - Updated error analyzer recommendations to leverage X-Ray insights for more accurate root cause identification
 
+- **EU Region Support with Automatic Model Mapping**
+  - Added support for deploying the solution in EU regions (eu-central-1, eu-west-1, etc.)
+  - Automatic model endpoint mapping between US and EU regions for seamless deployment
+  - Comprehensive model mapping table covering Amazon Nova and Anthropic Claude models
+  - Intelligent fallback mappings when direct EU equivalents are unavailable
+  - Quick Launch button for eu-central-1 region in README and deployment documentation
+  - Complete technical documentation in `docs/eu-region-model-support.md` with best practices and troubleshooting
+
 ### Changed
 
 - **Migrated Evaluation from EventBridge Trigger to Step Functions Workflow**
diff --git a/README.md b/README.md
@@ -70,6 +70,7 @@ To quickly deploy the GenAI-IDP solution in your AWS account:
 | --------------------- | ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | US West (Oregon)      | us-west-2   | [![Launch Stack](https://cdn.rawgit.com/buildkite/cloudformation-launch-stack-button-svg/master/launch-stack.svg)](https://us-west-2.console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/create/review?templateURL=https://s3.us-west-2.amazonaws.com/aws-ml-blog-us-west-2/artifacts/genai-idp/idp-main.yaml&stackName=IDP) |
 | US East (N.Virginia)      | us-east-1   | [![Launch Stack](https://cdn.rawgit.com/buildkite/cloudformation-launch-stack-button-svg/master/launch-stack.svg)](https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/create/review?templateURL=https://s3.us-east-1.amazonaws.com/aws-ml-blog-us-east-1/artifacts/genai-idp/idp-main.yaml&stackName=IDP) |
+| EU Central (Frankfurt)      | eu-central-1   | [![Launch Stack](https://cdn.rawgit.com/buildkite/cloudformation-launch-stack-button-svg/master/launch-stack.svg)](https://eu-central-1.console.aws.amazon.com/cloudformation/home?region=eu-central-1#/stacks/create/review?templateURL=https://s3.eu-central-1.amazonaws.com/aws-ml-blog-eu-central-1/artifacts/genai-idp/idp-main.yaml&stackName=IDP) |
 
 3. When the stack deploys for the first time, you'll receive an email with a temporary password to access the web UI
 4. Use this temporary password for your first login to set up a permanent password
@@ -138,6 +139,7 @@ To update an existing GenAIIDP stack to a new version:
 5. Enter the template URL: 
    - us-west-2: `https://s3.us-west-2.amazonaws.com/aws-ml-blog-us-west-2/artifacts/genai-idp/idp-main.yaml`
    - us-east-1: `https://s3.us-east-1.amazonaws.com/aws-ml-blog-us-east-1/artifacts/genai-idp/idp-main.yaml`
+   - eu-central-1: `https://s3.eu-central-1.amazonaws.com/aws-ml-blog-eu-central-1/artifacts/genai-idp/idp-main.yaml`
 6. Follow the prompts to update your stack, reviewing any parameter changes
 7. For detailed instructions, see the [Deployment Guide](./docs/deployment.md#updating-an-existing-stack)
 
diff --git a/docs/deployment.md b/docs/deployment.md
@@ -24,6 +24,7 @@ The GenAI IDP Accelerator can be deployed using either the AWS CloudFormation co
 | ----------- | ----------- | ------ |
 | US West (Oregon) | us-west-2 | [![Launch Stack](https://cdn.rawgit.com/buildkite/cloudformation-launch-stack-button-svg/master/launch-stack.svg)](https://us-west-2.console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/create/review?templateURL=https://s3.us-west-2.amazonaws.com/aws-ml-blog-us-west-2/artifacts/genai-idp/idp-main.yaml&stackName=IDP) |
 | US East (N.Virginia) | us-east-1 | [![Launch Stack](https://cdn.rawgit.com/buildkite/cloudformation-launch-stack-button-svg/master/launch-stack.svg)](https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/create/review?templateURL=https://s3.us-east-1.amazonaws.com/aws-ml-blog-us-east-1/artifacts/genai-idp/idp-main.yaml&stackName=IDP) |
+| EU Central (Frankfurt)      | eu-central-1   | [![Launch Stack](https://cdn.rawgit.com/buildkite/cloudformation-launch-stack-button-svg/master/launch-stack.svg)](https://eu-central-1.console.aws.amazon.com/cloudformation/home?region=eu-central-1#/stacks/create/review?templateURL=https://s3.eu-central-1.amazonaws.com/aws-ml-blog-eu-central-1/artifacts/genai-idp/idp-main.yaml&stackName=IDP) |
 
 2. Review the template parameters and provide values as needed
 3. Check the acknowledgment box and click **Create stack**
@@ -309,6 +310,7 @@ To update an existing GenAIIDP deployment to a new version:
 6. Provide the new template URL:
    - us-west-2: `https://s3.us-west-2.amazonaws.com/aws-ml-blog-us-west-2/artifacts/genai-idp/idp-main.yaml`
    - us-east-1: `https://s3.us-east-1.amazonaws.com/aws-ml-blog-us-east-1/artifacts/genai-idp/idp-main.yaml`
+   - eu-central-1: `https://s3.eu-central-1.amazonaws.com/aws-ml-blog-eu-central-1/artifacts/genai-idp/idp-main.yaml`
 7. Click "Next"
 8. Review the parameters and make any necessary changes
    - The update will preserve your existing parameter values
diff --git a/src/ui/.eslintrc.json b/src/ui/.eslintrc.json
@@ -17,7 +17,7 @@
   "rules": {
     "no-console": "off",
     "no-alert": "off",
-    "max-len": ["error", { "code": 120, "ignoreUrls": true, "ignoreTemplateLiterals": true }],
+    "max-len": ["error", { "code": 120, "ignoreUrls": true, "ignoreTemplateLiterals": true, "ignoreComments": true }],
     "linebreak-style": ["error", "unix"],
     "react/jsx-filename-extension": [
       "warn",
@@ -56,6 +56,8 @@
       {
         "ignore": ["\\.css$"]
       }
-    ]
+    ],
+    "react/require-default-props": "off",
+    "react/default-props-match-prop-types": "off"
   }
 }
diff --git a/src/ui/package-lock.json b/src/ui/package-lock.json
diff --git a/src/ui/src/components/common/ReprocessDocumentModal.jsx b/src/ui/src/components/common/ReprocessDocumentModal.jsx
@@ -63,6 +63,4 @@ ReprocessDocumentModal.propTypes = {
   ),
 };
 
-
-
 export default ReprocessDocumentModal;
diff --git a/src/ui/src/components/common/confidence-alerts-utils.js b/src/ui/src/components/common/confidence-alerts-utils.js
@@ -293,13 +293,15 @@ export const getFieldConfidenceInfo = (fieldName, explainabilityInfo, path = [],
         // Handle array indices
         const index = parseInt(pathSegment, 10);
         if (!Number.isNaN(index) && index >= 0 && index < currentExplainabilityData.length) {
-          currentExplainabilityData = currentExplainabilityData[index];  // nosemgrep: javascript.lang.security.audit.prototype-pollution.prototype-pollution-loop.prototype-pollution-loop - Index from controlled array iteration
+          // nosemgrep: javascript.lang.security.audit.prototype-pollution.prototype-pollution-loop
+          currentExplainabilityData = currentExplainabilityData[index];
         } else {
           return { hasConfidenceInfo: false };
         }
       } else {
         // Handle object properties
-        currentExplainabilityData = currentExplainabilityData[pathSegment];  // nosemgrep: javascript.lang.security.audit.prototype-pollution.prototype-pollution-loop.prototype-pollution-loop - Index from controlled array iteration
+        // nosemgrep: javascript.lang.security.audit.prototype-pollution.prototype-pollution-loop
+        currentExplainabilityData = currentExplainabilityData[pathSegment];
       }
     } else {
       return { hasConfidenceInfo: false };
diff --git a/src/ui/src/components/common/debug-utils.js b/src/ui/src/components/common/debug-utils.js
@@ -29,7 +29,7 @@ export const debugSectionStructure = (section, sectionId = 'Unknown') => {
           );
 
           if (hasConfidenceFields) {
-            console.log(`Found confidence data in Output.${key}:`, value);  // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Data from trusted internal source only
+            console.log(`Found confidence data in Output.${key}:`, value); // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Data from trusted internal source only
           }
         }
       });
diff --git a/src/ui/src/components/configuration-layout/ConfigurationLayout.jsx b/src/ui/src/components/configuration-layout/ConfigurationLayout.jsx
@@ -286,12 +286,16 @@ const ConfigurationLayout = () => {
                             // Only check constraints if it's a valid number
                             if (isValidNumber && itemProp.minimum !== undefined && numValue < itemProp.minimum) {
                               errors.push({
-                                message: `Field '${itemKey}' in item ${index} of '${key}' must be at least ${itemProp.minimum}`,
+                                message:
+                                  `Field '${itemKey}' in item ${index} of '${key}' must be ` +
+                                  `at least ${itemProp.minimum}`,
                               });
                             }
                             if (isValidNumber && itemProp.maximum !== undefined && numValue > itemProp.maximum) {
                               errors.push({
-                                message: `Field '${itemKey}' in item ${index} of '${key}' must be at most ${itemProp.maximum}`,
+                                message:
+                                  `Field '${itemKey}' in item ${index} of '${key}' must be ` +
+                                  `at most ${itemProp.maximum}`,
                               });
                             }
                           }
@@ -504,7 +508,8 @@ const ConfigurationLayout = () => {
       const compareWithDefault = (current, defaultObj, path = '') => {
         // Add debugging for granular assessment
         if (path.includes('granular')) {
-          console.log(`DEBUG: compareWithDefault called with path '${path}':`, {  // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Debug logging with controlled internal data
+          console.log(`DEBUG: compareWithDefault called with path '${path}':`, {
+            // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Debug logging with controlled internal data
             current,
             currentType: typeof current,
             defaultObj,
@@ -593,7 +598,8 @@ const ConfigurationLayout = () => {
 
             // Add debugging for granular assessment
             if (newPath.includes('granular')) {
-              console.log(`DEBUG: Comparing object key '${key}' at path '${newPath}':`, {  // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Debug logging with controlled internal data
+              console.log(`DEBUG: Comparing object key '${key}' at path '${newPath}':`, {
+                // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Debug logging with controlled internal data
                 currentValue: current[key],
                 defaultValue: defaultObj[key],
                 keyInCurrent: key in current,
@@ -611,7 +617,8 @@ const ConfigurationLayout = () => {
 
               // Add debugging for granular assessment
               if (newPath.includes('granular')) {
-                console.log(`DEBUG: Recursive call result for '${newPath}':`, {  // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Debug logging with controlled internal data
+                console.log(`DEBUG: Recursive call result for '${newPath}':`, {
+                  // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Debug logging with controlled internal data
                   nestedResults,
                   nestedResultsKeys: Object.keys(nestedResults),
                   nestedResultsLength: Object.keys(nestedResults).length,
@@ -627,7 +634,8 @@ const ConfigurationLayout = () => {
 
         // Handle primitive values
         if (current !== defaultObj) {
-          console.log(`DEBUG: Primitive difference detected at path '${path}':`, {  // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Debug logging with controlled internal data
+          console.log(`DEBUG: Primitive difference detected at path '${path}':`, {
+            // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Debug logging with controlled internal data
             current,
             currentType: typeof current,
             defaultObj,
@@ -699,7 +707,7 @@ const ConfigurationLayout = () => {
                 for (let i = 0; i < parts.length - 1; i += 1) {
                   // Use += 1 instead of ++
                   current[parts[i]] = {};
-                  current = current[parts[i]];  // nosemgrep: javascript.lang.security.audit.prototype-pollution.prototype-pollution-loop.prototype-pollution-loop - Index from controlled array iteration
+                  current = current[parts[i]]; // nosemgrep: javascript.lang.security.audit.prototype-pollution.prototype-pollution-loop.prototype-pollution-loop - Index from controlled array iteration
                 }
 
                 // Set the value at the final path - IMPORTANT: preserve boolean false values!
diff --git a/src/ui/src/components/configuration-layout/FormView.jsx b/src/ui/src/components/configuration-layout/FormView.jsx
@@ -590,7 +590,7 @@ const FormView = ({
   // Define renderField first as a function declaration
   function renderField(key, property, path = '') {
     const currentPath = path ? `${path}.${key}` : key;
-    let value = getValueAtPath(formValues, currentPath);
+    const value = getValueAtPath(formValues, currentPath);
 
     // Add debugging for granular assessment
     if (currentPath.includes('granular')) {
diff --git a/src/ui/src/components/genaiidp-layout/GenAIIDPLayout.jsx b/src/ui/src/components/genaiidp-layout/GenAIIDPLayout.jsx
@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import React, { useState } from 'react';
+import PropTypes from 'prop-types';
 import { Routes, Route } from 'react-router-dom';
 import { AppLayout, Flashbar } from '@cloudscape-design/components';
 
@@ -129,4 +130,8 @@ const GenAIIDPLayout = ({ children }) => {
   );
 };
 
+GenAIIDPLayout.propTypes = {
+  children: PropTypes.node,
+};
+
 export default GenAIIDPLayout;
diff --git a/src/ui/src/components/step-function-flow/StepDetails.jsx b/src/ui/src/components/step-function-flow/StepDetails.jsx
@@ -46,6 +46,10 @@ const JsonDisplay = ({ data = null }) => {
   );
 };
 
+JsonDisplay.propTypes = {
+  data: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
+};
+
 // Helper function to check if a step is disabled based on configuration
 const isStepDisabled = (stepName, config) => {
   if (!config) return false;
diff --git a/src/ui/src/hooks/use-graphql-api.js b/src/ui/src/hooks/use-graphql-api.js
@@ -43,29 +43,32 @@ const useGraphQlApi = ({ initialPeriodsToLoad = DOCUMENT_LIST_SHARDS_PER_DAY * 2
     });
   }, []);
 
-  const getDocumentDetailsFromIds = useCallback(async (objectKeys) => {
-    // prettier-ignore
-    logger.debug('getDocumentDetailsFromIds', objectKeys);
-    const getDocumentPromises = objectKeys.map((objectKey) =>
-      client.graphql({ query: getDocument, variables: { objectKey } }),
-    );
-    const getDocumentResolutions = await Promise.allSettled(getDocumentPromises);
-    const getDocumentRejected = getDocumentResolutions.filter((r) => r.status === 'rejected');
-    if (getDocumentRejected.length) {
-      setErrorMessage('failed to get document details - please try again later');
-      logger.error('get document promises rejected', getDocumentRejected);
-    }
-    const documentValues = getDocumentResolutions
-      .filter((r) => r.status === 'fulfilled')
-      .map((r) => r.value?.data?.getDocument);
+  const getDocumentDetailsFromIds = useCallback(
+    async (objectKeys) => {
+      // prettier-ignore
+      logger.debug('getDocumentDetailsFromIds', objectKeys);
+      const getDocumentPromises = objectKeys.map((objectKey) =>
+        client.graphql({ query: getDocument, variables: { objectKey } }),
+      );
+      const getDocumentResolutions = await Promise.allSettled(getDocumentPromises);
+      const getDocumentRejected = getDocumentResolutions.filter((r) => r.status === 'rejected');
+      if (getDocumentRejected.length) {
+        setErrorMessage('failed to get document details - please try again later');
+        logger.error('get document promises rejected', getDocumentRejected);
+      }
+      const documentValues = getDocumentResolutions
+        .filter((r) => r.status === 'fulfilled')
+        .map((r) => r.value?.data?.getDocument);
 
-    return documentValues;
-  }, [setErrorMessage]);
+      return documentValues;
+    },
+    [setErrorMessage],
+  );
 
   useEffect(() => {
     if (subscriptionsRef.current.onCreate) {
       logger.debug('onCreateDocument subscription already exists, skipping');
-      return;
+      return undefined;
     }
 
     logger.debug('onCreateDocument subscription');
@@ -105,7 +108,7 @@ const useGraphQlApi = ({ initialPeriodsToLoad = DOCUMENT_LIST_SHARDS_PER_DAY * 2
   useEffect(() => {
     if (subscriptionsRef.current.onUpdate) {
       logger.debug('onUpdateDocument subscription already exists, skipping');
-      return;
+      return undefined;
     }
 
     logger.debug('onUpdateDocument subscription setup');
diff --git a/src/ui/src/index.jsx b/src/ui/src/index.jsx
@@ -21,5 +21,5 @@ const root = createRoot(document.getElementById('root'));
 root.render(
   <React.StrictMode>
     <App />
-  </React.StrictMode>
+  </React.StrictMode>,
 );

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"rules": {`
`18`	`18`	`"no-console": "off",`
`19`	`19`	`"no-alert": "off",`
`20`		`- "max-len": ["error", { "code": 120, "ignoreUrls": true, "ignoreTemplateLiterals": true }],`
	`20`	`+ "max-len": ["error", { "code": 120, "ignoreUrls": true, "ignoreTemplateLiterals": true, "ignoreComments": true }],`
`21`	`21`	`"linebreak-style": ["error", "unix"],`
`22`	`22`	`"react/jsx-filename-extension": [`
`23`	`23`	`"warn",`
`@@ -56,6 +56,8 @@`
`56`	`56`	`{`
`57`	`57`	`"ignore": ["\\.css$"]`
`58`	`58`	`}`
`59`		`- ]`
	`59`	`+ ],`
	`60`	`+ "react/require-default-props": "off",`
	`61`	`+ "react/default-props-match-prop-types": "off"`
`60`	`62`	`}`
`61`	`63`	`}`
-Original file line number
+Diff line change
   ),
 };
+-
+-
 export default ReprocessDocumentModal;
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export const debugSectionStructure = (section, sectionId = 'Unknown') => {`
`29`	`29`	`);`
`30`	`30`
`31`	`31`	`if (hasConfidenceFields) {`
`32`		- console.log(`Found confidence data in Output.${key}:`, value); // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Data from trusted internal source only
	`32`	+ console.log(`Found confidence data in Output.${key}:`, value); // nosemgrep: javascript.lang.security.audit.unsafe-formatstring.unsafe-formatstring - Data from trusted internal source only
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`});`