Merge branch 'main' into beta

Author: actions-user

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 default_language_version:
   # default language version for each language
-  python: python3.11
+  python: python3.13
 repos:
   - repo: https://github.com/codespell-project/codespell
     rev: v2.4.1

Makefile

@@ -6,7 +6,7 @@ ifeq ($(OS),Windows_NT)
     PYTHON := python.exe
     ACTIVATE_VENV := venv\Scripts\activate
 else
-    PYTHON := python3.11
+    PYTHON := python3.13
     ACTIVATE_VENV := source venv/bin/activate
 endif
 PIP := $(PYTHON) -m pip

api/terraform/Dockerfile

@@ -0,0 +1,10 @@
+FROM public.ecr.aws/lambda/python:3.13
+
+RUN pip install --no-cache-dir --upgrade pip
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY python/ /var/task/
+
+CMD ["openai_api.lambda_openai_v2.lambda_handler.handler"]

api/terraform/ecr_lambda_repo.tf

@@ -0,0 +1,48 @@
+#------------------------------------------------------------------------------
+# written by: Lawrence McDaniel
+#             https://lawrencemcdaniel.com/
+#
+# date:   sep-2023
+#
+# usage:  Build a one-size-fits-all ECR repository to hold the
+#         Lambda function container image.
+#------------------------------------------------------------------------------
+locals {
+  image_tag = "v1.0.7"
+}
+
+
+
+resource "null_resource" "build_and_push" {
+  triggers = {
+      dockerfile    = filesha1("${path.module}/Dockerfile")
+      requirements  = filesha1("${path.module}/requirements.txt")
+      source_hash   = sha1(join("", [for f in fileset("${path.module}/python/openai_api", "**") : filesha1("${path.module}/python/openai_api/${f}")]))
+    }
+  provisioner "local-exec" {
+    interpreter = ["/bin/bash", "-c"]
+
+    command = <<EOT
+set -e
+
+AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+REGION=${var.aws_region}
+REPO=${aws_ecr_repository.lambda_repo.name}
+
+IMAGE_URI=$AWS_ACCOUNT_ID.dkr.ecr.$REGION.amazonaws.com/$REPO:${local.image_tag}
+
+aws ecr get-login-password --region $REGION \
+| docker login --username AWS --password-stdin $AWS_ACCOUNT_ID.dkr.ecr.$REGION.amazonaws.com
+
+
+docker build --platform linux/amd64 -t $REPO:${local.image_tag} .
+docker tag $REPO:${local.image_tag} $IMAGE_URI
+docker push $IMAGE_URI
+
+EOT
+  }
+}
+
+resource "aws_ecr_repository" "lambda_repo" {
+  name = "lambda-openai-v2"
+}

api/terraform/lambda_info.tf

@@ -72,7 +72,6 @@ resource "aws_lambda_function" "info" {
   handler          = "openai_api.lambda_info.lambda_handler.handler"
   filename         = data.archive_file.lambda_info.output_path
   source_code_hash = data.archive_file.lambda_info.output_base64sha256
-  layers           = [aws_lambda_layer_version.openai.arn]
   tags             = var.tags
 
   environment {

api/terraform/lambda_langchain.tf

@@ -79,7 +79,6 @@ resource "aws_lambda_function" "lambda_langchain" {
   architectures    = var.compatible_architectures
   filename         = data.archive_file.lambda_langchain.output_path
   source_code_hash = data.archive_file.lambda_langchain.output_base64sha256
-  layers           = [aws_lambda_layer_version.openai.arn, aws_lambda_layer_version.langchain.arn]
   tags             = var.tags
 
   environment {