chore: wip

Author: chrisbbreuer

storage/framework/core/cloud/src/cloud/ai.ts

@@ -9,6 +9,7 @@ export interface AiStackProps extends NestedCloudProps {
 
 export class AiStack {
   askAiUrl: lambda.FunctionUrl
+  summarizeAiUrl: lambda.FunctionUrl
 
   constructor(scope: Construct, props: AiStackProps) {
     // Define the Lambda Layer for aws-sdk
@@ -66,51 +67,20 @@ export class AiStack {
       timeout: Duration.seconds(30),
     })
 
-    const summarizeAiUrl = new lambda.FunctionUrl(scope, 'SummarizeAiFunctionUrl', {
+    this.summarizeAiUrl = new lambda.FunctionUrl(scope, 'SummarizeAiFunctionUrl', {
       function: summarizeAi,
       authType: lambda.FunctionUrlAuthType.NONE,
       cors: {
         allowedOrigins: ['*'],
       },
     })
 
-    // const api = new RestApi(scope, 'AiRestApi', {
-    //   restApiName: `${props.slug}-${props.appEnv}-ai`,
-    //   description: 'Stacks AI API',
-    //   defaultCorsPreflightOptions: {
-    //     allowOrigins: Cors.ALL_ORIGINS,
-    //     allowMethods: Cors.ALL_METHODS,
-    //   },
-    // })
-
-    // const askResource = api.root.addResource('ask')
-    // const askIntegration = new LambdaIntegration(askAi)
-    // askResource.addMethod('POST', askIntegration, {
-    //   operationName: 'Stacks AI Ask',
-    //   authorizationType: AuthorizationType.NONE,
-    // })
-
-    // alias to ask
-    // const promptResource = api.root.addResource('prompt')
-    // const promptIntegration = new LambdaIntegration(askAi)
-    // promptResource.addMethod('POST', promptIntegration, {
-    //   operationName: 'Stacks AI Ask',
-    //   authorizationType: AuthorizationType.NONE,
-    // })
-
-    // const summarizeResource = api.root.addResource('summarize')
-    // const summarizeIntegration = new LambdaIntegration(summarizeAi)
-    // summarizeResource.addMethod('POST', summarizeIntegration, {
-    //   operationName: 'Stacks AI Summarize',
-    //   authorizationType: AuthorizationType.NONE,
-    // })
-
     new Output(scope, 'AiVanityAskApiUrl', {
       value: this.askAiUrl.url,
     })
 
     new Output(scope, 'AiVanitySummarizeApiUrl', {
-      value: summarizeAiUrl.url,
+      value: this.summarizeAiUrl.url,
     })
 
     new Output(scope, 'AiAskApiUrl', {

storage/framework/core/cloud/src/cloud/cdn.ts

@@ -20,6 +20,7 @@ export interface CdnStackProps extends NestedCloudProps {
   webServerUrl: lambda.FunctionUrl
   cliSetupUrl: lambda.FunctionUrl
   askAiUrl: lambda.FunctionUrl
+  summarizeAiUrl: lambda.FunctionUrl
 }
 
 export class CdnStack {
@@ -244,40 +245,39 @@ export class CdnStack {
 
   aiBehaviorOptions(scope: Construct, props: CdnStackProps): Record<string, cloudfront.BehaviorOptions> {
     const hostname = Fn.select(2, Fn.split('/', props.askAiUrl.url))
+    const summaryHostname = Fn.select(2, Fn.split('/', props.summarizeAiUrl.url))
+
+    const aiCachePolicy = new cloudfront.CachePolicy(scope, 'AiCachePolicy', {
+      comment: 'Stacks AI Cache Policy',
+      cachePolicyName: `${this.props.slug}-${this.props.appEnv}-ai-cache-policy`,
+      defaultTtl: Duration.seconds(0),
+      // minTtl: config.cloud.cdn?.minTtl ? Duration.seconds(config.cloud.cdn.minTtl) : undefined,
+      cookieBehavior: cloudfront.CacheCookieBehavior.none(),
+      headerBehavior: cloudfront.CacheHeaderBehavior.allowList('Accept', 'x-api-key', 'Authorization', 'Content-Type'),
+      queryStringBehavior: cloudfront.CacheQueryStringBehavior.all(),
+    })
+
     return {
       '/ai/ask': {
-        // origin: new origins.HttpOrigin('9qp44a2b7e.execute-api.us-east-1.amazonaws.com', {
         origin: new origins.HttpOrigin(hostname, {
           originPath: '/ai',
           protocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
         }),
         compress: false,
         allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
         viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-        cachePolicy: new cloudfront.CachePolicy(scope, 'AiCachePolicy', {
-          comment: 'Stacks AI Cache Policy',
-          cachePolicyName: `${this.props.slug}-${this.props.appEnv}-ai-cache-policy`,
-          defaultTtl: Duration.seconds(0),
-          // minTtl: config.cloud.cdn?.minTtl ? Duration.seconds(config.cloud.cdn.minTtl) : undefined,
-          cookieBehavior: cloudfront.CacheCookieBehavior.none(),
-          headerBehavior: cloudfront.CacheHeaderBehavior.allowList('Accept', 'x-api-key', 'Authorization', 'Content-Type'),
-          queryStringBehavior: cloudfront.CacheQueryStringBehavior.all(),
+        cachePolicy: aiCachePolicy,
+      },
+      '/ai/summary': {
+        origin: new origins.HttpOrigin(summaryHostname, {
+          originPath: '/ai',
+          protocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
         }),
+        compress: false,
+        allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
+        viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+        cachePolicy: aiCachePolicy,
       },
-      // '/ai/ask/*': {
-      //   origin,
-      //   compress: false,
-      //   allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
-      //   viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-      //   cachePolicy: this.setApiCachePolicy(scope),
-      // },
-      // '/ai/summary': {
-      //   origin,
-      //   compress: false,
-      //   allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
-      //   viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-      //   cachePolicy: this.setApiCachePolicy(scope),
-      // },
     }
   }
 

storage/framework/core/cloud/src/cloud/index.ts

@@ -86,6 +86,7 @@ export class Cloud extends Stack {
       webServerUrl: api.apiServerUrl,
       cliSetupUrl: cli.cliSetupUrl,
       askAiUrl: ai.askAiUrl,
+      summarizeAiUrl: ai.summarizeAiUrl,
     })
 
     new DeploymentStack(this, {