utilitas 2000.3.45 → 2000.3.47

package/index.mjs

@@ -12,7 +12,7 @@ import * as cache from './lib/cache.mjs';
 import * as callosum from './lib/callosum.mjs';
 import * as dbio from './lib/dbio.mjs';
 import * as email from './lib/email.mjs';
-import * as embedding from './lib/embedding.mjs';
+import * as rag from './lib/rag.mjs';
 import * as encryption from './lib/encryption.mjs';
 import * as event from './lib/event.mjs';
 import * as media from './lib/media.mjs';
@@ -38,9 +38,9 @@ export {
     // dependencies
     fileType, math, uuid,
     // features
-    alan, bee, bot, boxes, cache, callosum, color, dbio, email, embedding,
-    encryption, event, manifest, media, memory, network, sentinel, shell, sms,
-    speech, ssl, storage, tape, uoid, utilitas, vision, web
+    alan, bee, bot, boxes, cache, callosum, color, dbio, email, rag, encryption,
+    event, manifest, media, memory, network, sentinel, shell, sms, speech, ssl,
+    storage, tape, uoid, utilitas, vision, web
 };
 
 if (utilitas.inBrowser() && !globalThis.utilitas) {

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "2000.3.45",
+    "version": "2000.3.47",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -26,6 +26,7 @@ const manifest = {
     "devDependencies": {
         "@ffmpeg-installer/ffmpeg": "^1.1.0",
         "@ffprobe-installer/ffprobe": "^2.1.2",
+        "@google-cloud/discoveryengine": "^2.5.2",
         "@google-cloud/storage": "^7.18.0",
         "@google/genai": "^1.31.0",
         "@mozilla/readability": "github:mozilla/readability",

package/lib/rag.mjs

@@ -0,0 +1,248 @@
+import { convert } from './storage.mjs';
+import { ensureArray, ensureString, need } from './utilitas.mjs';
+import { trimText } from './alan.mjs';
+
+const _NEED = ['openai', '@google-cloud/discoveryengine'];
+const embeddingClients = {};
+const rerankerClients = {};
+
+const [
+    OPENAI, GOOGLE, OPENROUTER, JINA,
+    GOOGLE_DEFAULT_LOCATION, GOOGLE_RERANK_CONFIG_ID,
+    OPENAI_MODEL_EMBED_SMALL,
+    OPENAI_MODEL_EMBED_LARGE,
+    GOOGLE_MODEL_GEMINI_EMBED,
+    JINA_MODEL_CLIP_2,
+    JINA_MODEL_V_3,
+    GOOGLE_MODEL_SEMANTIC_RANKER,
+] = [
+        'OPENAI', 'GOOGLE', 'OPENROUTER', 'JINA',
+        'global', 'default_ranking_config',
+        'text-embedding-3-small', // dim: 1536
+        'text-embedding-3-large', // dim: 3072
+        'gemini-embedding-001', // dim: 768(default), 1536, or 3072(google default)
+        'jina-clip-v2', // dim: 1024
+        'jina-embeddings-v3', // dim: 256‑1024
+        'semantic-ranker-default@latest',
+    ];
+
+const PROVIDER_BASE_URL = {
+    [OPENROUTER]: 'https://openrouter.ai/api/v1',
+    [JINA]: 'https://api.jina.ai/v1/',
+};
+
+const DEFAULT_EMBEDDING_MODELS = {
+    [OPENAI]: OPENAI_MODEL_EMBED_SMALL,
+    [OPENROUTER]: GOOGLE_MODEL_GEMINI_EMBED,
+    [JINA]: JINA_MODEL_CLIP_2,
+};
+
+const DEFAULT_RERANKER_MODELS = {
+    [GOOGLE]: GOOGLE_MODEL_SEMANTIC_RANKER,
+};
+
+const MODEL_CONFIG = {
+    [OPENAI_MODEL_EMBED_SMALL]: {
+        source: 'openai', image: false, maxTokens: 8192,
+    },
+    [OPENAI_MODEL_EMBED_LARGE]: {
+        source: 'openai', image: false, maxTokens: 8192,
+    },
+    [GOOGLE_MODEL_GEMINI_EMBED]: {
+        source: 'google', image: false, maxTokens: 2048,
+        options: { dimensions: 768 },
+    },
+    [JINA_MODEL_CLIP_2]: {
+        source: 'jina', image: true, maxTokens: 8192, options: {
+            task: 'retrieval.query', dimensions: 1024,
+            normalized: true, embedding_type: 'float',
+        },
+    },
+    // Token calculation may be incorrect because its limitation applies to the
+    // entire request rather than individual entries.
+    [JINA_MODEL_V_3]: {
+        source: 'jina', image: false, maxTokens: 8192, options: {
+            task: 'retrieval.query', dimensions: 1024, normalized: true,
+            late_chunking: true, embedding_type: 'float',
+        },
+    },
+    [GOOGLE_MODEL_SEMANTIC_RANKER]: {
+        source: 'google', image: false, maxTokens: 8192,
+        options: {
+            // task: 'retrieval.query',
+            // dimensions: 1024,
+            // normalized: true,
+            // late_chunking: true,
+            // embedding_type: 'float',
+        },
+    },
+};
+
+const ensureEmbeddingProvider = (options) => {
+    options.provider = ensureString(options?.provider, { case: 'UP' });
+    assert(
+        DEFAULT_EMBEDDING_MODELS?.[options.provider],
+        'Embedding provider is required.', 400
+    );
+    return options.provider;
+};
+
+const ensureRerankerProvider = (options) => {
+    options.provider = ensureString(options?.provider, { case: 'UP' });
+    assert(
+        DEFAULT_RERANKER_MODELS?.[options.provider],
+        'Reranker provider is required.', 400
+    );
+    return options.provider;
+};
+
+const ensureApiKey = (options) => {
+    assert(options?.apiKey, 'API key is required.', 400);
+    return options.apiKey;
+};
+
+const ensureGoogleCredentials = (options) => {
+    assert(options?.googleCredentials, 'Google credentials are required.', 400);
+    assert(options?.projectId, 'Google project ID is required.', 400);
+    return options;
+};
+
+const getEmbeddingClient = (provider) => {
+    provider = ensureString(provider, { case: 'UP' })
+        || Object.keys(embeddingClients || {})[0];
+    assert(provider, 'No embedding provider has been initialized.', 500);
+    return { ...embeddingClients?.[provider], provider };
+};
+
+const getRerankerClient = (provider) => {
+    provider = ensureString(provider, { case: 'UP' })
+        || Object.keys(rerankerClients || {})[0];
+    assert(provider, 'No reranker provider has been initialized.', 500);
+    return { ...rerankerClients?.[provider], provider };
+};
+
+const initEmbedding = async (options = {}) => {
+    ensureApiKey(options);
+    const provider = ensureEmbeddingProvider(options);
+    const OpenAI = await need('openai');
+    const baseURL = options?.baseURL || PROVIDER_BASE_URL[provider];
+    const model = options?.model || DEFAULT_EMBEDDING_MODELS[provider];
+    embeddingClients[provider] = {
+        client: new OpenAI({ ...options, baseURL }),
+        model, source: MODEL_CONFIG[model]?.source,
+    };
+    return getEmbeddingClient(provider);
+};
+
+const embed = async (input, options = {}) => {
+    let [{ client, model: selectedModel, provider, source }, resp]
+        = [getEmbeddingClient(options?.provider), null];
+    const model = options?.model || selectedModel;
+    const multiple = Array.isArray(input);
+    input = await Promise.all(ensureArray(input).map(async x => {
+        x = Object.isObject(x) ? x : { text: x };
+        assert(
+            Object.keys(x).length == 1,
+            'Only one type of input is allowed at a time.', 400
+        );
+        if (x.text) {
+            x.text = await trimText(x.text, MODEL_CONFIG[model]?.maxTokens);
+        } else if (x.image) {
+            assert(
+                MODEL_CONFIG[model]?.image,
+                `Model ${model} does not support image embeddings.`, 400
+            );
+            if (options?.input) {
+                x.image = await convert(
+                    x.image, { ...options, expected: 'base64' }
+                );
+            }
+        }
+        return x;
+    }));
+    MODEL_CONFIG[model]?.image || (input = input.map(x => x.text));
+    assert(input.length, 'Input is required.', 400);
+    const body = {
+        model, input, ...MODEL_CONFIG[model]?.options || {},
+        ...options?.requestOptions || {},
+    };
+    switch (provider) {
+        case JINA:
+            resp = await client.post('/embeddings', { body });
+            break;
+        case OPENROUTER:
+            source = options?.source || source
+                || MODEL_CONFIG[body.model]?.source;
+            body.model = `${source ? `${source}/` : ''}${body.model}`;
+        case OPENAI:
+            resp = await client.embeddings.create(body);
+            break;
+        default:
+            throw new Error(`Unsupported embedding provider: ${provider}`);
+    }
+    assert(resp?.data?.length, 'No embeddings returned.', 500);
+    if (options?.raw) { return resp; }
+    const vectors = resp.data.map(x => x.embedding);
+    return multiple ? vectors : vectors[0];
+};
+
+const initReranker = async (options = {}) => {
+    const provider = ensureRerankerProvider(options);
+    switch (provider) {
+        case GOOGLE:
+            ensureGoogleCredentials(options);
+            const { RankServiceClient } = await need(
+                '@google-cloud/discoveryengine', { raw: true }
+            );
+            const location = options?.location || GOOGLE_DEFAULT_LOCATION;
+            const clientOptions = {
+                ...location ? { apiEndpoint: `${location}-discoveryengine.googleapis.com` } : {},
+                ...options?.apiEndpoint ? { apiEndpoint: options.apiEndpoint } : {},
+                keyFilename: options.googleCredentials,
+            };
+            const client = new RankServiceClient(clientOptions);
+            rerankerClients[provider] = {
+                model: options?.model || DEFAULT_RERANKER_MODELS[provider],
+                client, rankingConfigPath: client.rankingConfigPath(
+                    options.projectId, location,
+                    options?.rerankerConfigId || GOOGLE_RERANK_CONFIG_ID
+                ),
+            };
+            break;
+        default:
+            throw new Error(`Unsupported reranker provider: ${provider}`);
+    }
+    return getRerankerClient(provider);
+};
+
+const rerank = async (query, documents, options = {}) => {
+    assert(query, 'Query is required.', 400);
+    assert(documents?.length, 'Documents are required.', 400);
+    const records = documents.map((doc, idx) => ({
+        id: String(idx), content: doc,
+    }));
+    const { provider, model, client, rankingConfigPath }
+        = getRerankerClient(options?.provider);
+    let result;
+    switch (provider) {
+        case GOOGLE:
+            const request = {
+                model, query, rankingConfig: rankingConfigPath,
+                records, topN: ~~options?.topN || documents.length,
+            };
+            result = (await client.rank(request))?.[0]?.records;
+            break;
+        default:
+            throw new Error(`Unsupported reranker provider: ${provider}`);
+    }
+    // print(result);
+    return result || [];
+};
+
+export {
+    _NEED,
+    embed,
+    initEmbedding,
+    initReranker,
+    rerank,
+};

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "2000.3.45",
+    "version": "2000.3.47",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -37,6 +37,7 @@
     "devDependencies": {
         "@ffmpeg-installer/ffmpeg": "^1.1.0",
         "@ffprobe-installer/ffprobe": "^2.1.2",
+        "@google-cloud/discoveryengine": "^2.5.2",
         "@google-cloud/storage": "^7.18.0",
         "@google/genai": "^1.31.0",
         "@mozilla/readability": "github:mozilla/readability",

package/lib/embedding.mjs

@@ -1,157 +0,0 @@
-import { convert } from './storage.mjs';
-import { ensureArray, ensureString, need } from './utilitas.mjs';
-import { trimText } from './alan.mjs';
-
-const _NEED = ['openai'];
-const clients = {};
-
-const [
-    OPENAI,
-    OPENROUTER,
-    JINA,
-    OPENAI_MODEL_EMBED_SMALL,
-    OPENAI_MODEL_EMBED_LARGE,
-    GOOGLE_MODEL_GEMINI_EMBED,
-    JINA_MODEL_CLIP_2,
-    JINA_MODEL_V_3,
-] = [
-        'OPENAI',
-        'OPENROUTER',
-        'JINA',
-        'text-embedding-3-small', // dim: 1536
-        'text-embedding-3-large', // dim: 3072
-        'gemini-embedding-001', // dim: 768(default), 1536, or 3072(google default)
-        'jina-clip-v2', // dim: 1024
-        'jina-embeddings-v3', // dim: 256‑1024
-    ];
-
-const PROVIDER_BASE_URL = {
-    [OPENROUTER]: 'https://openrouter.ai/api/v1',
-    [JINA]: 'https://api.jina.ai/v1/',
-};
-
-const DEFAULT_MODELS = {
-    [OPENAI]: OPENAI_MODEL_EMBED_SMALL,
-    [OPENROUTER]: GOOGLE_MODEL_GEMINI_EMBED,
-    [JINA]: JINA_MODEL_CLIP_2,
-};
-
-const MODEL_CONFIG = {
-    [OPENAI_MODEL_EMBED_SMALL]: { source: 'openai', maxTokens: 8192 },
-    [OPENAI_MODEL_EMBED_LARGE]: { source: 'openai', maxTokens: 8192 },
-    [GOOGLE_MODEL_GEMINI_EMBED]: {
-        source: 'google', maxTokens: 2048, options: { dimensions: 768 },
-    },
-    [JINA_MODEL_CLIP_2]: {
-        maxTokens: 8192,
-        image: true,
-        options: {
-            task: 'retrieval.query',
-            dimensions: 1024,
-            normalized: true,
-            embedding_type: 'float',
-        },
-    },
-    // Token calculation may be incorrect because its limitation applies to the
-    // entire request rather than individual entries.
-    [JINA_MODEL_V_3]: {
-        maxTokens: 8192,
-        image: false,
-        options: {
-            task: 'retrieval.query',
-            dimensions: 1024,
-            normalized: true,
-            late_chunking: true,
-            embedding_type: 'float',
-        },
-    },
-};
-
-const ensureProvider = (options) => {
-    options.provider = ensureString(options?.provider, { case: 'UP' });
-    assert(
-        DEFAULT_MODELS?.[options.provider], 'Provider is required.', 400
-    );
-    return options.provider;
-};
-
-const ensureApiKey = (options) => {
-    assert(options?.apiKey, 'API key is required.', 400);
-    return options.apiKey;
-};
-
-const getClient = (provider) => {
-    provider = ensureString(provider, { case: 'UP' })
-        || Object.keys(clients || {})[0];
-    assert(provider, 'No embedding provider has been initialized.', 500);
-    return { ...clients?.[provider], provider };
-};
-
-const init = async (options = {}) => {
-    ensureApiKey(options);
-    const provider = ensureProvider(options);
-    const OpenAI = await need('openai');
-    const baseURL = options?.baseURL || PROVIDER_BASE_URL[provider];
-    const model = options?.model || DEFAULT_MODELS[provider];
-    clients[provider] = {
-        client: new OpenAI({ ...options, baseURL }),
-        model, source: MODEL_CONFIG[model]?.source,
-    };
-    return getClient(provider);
-};
-
-const embed = async (input, options = {}) => {
-    let [{ client, model: selectedModel, provider, source }, resp]
-        = [getClient(options?.provider), null];
-    const model = options?.model || selectedModel;
-    const multiple = Array.isArray(input);
-    input = await Promise.all(ensureArray(input).map(async x => {
-        x = Object.isObject(x) ? x : { text: x };
-        assert(
-            Object.keys(x).length == 1,
-            'Only one type of input is allowed at a time.', 400
-        );
-        if (x.text) {
-            x.text = await trimText(x.text, MODEL_CONFIG[model]?.maxTokens);
-        } else if (x.image) {
-            assert(
-                MODEL_CONFIG[model]?.image,
-                `Model ${model} does not support image embeddings.`, 400
-            );
-            if (options?.input) {
-                x.image = await convert(
-                    x.image, { ...options, expected: 'base64' }
-                );
-            }
-        }
-        return x;
-    }));
-    MODEL_CONFIG[model]?.image || (input = input.map(x => x.text));
-    assert(input.length, 'Input is required.', 400);
-    const body = {
-        model, input, ...MODEL_CONFIG[model]?.options || {},
-        ...options?.requestOptions || {},
-    };
-    switch (provider) {
-        case JINA:
-            resp = await client.post('/embeddings', { body });
-            break;
-        case OPENROUTER:
-            source = options?.source || source
-                || MODEL_CONFIG[body.model]?.source;
-            body.model = `${source ? `${source}/` : ''}${body.model}`;
-        case OPENAI:
-            resp = await client.embeddings.create(body);
-    }
-    assert(resp?.data?.length, 'No embeddings returned.', 500);
-    if (options?.raw) { return resp; }
-    const vectors = resp.data.map(x => x.embedding);
-    return multiple ? vectors : vectors[0];
-};
-
-export default init;
-export {
-    _NEED,
-    embed,
-    init,
-};