Making url fixes backwards compatible

Author: estohlmann

lambda/repository/rag_document_repo.py

@@ -58,7 +58,11 @@ def delete_by_id(self, document_id: str) -> None:
                 for doc in subdocs:
                     batch.delete_item(Key={"document_id": doc.document_id, "sk": doc.sk})
 
-            self.doc_table.delete_item(Key={"pk": document.pk, "document_id": document.document_id})
+            # Check if document exists before trying to delete it
+            if document is not None:
+                self.doc_table.delete_item(Key={"pk": document.pk, "document_id": document.document_id})
+            else:
+                logging.warning(f"Document with ID {document_id} not found, skipping deletion from doc table")
         except ClientError as e:
             logging.error(f"Error deleting document: {e.response['Error']['Message']}")
             raise
@@ -193,7 +197,7 @@ def find_by_source(
 
             yield from self._yield_documents(response["Items"], join_docs=join_docs)
 
-    def _yield_documents(self, items, join_docs):
+    def _yield_documents(self, items: list[dict], join_docs: bool) -> Generator[RagDocument, None, None]:
         for item in items:
             document = RagDocument(**item)
             if join_docs:

lib/models/model-api.ts

@@ -58,6 +58,7 @@ import { LAMBDA_PATH } from '../util';
  */
 type ModelsApiProps = BaseProps & {
     authorizer?: IAuthorizer;
+    lisaServeEndpointUrlPs?: StringParameter;
     restApiId: string;
     rootResourceId: string;
     securityGroups: ISecurityGroup[];
@@ -73,7 +74,7 @@ export class ModelsApi extends Construct {
 
         const { authorizer, config, restApiId, rootResourceId, securityGroups, vpc } = props;
 
-        const lisaServeEndpointUrlPs = StringParameter.fromStringParameterName(
+        const lisaServeEndpointUrlPs = props.lisaServeEndpointUrlPs ?? StringParameter.fromStringParameterName(
             scope,
             createCdkId(['LisaRestApiUri', 'StringParameter']),
             `${config.deploymentPrefix}/lisaServeRestApiUri`,

lib/models/modelsApiConstruct.ts

@@ -23,9 +23,12 @@ import { Construct } from 'constructs';
 import { Vpc } from '../networking/vpc';
 import { ModelsApi } from './model-api';
 import { BaseProps } from '../schema';
+import { StringParameter } from 'aws-cdk-lib/aws-ssm';
+
 export type LisaModelsApiProps = BaseProps &
   StackProps & {
       authorizer?: IAuthorizer;
+      lisaServeEndpointUrlPs?: StringParameter;
       restApiId: string;
       rootResourceId: string;
       securityGroups: ISecurityGroup[];

lib/rag/ragConstruct.ts

@@ -48,6 +48,8 @@ import { IngestionStack } from './ingestion/ingestion-stack';
 
 export type LisaRagProps = {
     authorizer: IAuthorizer;
+    endpointUrl?: StringParameter;
+    modelsPs?: StringParameter;
     restApiId: string;
     rootResourceId: string;
     securityGroups: ISecurityGroup[];
@@ -72,13 +74,13 @@ export class LisaRagConstruct extends Construct {
         this.scope = scope;
         const { authorizer, config, restApiId, rootResourceId, securityGroups, vpc } = props;
 
-        const endpointUrl = StringParameter.fromStringParameterName(
+        const endpointUrl = props.endpointUrl ?? StringParameter.fromStringParameterName(
             scope,
             createCdkId(['LisaRestApiUri', 'StringParameter']),
             `${config.deploymentPrefix}/lisaServeRestApiUri`,
         );
 
-        const modelsPs = StringParameter.fromStringParameterName(
+        const modelsPs = props.modelsPs ?? StringParameter.fromStringParameterName(
             scope,
             createCdkId(['RegisteredModels', 'StringParameter']),
             `${config.deploymentPrefix}/registeredModels`,

lib/stages.ts

@@ -214,6 +214,7 @@ export class LisaServeApplicationStage extends Stage {
             ...baseStackProps,
             authorizer: apiBaseStack.authorizer,
             description: `LISA-models: ${config.deploymentName}-${config.deploymentStage}`,
+            lisaServeEndpointUrlPs: config.restApiConfig.internetFacing ? serveStack.endpointUrl : undefined,
             restApiId: apiBaseStack.restApiId,
             rootResourceId: apiBaseStack.rootResourceId,
             stackName: createCdkId([config.deploymentName, config.appName, 'models', config.deploymentStage]),
@@ -231,6 +232,8 @@ export class LisaServeApplicationStage extends Stage {
                 description: `LISA-rag: ${config.deploymentName}-${config.deploymentStage}`,
                 restApiId: apiBaseStack.restApiId,
                 rootResourceId: apiBaseStack.rootResourceId,
+                endpointUrl: config.restApiConfig.internetFacing ? serveStack.endpointUrl : undefined,
+                modelsPs: config.restApiConfig.internetFacing ? serveStack.modelsPs : undefined,
                 stackName: createCdkId([config.deploymentName, config.appName, 'rag', config.deploymentStage]),
                 securityGroups: [networkingStack.vpc.securityGroups.lambdaSg],
                 vpc: networkingStack.vpc,

lib/user-interface/react/src/components/chatbot/Chat.tsx

@@ -738,7 +738,8 @@ export default function Chat ({ sessionId }) {
                                                         type: 'icon-button',
                                                         id: 'upload-to-rag',
                                                         iconName: 'upload',
-                                                        text: 'Upload to RAG'
+                                                        text: 'Upload to RAG',
+                                                        disabled: !useRag
                                                     }] as ButtonGroupProps.Item[] : []),
                                                 ...(config?.configuration.enabledComponents.uploadContextDocs && !isImageGenerationMode ?
                                                     [{