Select existing KB from a drop-down

backend/app/repositories/knowledge_base.py

@@ -1,11 +1,13 @@
 import logging
+from typing import List
 
 from app.utils import get_bedrock_agent_client
 from app.repositories.models.custom_bot_kb import (
     BedrockAgentGetKnowledgeBaseResponse,
     KnowledgeBase,
     KnowledgeBaseConfiguration,
 )
+from app.routes.schemas.knowledge_base import KnowledgeBaseListItem
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
@@ -33,3 +35,31 @@ def get_knowledge_base_info(
                 knowledge_base_configuration=KnowledgeBaseConfiguration(type="VECTOR")
             )
         )
+
+
+def list_knowledge_bases() -> List[KnowledgeBaseListItem]:
+    """List all available knowledge bases in the account."""
+    client = get_bedrock_agent_client()
+    knowledge_bases: List[KnowledgeBaseListItem] = []
+
+    try:
+        paginator = client.get_paginator("list_knowledge_bases")
+        page_iterator = paginator.paginate()
+
+        for page in page_iterator:
+            for kb in page.get("knowledgeBaseSummaries", []):
+                knowledge_bases.append(
+                    KnowledgeBaseListItem(
+                        knowledge_base_id=kb.get("knowledgeBaseId", ""),
+                        name=kb.get("name", ""),
+                        description=kb.get("description"),
+                        status=kb.get("status", "UNKNOWN"),
+                    )
+                )
+
+        logger.info(f"Found {len(knowledge_bases)} knowledge bases")
+        return knowledge_bases
+
+    except Exception as e:
+        logger.error(f"Failed to list knowledge bases: {e}")
+        return []

backend/app/routes/bot.py

@@ -3,6 +3,7 @@
 
 from app.dependencies import check_creating_bot_allowed
 from app.repositories.custom_bot import find_bot_by_id
+from app.repositories.knowledge_base import list_knowledge_bases
 from app.routes.schemas.bot import (
     BotInput,
     BotMetaOutput,
@@ -14,6 +15,7 @@
     BotSwitchVisibilityInput,
     Tool,
 )
