🐛 Bug: Fix the bug where the embedding URL for GLM and GitHub models is incorrect.

test/test_baseurl.py

@@ -0,0 +1,22 @@
+import os
+import sys
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from utils import BaseAPI
+
+def print_base_api(url):
+    base_api = BaseAPI(url)
+    print("base_url            ", base_api.base_url)
+    print("v1_url              ", base_api.v1_url)
+    print("chat_url            ", base_api.chat_url)
+    print("image_url           ", base_api.image_url)
+    print("audio_transcriptions", base_api.audio_transcriptions)
+    print("moderations         ", base_api.moderations)
+    print("embeddings          ", base_api.embeddings)
+    print("-"*50)
+
+
+print_base_api("https://api.openai.com/v1/chat/completions")
+print_base_api("https://api.deepseek.com/chat/completions")
+print_base_api("https://models.inference.ai.azure.com/chat/completions")
+print_base_api("https://open.bigmodel.cn/api/paas/v4/chat/completions")

utils.py

@@ -573,23 +573,21 @@ class BaseAPI:
         self.source_api_url: str = api_url
         from urllib.parse import urlparse, urlunparse
         parsed_url = urlparse(self.source_api_url)
+        # print("parsed_url", parsed_url)
         if parsed_url.scheme == "":
             raise Exception("Error: API_URL is not set")
         if parsed_url.path != '/':
-            before_v1 = parsed_url.path.split("/v1")[0]
+            before_v1 = parsed_url.path.split("chat/completions")[0]
         else:
             before_v1 = ""
-        self.base_url: str = urlunparse(parsed_url[:2] + (before_v1,) + ("",) * 3)
-        self.v1_url: str = urlunparse(parsed_url[:2]+ (before_v1 + "/v1",) + ("",) * 3)
-        self.v1_models: str = urlunparse(parsed_url[:2] + (before_v1 + "/v1/models",) + ("",) * 3)
-        if parsed_url.netloc == "api.deepseek.com":
-            self.chat_url: str = urlunparse(parsed_url[:2] + ("/chat/completions",) + ("",) * 3)
-        else:
-            self.chat_url: str = urlunparse(parsed_url[:2] + (before_v1 + "/v1/chat/completions",) + ("",) * 3)
-        self.image_url: str = urlunparse(parsed_url[:2] + (before_v1 + "/v1/images/generations",) + ("",) * 3)
-        self.audio_transcriptions: str = urlunparse(parsed_url[:2] + (before_v1 + "/v1/audio/transcriptions",) + ("",) * 3)
-        self.moderations: str = urlunparse(parsed_url[:2] + (before_v1 + "/v1/moderations",) + ("",) * 3)
-        self.embeddings: str = urlunparse(parsed_url[:2] + (before_v1 + "/v1/embeddings",) + ("",) * 3)
+        self.base_url: str = urlunparse(parsed_url[:2] + ("",) + ("",) * 3)
+        self.v1_url: str = urlunparse(parsed_url[:2]+ (before_v1,) + ("",) * 3)
+        self.v1_models: str = urlunparse(parsed_url[:2] + (before_v1 + "models",) + ("",) * 3)
+        self.chat_url: str = urlunparse(parsed_url[:2] + (before_v1 + "chat/completions",) + ("",) * 3)
+        self.image_url: str = urlunparse(parsed_url[:2] + (before_v1 + "images/generations",) + ("",) * 3)
+        self.audio_transcriptions: str = urlunparse(parsed_url[:2] + (before_v1 + "audio/transcriptions",) + ("",) * 3)
+        self.moderations: str = urlunparse(parsed_url[:2] + (before_v1 + "moderations",) + ("",) * 3)
+        self.embeddings: str = urlunparse(parsed_url[:2] + (before_v1 + "embeddings",) + ("",) * 3)
 
 def safe_get(data, *keys, default=None):
     for key in keys: