@johnowennixon/diffdash 1.7.0 → 1.9.0

package/dist/src/lib_llm_access.js

@@ -3,8 +3,13 @@ import { COMMA } from "./lib_char_punctuation.js";
 import { llm_api_get_api_key, llm_api_get_api_key_env } from "./lib_llm_api.js";
 import { llm_model_find_detail } from "./lib_llm_model.js";
 export function llm_access_available({ llm_model_details, llm_model_name, llm_include, llm_excludes, }) {
+    const detail = llm_model_find_detail({ llm_model_details, llm_model_name });
+    const { llm_api_code } = detail;
+    if (llm_api_get_api_key(llm_api_code) === null) {
+        return false;
+    }
     if (llm_include) {
-        if (!llm_model_name.includes(llm_include)) {
+        if (!(llm_model_name.includes(llm_include) || llm_include === llm_api_code)) {
             return false;
         }
     }
@@ -16,59 +21,15 @@ export function llm_access_available({ llm_model_details, llm_model_name, llm_in
             }
         }
     }
-    const detail = llm_model_find_detail({ llm_model_details, llm_model_name });
-    const { llm_api_code, llm_model_code_direct, llm_model_code_requesty, llm_model_code_openrouter } = detail;
-    if (llm_model_code_direct !== null && llm_api_code !== null) {
-        if (llm_api_get_api_key(llm_api_code)) {
-            return true;
-        }
-    }
-    if (llm_model_code_openrouter !== null) {
-        if (llm_api_get_api_key("openrouter")) {
-            return true;
-        }
-    }
-    if (llm_model_code_requesty !== null) {
-        if (llm_api_get_api_key("requesty")) {
-            return true;
-        }
-    }
-    return false;
+    return true;
 }
