chore: wip

chore: wip

chore: wip

chore: wip

chore: wip

chore: wip

chore: wip

chore: wip

chore: wip

chore: wip

Author: chrisbbreuer

bun.lockb

@@ -47,5 +47,4 @@ savePath = "bun.lockb"
 
 # whether to save the lockfile to disk
 save = true
-
-preload = ["./storage/framework/.stacks/core/bun-plugin-yaml/src/index.ts"]
+preload = [ "./storage/framework/.stacks/core/bun-plugin-yaml/src/index.ts" ]

bunfig.toml

@@ -31,14 +31,12 @@ export default {
     },
   },
 
-  deploy: {
-    docs: true, // deploys docs
-    api: true, // deploys api
-    fileSystem: true, // enables file system
-  },
+  ai: true, // deploys AI endpoints
+  docs: true, // deploys project documentation
+  api: true, // deploys project API
+  fileSystem: true, // enables file system
 
   // compute: {},
-
   // queues: false,
   // queue-concurrency: 50
 } satisfies CloudConfig

config/cloud.ts

@@ -36,11 +36,22 @@ export class AiStack {
     bedrockAccessRole.addToPolicy(bedrockAccessPolicy)
 
     const aiLambda = new lambda.Function(scope, 'AiFunction', {
-      functionName: `${props.slug}-${props.appEnv}-ai`,
+      functionName: `${props.slug}-${props.appEnv}-ai-ask`,
       description: 'Lambda function to invoke the AI model',
       runtime: lambda.Runtime.NODEJS_20_X,
       handler: 'index.handler',
-      code: lambda.Code.fromAsset('src/cloud/lambda'), // path relative to the cloud root package dir
+      code: lambda.Code.fromAsset('src/cloud/lambda/ask'), // path relative to the cloud root package dir
+      layers: [awsSdkLayer],
+      role: bedrockAccessRole,
+      timeout: Duration.seconds(30),
+    })
+
+    const summarizeLambda = new lambda.Function(scope, 'AiFunction', {
+      functionName: `${props.slug}-${props.appEnv}-ai-summarize`,
+      description: 'Lambda function to summarize any given text',
+      runtime: lambda.Runtime.NODEJS_20_X,
+      handler: 'index.handler',
+      code: lambda.Code.fromAsset('src/cloud/lambda/summarize'),
       layers: [awsSdkLayer],
       role: bedrockAccessRole,
       timeout: Duration.seconds(30),

eslint.config.ts renamed to eslint.config.js

@@ -186,11 +186,11 @@ export class CdnStack {
   }
 
   shouldDeployApi() {
-    return config.cloud.deploy?.api
+    return config.cloud.api
   }
 
   apiBehaviorOptions(scope: Construct, props: CdnStackProps): Record<string, cloudfront.BehaviorOptions> {
-    const origin = (path: '/api' | '/api/*' = '/api') => new origins.HttpOrigin(props.lb.loadBalancerDnsName, {
+    const origin = new origins.HttpOrigin(props.lb.loadBalancerDnsName, {
       originPath: path,
       protocolPolicy: cloudfront.OriginProtocolPolicy.HTTP_ONLY,
     })
@@ -201,15 +201,15 @@ export class CdnStack {
 
     return {
       '/api': {
-        origin: origin(),
+        origin,
         compress: true,
         allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
         // cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS,
         cachePolicy: this.setApiCachePolicy(scope),
         viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
       },
       '/api/*': {
-        origin: origin('/api/*'),
+        origin,
         compress: true,
         allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
         // cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS,
@@ -247,32 +247,36 @@ export class CdnStack {
   }
 
   aiBehaviorOptions(scope: Construct): Record<string, cloudfront.BehaviorOptions> {
+    // const url = new URL()
+
     return {
       '/ai/ask': {
-        origin: new origins.HttpOrigin('juyejkyfu5.execute-api.us-east-1.amazonaws.com', {
+        origin: new origins.HttpOrigin('9qp44a2b7e.execute-api.us-east-1.amazonaws.com', {
           originPath: '/prod',
           protocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
         }),
         compress: false,
         allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
         viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-        cachePolicy: this.setApiCachePolicy(scope),
-      },
-      '/ai/ask/*': {
-        origin: new origins.HttpOrigin('juyejkyfu5.execute-api.us-east-1.amazonaws.com', {
-          originPath: '/prod',
-          protocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
+        cachePolicy: new cloudfront.CachePolicy(scope, 'ApiCachePolicy', {
+          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(),
         }),
-        compress: false,
-        allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
-        viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-        cachePolicy: this.setApiCachePolicy(scope),
       },
+      // '/ai/ask/*': {
+      //   origin,
+      //   compress: false,
+      //   allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
+      //   viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+      //   cachePolicy: this.setApiCachePolicy(scope),
+      // },
       // '/ai/summary': {
-      //   origin: new origins.HttpOrigin('s5p93gkv25.execute-api.us-east-1.amazonaws.com', {
-      //     originPath: '/prompt',
-      //     protocolPolicy: cloudfront.OriginProtocolPolicy.HTTP_ONLY,
-      //   }),
+      //   origin,
       //   compress: false,
       //   allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
       //   viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
@@ -282,7 +286,7 @@ export class CdnStack {
   }
 
   shouldDeployAiEndpoints() {
-    return true
+    return config.cloud.ai
   }
 
   shouldDeployDocs() {

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

@@ -69,6 +69,8 @@ export class Cloud extends Stack {
       certificate: security.certificate,
     })
 
+    new AiStack(this, props)
+
     const cdn = new CdnStack(this, {
       ...props,
       publicBucket: storage.publicBucket,
@@ -85,7 +87,5 @@ export class Cloud extends Stack {
       privateBucket: storage.privateBucket,
       cdn: cdn.distribution,
     })
-
-    new AiStack(this, props)
   }
 }

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

@@ -0,0 +1,42 @@
+import type { APIGatewayEvent, APIGatewayProxyHandler } from 'aws-cdk-lib/aws-lambda'
+import type { InvokeModelResponse } from '@aws-sdk/client-bedrock-runtime'
+import { BedrockRuntimeClient, InvokeModelCommand } from '@aws-sdk/client-bedrock-runtime'
+
+const bedrockClient = new BedrockRuntimeClient()
+
+export const handler: APIGatewayProxyHandler = async (event: APIGatewayEvent, context) => {
+  const body = JSON.parse(event.body || '')
+  console.log('Body', event.body)
+
+  const input = {
+    modelId: 'amazon.titan-text-lite-v1',
+    contentType: 'application/json',
+    accept: '*/*',
+    body: JSON.stringify({
+      inputText: `Summarise the following text: "${body.inputText || ''}"`,
+      textGenerationConfig: {
+        maxTokenCount: 512,
+        stopSequences: [],
+        temperature: 0,
+        topP: 0.9,
+      },
+    }),
+  }
+  const rawResponse: InvokeModelResponse = await bedrockClient.send(new InvokeModelCommand(input))
+  const modelResponse = JSON.parse(
+    new TextDecoder().decode(rawResponse.body),
+  ) as {
+    inputTextTokenCount: number
+    results: [{
+      tokenCount: number
+      outputText: string
+      completionReason: string
+    }]
+  }
+  const summary = modelResponse.results[0].outputText
+
+  return {
+    statusCode: 200,
+    body: JSON.stringify({ summary }),
+  }
+}

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

@@ -193,30 +193,33 @@ export async function deleteIamUsers() {
   const iam = new IAM({ region: 'us-east-1' })
   const data = await iam.listUsers({})
   const teamName = slug(config.team.name)
-  const users = data.Users?.filter(user => user.UserName?.includes(teamName)) || []
+  const users = data.Users?.filter((user) => {
+    const userNameLower = user.UserName?.toLowerCase()
+    return userNameLower !== 'stacks' && userNameLower !== teamName.toLowerCase() && userNameLower?.includes(teamName.toLowerCase())
+  }) || []
 
   if (!users || users.length === 0)
     return ok(`No Stacks IAM users found for team ${teamName}`)
 
   const promises = users.map(async (user) => {
-    const userName = user.UserName || '';
+    const userName = user.UserName || ''
     console.log(`Deleting IAM user: ${userName}`)
 
     // Get the list of policies attached to the user
-    const policies = await iam.listAttachedUserPolicies({ UserName: userName });
+    const policies = await iam.listAttachedUserPolicies({ UserName: userName })
 
     // Detach each policy
     await Promise.all(policies.AttachedPolicies?.map(policy =>
-      iam.detachUserPolicy({ UserName: userName, PolicyArn: policy.PolicyArn || '' })
-    ) || []);
+      iam.detachUserPolicy({ UserName: userName, PolicyArn: policy.PolicyArn || '' }),
+    ) || [])
 
     // Get the list of access keys for the user
-    const accessKeys = await iam.listAccessKeys({ UserName: userName });
+    const accessKeys = await iam.listAccessKeys({ UserName: userName })
 
     // Delete each access key
     await Promise.all(accessKeys.AccessKeyMetadata?.map(key =>
-      iam.deleteAccessKey({ UserName: userName, AccessKeyId: key.AccessKeyId || '' })
-    ) || []);
+      iam.deleteAccessKey({ UserName: userName, AccessKeyId: key.AccessKeyId || '' }),
+    ) || [])
 
     // Now delete the user
     return iam.deleteUser({ UserName: userName })
@@ -563,7 +566,7 @@ export async function getOrCreateTimestamp(): Promise<string> {
   }
   catch (error: any) {
     const timestamp = new Date().getTime().toString()
-    log.info(`Creating timestamp parameter ${parameterName} with value ${timestamp}`)
+    log.debug(`Creating timestamp parameter ${parameterName} with value ${timestamp}`)
     await ssm.putParameter({
       Name: parameterName,
       Value: timestamp,