Merge branch 'develop'

.env

@@ -5,6 +5,7 @@ SIGNAL_PHONE_NUMBER=
 # ChatGPT
 OPENAI_API_BASE=
 OPENAI_API_KEY=
+OPENAI_MODEL=gpt-3.5-turbo
 
 # Bard
 BARD_TOKEN=
@@ -20,4 +21,4 @@ MODEL=/models/<your_model_here>
 DEFAULT_MODEL=
 
 # Space-separated list of disabled models
-DISABLED_MODELS=bard bing hugchat # these require cookie authentication (see readme)
+DISABLED_MODELS=bard hugchat # these require cookie authentication (see readme)

.github/README.md

@@ -70,6 +70,8 @@ Go to https://bard.google.com/
 
 ### 3. Bing Chat
 
+_The setup steps below may not be required but is still supported in case unauthenticated access to Bing Chat does not work in your region._
+
 See the [EdgeGPT](https://github.com/acheong08/EdgeGPT) repository. TL;DR:
 
 <details>

ai.py

@@ -50,7 +50,10 @@ def get_api(self):
             openai_api_base = (
                 os.getenv("OPENAI_API_BASE") or "https://api.openai.com/v1"
             )
-            return OpenAIAPI(api_key=openai_api_key, api_base=openai_api_base)
+            openai_model = os.getenv("OPENAI_MODEL") or "gpt-3.5-turbo"
+            return OpenAIAPI(
+                api_key=openai_api_key, api_base=openai_api_base, model=openai_model
+            )
 
         if self.model == "hugchat":
             cookie_path = "./config/hugchat.json"