-export function llm_access_get({ llm_model_details, llm_model_name, llm_router, }) {
+export function llm_access_get({ llm_model_details, llm_model_name, }) {
     const detail = llm_model_find_detail({ llm_model_details, llm_model_name });
-    const { llm_api_code, llm_model_code_direct, llm_model_code_requesty, llm_model_code_openrouter } = detail;
-    if (!llm_router) {
-        if (llm_model_code_direct !== null && llm_api_code !== null) {
-            const llm_api_key = llm_api_get_api_key(llm_api_code);
-            if (llm_api_key) {
-                return { llm_model_code: llm_model_code_direct, llm_api_code, llm_api_key };
-            }
-        }
-    }
-    if (llm_model_code_openrouter !== null) {
-        const llm_api_key = llm_api_get_api_key("openrouter");
-        if (llm_api_key) {
-            return { llm_model_code: llm_model_code_openrouter, llm_api_code: "openrouter", llm_api_key };
-        }
-    }
-    if (llm_model_code_requesty !== null) {
-        const llm_api_key = llm_api_get_api_key("requesty");
-        if (llm_api_key) {
-            return { llm_model_code: llm_model_code_requesty, llm_api_code: "requesty", llm_api_key };
-        }
-    }
-    if (llm_model_code_direct !== null && llm_api_code !== null) {
-        const llm_api_key = llm_api_get_api_key(llm_api_code);
-        if (llm_api_key) {
-            return { llm_model_code: llm_model_code_direct, llm_api_code, llm_api_key };
-        }
-    }
-    const env_openrouter = llm_api_get_api_key_env("openrouter");
-    const env_requesty = llm_api_get_api_key_env("requesty");
-    if (llm_api_code !== null) {
-        const env_direct = llm_api_get_api_key_env(llm_api_code);
-        abort_with_error(`Please set environment variable ${env_direct}, ${env_openrouter} or ${env_requesty}`);
+    const { llm_api_code, llm_model_code } = detail;
+    const llm_api_key = llm_api_get_api_key(llm_api_code);
+    if (!llm_api_key) {
+        const env_name = llm_api_get_api_key_env(llm_api_code);
+        abort_with_error(`Please set environment variable ${env_name}`);
     }
-    abort_with_error(`Please set environment variable ${env_openrouter} or ${env_requesty}`);
+    return { llm_model_code, llm_api_code, llm_api_key };
 }

package/dist/src/lib_llm_api.js

@@ -3,26 +3,8 @@ import { createDeepSeek } from "@ai-sdk/deepseek";
 import { createGoogleGenerativeAI } from "@ai-sdk/google";
 import { createOpenAI } from "@ai-sdk/openai";
 import { createOpenRouter } from "@openrouter/ai-sdk-provider";
-import { createRequesty } from "@requesty/ai-sdk";
 import { abort_with_error } from "./lib_abort.js";
-import { assert_type_string } from "./lib_assert_type.js";
-import { AT_SIGN } from "./lib_char_punctuation.js";
 import { env_get } from "./lib_env.js";
-export function llm_api_get_via(llm_api_code) {
-    switch (llm_api_code) {
-        case "anthropic":
-        case "deepseek":
-        case "google":
-        case "openai":
-            return "direct";
-        case "requesty":
-            return "via Requesty";
-        case "openrouter":
-            return "via OpenRouter";
-        default:
-            abort_with_error("Unknown LLM API");
-    }
-}
 export function llm_api_get_api_key_env(llm_api_code) {
     switch (llm_api_code) {
         case "anthropic":
@@ -33,8 +15,6 @@ export function llm_api_get_api_key_env(llm_api_code) {
             return "GEMINI_API_KEY";
         case "openai":
             return "OPENAI_API_KEY";
-        case "requesty":
-            return "REQUESTY_API_KEY";
         case "openrouter":
             return "OPENROUTER_API_KEY";
         default:
@@ -45,6 +25,7 @@ export function llm_api_get_api_key(llm_api_code) {
     const env = llm_api_get_api_key_env(llm_api_code);
     return env_get(env);
 }
+// eslint-disable-next-line sonarjs/function-return-type
 export function llm_api_get_ai_sdk_language_model({ llm_model_code, llm_api_code, llm_api_key, }) {
     switch (llm_api_code) {
         case "anthropic":
@@ -55,23 +36,8 @@ export function llm_api_get_ai_sdk_language_model({ llm_model_code, llm_api_code
             return createGoogleGenerativeAI({ apiKey: llm_api_key })(llm_model_code);
         case "openai":
             return createOpenAI({ apiKey: llm_api_key })(llm_model_code);
-        case "requesty":
-            return createRequesty({ apiKey: llm_api_key })(llm_model_code);
         case "openrouter": {
-            const openrouter = createOpenRouter({ apiKey: llm_api_key });
-            if (llm_model_code.includes(AT_SIGN)) {
-                const splits = llm_model_code.split(AT_SIGN);
-                const model_id = assert_type_string(splits[0]);
-                const provider = assert_type_string(splits[1]);
-                return openrouter(model_id, {
-                    extraBody: {
-                        provider: {
-                            only: [provider],
-                        },
-                    },
-                });
-            }
-            return openrouter(llm_model_code);
+            return createOpenRouter({ apiKey: llm_api_key })(llm_model_code);
         }
         default:
             abort_with_error("Unknown LLM API");

package/dist/src/lib_llm_chat.js

@@ -1,16 +1,15 @@
-import { generateObject, generateText } from "ai";
+import { generateObject, generateText, stepCountIs } from "ai";
 import { debug_channels, debug_inspect_when } from "./lib_debug.js";
 import { Duration } from "./lib_duration.js";
 import { env_get_empty, env_get_substitute } from "./lib_env.js";
 import { error_get_text } from "./lib_error.js";
 import { llm_api_get_ai_sdk_language_model } from "./lib_llm_api.js";
-import { parse_float_or_undefined, parse_int, parse_int_or_undefined } from "./lib_parse_number.js";
+import { parse_int, parse_int_or_undefined } from "./lib_parse_number.js";
 import { tell_debug } from "./lib_tell.js";
 import { tui_block_string } from "./lib_tui_block.js";
 function llm_chat_get_parameters() {
     return {
-        max_tokens: parse_int_or_undefined(env_get_empty("lib_llm_chat_max_tokens")),
-        temperature: parse_float_or_undefined(env_get_substitute("lib_llm_chat_temperature", "0.6")),
+        max_output_tokens: parse_int_or_undefined(env_get_empty("lib_llm_chat_max_output_tokens")),
         timeout: parse_int(env_get_substitute("lib_llm_chat_timeout", "60")),
     };
 }
@@ -23,24 +22,26 @@ function llm_chat_debug_prompts({ llm_model_name, system_prompt, user_prompt, })
         tui_block_string({ teller, title: `LLM user prompt (for ${llm_model_name}):`, content: user_prompt });
     }
 }
-export async function llm_chat_generate_text({ llm_config, headers, system_prompt, user_prompt, tools, max_steps, min_steps, }) {
-    const { llm_model_name, llm_api_code, llm_model_code, llm_api_key } = llm_config;
+export async function llm_chat_generate_text({ llm_config, system_prompt, user_prompt, tools, max_steps, min_steps, }) {
+    const { llm_model_name, llm_model_detail, llm_model_code, llm_api_code, llm_api_key } = llm_config;
     llm_chat_debug_prompts({ system_prompt, user_prompt, llm_model_name });
     const ai_sdk_language_model = llm_api_get_ai_sdk_language_model({
         llm_model_code,
         llm_api_code,
         llm_api_key,
     });
-    const { max_tokens, temperature, timeout } = llm_chat_get_parameters();
+    const { recommended_temperature, provider_options } = llm_model_detail;
+    const temperature = recommended_temperature;
+    const { max_output_tokens, timeout } = llm_chat_get_parameters();
     const llm_inputs = {
         model: ai_sdk_language_model,
         system: system_prompt,
         prompt: user_prompt,
         tools,
-        headers,
-        maxSteps: max_steps,
-        maxTokens: max_tokens,
+        stopWhen: max_steps === undefined ? undefined : stepCountIs(max_steps),
+        maxOutputTokens: max_output_tokens,
         temperature,
+        providerOptions: provider_options,
         abortSignal: AbortSignal.timeout(timeout * 1000),
     };
     debug_inspect_when(debug_channels.llm_inputs, llm_inputs, `LLM inputs object (for ${llm_model_name})`);
@@ -53,45 +54,51 @@ export async function llm_chat_generate_text({ llm_config, headers, system_promp
     if (max_steps !== undefined && llm_outputs.steps.length === max_steps) {
         throw new Error("Too many steps taken");
     }
-    return llm_outputs.text;
+    const { text: generated_text, reasoningText: reasoning_text, totalUsage: total_usage, providerMetadata: provider_metadata, } = llm_outputs;
+    return { generated_text, reasoning_text, total_usage, provider_metadata };
 }
-export async function llm_chat_generate_result({ llm_config, system_prompt, user_prompt, }) {
+export async function llm_chat_generate_text_result({ llm_config, system_prompt, user_prompt, }) {
     const duration = new Duration();
     duration.start();
     try {
-        const llm_response_text = await llm_chat_generate_text({ llm_config, system_prompt, user_prompt });
+        const outputs = await llm_chat_generate_text({ llm_config, system_prompt, user_prompt });
         duration.stop();
         const seconds = duration.seconds_rounded();
-        return { llm_config, seconds, llm_response_text, error_text: null };
+        return { llm_config, seconds, error_text: null, outputs };
     }
     catch (error) {
         duration.stop();
         const seconds = duration.seconds_rounded();
         const error_text = error_get_text(error);
-        return { llm_config, seconds, llm_response_text: null, error_text };
+        return { llm_config, seconds, error_text, outputs: null };
     }
 }
 export async function llm_chat_generate_object({ llm_config, user_prompt, system_prompt, schema, }) {
-    const { llm_model_name, llm_api_code, llm_model_code, llm_api_key } = llm_config;
+    const { llm_model_name, llm_model_detail, llm_model_code, llm_api_code, llm_api_key } = llm_config;
     llm_chat_debug_prompts({ system_prompt, user_prompt, llm_model_name });
     const ai_sdk_language_model = llm_api_get_ai_sdk_language_model({
         llm_model_code,
         llm_api_code,
         llm_api_key,
     });
-    const { max_tokens, temperature, timeout } = llm_chat_get_parameters();
+    const { recommended_temperature, provider_options } = llm_model_detail;
+    const temperature = recommended_temperature;
+    const { max_output_tokens, timeout } = llm_chat_get_parameters();
     const llm_inputs = {
         model: ai_sdk_language_model,
         system: system_prompt,
         prompt: user_prompt,
+        output: "object",
         schema,
-        maxTokens: max_tokens,
+        maxOutputTokens: max_output_tokens,
         temperature,
+        providerOptions: provider_options,
         abortSignal: AbortSignal.timeout(timeout * 1000),
     };
     debug_inspect_when(debug_channels.llm_inputs, llm_inputs, `LLM inputs object (for ${llm_model_name})`);
     // This is liable to throw an error
     const llm_outputs = await generateObject(llm_inputs);
     debug_inspect_when(debug_channels.llm_outputs, llm_outputs, `LLM outputs object (for ${llm_model_name})`);
-    return llm_outputs.object;
+    const { object: generated_object, usage: total_usage, providerMetadata: provider_metadata } = llm_outputs;
+    return { generated_object, total_usage, provider_metadata };
 }

package/dist/src/lib_llm_config.js

@@ -1,23 +1,20 @@
+import { env_get } from "./lib_env.js";
 import { llm_access_available, llm_access_get } from "./lib_llm_access.js";
-import { llm_api_get_via } from "./lib_llm_api.js";
 import { llm_model_find_detail, llm_model_get_choices } from "./lib_llm_model.js";
-import { tell_info } from "./lib_tell.js";
-export function llm_config_get({ llm_model_details, llm_model_name, llm_router, }) {
+import { parse_int_or_undefined } from "./lib_parse_number.js";
+export function llm_config_get({ llm_model_details, llm_model_name, }) {
     const llm_model_detail = llm_model_find_detail({ llm_model_details, llm_model_name });
-    const access = llm_access_get({ llm_model_details, llm_model_name, llm_router });
+    const access = llm_access_get({ llm_model_details, llm_model_name });
     const { llm_model_code, llm_api_code, llm_api_key } = access;
-    return { llm_model_name, llm_model_detail, llm_model_code, llm_api_code, llm_api_key };
+    let effective_context_window = llm_model_detail.context_window;
+    const env_context_window = parse_int_or_undefined(env_get("LLM_CONFIG_CONTEXT_WINDOW"));
+    if (env_context_window !== undefined) {
+        effective_context_window = Math.min(effective_context_window, env_context_window);
+    }
+    return { llm_model_name, llm_model_detail, llm_model_code, llm_api_code, llm_api_key, effective_context_window };
 }
-export function llm_config_get_all({ llm_model_details, llm_router, llm_include, llm_excludes, }) {
+export function llm_config_get_all({ llm_model_details, llm_include, llm_excludes, }) {
     const choices = llm_model_get_choices({ llm_model_details });
     const available = choices.filter((llm_model_name) => llm_access_available({ llm_model_details, llm_model_name, llm_include, llm_excludes }));
-    return available.map((llm_model_name) => llm_config_get({ llm_model_details, llm_model_name, llm_router }));
-}
-export function llm_config_get_model_via({ llm_config }) {
-    const { llm_model_name, llm_api_code } = llm_config;
-    return `${llm_model_name} (${llm_api_get_via(llm_api_code)})`;
-}
-export function llm_config_show({ llm_config }) {
-    const model_via = llm_config_get_model_via({ llm_config });
-    tell_info(`Using LLM ${model_via}`);
+    return available.map((llm_model_name) => llm_config_get({ llm_model_details, llm_model_name }));
 }

package/dist/src/lib_llm_list.js

@@ -1,18 +1,20 @@
 import { DOLLAR } from "./lib_char_punctuation.js";
 import { stdio_write_stdout_linefeed } from "./lib_stdio_write.js";
 import { tell_info, tell_warning } from "./lib_tell.js";
-import { tui_justify_right } from "./lib_tui_justify.js";
 import { TuiTable } from "./lib_tui_table.js";
 export function llm_list_models({ llm_model_details }) {
-    const headings = ["NAME", "CONTEXT", "INPUT", "OUTPUT"];
-    const table = new TuiTable({ headings });
+    const headings = ["NAME", "API", "CONTEXT", "INPUT", "OUTPUT", "REASONING"];
+    const alignments = ["left", "left", "right", "right", "right", "left"];
+    const table = new TuiTable({ headings, alignments, compact: true });
     for (const detail of llm_model_details) {
-        const { llm_model_name, context_window, cents_input, cents_output } = detail;
+        const { llm_model_name, llm_api_code, context_window, cents_input, cents_output, default_reasoning } = detail;
         const tui_name = llm_model_name;
-        const tui_context = tui_justify_right(7, context_window.toString());
-        const tui_input = tui_justify_right(6, DOLLAR + (cents_input / 100).toFixed(2));
-        const tui_output = tui_justify_right(6, DOLLAR + (cents_output / 100).toFixed(2));
-        const row = [tui_name, tui_context, tui_input, tui_output];
+        const tui_api = llm_api_code;
+        const tui_context = context_window.toString();
+        const tui_input = DOLLAR + (cents_input / 100).toFixed(2);
+        const tui_output = DOLLAR + (cents_output / 100).toFixed(2);
+        const tui_reasoning = default_reasoning ? "True" : "False";
+        const row = [tui_name, tui_api, tui_context, tui_input, tui_output, tui_reasoning];
         table.push(row);
     }
     stdio_write_stdout_linefeed(table.toString());