Merge pull request #225 from FullStackWithLawrence/next

refactor request templates for openai api v1 object_type

Author: lpm0073

CHANGELOG.md

@@ -8,19 +8,17 @@
 
 # [0.8.0](https://github.com/FullStackWithLawrence/aws-openai/compare/v0.7.2...v0.8.0) (2023-12-30)
 
-
 ### Bug Fixes
 
-* add an error boundary ([4b7d021](https://github.com/FullStackWithLawrence/aws-openai/commit/4b7d02113d4c06f57aef067155f458ca3857d60c))
-* convert return value to json if necessary. also verify dict keys before attempting to access anything ([376e14d](https://github.com/FullStackWithLawrence/aws-openai/commit/376e14defa77cef7d1bbc55ce98176f7b7be41bc))
-* ensure that error messages are strings ([7c01083](https://github.com/FullStackWithLawrence/aws-openai/commit/7c01083e780391e637f551f4f49a76670ff771a7))
-* scaffold an Error Boundary for the chatapp ([3fcbdb6](https://github.com/FullStackWithLawrence/aws-openai/commit/3fcbdb6c55d6748a1789d51e051cc8fab9b9456a))
-
+- add an error boundary ([4b7d021](https://github.com/FullStackWithLawrence/aws-openai/commit/4b7d02113d4c06f57aef067155f458ca3857d60c))
+- convert return value to json if necessary. also verify dict keys before attempting to access anything ([376e14d](https://github.com/FullStackWithLawrence/aws-openai/commit/376e14defa77cef7d1bbc55ce98176f7b7be41bc))
+- ensure that error messages are strings ([7c01083](https://github.com/FullStackWithLawrence/aws-openai/commit/7c01083e780391e637f551f4f49a76670ff771a7))
+- scaffold an Error Boundary for the chatapp ([3fcbdb6](https://github.com/FullStackWithLawrence/aws-openai/commit/3fcbdb6c55d6748a1789d51e051cc8fab9b9456a))
 
 ### Features
 
-* add v2 Settings class ([da8943d](https://github.com/FullStackWithLawrence/aws-openai/commit/da8943d55a568f1196e9389d8f3aaee1b15408bb))
-* add v2 Settings class ([240433b](https://github.com/FullStackWithLawrence/aws-openai/commit/240433bd2a50c32da4bdf484420bc86b9db545d6))
+- add v2 Settings class ([da8943d](https://github.com/FullStackWithLawrence/aws-openai/commit/da8943d55a568f1196e9389d8f3aaee1b15408bb))
+- add v2 Settings class ([240433b](https://github.com/FullStackWithLawrence/aws-openai/commit/240433bd2a50c32da4bdf484420bc86b9db545d6))
 
 ## [0.7.2](https://github.com/FullStackWithLawrence/aws-openai/compare/v0.7.1...v0.7.2) (2023-12-19)
 

api/terraform/apigateway_endpoints.tf

@@ -8,6 +8,7 @@ locals {
   openai_integration_template = templatefile(
     "${path.module}/mapping-templates/openai-integration.tpl",
     {
+      mapping_object_type         = var.mapping_object_type
       mapping_model               = var.mapping_model
       mapping_role_system_content = var.mapping_role_system_content
       mapping_end_point           = var.mapping_end_point

api/terraform/endpoint/api_gateway_endpoint.tf

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

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

@@ -38,6 +38,12 @@ variable "aws_iam_role_arn" {
 ###############################################################################
 # OpenAI mapping template
 ###############################################################################
+variable "mapping_object_type" {
+  description = "OpenAI Python API class to invoke."
+  type        = string
+  default     = "chat.completion"
+
+}
 variable "mapping_model" {
   # see https://platform.openai.com/docs/models/overview
   description = "which OpenAI model to use"

api/terraform/endpoint/variables.tf

@@ -7,11 +7,14 @@
 #             named `venv`. Terraform modules will look for and include these
 #             requirements in the zip package for this layer.
 # -----------------------------------------------------------------------------
-python-dotenv==1.0.0
-openai==1.6.1
+
+# generative AI requirements
 langchain
 langchain-experimental
+openai==1.6.1
 pinecone-client==2.2.4
+
+# general requirements
 pydantic==2.5.3
 pydantic-settings==2.1.0
 python-dotenv==1.0.0

api/terraform/python/layer_genai/requirements.txt

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # DO NOT EDIT.
 # Managed via automated CI/CD in .github/workflows/semanticVersionBump.yml.
-__version__ = "0.8.0"
+__version__ = "0.8.1"

api/terraform/python/openai_api/__version__.py

@@ -384,13 +384,14 @@ def aws_secret_access_key_source(self):
     @property
     def aws_auth(self) -> dict:
         """AWS authentication"""
-        return {
+        retval = {
             "aws_profile": self.aws_profile,
             "aws_access_key_id_source": self.aws_access_key_id_source,
             "aws_secret_access_key_source": self.aws_secret_access_key_source,
             "aws_region": self.aws_region,
-            "init_info": self.init_info,
         }
+        if self.init_info:
+            retval["init_info"] = self.init_info
 
     @property
     def aws_session(self):