Merge pull request #223 from FullStackWithLawrence/next

add v2 Settings class

Author: lpm0073

.github/actions/tests/python/action.yml

@@ -114,5 +114,8 @@ runs:
 
     - name: Run Python unit tests
       shell: bash
+      env:
+        GITHUB_ACTIONS: "true"
+        DEBUG_MODE: "true"
       run: |
         make api-test

.pre-commit-config.yaml

@@ -17,11 +17,11 @@ repos:
         types: [javascript]
         files: ^client/
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.4
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
   - repo: https://github.com/psf/black
-    rev: 23.12.0
+    rev: 23.12.1
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/flake8

.pylintrc

@@ -1,6 +1,9 @@
 [MASTER]
-ignore =
-  __version__.py
+ignore-paths=venv,node_modules
+ignore=__version__.py
 
 [FORMAT]
 max-line-length=120
+
+[MESSAGES CONTROL]
+disable=too-few-public-methods,invalid-name,line-too-long,no-self-argument,unused-import

README.md

@@ -102,7 +102,7 @@ Detailed documentation for each endpoint is available here: [Documentation](./do
 
 ## Support
 
-To get community support, go to the official [Issues Page](https://github.com/FullStackWithLawrence/aws-rekognition/issues) for this project.
+To get community support, go to the official [Issues Page](https://github.com/FullStackWithLawrence/aws-openai/issues) for this project.
 
 ## Good Coding Best Practices
 

api/terraform/apigateway.tf

@@ -61,45 +61,7 @@ resource "aws_api_gateway_api_key" "openai" {
 resource "aws_api_gateway_deployment" "openai" {
   rest_api_id = aws_api_gateway_rest_api.openai.id
   triggers = {
-    redeployment = sha1(jsonencode([
-      aws_api_gateway_rest_api.openai.body,
-
-      # 1 thru 10
-      module.default_grammar.sha1_deployment_trigger,
-      module.default_summarize.sha1_deployment_trigger,
-      module.default_parse_data.sha1_deployment_trigger,
-      module.default_emoji_translation.sha1_deployment_trigger,
-      module.default_time_complexity.sha1_deployment_trigger,
-      module.default_explain_code.sha1_deployment_trigger,
-      module.default_keywords.sha1_deployment_trigger,
-      module.default_product_name_gen.sha1_deployment_trigger,
-      module.default_fix_python_bugs.sha1_deployment_trigger,
-      module.default_spreadsheet_gen.sha1_deployment_trigger,
-
-      # 11 thru 20
-      module.default_tweet_classifier.sha1_deployment_trigger,
-      module.default_airport_codes.sha1_deployment_trigger,
-      module.default_mood_color.sha1_deployment_trigger,
-      module.default_vr_fitness.sha1_deployment_trigger,
-      module.default_marv_sarcastic_chat.sha1_deployment_trigger,
-      module.default_turn_by_turn_directions.sha1_deployment_trigger,
-      module.default_interview_questions.sha1_deployment_trigger,
-      module.default_function_from_spec.sha1_deployment_trigger,
-      module.default_code_improvement.sha1_deployment_trigger,
-      module.default_single_page_website.sha1_deployment_trigger,
-
-      # 21 thru 30
-      module.default_rap_battle.sha1_deployment_trigger,
-      module.default_memo_writer.sha1_deployment_trigger,
-      module.default_emoji_chatbot.sha1_deployment_trigger,
-      module.default_translation.sha1_deployment_trigger,
-      module.default_socratic_tutor.sha1_deployment_trigger,
-      module.default_sql_translate.sha1_deployment_trigger,
-      module.default_meeting_notes_summarizer.sha1_deployment_trigger,
-      module.default_review_classifier.sha1_deployment_trigger,
-      module.default_pro_con_discusser.sha1_deployment_trigger,
-      module.default_lesson_plan_writer.sha1_deployment_trigger
-    ]))
+    redeployment = timestamp()
   }
   lifecycle {
     create_before_destroy = true

api/terraform/endpoint/mapping-templates/openai-integration.tpl

@@ -1,5 +1,6 @@
 ## see https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-mapping-template-reference.html
 {
+  "object_type": "chat.completion",
   "model": "${mapping_model}",
   "end_point": "${mapping_end_point}",
   "temperature": ${mapping_temperature},

api/terraform/endpoint/outputs.tf

@@ -1,20 +0,0 @@
-
-output "aws_api_gateway_integration" {
-  value = aws_api_gateway_integration.post
-}
-
-output "aws_api_gateway_method" {
-  value = aws_api_gateway_method.post
-}
-
-output "aws_api_gateway_method_response_endpoint_response_200" {
-  value = aws_api_gateway_method_response.post_200
-}
-
-output "sha1_deployment_trigger" {
-  value = sha1(jsonencode([
-    aws_api_gateway_integration.post,
-    aws_api_gateway_method.post,
-    aws_api_gateway_method_response.post_200.id,
-  ]))
-}

api/terraform/json/iam_policy_lambda.json

@@ -13,6 +13,21 @@
         "logs:FilterLogEvents"
       ],
       "Resource": ["arn:aws:lambda:*"]
+    },
+    {
+      "Effect": "Allow",
+      "Action": [
+        "apigateway:GET",
+        "iam:ListPolicies",
+        "iam:GetPolicy",
+        "iam:GetPolicyVersion",
+        "iam:ListAttachedRolePolicies",
+        "s3:ListAllMyBuckets",
+        "ec2:DescribeRegions",
+        "route53:ListHostedZones",
+        "route53:ListResourceRecordSets"
+      ],
+      "Resource": "*"
     }
   ]
 }

api/terraform/lambda_langchain.tf

@@ -13,12 +13,11 @@
 #           that call this Lambda, rather than here.
 #------------------------------------------------------------------------------
 locals {
-  langchain_function_name        = "lambda_langchain"
-  langchain_build_path           = "${path.module}/build/"
-  langchain_openai_api_directory = "${path.module}/python/openai_api"
-  langchain_source_directory     = "${local.langchain_openai_api_directory}/${local.langchain_function_name}"
-  langchain_packaging_script     = "${local.langchain_source_directory}/create_pkg.sh"
-  langchain_dist_package_name    = "${local.langchain_function_name}_dist_pkg.zip"
+  langchain_function_name     = "lambda_langchain"
+  langchain_build_path        = "${path.module}/build/distribution_package"
+  langchain_source_directory  = "${path.module}/python/openai_api"
+  langchain_packaging_script  = "${local.langchain_source_directory}/create_pkg.sh"
+  langchain_dist_package_name = "${local.langchain_function_name}_dist_pkg.zip"
 }
 
 ###############################################################################
@@ -27,18 +26,15 @@ locals {
 ###############################################################################
 resource "null_resource" "package_lambda_langchain" {
   triggers = {
-    redeployment = sha1(jsonencode([
-      file("${local.langchain_source_directory}/lambda_handler.py"),
-      file("${local.langchain_packaging_script}")
-    ]))
+    always_redeploy = timestamp()
   }
 
   provisioner "local-exec" {
     interpreter = ["/bin/bash"]
     command     = local.langchain_packaging_script
 
     environment = {
-      PARENT_DIRECTORY = local.langchain_openai_api_directory
+      TERRAFORM_ROOT   = path.module
       SOURCE_CODE_PATH = local.langchain_source_directory
       BUILD_PATH       = local.langchain_build_path
       PACKAGE_FOLDER   = local.langchain_function_name
@@ -49,7 +45,7 @@ resource "null_resource" "package_lambda_langchain" {
 data "archive_file" "lambda_langchain" {
   # see https://registry.terraform.io/providers/hashicorp/archive/latest/docs/data-sources/file
   source_dir  = local.langchain_build_path
-  output_path = "${local.langchain_build_path}/${local.langchain_dist_package_name}"
+  output_path = "${path.module}/build/${local.langchain_dist_package_name}"
   type        = "zip"
   depends_on  = [null_resource.package_lambda_langchain]
 }
@@ -59,7 +55,7 @@ data "archive_file" "lambda_langchain" {
 ###############################################################################
 data "external" "env_lambda_langchain" {
   # kluge to read and map the openai api key and org data contained in .env
-  program = ["${local.langchain_source_directory}/env.sh"]
+  program = ["${local.langchain_source_directory}/${local.langchain_function_name}/env.sh"]
 
   # For Windows (or Powershell core on MacOS and Linux),
   # run a Powershell script instead
@@ -79,7 +75,7 @@ resource "aws_lambda_function" "lambda_langchain" {
   runtime          = var.lambda_python_runtime
   memory_size      = var.lambda_memory_size
   timeout          = var.lambda_timeout
-  handler          = "lambda_handler.handler"
+  handler          = "openai_api.lambda_langchain.lambda_handler.handler"
   architectures    = var.compatible_architectures
   filename         = data.archive_file.lambda_langchain.output_path
   source_code_hash = data.archive_file.lambda_langchain.output_base64sha256
@@ -93,6 +89,7 @@ resource "aws_lambda_function" "lambda_langchain" {
       OPENAI_API_KEY             = data.external.env_lambda_langchain.result["OPENAI_API_KEY"]
       OPENAI_ENDPOINT_IMAGE_N    = var.openai_endpoint_image_n
       OPENAI_ENDPOINT_IMAGE_SIZE = var.openai_endpoint_image_size
+      AWS_DEPLOYED               = true
     }
   }
 }

api/terraform/lambda_layer.tf

@@ -10,12 +10,12 @@
 locals {
   layer_slug              = "genai"
   layer_name              = "layer_${local.layer_slug}"
-  layer_parent_directory  = "${path.module}/python/"
-  layer_source_directory  = "${local.layer_parent_directory}${local.layer_name}"
+  layer_parent_directory  = "${path.module}/python"
+  layer_source_directory  = "${local.layer_parent_directory}/${local.layer_name}"
   layer_packaging_script  = "${local.layer_source_directory}/create_container.sh"
   layer_package_folder    = local.layer_slug
   layer_dist_build_path   = "${path.module}/build/"
-  layer_dist_package_name = "${local.layer_dist_build_path}${local.layer_name}_dst.zip"
+  layer_dist_package_name = "${local.layer_name}_dst.zip"
 }
 
 ###############################################################################
@@ -39,7 +39,6 @@ resource "null_resource" "package_layer_genai" {
     command     = local.layer_packaging_script
 
     environment = {
-      PARENT_DIRECTORY = local.layer_parent_directory
       SOURCE_CODE_PATH = local.layer_source_directory
       RUNTIME          = var.lambda_python_runtime
       CONTAINER_NAME   = local.layer_name