patch: reorganize llm apis

streamlit_langchain_chat/streamlit_app.py

@@ -157,7 +157,7 @@ def collect_dataset_and_built_index():
     some_files = True if uploaded_files_rows and uploaded_files_rows[-1].get('filepath') != "" else False
     some_urls = bool([True for url, citation in urls_df.to_numpy() if url])
 
-    openai.api_type = "azure" if type_id == 1 else "open_ai"
+    openai.api_type = "open_ai" if type_id == 1 else "azure"
     openai.api_base = api_base
     openai.api_version = "2023-03-15-preview" if type_id == 1 else None
 
@@ -335,7 +335,15 @@ def load_sidebar_page():
         [key for key, value in TYPE_IDS.items()])
     app.params['type_id'] = TYPE_IDS.get(combination_selected, None)
 
-    if app.params['type_id'] == 1:  # with AzureOpenAI endpoint
+    if app.params['type_id'] == 1:  # with OpenAI endpoint
+        os.environ['OPENAI_API_KEY'] = st.sidebar.text_input(
+            label="Enter OpenAI API Key",
+            placeholder="sk-...",
+            type="password"
+        ).strip()
+        app.params['api_base'] = "https://api.openai.com/v1"
+        app.params['deployment_id'] = None
+    elif app.params['type_id'] == 2:  # with AzureOpenAI endpoint
         # https://docs.streamlit.io/library/api-reference/widgets/st.text_input
         os.environ['OPENAI_API_KEY'] = st.sidebar.text_input(
             label="Enter Azure OpenAI API Key",
@@ -348,14 +356,6 @@ def load_sidebar_page():
         app.params['deployment_id'] = st.sidebar.text_input(
             label="Enter Azure deployment_id",
         ).strip()
-    elif app.params['type_id'] == 2:  # with OpenAI endpoint
-        os.environ['OPENAI_API_KEY'] = st.sidebar.text_input(
-            label="Enter OpenAI API Key",
-            placeholder="sk-...",
-            type="password"
-        ).strip()
-        app.params['api_base'] = "https://api.openai.com/v1"
-        app.params['deployment_id'] = None
 
     # ####### #
     # INDEXES #