utilitas 1999.1.11 → 1999.1.12

package/lib/alan.mjs

@@ -70,7 +70,8 @@ const [
     name, user, system, assistant, MODEL, JSON_OBJECT, TOOL, silent,
     GEMINI_EMBEDDING_M, INVALID_FILE, tokenSafeRatio, GPT_QUERY_LIMIT,
     CONTENT_IS_REQUIRED, OPENAI_HI_RES_SIZE, k, kT, m, minute, hour,
-    gb, trimTailing, EBD, GEMINI_20_FLASH_EXP, IMAGE
+    gb, trimTailing, EBD, GEMINI_20_FLASH_EXP, IMAGE, JINA_DEEPSEARCH,
+    JINA_DEEPSEARCH_M, JINA_EMBEDDING, JINA_CLIP,
 ] = [
         'OpenAI', 'Gemini', 'OPENAI_EMBEDDING', 'GEMINI_EMEDDING',
         'OPENAI_TRAINING', 'Ollama', 'gpt-4o-mini', 'gpt-4o', 'o1', 'o3-mini',
@@ -88,7 +89,8 @@ const [
         'Content is required.', 2000 * 768, x => 1024 * x, x => 1000 * x,
         x => 1024 * 1024 * x, x => 60 * x, x => 60 * 60 * x,
         x => 1024 * 1024 * 1024 * x, x => x.replace(/[\.\s]*$/, ''),
-        { embedding: true }, 'gemini-2.0-flash-exp', 'image',
+        { embedding: true }, 'gemini-2.0-flash-exp', 'image', 'Jina Deepsearch',
+        'jina-deepsearch-v1', 'JINA_EMBEDDING', 'jina-clip-v2',
     ];
 
 const [tool, messages, text]
@@ -168,6 +170,12 @@ const MODELS = {
         supportedMimeTypes: [png, jpeg, gif],
         fast: true, json: true, vision: true,
     },
+    [JINA_DEEPSEARCH_M]: {
+        contextWindow: Infinity, maxInputTokens: Infinity,
+        maxOutputTokens: Infinity, imageCostTokens: 0, maxImageSize: Infinity,
+        supportedMimeTypes: [png, jpeg, mimeText, webp, pdf],
+        reasoning: true, json: true, vision: true,
+    },
     [DEEPSEEK_R1]: {
         contextWindow: kT(128), maxOutputTokens: k(32),
         reasoning: true,
@@ -175,6 +183,9 @@ const MODELS = {
     [TEXT_EMBEDDING_3_LARGE]: { ...OPENAI_EBD, dimension: k(3) },
     [TEXT_EMBEDDING_3_SMALL]: { ...OPENAI_EBD, dimension: k(1.5) },
     [GEMINI_EMBEDDING_M]: { ...EBD, maxInputTokens: k(8), dimension: k(3) },
+    [JINA_CLIP]: {
+        maxInputTokens: k(8), maxImageSize: 512 * 512, dimension: k(1),
+    },
     [CLOUD_37_SONNET]: { // 100 pages: https://docs.anthropic.com/en/docs/build-with-claude/pdf-support
         contextWindow: kT(200), maxOutputTokens: kT(64),
         documentCostTokens: 3000 * 100, maxDocumentFile: m(32),
@@ -183,7 +194,6 @@ const MODELS = {
         supportedMimeTypes: [png, jpeg, gif, webp, pdf],
         json: true, reasoning: true, tools: true, vision: true,
     }, // https://docs.anthropic.com/en/docs/build-with-claude/vision
-
 };
 
 // Unifiy model configurations
@@ -215,10 +225,12 @@ const DEFAULT_MODELS = {
     [GEMINI]: GEMINI_20_FLASH,
     [ANTHROPIC]: CLOUD_37_SONNET,
     [VERTEX_ANTHROPIC]: CLOUD_37_SONNET,
+    [JINA_DEEPSEARCH]: JINA_DEEPSEARCH_M,
     [OLLAMA]: GEMMA327B,
     [OPENAI_VOICE]: NOVA,
     [OPENAI_EMBEDDING]: TEXT_EMBEDDING_3_SMALL,
     [GEMINI_EMEDDING]: GEMINI_EMBEDDING_M,
+    [JINA_EMBEDDING]: JINA_CLIP,
     [OPENAI_TRAINING]: GPT_4O_MINI, // https://platform.openai.com/docs/guides/fine-tuning
 };
 DEFAULT_MODELS[CHAT] = DEFAULT_MODELS[GEMINI];
@@ -239,7 +251,7 @@ let tokeniser;
 const unifyProvider = provider => {
     assert(provider = (provider || '').trim(), 'AI provider is required.');
     for (let type of [OPENAI, AZURE_OPENAI, AZURE, GEMINI, ANTHROPIC,
-        VERTEX_ANTHROPIC, OLLAMA]) {
+        VERTEX_ANTHROPIC, JINA_DEEPSEARCH, OLLAMA]) {
         if (insensitiveCompare(provider, type)) { return type; }
     }
     throwError(`Invalid AI provider: ${provider}.`);
@@ -410,6 +422,19 @@ const init = async (options = {}) => {
                 prompt: async (cnt, opts) => await promptAnthropic(id, cnt, opts),
             });
             break;
+        case JINA_DEEPSEARCH:
+            assertApiKey(provider, options);
+            ais.push({
+                id, provider, model, priority: 0, initOrder: ais.length,
+                client: await OpenAI({
+                    baseURL: 'https://deepsearch.jina.ai/v1/', ...options,
+                }),
+                prompt: async (cnt, opts) => await promptOpenAI(id, cnt, opts),
+                embedding: async (i, o) => await createJinaEmbedding(await OpenAI({
+                    baseURL: 'https://api.jina.ai/v1/', ...options,
+                }), i, o),
+            });
+            break;
         case OLLAMA:
             // https://github.com/ollama/ollama/blob/main/docs/openai.md
             const baseURL = 'http://localhost:11434/v1/';
@@ -1152,7 +1177,7 @@ const checkEmbeddingInput = async (input, model) => {
     return getInput();
 };
 
-const createOpenAIEmbedding = async (aiId, input, options) => {
+const createOpenAIEmbedding = async (client, input, options) => {
     // args from vertex embedding may be useful uere
     // https://cloud.google.com/vertex-ai/docs/generative-ai/embeddings/get-text-embeddings
     // task_type	Description
@@ -1161,7 +1186,7 @@ const createOpenAIEmbedding = async (aiId, input, options) => {
     // SEMANTIC_SIMILARITY	Specifies the given text will be used for Semantic Textual Similarity(STS).
     // CLASSIFICATION	Specifies that the embeddings will be used for classification.
     // CLUSTERING	Specifies that the embeddings will be used for clustering.
-    const { client } = await getAi(aiId);
+    String.isString(client) && (client = (await getAi(client)).client);
     const model = options?.model || DEFAULT_MODELS[OPENAI_EMBEDDING];
     const resp = await client.embeddings.create({
         model, input: await checkEmbeddingInput(input, model),
@@ -1169,6 +1194,11 @@ const createOpenAIEmbedding = async (aiId, input, options) => {
     return options?.raw ? resp : resp?.data[0].embedding;
 };
 
+const createJinaEmbedding = async (client, input, options) =>
+    await createOpenAIEmbedding(client, input, {
+        model: DEFAULT_MODELS[JINA_EMBEDDING], ...options || {}
+    });
+
 const createGeminiEmbedding = async (aiId, input, options) => {
     const { client } = await getAi(aiId);
     const model = options?.model || DEFAULT_MODELS[GEMINI_EMEDDING];

package/lib/manifest.mjs

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