utilitas 1999.1.31 → 1999.1.33

package/lib/alan.mjs

@@ -747,12 +747,20 @@ const packResp = async (resp, options) => {
         ).join('\n');
     }
     txt = txt.split('\n');
-    const reJina = new RegExp(`^\s*${THINK_STR}(.*)${THINK_END}\s*$`);
+    const [reJinaStr, reJinaEnd]
+        = [`^\s*(${THINK_STR})`, `(${THINK_END})\s*$`].map(x => new RegExp(x));
     const fixJina = [];
     for (let l of txt) {
-        if (reJina.test(l)) {
-            fixJina.push(THINK_STR, l.replace(reJina, '$1'), THINK_END);
-        } else { fixJina.push(l); }
+        let catched = false;
+        if (reJinaStr.test(l)) {
+            fixJina.push(THINK_STR);
+            l = l.replace(reJinaStr, '');
+        }
+        if (reJinaEnd.test(l)) {
+            l = l.replace(reJinaEnd, '');
+            catched = true;
+        }
+        fixJina.push(l, ...catched ? [THINK_END, ''] : []);
     }
     txt = fixJina;
     for (let i in txt) {

package/lib/manifest.mjs

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

package/lib/speech.mjs

@@ -26,11 +26,10 @@ const WHISPER_DEFAULT_MODEL = 'base';
 const errorMessage = 'Invalid audio data.';
 const [BUFFER, STREAM, BASE64, FILE, clients, languageCode, audioEncoding, suffix, SPEAKER, cleanup]
     = ['BUFFER', 'STREAM', 'BASE64', 'FILE', {}, 'en-US', 'OGG_OPUS', 'ogg', 'SPEAKER', true];
-
-// https://platform.openai.com/account/limits
-const [TTS_1, TTS_1_HD] = ['tts-1', 'tts-1-hd']; // [7500 RPM, 7500 RPM]
-const OPENAI_TTS_MAX_LENGTH = 4096;
-const defaultOpenAITtsModel = TTS_1;
+const [GPT_4O_MIMI_TTS, GPT_4O_TRANSCRIBE, OPENAI_TTS_MAX_LENGTH]
+    = ['gpt-4o-mini-tts', 'gpt-4o-transcribe', 4096];
+const [defaultOpenAITtsModel, defaultOpenAISttModel]
+    = [GPT_4O_MIMI_TTS, GPT_4O_TRANSCRIBE];
 
 const WHISPER_MODELS = [
     // npx whisper-node download tiny.en
@@ -147,12 +146,13 @@ const checkWhisper = async (options) => {
 };
 
 const ttsOpenAI = async (input, options) => {
-    assert(clients.tts, 'Text-to-Speech API has not been initialized.', 500);
+    assert(clients.tts, 'OpenAI TTS API has not been initialized.', 500);
     assert(input, 'Text is required.', 400);
     assert(input.length <= OPENAI_TTS_MAX_LENGTH, 'Text is too long.', 400);
     // https://platform.openai.com/docs/api-reference/audio/createSpeech
     const content = await clients.tts.create({
         model: defaultOpenAITtsModel, voice: DEFAULT_MODELS[OPENAI_VOICE],
+        instructions: 'Speak in a friendly and sweet tone.',
         response_format: 'opus', input, ...options?.params || {},
     });
     const buffer = Buffer.from(await content.arrayBuffer());
@@ -160,7 +160,7 @@ const ttsOpenAI = async (input, options) => {
 };
 
 const ttsGoogle = async (text, options) => {
-    assert(clients.tts, 'Text-to-Speech API has not been initialized.', 500);
+    assert(clients.tts, 'Google TTS API has not been initialized.', 500);
     assert(text, 'Text is required.', 400);
     const [response] = await clients.tts.synthesizeSpeech({
         input: { text, ...options?.input || {} },
@@ -197,7 +197,7 @@ const ttsBrowser = async (text) => {
 };
 
 const sttOpenAI = async (audio, options) => {
-    assert(clients.stt, 'Speech-to-Text API has not been initialized.', 500);
+    assert(clients.stt, 'OpenAI STT API has not been initialized.', 500);
     const input = ensureString(options?.input, { case: 'UP' });
     const { content, cleanup } = await convert(audio, {
         input: options?.input, ...options || {}, expected: STREAM, errorMessage,
@@ -205,7 +205,7 @@ const sttOpenAI = async (audio, options) => {
         withCleanupFunc: true,
     });
     const result = await clients.stt.create({
-        file: await clients.toFile(content), model: 'whisper-1',
+        file: await clients.toFile(content), model: defaultOpenAISttModel,
         response_format: 'text', ...options?.params || {},
     });
     await cleanup();
@@ -213,7 +213,7 @@ const sttOpenAI = async (audio, options) => {
 };
 
 const sttGoogle = async (audio, options) => {
-    assert(clients.stt, 'Speech-to-Text API has not been initialized.', 500);
+    assert(clients.stt, 'Google STT API has not been initialized.', 500);
     const content = await convert(audio, {
         input: options?.input, expected: BASE64, errorMessage,
     });

package/lib/web.mjs

@@ -222,7 +222,7 @@ const search = async (query, options = {}) => {
                     headers: {
                         'Authorization': `Bearer ${key}`,
                         'Accept': options?.aiFriendly ? MIME_TEXT : MIME_JSON,
-                        'X-Respond-With': 'no-content',
+                        ...options?.fetch ? {} : { 'X-Respond-With': 'no-content' },
                         ...options?.aiFriendly ? {} : { 'X-With-Favicons': true },
                     }
                 }, ...options || {},
@@ -329,8 +329,14 @@ const distill = async (url, options = {}) => {
     const key = options.apiKey || jinaApiKey;
     if (key) {
         const resp = await get(`https://r.jina.ai/${encodeURIComponent(url)}`, {
-            fetch: { headers: { 'Authorization': `Bearer ${key}` } },
-            ...options || {},
+            fetch: {
+                headers: {
+                    'Authorization': `Bearer ${key}`,
+                    // 'X-Engine': 'cf-browser-rendering',
+                    // 'X-Respond-With': 'readerlm-v2',
+                    'X-Base': 'final',
+                }
+            }, ...options || {},
         });
         return { content: null, summary: resp?.content };
     }

package/package.json

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