Refactored initialization code. Fixed readme bug.

Signed-off-by: Paul Yuknewicz <[email protected]>

Author: paulyuk

README.md

@@ -37,7 +37,7 @@ Take note of the value of `AZURE_OPENAI_ENDPOINT` which can be found in `./.azur
 AZURE_OPENAI_ENDPOINT="https://cog-<unique string>.openai.azure.com/"
 ```
 
-5) Add this `local.settings.json` file to the root of the repo folder to simplify local development.  Replace `AZURE_OPENAI_ENDPOINT` with your value from step 4.  Optionally you can choose a different model deployment in `CHAT_MODEL_DEPLOYMENT_NAME`.  This file will be gitignored to protect secrets from committing to your repo, however by default the sample uses Entra identity (user identity and mananaged identity) so it is secretless.  
+5) Add this `local.settings.json` file to the root of the repo folder to simplify local development.  Replace `AZURE_OPENAI_ENDPOINT` with your value from step 4.  Optionally you can choose a different model deployment in `AZURE_OPENAI_CHATGPT_DEPLOYMENT`.  This file will be gitignored to protect secrets from committing to your repo, however by default the sample uses Entra identity (user identity and mananaged identity) so it is secretless.  
 ```json
 {
   "IsEncrypted": false,

function_app.py

@@ -9,30 +9,24 @@
 app = func.FunctionApp()
 
 
-# Use the Entra Id DefaultAzureCredential to get the token
-credential = DefaultAzureCredential()
-# Set the API type to `azure_ad`
-os.environ["OPENAI_API_TYPE"] = "azure_ad"
-# Set the API_KEY to the token from the Azure credential
-os.environ["OPENAI_API_KEY"] = credential.get_token(
-    "https://cognitiveservices.azure.com/.default"
-    ).token
+# Initializes Azure OpenAI environment
+def init():
+    global credential
+    global AZURE_OPENAI_ENDPOINT
+    global AZURE_OPENAI_KEY
+    global AZURE_OPENAI_CHATGPT_DEPLOYMENT
+    global OPENAI_API_VERSION
 
+    # Use the Entra Id DefaultAzureCredential to get the token
+    credential = DefaultAzureCredential()
+    # Set the API type to `azure_ad`
+    os.environ["OPENAI_API_TYPE"] = "azure_ad"
+    # Set the API_KEY to the token from the Azure credential
+    os.environ["OPENAI_API_KEY"] = credential.get_token(
+        "https://cognitiveservices.azure.com/.default"
+        ).token
 
-@app.function_name(name="ask")
-@app.route(route="ask", auth_level="function", methods=["POST"])
-def main(req):
-
-    try:
-        req_body = req.get_json()
-        prompt = req_body.get("prompt")
-    except ValueError:
-        raise RuntimeError("prompt data must be set in POST.")
-    else:
-        if not prompt:
-            raise RuntimeError("prompt data must be set in POST.")
-
-    # Init OpenAI: configure these using Env Variables
+    # Initialize Azure OpenAI environment
     AZURE_OPENAI_ENDPOINT = os.environ.get("AZURE_OPENAI_ENDPOINT")
     AZURE_OPENAI_KEY = credential.get_token(
         "https://cognitiveservices.azure.com/.default"
@@ -42,14 +36,32 @@ def main(req):
     OPENAI_API_VERSION = os.environ.get(
         "OPENAI_API_VERSION") or "2023-05-15"
 
-    # configure azure openai for langchain and/or llm
+    # Configure base OpenAI framework for LangChain and/or llm
     openai.api_key = AZURE_OPENAI_KEY
     openai.api_base = AZURE_OPENAI_ENDPOINT
     openai.api_type = "azure"
-
-    # this may change in the future
     openai.api_version = OPENAI_API_VERSION
 
+
+# Initialize Azure OpenAI environment
+init()
+
+
+# Function App entry point route for /api/ask
+@app.function_name(name="ask")
+@app.route(route="ask", auth_level="function", methods=["POST"])
+def main(req):
+
+    try:
+        req_body = req.get_json()
+        prompt = req_body.get("prompt")
+    except ValueError:
+        raise RuntimeError("prompt data must be set in POST.")
+    else:
+        if not prompt:
+            raise RuntimeError("prompt data must be set in POST.")
+
+    # LangChain user code goes here
     llm = AzureChatOpenAI(
         deployment_name=AZURE_OPENAI_CHATGPT_DEPLOYMENT,
         temperature=0.3,