Refactor temperature handling + improve options extraction in custom APIs

Author: XInTheDark

src/api/Providers/deepinfra.js

@@ -141,7 +141,7 @@ export const DeepInfraProvider = {
       model: model,
       messages: json_chat,
       tools: tools.length > 0 ? tools : undefined,
-      temperature: options.temperature,
+      temperature: options.temperature ?? 0.7,
       max_tokens: 100000,
       stream: true,
       ...overrides[model],

src/api/Providers/replicate.js

@@ -32,7 +32,7 @@ export const ReplicateProvider = {
         prompt: format_chat_to_prompt(chat, { model: model }),
         max_tokens: model.includes("meta-llama-3") ? 512 : null, // respected by meta-llama-3
         max_new_tokens: model.includes("mixtral") ? 1024 : null, // respected by mixtral-8x7b
-        temperature: options.temperature,
+        temperature: options.temperature ?? 0.7,
       },
     };
 

src/api/Providers/special/custom_openai.js

@@ -25,7 +25,8 @@ export const CustomOpenAIProvider = {
   isCustom: true,
   config: {},
   generate: async function* (chat, options) {
-    const url = options.url;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    let { url, model, apiKey, config: _, ...reqBody } = options;
 
     let apiData = {};
     try {
@@ -36,7 +37,6 @@ export const CustomOpenAIProvider = {
 
     // Initialize
     const api_url = url.endsWith("/chat/completions") ? url : url + "/chat/completions";
-    let { model, apiKey, ...reqBody } = options;
     apiKey = apiKey || apiData.apiKey;
     const config = { ...this.config, ...apiData.config };
 
@@ -54,8 +54,8 @@ export const CustomOpenAIProvider = {
       messages: chat,
       stream: true,
       model: model,
-      ...config,
       ...reqBody,
+      ...config, // config overrides reqBody
     };
 
     let response = await fetch(

src/api/providers.js

@@ -13,7 +13,7 @@ export const additional_provider_options = (provider, chatOptions = null) => {
   let options = {};
   if (chatOptions?.creativity) {
     let temperature = Number(chatOptions.creativity);
-    temperature = Math.max(0.0, temperature).toFixed(1);
+    temperature = Math.max(0.0, temperature);
     options.temperature = temperature;
   } else {
     options.temperature = 0.7;
@@ -48,13 +48,14 @@ export const get_provider_info = (providerString) => {
 
 // Get options from info
 export const get_options_from_info = (info, chatOptions = {}) => {
-  // we delete the provider key since it's not an option
-  return {
+  let o = {
     ...(info || {}),
-    ...(chatOptions || {}),
+    config: { ...(chatOptions || {}) },
     ...additional_provider_options(info?.provider, chatOptions),
-    provider: undefined,
   };
+  // we delete the provider key since it's not an option
+  delete o.provider;
+  return o;
 };
 
 // Get provider info from alias