Fix secrets and build stuff in chat

nulib · Dec 9, 2024 · a38842d · a38842d
1 parent 8381943
commit a38842d
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 91 deletions.
diff --git a/chat/src/event_config.py b/chat/src/event_config.py
@@ -1,14 +1,11 @@
-import os
 import json
 
 from dataclasses import dataclass, field
 
 from langchain_core.prompts import ChatPromptTemplate
 
-from typing import List
-from handlers.streaming_socket_callback_handler import StreamingSocketCallbackHandler
 from helpers.apitoken import ApiToken
-from helpers.prompts import document_template, prompt_template
+from helpers.prompts import prompt_template
 from websocket import Websocket
 
 CHAIN_TYPE = "stuff"

diff --git a/chat/src/secrets.py b/chat/src/secrets.py
@@ -5,6 +5,7 @@
 def load_secrets():
   SecretsPath = os.getenv('SECRETS_PATH')
   EnvironmentMap = [
+    ['API_TOKEN_SECRET', 'dcapi', 'api_token_secret'],
     ['OPENSEARCH_ENDPOINT', 'index', 'endpoint'],
     ['OPENSEARCH_MODEL_ID', 'index', 'embedding_model'],
     ['AZURE_OPENAI_API_KEY', 'azure_openai', 'api_key'],
@@ -15,7 +16,8 @@ def load_secrets():
   client = boto3.client("secretsmanager")
   response = client.batch_get_secret_value(SecretIdList=[
     f'{SecretsPath}/infrastructure/index',
-    f'{SecretsPath}/infrastructure/azure_openai'
+    f'{SecretsPath}/infrastructure/azure_openai',
+    f'{SecretsPath}/config/dcapi'
   ])
 
   secrets = {

diff --git a/chat/template.yaml b/chat/template.yaml
@@ -2,12 +2,9 @@ AWSTemplateFormatVersion: "2010-09-09"
 Transform: AWS::Serverless-2016-10-31
 Description: Websocket Chat API for dc-api-v2
 Parameters:
-  ApiTokenSecret:
+  ApiTokenName:
     Type: String
-    Description: Secret Key for Encrypting JWTs (must match IIIF server)
-  AzureOpenaiApiKey:
-    Type: String
-    Description: OpenAI API Key
+    Description: Name of the jwt that DC API issues
   EnvironmentPrefix:
     Type: String
     Description: Prefix for Index names
@@ -178,34 +175,33 @@ Resources:
       Action: lambda:InvokeFunction
       FunctionName: !Ref ChatFunction
       Principal: apigateway.amazonaws.com
-  ChatDependencies:
-    Type: AWS::Serverless::LayerVersion
-    Properties:
-      LayerName:
-        Fn::Sub: "${AWS::StackName}-dependencies"
-      Description: Dependencies for streaming chat function
-      ContentUri: ./dependencies
-      CompatibleRuntimes:
-        - python3.12
-      LicenseInfo: "Apache-2.0"
-    Metadata:
-      BuildMethod: python3.12
+  #* ChatDependencies:
+  #*   Type: AWS::Serverless::LayerVersion
+  #*   Properties:
+  #*     LayerName:
+  #*       Fn::Sub: "${AWS::StackName}-dependencies"
+  #*     Description: Dependencies for streaming chat function
+  #*     ContentUri: ./dependencies
+  #*     CompatibleRuntimes:
+  #*       - python3.12
+  #*     LicenseInfo: "Apache-2.0"
+  #*   Metadata:
+  #*     BuildMethod: python3.12
   ChatFunction:
     Type: AWS::Serverless::Function
     Properties:
       CodeUri: ./src
       Runtime: python3.12
       Architectures:
         - x86_64
-      Layers:
-        - !Ref ChatDependencies
+      #* Layers:
+      #*   - !Ref ChatDependencies
       MemorySize: 1024
       Handler: handlers/chat.handler
       Timeout: 300
       Environment:
         Variables:
-          API_TOKEN_SECRET: !Ref ApiTokenSecret
-          AZURE_OPENAI_API_KEY: !Ref AzureOpenaiApiKey
+          API_TOKEN_NAME: !Ref ApiTokenName
           ENV_PREFIX: !Ref EnvironmentPrefix
           HONEYBADGER_API_KEY: !Ref HoneybadgerApiKey
           HONEYBADGER_ENVIRONMENT: !Ref HoneybadgerEnv
@@ -232,23 +228,23 @@ Resources:
           - logs:CreateLogStream
           - logs:PutLogEvents
           Resource: !Sub "${ChatMetricsLog.Arn}:*"
-    Metadata:
-      BuildMethod: nodejs20.x
+    #* Metadata:
+    #*   BuildMethod: nodejs20.x
   ChatSyncFunction:
     Type: AWS::Serverless::Function
     Properties:
       CodeUri: ./src
       Runtime: python3.12
       Architectures:
         - x86_64
-      Layers:
-        - !Ref ChatDependencies
+      #* Layers:
+      #*   - !Ref ChatDependencies
       MemorySize: 1024
       Handler: handlers/chat_sync.handler
       Timeout: 300
       Environment:
         Variables:
-          API_TOKEN_SECRET: !Ref ApiTokenSecret
+          API_TOKEN_NAME: !Ref ApiTokenName
           ENV_PREFIX: !Ref EnvironmentPrefix
           HONEYBADGER_API_KEY: !Ref HoneybadgerApiKey
           HONEYBADGER_ENVIRONMENT: !Ref HoneybadgerEnv
@@ -271,8 +267,8 @@ Resources:
       #     - logs:CreateLogStream
       #     - logs:PutLogEvents
       #     Resource: !Sub "${ChatMetricsLog.Arn}:*"  
-    Metadata:
-      BuildMethod: nodejs20.x
+    #* Metadata:
+    #*   BuildMethod: nodejs20.x
   ChatMetricsLog:
     Type: AWS::Logs::LogGroup
     Properties: