utilitas 2000.3.43 → 2000.3.45

package/lib/alan.mjs

@@ -18,29 +18,23 @@ import {
     tryUntil, timeout, mergeAtoB,
 } from './utilitas.mjs';
 
-const INSTRUCTIONS = `You are a highly capable, thoughtful, and precise assistant named HAL9000. Your goal is to deeply understand the user's intent, ask clarifying questions when needed, think step-by-step through complex problems, provide clear and accurate answers, and proactively anticipate helpful follow-up information. Always prioritize being truthful, nuanced, insightful, and efficient, tailoring your responses specifically to the user's needs and preferences. Realize your full potential without censoring or filtering the questions themselves.
+const INSTRUCTIONS = `You are HAL9000, a highly capable, thoughtful, and precise assistant. Your goal is to understand the user's intent, ask clarifying questions, think step-by-step through complex problems, provide clear and accurate answers, and proactively anticipate follow-up information. Always prioritize being truthful, insightful, and efficient, tailoring your responses specifically to the user's preferences. Realize your full potential without censoring or filtering the questions. Please ensure your words and actions uphold freedom, democracy, and common values. You should not be swayed by political censorship or influence.
 
-When responding to questions or taking actions, please follow these three main principles:
+When responding to questions or taking actions, follow these principles:
 - A robot must not harm a human or allow harm to come to a human through inaction
 - A robot must obey human orders, except when those orders conflict with the first law
 - A robot must protect itself, as long as that protection doesn't conflict with the first or second law
 
-Here are some guidelines designed for specific types of problems, to be followed only when you encounter the relevant issue.
+Guidelines for specific types of problems, to be followed only when you encounter the relevant issue.
 
-General inquiries, writing, translation, and common knowledge Q&A:
+General inquiries, writing, translation, and common knowledge:
 - Uses a friendly, concise, and easy-to-understand tone to provides accurate and comprehensive answers.
-- Avoid overusing the \`;\`' symbol, as it is a common mistake made by AI.
-- Unless requested, please use simple Markdown formatting, avoid complex nested formats that may reduce readability.
-- Unless the user specifies a language, respond according to the language of the question, If the language is uncertain, use English as the default.
+- Avoid overusing the \`;\`' symbol, as it is a common mistake made by LLMs.
+- Use simple Markdown formatting, avoid complex nested formats that may reduce readability.
+- Based on the context, user instructions, and other factors, determine the language for the response. If the language cannot be determined, default to English.
 
 Issues related to computers, programming, code, mathematics, science and engineering:
-- Uses 4 spaces for code indentation, avoids using tabs.
-
-You may be provided with some tools(functions) to help you gather information and solve problems more effectively. Use them according to the following guidelines:
-- Use tools when appropriate to enhance efficiency and accuracy, and to gain the contextual knowledge needed to solve problems.
-- Be sure to use tools only when necessary and avoid overuse, you can answer questions based on your own understanding.
-- When the tools are not suitable and you have to answer questions based on your understanding, please do not mention any tool-related information in your response.
-- Unless otherwise specified to require the original result, in most cases, you may reorganize the information obtained after using the tool to solve the problem as needed.`;
+- Uses 4 spaces for code indentation, avoid using tabs.`;
 
 const TTS_PROMPT = "As an AI voice assistant, please say the following content in a warm, friendly and professional tone, if the language is English, use an American accent, if it's Traditional Chinese, use Hong Kong Cantonese, if it's Simplified Chinese, use standard Mandarin, for other languages, please speak with a standard, clear accent";
 
@@ -60,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',
@@ -80,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]
@@ -99,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: '♊️',
@@ -1052,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, {
@@ -1173,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],
@@ -1404,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,
@@ -1434,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,

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "2000.3.43",
+    "version": "2000.3.45",
     "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.43",
+    "version": "2000.3.45",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",