:boom: [Fix] ChatCompletionsRequester: select endpoint and model

networks/llm_requester.js

@@ -18,15 +18,20 @@ export class ChatCompletionsRequester {
         openai_endpoint = null
     ) {
         this.prompt = prompt;
-        this.model = model || get_selected_llm_model() || "gpt-turbo-3.5";
+        this.openai_endpoint =
+            openai_endpoint || this.extract_endpoint_and_model()[0];
+        this.model = model || this.extract_endpoint_and_model()[1];
         this.temperature =
             temperature !== null ? temperature : get_selected_temperature();
-
-        this.openai_endpoint =
-            openai_endpoint || get_endpoint_by_model(this.model);
         this.backend_request_endpoint = "/chat/completions";
         this.controller = new AbortController();
     }
+    extract_endpoint_and_model() {
+        let model_id_with_endpoint = get_selected_llm_model();
+        this.openai_endpoint = model_id_with_endpoint.split("|")[0];
+        this.model = model_id_with_endpoint.split("|")[1];
+        return [this.openai_endpoint, this.model];
+    }
     construct_openai_request_headers() {
         this.backend_request_headers = {
             "Content-Type": "application/json",

storages/endpoint_storage.js

@@ -188,7 +188,7 @@ class EndpointStorage {
                             ).hostname
                                 .split(".")[0]
                                 .split("-")[0];
-                            let model_id_with_endpoint = `${row.endpoint}/models/${model_id}`;
+                            let model_id_with_endpoint = `${row.endpoint}|${model_id}`;
 
                             model_name = `${model_id} (${endpoint_hostname})`;
                             const option = new Option(
@@ -208,7 +208,7 @@ class EndpointStorage {
 
     set_default_model() {
         let storage_default_model = localStorage.getItem("default_model");
-        // format of storage_default_model is `{endpoint}/models/{model_id}`
+        // format of storage_default_model is `{endpoint}|{model_id}`
         // if storage_default_model is null, or not in the available_models_select,
         // set as the first one of available_models_select
         let select = $("#available-models-select");