修复自定义URL Base时的bug

modules/index_func.py

@@ -118,7 +118,7 @@ def construct_index(
         embeddings = HuggingFaceEmbeddings(model_name = "sentence-transformers/distiluse-base-multilingual-cased-v2")
     else:
         from langchain.embeddings import OpenAIEmbeddings
-        embeddings = OpenAIEmbeddings()
+        embeddings = OpenAIEmbeddings(openai_api_base=os.environ.get("OPENAI_API_BASE", None), openai_api_key=os.environ.get("OPENAI_EMBEDDING_API_KEY", api_key))
     if os.path.exists(index_path):
         logging.info("找到了缓存的索引文件，加载中……")
         return FAISS.load_local(index_path, embeddings)

modules/models/ChuanhuAgent.py

@@ -156,7 +156,7 @@ class ChuanhuAgent_Client(BaseLLMModel):
         texts = Document(page_content=text)
         texts = self.text_splitter.split_documents([texts])
         # use embedding
-        embeddings = OpenAIEmbeddings(openai_api_key=self.api_key)
+        embeddings = OpenAIEmbeddings(openai_api_key=self.api_key, openai_api_base=os.environ.get("OPENAI_API_BASE", None))
 
         # create vectorstore
         db = FAISS.from_documents(texts, embeddings)

modules/shared.py

@@ -1,6 +1,7 @@
 from modules.presets import COMPLETION_URL, BALANCE_API_URL, USAGE_API_URL, API_HOST
 import os
 import queue
+import openai
 
 class State:
     interrupted = False
@@ -16,6 +17,7 @@ class State:
         self.interrupted = False
 
     def set_api_host(self, api_host: str):
+        api_host = api_host.rstrip("/")
         if not api_host.startswith("http"):
             api_host = f"https://{api_host}"
         if api_host.endswith("/v1"):
@@ -23,13 +25,13 @@ class State:
         self.completion_url = f"{api_host}/v1/chat/completions"
         self.balance_api_url = f"{api_host}/dashboard/billing/credit_grants"
         self.usage_api_url = f"{api_host}/dashboard/billing/usage"
-        os.environ["OPENAI_API_BASE"] = f"{api_host}/v1"
+        os.environ["OPENAI_API_BASE"] = api_host
 
     def reset_api_host(self):
         self.completion_url = COMPLETION_URL
         self.balance_api_url = BALANCE_API_URL
         self.usage_api_url = USAGE_API_URL
-        os.environ["OPENAI_API_BASE"] = f"https://{API_HOST}/v1"
+        os.environ["OPENAI_API_BASE"] = f"https://{API_HOST}"
         return API_HOST
 
     def reset_all(self):