utilitas 1998.2.60 → 1998.2.61

package/lib/alan.mjs

@@ -42,7 +42,7 @@ You may be provided with some tools(functions) to help you gather information an
 
 const _NEED = [
     '@anthropic-ai/sdk', '@anthropic-ai/vertex-sdk', '@google/generative-ai',
-    'js-tiktoken', 'ollama', 'OpenAI',
+    'js-tiktoken', 'OpenAI',
 ];
 
 const [
@@ -565,10 +565,13 @@ const init = async (options = {}) => {
             };
             break;
         case OLLAMA:
+            // https://github.com/ollama/ollama/blob/main/docs/openai.md
             ais[id] = {
-                id, provider, model,
-                client: new (await need('ollama', { raw: true })).Ollama(options),
-                prompt: async (cnt, opts) => await promptOllama(id, cnt, opts),
+                id, provider, model, client: await OpenAI({
+                    baseURL: 'http://localhost:11434/v1/', apiKey: 'ollama',
+                    ...options
+                }),
+                prompt: async (cnt, opts) => await promptOpenAI(id, cnt, opts),
             };
             break;
         default:
@@ -638,14 +641,6 @@ const buildGptMessage = (content, options) => {
     return message;
 };
 
-const buildOllamaMessage = (content, options) => {
-    const message = String.isString(content) ? {
-        role: options?.role || user, content,
-    } : content;
-    assertContent(message.content);
-    return message;
-};
-
 const buildGeminiParts = (text, attachments) => {
     // Gemini API does not allow empty text, even you prompt with attachments.
     const message = [...text?.length || attachments?.length ? [{
@@ -695,8 +690,8 @@ const buildGeminiHistory = (text, options) => buildGeminiMessage(
     text, { ...options || {}, history: true }
 );
 
-const [getOpenAIClient, getGeminiClient, getOllamaClient, getClaudeClient]
-    = [OPENAI, GEMINI, OLLAMA, CLAUDE].map(
+const [getOpenAIClient, getGeminiClient, getClaudeClient]
+    = [OPENAI, GEMINI, CLAUDE].map(
         x => async options => await init({ ...provider(x), ...options })
     );
 
@@ -742,8 +737,7 @@ const packResp = async (resp, options) => {
     ])) && (audio = await convert(audio, {
         input: BUFFER, expected: BUFFER, ...options || {},
     }));
-    options?.jsonMode && !options?.delta && !options?.processing
-        && (json = parseJson(simpleText));
+    options?.jsonMode && !options?.delta && (json = parseJson(simpleText, null));
     if (options?.simple && options?.audioMode) { return audio; }
     else if (options?.simple && options?.jsonMode) { return json; }
     else if (options?.simple) { return simpleText; }
@@ -829,10 +823,6 @@ const buildPrompts = async (model, input, options = {}) => {
             systemPrompt = options.systemPrompt;
             prompt = buildClaudeMessage(content, { ...options, cache_control: true });
             break;
-        case OLLAMA:
-            systemPrompt = buildOllamaMessage(options.systemPrompt, _system);
-            prompt = buildOllamaMessage(content, options);
-            break;
         case GEMINI:
             const _role = { role: options.model === GEMMA_3_27B ? user : system };
             systemPrompt = buildGeminiHistory(options.systemPrompt, _role);
@@ -852,10 +842,6 @@ const buildPrompts = async (model, input, options = {}) => {
                     history.push(buildClaudeMessage(x.request, _user));
                     history.push(buildClaudeMessage(x.response, _assistant));
                     break;
-                case OLLAMA:
-                    history.push(buildOllamaMessage(x.request, _user));
-                    history.push(buildOllamaMessage(x.response, _assistant));
-                    break;
                 case GEMINI:
                     if (options.attachments?.length) { return; }
                     history.push(buildGeminiHistory(x.request, _user));
@@ -864,9 +850,14 @@ const buildPrompts = async (model, input, options = {}) => {
             }
         });
         switch (options.flavor) {
-            case CHATGPT: case CLAUDE: case OLLAMA:
+            case CHATGPT:
+                history = messages([
+                    systemPrompt, ...history, prompt,
+                    ...options.toolsResult?.length ? options.toolsResult : []
+                ]);
+                break;
+            case CLAUDE:
                 history = messages([
-                    ...options.flavor === CLAUDE ? [] : [systemPrompt],
                     ...history, prompt,
                     ...options.toolsResult?.length ? options.toolsResult : []
                 ]);
@@ -891,8 +882,7 @@ const buildPrompts = async (model, input, options = {}) => {
             content = trimTailing(trimTailing(content).slice(0, -1)) + '...';
         }
     }, model.maxInputTokens - options.attachments?.length * ATTACHMENT_TOKEN_COST);
-    if ([CHATGPT, OLLAMA].includes(options.flavor)
-        || options.model === GEMMA_3_27B) {
+    if ([CHATGPT].includes(options.flavor) || options.model === GEMMA_3_27B) {
         systemPrompt = null;
     }
     return { systemPrompt, history, prompt };
@@ -1063,27 +1053,6 @@ const promptOpenAI = async (aiId, content, options = {}) => {
     return await packResp(event, options);
 };
 
-const promptOllama = async (aiId, content, options = {}) => {
-    const { client, model } = await getAi(aiId);
-    // https://github.com/ollama/ollama-js
-    // https://github.com/jmorganca/ollama/blob/main/examples/typescript-simplechat/client.ts
-    options.model = options?.model || model.name;
-    let [chunk, result] = [null, ''];
-    const { history }
-        = await buildPrompts(model, content, { ...options, flavor: OLLAMA });
-    const resp = await client.chat({
-        model: options.model, stream: true, ...history,
-    });
-    for await (chunk of resp) {
-        const delta = chunk.message.content || '';
-        result += delta;
-        delta && await streamResp({
-            text: options.delta ? delta : result,
-        }, options);
-    }
-    return await packResp({ text: result }, options);
-};
-
 const promptAnthropic = async (aiId, content, options = {}) => {
     const { client, model } = await getAi(aiId);
     let [
@@ -1458,7 +1427,7 @@ const talk = async (input, options) => {
         case CHATGPT: resp = await promptOpenAI(input, pmtOptions); break;
         case GEMINI: resp = await promptGemini(input, pmtOptions); break;
         case CLAUDE: resp = await promptAnthropic(input, pmtOptions); break;
-        case OLLAMA: resp = await promptOllama(input, pmtOptions); break;
+        // case OLLAMA: resp = await promptOllama(input, pmtOptions); break;
         case AZURE: resp = await promptAzure(input, pmtOptions); break;
         default: throwError(`Invalid AI engine: '${engine}'.`);
     }
@@ -1585,7 +1554,7 @@ const PREFERRED_ENGINES = [
     { client: GEMINI, func: promptGemini, multimodal: 1 },
     { client: CLAUDE, func: promptAnthropic, multimodal: 2 },
     // { client: AZURE, func: promptAzure, multimodal: 3 },
-    { client: OLLAMA, func: promptOllama, multimodal: 99 },
+    // { client: OLLAMA, func: promptOllama, multimodal: 99 },
 ]; // keep gpt first to avoid gemini grounding by default
 
 export default init;
@@ -1619,7 +1588,6 @@ export {
     prompt, promptOpenAI,
     promptAnthropic,
     promptGemini,
-    promptOllama,
     resetSession,
     tailGptFineTuningEvents,
     talk,

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.2.60",
+    "version": "1998.2.61",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -53,7 +53,6 @@ const manifest = {
         "node-mailjet": "^6.0.8",
         "node-polyfill-webpack-plugin": "^4.1.0",
         "office-text-extractor": "^3.0.3",
-        "ollama": "^0.5.14",
         "openai": "^4.87.3",
         "pdfjs-dist": "^4.10.38",
         "pg": "^8.14.0",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.2.60",
+    "version": "1998.2.61",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -64,7 +64,6 @@
         "node-mailjet": "^6.0.8",
         "node-polyfill-webpack-plugin": "^4.1.0",
         "office-text-extractor": "^3.0.3",
-        "ollama": "^0.5.14",
         "openai": "^4.87.3",
         "pdfjs-dist": "^4.10.38",
         "pg": "^8.14.0",