+from app.routes.schemas.knowledge_base import ListKnowledgeBasesResponse
 from app.routes.schemas.conversation import type_model_name
 from app.usecases.bot import (
     create_new_bot,
@@ -165,3 +167,11 @@ def get_bot_available_tools(request: Request, bot_id: str):
     """Get available tools for bot"""
     tools = fetch_available_agent_tools()
     return tools
+
+
+@router.get("/knowledge-bases", response_model=ListKnowledgeBasesResponse)
+def get_knowledge_bases(request: Request):
+    """List all available knowledge bases in the account."""
+    current_user: User = request.state.current_user
+    knowledge_bases = list_knowledge_bases()
+    return ListKnowledgeBasesResponse(knowledge_bases=knowledge_bases)

frontend/src/features/knowledgeBase/pages/BotKbEditPage.tsx

@@ -69,6 +69,7 @@ import {
 } from '../types';
 import { toCamelCase } from '../../../utils/StringUtils';
 import useGlobalConfig from '../../../hooks/useGlobalConfig';
+import useKnowledgeBaseApi from '../../../hooks/useKnowledgeBaseApi';
 
 const edgeGenerationParams = EDGE_GENERATION_PARAMS;
 
@@ -82,6 +83,8 @@ const BotKbEditPage: React.FC = () => {
   const { availableTools } = useAgent();
   const { getGlobalConfig } = useGlobalConfig();
   const { data: globalConfig } = getGlobalConfig();
+  const { listKnowledgeBases } = useKnowledgeBaseApi();
+  const { data: knowledgeBasesData } = listKnowledgeBases();
 
   const [isLoading, setIsLoading] = useState(false);
 
@@ -1604,7 +1607,10 @@ const BotKbEditPage: React.FC = () => {
                     label={t(
                       'knowledgeBaseSettings.advancedConfigration.createDedicatedKnowledgeBase.label'
                     )}
-                    onChange={() => setKnowledgeBaseType('new')}
+                    onChange={() => {
+                      setKnowledgeBaseType('new');
+                      setExistKnowledgeBaseId(null);
+                    }}
                   />
                   <RadioButton
                     name="knowledgeBaseType"
@@ -1613,7 +1619,10 @@ const BotKbEditPage: React.FC = () => {
                     label={t(
                       'knowledgeBaseSettings.advancedConfigration.createTenantInSharedKnowledgeBase.label'
                     )}
-                    onChange={() => setKnowledgeBaseType('shared')}
+                    onChange={() => {
+                      setKnowledgeBaseType('shared');
+                      setExistKnowledgeBaseId(null);
+                    }}
                   />
                   <RadioButton
                     name="knowledgeBaseType"
@@ -1628,18 +1637,34 @@ const BotKbEditPage: React.FC = () => {
 
                 {(() => {
                   if (knowledgeBaseType === 'existing') {
+                    // Prepare knowledge base options for the dropdown
+                    const knowledgeBaseOptions = (
+                      knowledgeBasesData?.knowledgeBases || []
+                    ).map((kb) => ({
+                      value: kb.knowledgeBaseId,
+                      label: `${kb.name} (${kb.knowledgeBaseId})`,
+                      description: kb.description || kb.status,
+                    }));
+
                     return (
                       <div className="mt-3 rounded-lg border border-aws-font-color-light/30 p-4 dark:border-aws-font-color-dark/30">
-                        <InputText
+                        <Select
                           label={t(
                             'knowledgeBaseSettings.advancedConfigration.existingKnowledgeBaseId.label'
                           )}
                           value={existKnowledgeBaseId ?? ''}
+                          options={knowledgeBaseOptions}
                           onChange={setExistKnowledgeBaseId}
-                          disabled={!isNewBot}
-                          placeholder="ABCDEFGHIJ"
+                          disabled={knowledgeBaseOptions.length === 0}
                         />
-                        <div className="text-sm text-aws-font-color-light/50 dark:text-aws-font-color-dark">
+                        {knowledgeBaseOptions.length === 0 && (
+                          <div className="mt-2 text-sm text-red">
+                            {t(
+                              'knowledgeBaseSettings.advancedConfigration.existingKnowledgeBaseId.noKnowledgeBasesFound'
+                            )}
+                          </div>
+                        )}
+                        <div className="mt-2 text-sm text-aws-font-color-light/50 dark:text-aws-font-color-dark">
                           {t(
                             'knowledgeBaseSettings.advancedConfigration.existingKnowledgeBaseId.description'
                           )}

frontend/src/i18n/en/index.ts

@@ -947,9 +947,11 @@ How would you categorize this email?`,
       },
       advancedConfigration: {
         existingKnowledgeBaseId: {
-          label: 'ID for the Amazon Bedrock Knowledge Base',
+          label: 'Amazon Bedrock Knowledge Base ID',
           description:
-            'Please specify ID that your existing Amazon Bedrock knowledge base.',
+            'Please specify the ID of your existing Amazon Bedrock knowledge base.',
+          noKnowledgeBasesFound:
+            'No knowledge bases found in your account. Please create a knowledge base first.',
         },
         createDedicatedKnowledgeBase: {
           label: 'Create a dedicated Knowledge Base',
@@ -958,7 +960,7 @@ How would you categorize this email?`,
           label: 'Create a tenant in a shared Knowledge Base',
         },
         useExistingKnowledgeBase: {
-          label: 'Use your existing Knowledge Base',
+          label: 'Use an existing Knowledge Base',
         },
       },
     },

frontend/src/i18n/ja/index.ts

@@ -956,6 +956,8 @@ const translation: typeof en = {
           label: '既存のAmazon Bedrock Knowledge BaseのID',
           description:
             '既存のAmazon Bedrock Knowledge Baseを利用できます',
+          noKnowledgeBasesFound:
+            'アカウントにナレッジベースが見つかりません。最初にナレッジベースを作成してください。',
         },
         createDedicatedKnowledgeBase: {
           label: '専用のKnowledge Baseを作成する',