@saltcorn/large-language-model 1.0.4 → 1.0.6

package/generate.js

@@ -424,13 +424,24 @@ const getCompletion = async (config, opts) => {
   }
 };
 
-const getAiSdkModel = (
-  { provider, api_key, model_name, anthropic_api_key },
-  isEmbedding,
-) => {
-  switch (provider) {
+const getAiSdkModel = ({ config, alt_config, userCfg }, isEmbedding) => {
+  const use_config = alt_config
+    ? config.alt_aisdk_configs?.find?.((acfg) => acfg.name === alt_config) ||
+      config
+    : config;
+  const use_provider = use_config.provider;
+  const model_name = isEmbedding
+    ? userCfg.embed_model ||
+      userCfg.model ||
+      config.embed_model ||
+      "text-embedding-3-small"
+    : userCfg.model || use_config.model;
+
+  switch (use_provider) {
     case "OpenAI":
-      const openai = createOpenAI({ apiKey: api_key });
+      const use_api_key =
+        userCfg.api_key || userCfg.apiKey || use_config.api_key;
+      const openai = createOpenAI({ apiKey: use_api_key });
       return isEmbedding
         ? openai.textEmbeddingModel(model_name)
         : openai(model_name);
@@ -439,7 +450,8 @@ const getAiSdkModel = (
       if (isEmbedding)
         throw new Error("Anthropic does not provide embedding models");
       const anthropic = createAnthropic({
-        apiKey: anthropic_api_key,
+        apiKey:
+          userCfg.api_key || userCfg.apiKey || use_config.anthropic_api_key,
       });
       return anthropic(model_name);
     default:
@@ -448,7 +460,7 @@ const getAiSdkModel = (
 };
 
 const getCompletionAISDK = async (
-  { apiKey, model, provider, temperature, anthropic_api_key },
+  config,
   {
     systemPrompt,
     prompt,
@@ -461,12 +473,12 @@ const getCompletionAISDK = async (
     ...rest
   },
 ) => {
+  const { apiKey, model, provider, temperature } = config;
   const use_model_name = rest.model || model;
   let model_obj = getAiSdkModel({
-    model_name: use_model_name,
-    api_key: api_key || apiKey,
-    provider,
-    anthropic_api_key,
+    config,
+    alt_config: rest.alt_config,
+    userCfg: rest,
   });
   const modifyChat = (chat) => {
     const f = (c) => {
@@ -620,13 +632,17 @@ const getCompletionOpenAICompatible = async (
   }
   if (responses_api) {
     delete body.tool_choice;
-    for (const tool of body.tools || []) {
-      if (tool.type !== "function" || !tool.function) continue;
-      tool.name = tool.function.name;
-      tool.description = tool.function.description;
-      tool.parameters = tool.function.parameters;
-      if (tool.function.required) tool.required = tool.function.required;
-      delete tool.function;
+    if (body.tools) {
+      const newtools = JSON.parse(JSON.stringify(body.tools));
+      for (const tool of newtools) {
+        if (tool.type !== "function" || !tool.function) continue;
+        tool.name = tool.function.name;
+        tool.description = tool.function.description;
+        tool.parameters = tool.function.parameters;
+        if (tool.function.required) tool.required = tool.function.required;
+        delete tool.function;
+      }
+      body.tools = newtools;
     }
     if (body.response_format?.type === "json_schema" && !body.text) {
       body.text = {
@@ -970,16 +986,16 @@ const getEmbeddingOpenAICompatible = async (
   return results?.data?.[0]?.embedding;
 };
 
-const getEmbeddingAISDK = async (config, { prompt, model, debugResult }) => {
-  const { provider, apiKey, embed_model } = config;
+const getEmbeddingAISDK = async (
+  config,
+  { prompt, model, debugResult, alt_config },
+) => {
   let providerOptions = {};
-  const model_name = model || embed_model || "text-embedding-3-small";
   let model_obj = getAiSdkModel(
     {
-      ...config,
-      model_name,
-      api_key: apiKey,
-      provider,
+      config,
+      userCfg: { model },
+      alt_config,
     },
     true,
   );

package/index.js

@@ -65,12 +65,12 @@ ${domReady(`
                 required: true,
                 attributes: {
                   options: [
+                    "AI SDK",
                     "OpenAI",
                     "OpenAI-compatible API",
                     "Local Ollama",
                     ...(isRoot ? ["Local llama.cpp"] : []),
                     "Google Vertex AI",
-                    "AI SDK",
                   ],
                   onChange: "backendChange(this)",
                 },
@@ -357,6 +357,11 @@ ${domReady(`
                 label: "Alternative configurations",
                 showIf: { backend: "OpenAI-compatible API" },
               },
+              {
+                input_type: "section_header",
+                label: "Alternative configurations",
+                showIf: { backend: ["OpenAI-compatible API", "AI SDK"] },
+              },
               new FieldRepeat({
                 name: "altconfigs",
                 label: "Alternative configurations",
@@ -385,6 +390,77 @@ ${domReady(`
                   },
                 ],
               }),
+              new FieldRepeat({
+                name: "alt_aisdk_configs",
+                label: "Alternative configurations",
+                showIf: { backend: "AI SDK" },
+                fields: [
+                  { name: "name", label: "Configuration name", type: "String" },
+                  {
+                    name: "alt_provider",
+                    label: "Provider", //gpt-3.5-turbo
+                    type: "String",
+                    required: true,
+                    attributes: {
+                      options: ["OpenAI", "Anthropic"],
+                    },
+                  },
+                  {
+                    name: "api_key",
+                    label: "API key",
+                    type: "String",
+                    required: true,
+                    fieldview: "password",
+                    showIf: { alt_provider: "OpenAI" },
+                  },
+                  {
+                    name: "anthropic_api_key",
+                    label: "API key",
+                    type: "String",
+                    required: true,
+                    fieldview: "password",
+                    showIf: { alt_provider: "Anthropic" },
+                  },
+                  {
+                    name: "model",
+                    label: "Model", //gpt-3.5-turbo
+                    type: "String",
+                    required: true,
+                    attributes: {
+                      calcOptions: [
+                        "alt_provider",
+                        {
+                          OpenAI: OPENAI_MODELS,
+                          Anthropic: [
+                            "claude-opus-4-6",
+                            "claude-sonnet-4-6",
+                            "claude-haiku-4-5",
+                          ],
+                        },
+                      ],
+                    },
+                  },
+                  {
+                    name: "embed_model",
+                    label: "Embedding model", //gpt-3.5-turbo
+                    type: "String",
+                    required: true,
+                    showIf: { alt_provider: ["OpenAI"] },
+                    attributes: {
+                      calcOptions: [
+                        "alt_provider",
+                        {
+                          OpenAI: [
+                            "text-embedding-3-small",
+                            "text-embedding-3-large",
+                            "text-embedding-ada-002",
+                          ],
+                        },
+                      ],
+                    },
+                  },
+                ],
+              }),
             ],
           });
         },
@@ -465,6 +541,25 @@ const functions = (config) => {
         { name: "options", type: "JSON", tstype: "any" },
       ],
     },
+    llm_get_configuration: {
+      run() {
+        return {
+          ...config,
+          alt_config_names:
+            config?.backend === "AI SDK"
+              ? config?.alt_aisdk_configs
+                  ?.map?.((cfg) => cfg.name)
+                  .filter(Boolean)
+              : config?.backend === "OpenAI-compatible API"
+                ? config?.altconfigs?.map?.((cfg) => cfg.name).filter(Boolean)
+                : [],
+        };
+      },
+      isAsync: false,
+      description: "Get the LLM configuration details",
+      tsreturns: "{alt_config_names: string[], backend: string}",
+      arguments: [],
+    },
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/large-language-model",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Large language models and functionality for Saltcorn",
   "main": "index.js",
   "dependencies": {
@@ -21,7 +21,7 @@
     "jest": "^29.7.0"
   },
   "scripts": {
-    "test": "jest tests --runInBand"
+    "test": "jest tests --runInBand --verbose"
   },
   "author": "Tom Nielsen",
   "license": "MIT",

package/tests/llm.test.js

@@ -97,7 +97,7 @@ for (const nameconfig of require("./configs")) {
     });
     it("uses tools", async () => {
       const answer = await getState().functions.llm_generate.run(
-        "Generate a list of EU capitals in a structured format using the provided tool",
+        "Generate a list of all the EU capitals in a structured format using the provided tool",
         cities_tool,
       );
       expect(typeof answer).toBe("object");
@@ -131,7 +131,7 @@ for (const nameconfig of require("./configs")) {
     it("tool use sequence", async () => {
       const chat = [];
       const answer = await getState().functions.llm_generate.run(
-        "Generate a list of EU capitals in a structured format using the provided tool",
+        "Generate a list of all the EU capitals in a structured format using the provided tool",
         {
           chat,
           appendToChat: true,
@@ -166,7 +166,7 @@ for (const nameconfig of require("./configs")) {
     });
     it("uses response_format", async () => {
       const answer = await getState().functions.llm_generate.run(
-        "Generate a list of EU capitals in JSON format",
+        "Generate a list of all the EU capitals in JSON format",
         {
           response_format: {
             type: "json_schema",
@@ -178,7 +178,6 @@ for (const nameconfig of require("./configs")) {
         },
       );
       expect(typeof answer).toBe("string");
-      console.log("answer", answer);
 
       const json_answer = JSON.parse(answer);