utilitas 1998.2.64 → 1998.2.65

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 { checkSearch, search } from './shot.mjs';
+import get, { 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';
@@ -702,12 +702,8 @@ const buildGeminiHistory = (text, options) => buildGeminiMessage(
     text, { ...options || {}, history: true }
 );
 
-const [getOpenAIClient] = [OPENAI].map(
-    x => async options => await init({ ...provider(x), ...options })
-);
-
-const listOpenAIModels = async (options) => {
-    const { client } = await getOpenAIClient(options);
+const listOpenAIModels = async (aiId, options) => {
+    const { client } = await getAi(aiId);
     const resp = await client.models.list();
     return options?.raw ? resp : resp.data;
 };
@@ -1139,8 +1135,8 @@ const promptAnthropic = async (aiId, content, options = {}) => {
     return packResp({ text: mergeMsgs(toolsResponse, tool_use) }, options);
 };
 
-const uploadFile = async (input, options) => {
-    const { client } = await getOpenAIClient(options);
+const uploadFile = async (aiId, input, options) => {
+    const { client } = await getAi(aiId);
     const { content: file, cleanup } = await convert(input, {
         input: options?.input, ...options || {}, expected: STREAM,
         errorMessage: INVALID_FILE, suffix: options?.suffix,
@@ -1151,20 +1147,20 @@ const uploadFile = async (input, options) => {
     return resp;
 };
 
-const uploadFileForFineTuning = async (content, options) => await uploadFile(
-    content, { suffix: 'jsonl', ...options, params: { purpose: 'fine-tune' } }
+const uploadFileForFineTuning = async (aiId, content, options) => await uploadFile(
+    aiId, content, { suffix: 'jsonl', ...options, params: { purpose: 'fine-tune' } }
 );
 
-const listFiles = async (options) => {
-    const { client } = await getOpenAIClient(options);
+const listFiles = async (aiId, options) => {
+    const { client } = await getAi(aiId);
     const files = [];
     const list = await client.files.list(options?.params || {});
     for await (const file of list) { files.push(file); }
     return files;
 };
 
-const deleteFile = async (file_id, options) => {
-    const { client } = await getOpenAIClient(options);
+const deleteFile = async (aiId, file_id, options) => {
+    const { client } = await getAi(aiId);
     return await client.files.del(file_id);
 };
 
@@ -1294,48 +1290,48 @@ const buildGptTrainingCases = (cases, opts) => cases.map(x => JSON.stringify(
     buildGptTrainingCase(x.prompt, x.response, { ...x.options, ...opts })
 )).join('\n');
 
-const createGptFineTuningJob = async (training_file, options) => {
-    const { client } = await getOpenAIClient(options);
+const createGptFineTuningJob = async (aiId, training_file, options) => {
+    const { client } = await getAi(aiId);
     return await client.fineTuning.jobs.create({
         training_file, model: options?.model || DEFAULT_MODELS[OPENAI_TRAINING],
     })
 };
 
-const getGptFineTuningJob = async (job_id, options) => {
-    const { client } = await getOpenAIClient(options);
+const getGptFineTuningJob = async (aiId, job_id, options) => {
+    const { client } = await getAi(aiId);
     // https://platform.openai.com/finetune/[job_id]?filter=all
     return await client.fineTuning.jobs.retrieve(job_id);
 };
 
-const cancelGptFineTuningJob = async (job_id, options) => {
-    const { client } = await getOpenAIClient(options);
+const cancelGptFineTuningJob = async (aiId, job_id, options) => {
+    const { client } = await getAi(aiId);
     return await client.fineTuning.jobs.cancel(job_id);
 };
 
-const listGptFineTuningJobs = async (options) => {
-    const { client } = await getOpenAIClient(options);
+const listGptFineTuningJobs = async (aiId, options) => {
+    const { client } = await getAi(aiId);
     const resp = await client.fineTuning.jobs.list({
         limit: GPT_QUERY_LIMIT, ...options?.params
     });
     return options?.raw ? resp : resp.data;
 };
 
-const listGptFineTuningEvents = async (job_id, options) => {
-    const { client } = await getOpenAIClient(options);
+const listGptFineTuningEvents = async (aiId, job_id, options) => {
+    const { client } = await getAi(aiId);
     const resp = await client.fineTuning.jobs.listEvents(job_id, {
         limit: GPT_QUERY_LIMIT, ...options?.params,
     });
     return options?.raw ? resp : resp.data;
 };
 
-const tailGptFineTuningEvents = async (job_id, options) => {
+const tailGptFineTuningEvents = async (aiId, job_id, options) => {
     assert(job_id, 'Job ID is required.');
     const [loopName, listOpts] = [`GPT - ${job_id} `, {
         ...options, params: { ...options?.params, order: 'ascending' }
     }];
     let lastEvent;
     return await loop(async () => {
-        const resp = await listGptFineTuningEvents(job_id, {
+        const resp = await listGptFineTuningEvents(aiId, job_id, {
             ...listOpts, params: {
                 ...listOpts?.params,
                 ...(lastEvent ? { after: lastEvent.id } : {}),

package/lib/manifest.mjs

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