utilitas 1998.2.62 → 1998.2.64

package/lib/alan.mjs

@@ -49,14 +49,15 @@ const [
     OPENAI, GEMINI, CHATGPT, OPENAI_EMBEDDING, GEMINI_EMEDDING, OPENAI_TRAINING,
     OLLAMA, CLAUDE, GPT_4O_MINI, GPT_4O, GPT_O1, GPT_O3_MINI, GEMINI_20_FLASH,
     GEMINI_20_FLASH_THINKING, GEMINI_20_PRO, NOVA, EMBEDDING_001, DEEPSEEK_R1,
-    DEEPSEEK_R1_70B, DEEPSEEK_R1_32B, MD_CODE, CHATGPT_REASONING, TEXT_EMBEDDING_3_SMALL,
-    TEXT_EMBEDDING_3_LARGE, CLOUD_37_SONNET, AUDIO, WAV, CHATGPT_MINI,
-    ATTACHMENTS, CHAT, OPENAI_VOICE, MEDIUM, LOW, HIGH, GPT_REASONING_EFFORT,
-    THINK, THINK_STR, THINK_END, AZURE, TOOLS_STR, TOOLS_END, TOOLS, TEXT,
-    THINKING, OK, FUNC, GPT_45, REDACTED_THINKING, GEMMA_3_27B, AZURE_OPENAI,
-    ANTHROPIC, VERTEX_ANTHROPIC, GEMMA327B, size8k, ais, MAX_TOOL_RECURSION,
-    LOG, name, user, system, assistant, MODEL, JSON_OBJECT, TOOL, silent,
-    NOT_INIT, INVALID_FILE, tokenSafeRatio, GPT_QUERY_LIMIT, minsOfDay,
+    DEEPSEEK_R1_70B, DEEPSEEK_R1_32B, MD_CODE, CHATGPT_REASONING,
+    TEXT_EMBEDDING_3_SMALL, TEXT_EMBEDDING_3_LARGE, CLOUD_37_SONNET, AUDIO, WAV,
+    CHATGPT_MINI, ATTACHMENTS, CHAT, OPENAI_VOICE, MEDIUM, LOW, HIGH,
+    GPT_REASONING_EFFORT, THINK, THINK_STR, THINK_END, AZURE, TOOLS_STR,
+    TOOLS_END, TOOLS, TEXT, THINKING, OK, FUNC, GPT_45, REDACTED_THINKING,
+    GEMMA_3_27B, AZURE_OPENAI, ANTHROPIC, VERTEX_ANTHROPIC, GEMMA327B, size8k,
+    ais, MAX_TOOL_RECURSION, LOG, name, user, system, assistant, MODEL,
+    JSON_OBJECT, TOOL, silent, NOT_INIT, INVALID_FILE, tokenSafeRatio,
+    GPT_QUERY_LIMIT, minsOfDay, CONTENT_IS_REQUIRED,
 ] = [
         'OPENAI', 'GEMINI', 'CHATGPT', 'OPENAI_EMBEDDING', 'GEMINI_EMEDDING',
         'OPENAI_TRAINING', 'OLLAMA', 'CLAUDE', 'gpt-4o-mini', 'gpt-4o', 'o1',
@@ -73,7 +74,7 @@ const [
         7680 * 4320, {}, 10, { log: true }, 'Alan', 'user', 'system',
         'assistant', 'model', 'json_object', 'tool', true,
         'AI engine has not been initialized.', 'Invalid file data.', 1.1, 100,
-        60 * 24,
+        60 * 24, 'Content is required.',
     ];
 
 const [
@@ -109,7 +110,6 @@ const unifyEngine = options => unifyType(options?.engine, 'AI engine');
 const trimTailing = text => text.replace(/[\.\s]*$/, '');
 const renderText = (t, o) => _renderText(t, { extraCodeBlock: 0, ...o || {} });
 const log = (cnt, opt) => _log(cnt, import.meta.url, { time: 1, ...opt || {} });
-const CONTENT_IS_REQUIRED = 'Content is required.';
 const assertContent = content => assert(content.length, CONTENT_IS_REQUIRED);
 const countToolCalls = r => r?.split('\n').filter(x => x === TOOLS_STR).length;
 const assertApiKey = (p, o) => assert(o?.apiKey, `${p} api key is required.`);
@@ -515,6 +515,7 @@ const init = async (options = {}) => {
             ais[id] = {
                 id, provider, model, client: await OpenAI(options),
                 prompt: async (cnt, opts) => await promptOpenAI(id, cnt, opts),
+                embedding: async (i, o) => await createOpenAIEmbedding(id, i, o),
             };
             break;
         case AZURE_OPENAI:
@@ -544,6 +545,7 @@ const init = async (options = {}) => {
                 id, provider, model,
                 client: new GoogleGenerativeAI(options.apiKey),
                 prompt: async (cnt, opts) => await promptGemini(id, cnt, opts),
+                embedding: async (i, o) => await createGeminiEmbedding(id, i, o),
             };
             break;
         case ANTHROPIC:
@@ -700,10 +702,9 @@ const buildGeminiHistory = (text, options) => buildGeminiMessage(
     text, { ...options || {}, history: true }
 );
 
-const [getOpenAIClient, getGeminiClient, getClaudeClient]
-    = [OPENAI, GEMINI, CLAUDE].map(
-        x => async options => await init({ ...provider(x), ...options })
-    );
+const [getOpenAIClient] = [OPENAI].map(
+    x => async options => await init({ ...provider(x), ...options })
+);
 
 const listOpenAIModels = async (options) => {
     const { client } = await getOpenAIClient(options);
@@ -1256,7 +1257,7 @@ const checkEmbeddingInput = async (input, model) => {
     return getInput();
 };
 
-const createOpenAIEmbedding = async (input, options) => {
+const createOpenAIEmbedding = async (aiId, 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
@@ -1265,7 +1266,7 @@ const createOpenAIEmbedding = async (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 getOpenAIClient(options);
+    const { client } = await getAi(aiId);
     const model = options?.model || DEFAULT_MODELS[OPENAI_EMBEDDING];
     const resp = await client.embeddings.create({
         model, input: await checkEmbeddingInput(input, model),
@@ -1273,8 +1274,8 @@ const createOpenAIEmbedding = async (input, options) => {
     return options?.raw ? resp : resp?.data[0].embedding;
 };
 
-const createGeminiEmbedding = async (input, options) => {
-    const { client } = await getGeminiClient(options);
+const createGeminiEmbedding = async (aiId, input, options) => {
+    const { client } = await getAi(aiId);
     const model = options?.model || DEFAULT_MODELS[GEMINI_EMEDDING];
     const resp = await client.getGenerativeModel({ model }).embedContent(
         await checkEmbeddingInput(input, model)
@@ -1283,8 +1284,9 @@ const createGeminiEmbedding = async (input, options) => {
 };
 
 const buildGptTrainingCase = (prompt, response, options) => messages([
-    ...options?.systemPrompt ? [buildGptMessage(options.systemPrompt, { role: system })] : [],
-    buildGptMessage(prompt),
+    ...options?.systemPrompt ? [
+        buildGptMessage(options.systemPrompt, { role: system })
+    ] : [], buildGptMessage(prompt),
     buildGptMessage(response, { role: assistant }),
 ]);
 

package/lib/manifest.mjs

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