Fix switching between Azure/OpenAI; add port option

app.py

@@ -46,12 +46,6 @@ Use this output format:
 ----
 - [textual evidence 1] - book
 - [textual evidence 2] - outside source"""
-# 7. Make a section for each key point. In each section, make a bullet list of textual evidence from task 3 that relate to that key point.
-
-
-class AzurePromptLayerChatOpenAI(AzureChatOpenAI, PromptLayerChatOpenAI):
-  pass
-
 
 
 def load_chain(api_key, api_type):
@@ -68,16 +62,17 @@ def load_chain(api_key, api_type):
     shared_args = {
         "temperature": 0,
         "model_name": "gpt-3.5-turbo",
-        "openai_api_key": api_key,
+        "api_key": api_key, # deliberately not use "openai_api_key" and other openai args since those apply globally
         "pl_tags": ["grammar"],
     }
     if api_type == "OpenAI":
       llm = PromptLayerChatOpenAI(**shared_args)
     elif api_type == "Azure OpenAI":
-      llm = AzurePromptLayerChatOpenAI(
-        openai_api_base = os.environ.get("AZURE_OPENAI_API_BASE", None),
-        openai_api_version = os.environ.get("AZURE_OPENAI_API_VERSION", "2023-03-15-preview"),
-        deployment_name = os.environ.get("AZURE_OPENAI_DEPLOYMENT_NAME", None),
+      llm = PromptLayerChatOpenAI(
+        api_type = "azure",
+        api_base = os.environ.get("AZURE_OPENAI_API_BASE", None),
+        api_version = os.environ.get("AZURE_OPENAI_API_VERSION", "2023-03-15-preview"),
+        engine = os.environ.get("AZURE_OPENAI_DEPLOYMENT_NAME", None),
         **shared_args
       )
 
@@ -365,4 +360,4 @@ with demo:
 
   demo.load(load_chain, [api_key, api_type], [chain, llm, chain_intro, chain_body1])
 
-demo.launch(debug=True)
+demo.launch(debug=True, server_port=int(os.environ.get("SERVER_PORT", None)))