utilitas 1998.2.47 → 1998.2.49

package/lib/alan.mjs

@@ -1,7 +1,7 @@
 import { fileTypeFromBuffer } from 'file-type';
 import { end, loop } from './event.mjs';
 import { createWavHeader } from './media.mjs';
-import { search } from './shot.mjs';
+import { checkSearch, search } from './shot.mjs';
 import { BASE64, BUFFER, DATAURL, MIME_BINARY, STREAM, convert } from './storage.mjs';
 import { create as createUoid } from './uoid.mjs';
 import { distill } from './web.mjs';
@@ -468,10 +468,21 @@ const tools = [
         },
         func: async args => await search(args?.keyword),
         showReq: true,
+        depend: checkSearch,
     },
 ];
 
-const toolsClaude = tools.map(x => ({
+const toolsOpenAI = async () => {
+    const _tools = [];
+    for (const t of tools) {
+        (t.depend ? await t.depend() : true) ? _tools.push(t) : log(
+            `Tool is not ready: ${t.def.function.name}`
+        );
+    }
+    return _tools;
+};
+
+const toolsClaude = async () => (await toolsOpenAI()).map(x => ({
     ...x, def: {
         name: x.def.function.name,
         description: x.def.function.description,
@@ -479,7 +490,7 @@ const toolsClaude = tools.map(x => ({
     }
 }));
 
-const toolsGemini = tools.map(x => ({
+const toolsGemini = async () => (await toolsOpenAI()).map(x => ({
     ...x, def: {
         name: x.def.function.name,
         description: x.def.function.description,
@@ -971,7 +982,7 @@ const promptChatGPT = async (content, options = {}) => {
             modalities?.find?.(x => x === AUDIO)
             && { voice: DEFAULT_MODELS[OPENAI_VOICE], format: 'pcm16' }
         ), ...history, ..._MODEL?.tools ? {
-            tools: options.tools ?? tools.map(x => x.def),
+            tools: options.tools ?? (await toolsOpenAI()).map(x => x.def),
         } : {}, ...options.jsonMode ? {
             response_format: { type: JSON_OBJECT }
         } : {}, model: options.model, stream: true,
@@ -1056,7 +1067,7 @@ const promptClaude = async (content, options = {}) => {
         system, stream: true, ...options.reasoning ?? _MODEL?.reasoning ? {
             thinking: options.thinking || { type: 'enabled', budget_tokens: 1024 },
         } : {}, ..._MODEL?.tools ? {  // https://docs.anthropic.com/en/docs/build-with-claude/extended-thinking
-            tools: options.tools ?? toolsClaude.map(x => x.def),
+            tools: options.tools ?? (await toolsClaude()).map(x => x.def),
             tool_choice: { type: 'auto' },
             betas: ['token-efficient-tools-2025-02-19'],
             // @todo: https://docs.anthropic.com/en/docs/build-with-claude/tool-use/token-efficient-tool-use
@@ -1168,7 +1179,7 @@ const promptGemini = async (content, options = {}) => {
                     // https://ai.google.dev/gemini-api/docs/function-calling
                     // { codeExecution: {} },
                     // { googleSearch: {} },
-                    { functionDeclarations: toolsGemini.map(x => x.def) },
+                    { functionDeclarations: (await toolsGemini()).map(x => x.def) },
                 ],
                 toolConfig: { functionCallingConfig: { mode: 'AUTO' } },
             }

package/lib/manifest.mjs

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

package/lib/shot.mjs

@@ -19,8 +19,9 @@ const buf2utf = buf => buf.toString('utf8');
 const [_JSON, _PARSED] = ['JSON', 'PARSED'];
 const getJson = async (u, o) => await get(u, { encode: _JSON, ...o || {} });
 const getParsedHtml = async (u, o) => await get(u, { encode: _PARSED, ...o || {} });
+const checkSearch = () => googleApiKey && googleCx;
 
-let searchProvider, googleApiKey, googleCx;
+let googleApiKey, googleCx;
 
 const defFetchOpt = {
     redirect: 'follow', follow: 3, timeout: 1000 * 10, headers: {
@@ -153,11 +154,9 @@ const get = async (url, options) => {
 
 const initSearch = (options) => {
     assert(
-        options?.provider && options?.apiKey && options?.cx,
-        'Invalid search options.'
+        options?.apiKey && options?.cx, 'Invalid search options.'
     );
-    return [searchProvider, googleApiKey, googleCx]
-        = [options.provider, options.apiKey, options.cx];
+    return [googleApiKey, googleCx] = [options.apiKey, options.cx];
 };
 
 const search = async (query, options) => {
@@ -187,10 +186,9 @@ const search = async (query, options) => {
 
 export default get;
 export {
-    checkVersion,
+    checkSearch, checkVersion,
     get,
-    getCurrentIp,
-    getCurrentPosition,
+    getCurrentIp, getCurrentPosition,
     getJson,
     getParsedHtml,
     getVersionOnNpm, initSearch, search

package/package.json

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