Merge pull request #297 from FullStackWithLawrence/next

refactor: rename modules to reflect plugin model

Author: lpm0073

README.md

@@ -39,9 +39,15 @@ make run    # run the web app locally in your dev environment
 
 ## Features
 
-- **Prompting**: Uses [Terraform templates](./api/terraform/apigateway_endpoints.tf) to create 30 different ChatBots, each with its own customized UX and api endpoint.
+- **Complete OpenAI API**: Deploys a production-ready API for integrating to OpenAI's complete suite of services, including ChatGTP, DALL·E, Whisper, and TTS.
 
-- **Function Calling**: Uses [Yaml templates](./api/terraform/python/openai_api/lambda_openai_function/config/) stored locally or in an AWS S3 bucket to easily configure highly customized ChatGPT prompting behavior that uses both dynamic prompting as well as [OpenAI Python Function Calling](https://platform.openai.com/docs/guides/function-calling) to integrate your own custom Python functions into chat response processing. Refer to the [Python source code](./api/terraform/python/openai_api/lambda_openai_function/) for additional documentation and examples including the fully implemented "[get_current_weather()](./api/terraform/python/openai_api/lambda_openai_function/function_weather.py)" from The official [OpenAI API documentation](https://platform.openai.com/docs/guides/function-calling/common-use-cases), and, a much more interesting example, [get_additional_info()](./api/terraform/python/openai_api/lambda_openai_function/function_refers_to.py) which implements yaml template custom configurations.
+- **LangChain Integration**: A simple API endpoint for building context-aware, reasoning applications with LangChain’s flexible abstractions and AI-first toolkit. Use this endpoint to develop a wide range of applications, from chatbots to question-answering systems.
+
+- **Dynamic ChatGPT Prompting**: Simple [Terraform templates](./api/terraform/apigateway_endpoints.tf) to create highly presonalized ChatBots. Program and skin your own custom chat apps in minutes.
+
+- **Function Calling**: OpenAI's most advanced integration feature to date. OpenAI API Function Calling is a feature that enables developers to integrate their own custom Python functions into the processing of chat responses. For example, when a chatbot powered by OpenAI's GPT-3 model is generating responses, it can call these custom Python functions to perform specific tasks or computations, and then include the results of these functions in its responses. This powerful feature can be used to create more dynamic and interactive chatbots that can perform tasks such as fetching real-time data, performing calculations, or interacting with other APIs or services. See the [Python source code](./api/terraform/python/openai_api/lambda_openai_function/) for additional documentation and examples, including, "[get_current_weather()](./api/terraform/python/openai_api/lambda_openai_function/function_weather.py)" from The official [OpenAI API documentation](https://platform.openai.com/docs/guides/function-calling/common-use-cases)
+
+- **Function Calling Plugins**: We created our own yaml-based "plugin" model, [function_calling_plugin()](./api/terraform/python/openai_api/lambda_openai_function/plugin.py). See this [example plugin](./api/terraform/python/openai_api/lambda_openai_function/config/example-configuration.yaml) and this [documentation](./api/terraform/python/openai_api/lambda_openai_function/README.md) for details, or try it out on this [live site](https://openai.lawrencemcdaniel.com/). Yaml templates can be stored locally or served from a secure AWS S3 bucket. You'll find set of fun example plugins [here](./api/terraform/python/openai_api/lambda_openai_function/config/).
 
 ![Marv](https://cdn.lawrencemcdaniel.com/marv.gif)
 

api/terraform/python/openai_api/lambda_openai_function/README.md

@@ -12,9 +12,9 @@ The following screenshots demonstrate the two Function Calling Python functions
 
 Fully implements the "[get_current_weather()](https://platform.openai.com/docs/guides/function-calling)" from The official OpenAI API documentation. OpenAI's documentation provides scaffolding for this feature, but falls short of actually providing code that retrieves location-based current weather forecasts.
 
-## function_refers_to.py
+## plugin.py
 
-This module demonstrates an alternative implementation of prompt behavior modification involving both Function Calling, plus, dynamic modifications to the system prompt. The module passes a customized configuration object to `get_additional_info()` based on a configurable set of search terms that it looks for in the user prompt. The function works with multiple customized configurations. That is, it maintains a list of custom configurations, and user prompts including search terms associated with multiple custom configurations will result in prompt configuration multiple "Function Calling" apis. The custom configurations are persisted both inside this repository in the [config](./config/) folder as well as via a remote AWS S3 bucket that Terraform creates and configures for you automatically. Custom configurations are data-driven via a standardized yaml format. Use [example-configuration.yaml](./config/example-configuration.yaml) as a template to create your own custom configurations. Storing these in the AWS S3 bucket is preferable to keeping these inside your repo.
+This module demonstrates an alternative implementation of prompt behavior modification involving both Function Calling, plus, dynamic modifications to the system prompt. The module passes a customized configuration object to `function_calling_plugin()` based on a configurable set of search terms that it looks for in the user prompt. The function works with multiple customized configurations. That is, it maintains a list of custom configurations, and user prompts including search terms associated with multiple custom configurations will result in prompt configuration multiple "Function Calling" apis. The custom configurations are persisted both inside this repository in the [config](./config/) folder as well as via a remote AWS S3 bucket that Terraform creates and configures for you automatically. Custom configurations are data-driven via a standardized yaml format. Use [example-configuration.yaml](./config/example-configuration.yaml) as a template to create your own custom configurations. Storing these in the AWS S3 bucket is preferable to keeping these inside your repo.
 
 ### Example custom configurations
 
@@ -48,7 +48,7 @@ function_calling:
   function_description: an example custom configuration to integrate with OpenAI API Function Calling additional information function, in this module.
   additional_information:
     about: >
-      This is some sample text that will be returned ChatGPT if it opts to invoke the get_additional_info() function.
+      This is some sample text that will be returned ChatGPT if it opts to invoke the function_calling_plugin() function.
       In an API call, you can describe functions and have the model intelligently choose to output a JSON object containing arguments to call one or many functions. The Chat Completions API does not call the function; instead, the model generates JSON that you can use to call the function in your code.
       The latest models (gpt-3.5-turbo-1106 and gpt-4-1106-preview) have been trained to both detect when a function should to be called (depending on the input) and to respond with JSON that adheres to the function signature more closely than previous models. With this capability also comes potential risks. We strongly recommend building in user confirmation flows before taking actions that impact the world on behalf of users (sending an email, posting something online, making a purchase, etc).
     links:

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

@@ -2,7 +2,7 @@
 # pylint: disable=E1101
 """
 This module contains the CustomConfig class, which is used to parse YAML config objects for
-function_refers_to.get_additional_info().
+plugin.function_calling_plugin().
 """
 import json
 import logging
@@ -274,7 +274,7 @@ def to_json(self) -> json:
 
 
 class CustomConfig(CustomConfigBase):
-    """A json object that contains the config for a function_refers_to.get_additional_info() function"""
+    """A json object that contains the config for a plugin.function_calling_plugin() function"""
 
     index: int = Field(0, description="Index of the config object")
     config_json: dict = Field(..., description="Config object")

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

@@ -39,18 +39,18 @@
     validate_item,
 )
 from openai_api.lambda_openai_function.custom_config import custom_configs
-from openai_api.lambda_openai_function.function_refers_to import (
-    customized_prompt,
-    get_additional_info,
-    info_tool_factory,
-    search_terms_are_in_messages,
-)
 
 # OpenAI functions
 from openai_api.lambda_openai_function.function_weather import (
     get_current_weather,
     weather_tool_factory,
 )
+from openai_api.lambda_openai_function.plugin import (
+    customized_prompt,
+    function_calling_plugin,
+    plugin_tool_factory,
+    search_terms_are_in_messages,
+)
 
 
 openai.organization = settings.openai_api_organization
@@ -85,7 +85,7 @@ def handler(event, context):
             ):
                 model = "gpt-3.5-turbo-1106"
                 messages = customized_prompt(config=config, messages=messages)
-                custom_tool = info_tool_factory(config=config)
+                custom_tool = plugin_tool_factory(config=config)
                 tools.append(custom_tool)
                 print(
                     f"Adding custom configuration: {config.name} {config.meta_data.version} created by {config.meta_data.author}"
@@ -113,7 +113,7 @@ def handler(event, context):
             # Note: the JSON response may not always be valid; be sure to handle errors
             available_functions = {
                 "get_current_weather": get_current_weather,
-                "get_additional_info": get_additional_info,
+                "function_calling_plugin": function_calling_plugin,
             }  # only one function in this example, but you can have multiple
             messages.append(response_message)  # extend conversation with assistant's reply
             # Step 4: send the info for each function call and function response to the model
@@ -127,7 +127,7 @@ def handler(event, context):
                         location=function_args.get("location"),
                         unit=function_args.get("unit"),
                     )
-                elif function_name == "get_additional_info":
+                elif function_name == "function_calling_plugin":
                     function_response = function_to_call(inquiry_type=function_args.get("inquiry_type"))
                 messages.append(
                     {

…da_openai_function/function_refers_to.py …nai_api/lambda_openai_function/plugin.pyapi/terraform/python/openai_api/lambda_openai_function/function_refers_to.py renamed to api/terraform/python/openai_api/lambda_openai_function/plugin.py api/terraform/python/openai_api/lambda_openai_function/function_refers_to.py renamed to api/terraform/python/openai_api/lambda_openai_function/plugin.py

@@ -50,7 +50,7 @@ def customized_prompt(config: CustomConfig, messages: list) -> list:
 
 
 # pylint: disable=too-many-return-statements
-def get_additional_info(inquiry_type: str) -> str:
+def function_calling_plugin(inquiry_type: str) -> str:
     """Return select info from custom config object"""
 
     for config in custom_configs:
@@ -64,14 +64,14 @@ def get_additional_info(inquiry_type: str) -> str:
     raise KeyError(f"Invalid inquiry_type: {inquiry_type}")
 
 
-def info_tool_factory(config: CustomConfig):
+def plugin_tool_factory(config: CustomConfig):
     """
     Return a dictionary of chat completion tools.
     """
     tool = {
         "type": "function",
         "function": {
-            "name": "get_additional_info",
+            "name": "function_calling_plugin",
             "description": config.function_calling.function_description,
             "parameters": {
                 "type": "object",

api/terraform/python/openai_api/lambda_openai_function/tests/test_custom_config.py

@@ -171,12 +171,18 @@ def test_function_calling(self):
 
     def test_aws_s3_bucket(self):
         """Test aws_s3_bucket."""
+
+        # If the aws_s3_bucket_name is example.com, then we don't need to test it.
+        if settings.aws_apigateway_root_domain == "example.com":
+            return
+
         aws_s3_bucket_name = settings.aws_s3_bucket_name
         s3 = settings.aws_s3_client
 
         folder_name = "test_folder/"
         file_name = folder_name + "test_file"
 
+        print("Testing aws_s3_bucket_name: ", aws_s3_bucket_name)
         # Connect to the aws_s3_bucket_name
         try:
             s3.head_bucket(Bucket=aws_s3_bucket_name)

api/terraform/python/openai_api/lambda_openai_function/tests/test_lambda_openai_custom_config.py

@@ -23,9 +23,9 @@
 from openai_api.lambda_openai_function.custom_config import CustomConfig
 
 # pylint: disable=no-name-in-module
-from openai_api.lambda_openai_function.function_refers_to import (
-    get_additional_info,
-    info_tool_factory,
+from openai_api.lambda_openai_function.plugin import (
+    function_calling_plugin,
+    plugin_tool_factory,
 )
 from openai_api.lambda_openai_function.tests.test_setup import get_test_file_path
 
@@ -42,20 +42,20 @@ def setUp(self):
 
     # pylint: disable=broad-exception-caught
     def test_get_additional_info(self):
-        """Test default return value of get_additional_info()"""
+        """Test default return value of function_calling_plugin()"""
         try:
             # pylint: disable=no-value-for-parameter
-            additional_information = get_additional_info(
+            additional_information = function_calling_plugin(
                 inquiry_type=self.config.function_calling.additional_information.keys[0]
             )
         except Exception:
-            self.fail("get_additional_info() raised ExceptionType")
+            self.fail("function_calling_plugin() raised ExceptionType")
 
         self.assertTrue(additional_information is not None)
 
     def test_info_tool_factory(self):
-        """Test integrity info_tool_factory()"""
-        itf = info_tool_factory(config=self.config)
+        """Test integrity plugin_tool_factory()"""
+        itf = plugin_tool_factory(config=self.config)
         self.assertIsInstance(itf, dict)
 
         self.assertIsInstance(itf, dict)