Merge pull request #271 from FullStackWithLawrence/next

refactor: remove legacy yaml config file

Author: lpm0073

api/terraform/python/openai_api/lambda_openai_function/function_refers_to.py

@@ -5,18 +5,12 @@
 """
 import json
 
-import requests
-import yaml
 from openai_api.common.const import PYTHON_ROOT
 from openai_api.lambda_openai_function.natural_language_processing import does_refer_to
 from openai_api.lambda_openai_function.refers_to import RefersTo
 from openai_api.lambda_openai_function.refers_to import config as refers_to_config
 
 
-with open(PYTHON_ROOT + "/openai_api/lambda_openai_function/lambda_config.yaml", "r", encoding="utf-8") as file:
-    lambda_config = yaml.safe_load(file)
-
-
 def search_terms_are_in_messages(messages: list, search_terms: list = None, search_pairs: list = None) -> bool:
     """
     Return True the user has mentioned Lawrence McDaniel or FullStackWithLawrence
@@ -40,11 +34,11 @@ def search_terms_are_in_messages(messages: list, search_terms: list = None, sear
     return False
 
 
-def customized_prompt(messages: list) -> list:
+def customized_prompt(config: RefersTo, messages: list) -> list:
     """Return a prompt for Lawrence McDaniel"""
     custom_prompt = {
         "role": "system",
-        "content": lambda_config["system_prompt"],
+        "content": config.system_prompt,
     }
 
     for i, message in enumerate(messages):
@@ -57,7 +51,7 @@ def customized_prompt(messages: list) -> list:
 
 # pylint: disable=too-many-return-statements
 def get_additional_info(inquiry_type: str) -> str:
-    """Return select info from lambda_config.yaml"""
+    """Return select info from custom config object"""
 
     for config in refers_to_config:
         try:

api/terraform/python/openai_api/lambda_openai_function/lambda_config.yaml

@@ -81,7 +81,7 @@ def handler(event, context):
                 messages=messages, search_terms=config.search_terms.strings, search_pairs=config.search_terms.pairs
             ):
                 model = "gpt-3.5-turbo-1106"
-                messages = customized_prompt(messages=messages)
+                messages = customized_prompt(config=config, messages=messages)
                 tools = info_tool_factory(config=config)
                 break
 

api/terraform/python/openai_api/lambda_openai_function/lambda_handler.py

@@ -2,12 +2,13 @@
 search_terms:
   strings:
     - everlasting gobstopper
-    - everlasting gob stopper
+    - everlasting gobstoppers
+    - everlasting gobstopper's
   pairs:
     - - everlasting
       - gobstopper
     - - everlasting
-      - gob stopper
+      - gobstoppers
 function_description: Get additional information about the Everlasting Gobstopper product created by Willy Wonka Chocolate Factory. Information includes sales promotions, coupon codes, company contact information and biographical background on the company founder.
 system_prompt: >
   You are a helpful marketing agent for the [Everlasting Gobstopper Company](https://everlasting-gobstoppers.com).

api/terraform/python/openai_api/lambda_openai_function/tests/mock_data/config/everlasting-gobbstopper.json

@@ -10,7 +10,7 @@
     },
     {
       "role": "user",
-      "content": "have you ever heard of lawrence mcdaniel?"
+      "content": "have you ever heard of everlasting gobstoppers?"
     }
   ]
 }