Merge pull request #520 from aws-samples/bedrock-api

fix: fix glue issue
aws-samples · Jan 22, 2025 · 6f3f74d · 6f3f74d
2 parents 1bbdd21 + 03a3de2
commit 6f3f74d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 244 deletions.
diff --git a/source/infrastructure/lib/knowledge-base/knowledge-base-stack.ts b/source/infrastructure/lib/knowledge-base/knowledge-base-stack.ts
@@ -314,9 +314,9 @@ export class KnowledgeBaseStack extends NestedStack implements KnowledgeBaseStac
         "--REGION": process.env.CDK_DEFAULT_REGION || "-",
         "--BEDROCK_REGION": props.config.chat.bedrockRegion,
         "--API_INFERENCE_ENABLED": props.config.chat.apiInference.enabled.toString(),
-        "--API_INFERENCE_PROVIDER": props.config.chat.apiInference.apiInferenceProvider,
-        "--API_ENDPOINT": props.config.chat.apiInference.apiEndpoint,
-        "--API_KEY_ARN": props.config.chat.apiInference.apiKey,
+        "--API_INFERENCE_PROVIDER": props.config.chat.apiInference.apiInferenceProvider || "-",
+        "--API_ENDPOINT": props.config.chat.apiInference.apiEndpoint || "-",
+        "--API_KEY_ARN": props.config.chat.apiInference.apiKey || "-",
         "--RES_BUCKET": this.glueResultBucket.bucketName,
         "--S3_BUCKET.$": "$.s3Bucket",
         "--S3_PREFIX.$": "$.s3Prefix",

diff --git a/source/lambda/intention/aos/sm_utils.py b/source/lambda/intention/aos/sm_utils.py
diff --git a/source/lambda/job/dep/dist/llm_bot_dep-0.1.0-py3-none-any.whl b/source/lambda/job/dep/dist/llm_bot_dep-0.1.0-py3-none-any.whl
diff --git a/source/portal/src/pages/chatbot/ChatBot.tsx b/source/portal/src/pages/chatbot/ChatBot.tsx
@@ -64,6 +64,23 @@ interface ChatBotProps {
   historySessionId?: string;
 }
 
+const isValidUrl = (url: string): boolean => {
+  try {
+    new URL(url);
+    return url.startsWith('http://') || url.startsWith('https://');
+  } catch {
+    return false;
+  }
+};
+
+const isValidArn = (arn: string): boolean => {
+  // AWS Global and China ARN patterns
+  // arn:aws:secretsmanager:region:account-id:secret:name
+  // arn:aws-cn:secretsmanager:region:account-id:secret:name
+  const arnPattern = /^arn:aws(?:-cn)?:secretsmanager:[a-z0-9-]+:\d{12}:secret:.+$/;
+  return arnPattern.test(arn);
+};
+
 const ChatBot: React.FC<ChatBotProps> = (props: ChatBotProps) => {
   const { historySessionId } = props;
   // const localScenario = localStorage.getItem(MODEL_TYPE);
@@ -794,8 +811,13 @@ const ChatBot: React.FC<ChatBotProps> = (props: ChatBotProps) => {
                         <Input
                           value={apiEndpoint}
                           onChange={({ detail }) => {
-                            setApiEndpointError('');
-                            setApiEndpoint(detail.value);
+                            const value = detail.value;
+                            if (value === '' || isValidUrl(value)) {
+                              setApiEndpointError('');
+                            } else {
+                              setApiEndpointError('Invalid url, please type in a valid HTTPS or HTTP url');
+                            }
+                            setApiEndpoint(value);
                           }}
                           placeholder="https://api.example.com/v1"
                         />
@@ -809,8 +831,13 @@ const ChatBot: React.FC<ChatBotProps> = (props: ChatBotProps) => {
                         <Input
                           value={apiKeyArn}
                           onChange={({ detail }) => {
-                            setApiKeyArnError('');
-                            setApiKeyArn(detail.value);
+                            const value = detail.value;
+                            if (value === '' || isValidArn(value)) {
+                              setApiKeyArnError('');
+                            } else {
+                              setApiKeyArnError('Invalid ARN, please type in a valid secret ARN from AWS Secrets Manager');
+                            }
+                            setApiKeyArn(value);
                           }}
                           placeholder="arn:aws:secretsmanager:region:account:secret:name"
                         />