utilitas 2000.3.44 → 2000.3.46

package/lib/alan.mjs

@@ -54,7 +54,7 @@ const [
     OPENROUTER, AUTO, TOOL, S_OPENAI, S_GOOGLE, S_ANTHROPIC, ONLINE,
     GEMINI_30_PRO, GEMINI_25_FLASH, IMAGEN_4_ULTRA, VEO_31, IMAGEN_4_UPSCALE,
     ERROR_GENERATING, GEMINI_25_FLASH_TTS, GEMINI_25_PRO_TTS, wav,
-    GPT_4O_MIMI_TTS, GPT_4O_TRANSCRIBE, INVALID_AUDIO, OGG_EXT,
+    GPT_4O_MIMI_TTS, GPT_4O_TRANSCRIBE, INVALID_AUDIO, OGG_EXT, ELLIPSIS,
 ] = [
         'OpenAI', 'Google', 'Ollama', 'nova', 'deepseek-3.2-speciale', '```',
         'claude-opus-4.5', 'audio', 'wav', 'OPENAI_VOICE', 'medium', 'think',
@@ -74,7 +74,7 @@ const [
         'veo-3.1-generate-preview', 'imagen-4.0-upscale-preview',
         'Error generating content.', 'gemini-2.5-flash-preview-tts',
         'gemini-2.5-pro-tts', 'wav', 'gpt-4o-mini-tts', 'gpt-4o-transcribe',
-        'Invalid audio data.', 'ogg',
+        'Invalid audio data.', 'ogg', '...',
     ];
 
 const [tool, messages, text]
@@ -93,6 +93,7 @@ const countToolCalls = r => r?.split('\n').filter(x => x === TOOLS_STR).length;
 const assertApiKey = (p, o) => assert(o?.apiKey, `${p} api key is required.`);
 const getProviderIcon = provider => PROVIDER_ICONS[provider] || '🔮';
 const libOpenAi = async opts => await need('openai', { ...opts, raw: true });
+const buildTextWithEllipsis = (txt, trim) => `${txt}${(trim ? ELLIPSIS : '')}`;
 
 const GEMINI_RULES = {
     source: S_GOOGLE, icon: '♊️',
@@ -1046,10 +1047,7 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
     prompt = ensureString(prompt, { trim: true });
     assertPrompt(prompt);
     M.tts && (prompt = `${options?.prompt || TTS_PROMPT}: ${prompt}`);
-    assert(await countTokens(prompt, { fast: true })
-        <= M.maxInputTokens,
-        `Prompt must be less than ${M.maxInputTokens} tokens.`, 400
-    );
+    prompt = await trimText(prompt, M.maxInputTokens);
     if (M?.image) {
         var resp = await client.models.generateImages({
             model: M.name, prompt, config: mergeAtoB(options?.config, {
@@ -1167,11 +1165,9 @@ const promptOpenAI = async (aiId, prompt, options = {}) => {
     if (M?.audio) {
         assertPrompt(prompt);
         const ins_prompt = options?.prompt || `${TTS_PROMPT}.`;
-        assert(await countTokens(
-            JSON.stringify([ins_prompt, prompt]), { fast: true }
-        ) <= M.maxInputTokens,
-            `Prompt must be less than ${M.maxInputTokens} tokens.`, 400
-        );
+        prompt = await trimText(prompt, M.maxInputTokens - await countTokens(
+            ins_prompt, { fast: true }
+        ));
         // https://platform.openai.com/docs/api-reference/audio/createSpeech
         var resp = await client.audio.speech.create({
             model: M.name, voice: DEFAULT_MODELS[OPENAI_VOICE],
@@ -1398,6 +1394,21 @@ const analyzeSessions = async (sessionIds, options) => {
     return Array.isArray(sessionIds) ? resp : resp[sessionIds[0]];
 };
 
+const trimText = async (text, limit = Infinity) => {
+    text = ensureString(text, { trim: true });
+    let trimmed = false;
+    let lastCheck = null;
+    while ((lastCheck = await countTokens(
+        buildTextWithEllipsis(text, trimmed), { fast: true }
+    )) > limit) {
+        text = text.split(' ').slice(
+            0, -Math.ceil((Math.abs(lastCheck - limit) / 10))
+        ).join(' ').trimEnd();
+        trimmed = true;
+    }
+    return buildTextWithEllipsis(text, trimmed);
+};
+
 export default init;
 export {
     _NEED,
@@ -1428,14 +1439,15 @@ export {
     getChatPromptLimit,
     getSession,
     init,
-    tts,
-    stt,
     initChat,
     k,
     listOpenAIModels,
     prompt,
     promptOpenRouter,
     resetSession,
+    stt,
     talk,
     trimPrompt,
+    trimText,
+    tts,
 };

package/lib/embedding.mjs

@@ -1,11 +1,9 @@
 import { convert } from './storage.mjs';
-import { countTokens } from './alan.mjs';
 import { ensureArray, ensureString, need } from './utilitas.mjs';
+import { trimText } from './alan.mjs';
 
 const _NEED = ['openai'];
 const clients = {};
-const ELLIPSIS = '...';
-const buildTextWithEllipsis = (txt, trim) => `${txt}${(trim ? ELLIPSIS : '')}`;
 
 const [
     OPENAI,
@@ -82,21 +80,6 @@ const ensureApiKey = (options) => {
     return options.apiKey;
 };
 
-const trimTextToLimit = async (text, limit = Infinity) => {
-    text = ensureString(text, { trim: true });
-    let trimmed = false;
-    let lastCheck = null;
-    while ((lastCheck = await countTokens(
-        buildTextWithEllipsis(text, trimmed), { fast: true }
-    )) > limit) {
-        text = text.split(' ').slice(
-            0, -Math.ceil((Math.abs(lastCheck - limit) / 10))
-        ).join(' ').trimEnd();
-        trimmed = true;
-    }
-    return buildTextWithEllipsis(text, trimmed);
-};
-
 const getClient = (provider) => {
     provider = ensureString(provider, { case: 'UP' })
         || Object.keys(clients || {})[0];
@@ -129,9 +112,7 @@ const embed = async (input, options = {}) => {
             'Only one type of input is allowed at a time.', 400
         );
         if (x.text) {
-            x.text = await trimTextToLimit(
-                x.text, MODEL_CONFIG[model]?.maxTokens
-            );
+            x.text = await trimText(x.text, MODEL_CONFIG[model]?.maxTokens);
         } else if (x.image) {
             assert(
                 MODEL_CONFIG[model]?.image,
@@ -161,6 +142,9 @@ const embed = async (input, options = {}) => {
             body.model = `${source ? `${source}/` : ''}${body.model}`;
         case OPENAI:
             resp = await client.embeddings.create(body);
+            break;
+        default:
+            throw new Error(`Unsupported provider: ${provider}`);
     }
     assert(resp?.data?.length, 'No embeddings returned.', 500);
     if (options?.raw) { return resp; }

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "2000.3.44",
+    "version": "2000.3.46",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "2000.3.44",
+    "version": "2000.3.46",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",