utilitas 1995.2.26 → 1995.2.28

package/lib/alan.mjs

@@ -1,17 +1,16 @@
 import { ensureString, need, throwError } from './utilitas.mjs';
+import { convert } from './storage.mjs';
 
-const _NEED = [
-    'OpenAI',
-];
-
+const _NEED = ['OpenAI'];
 const [OPENAI] = ['OPENAI'];
-const [name] = ['Alan'];
-const [user] = ['user'];
-const [gpt4, gpt4_1106] = ['gpt-4', 'gpt-4-1106-preview'];
+const [name, user] = ['Alan', 'user'];
+const [STREAM] = ['STREAM'];
+const [GPT4, GPT4_1106] = ['gpt-4', 'gpt-4-1106-preview'];
 const openaiProvider = { provider: OPENAI };
 const openaiProviderBeta = { ...openaiProvider, beta: true };
-const openaiDefaultModel = gpt4;
+const openaiDefaultModel = GPT4;
 const getMsg = cnt => String.isString(cnt) ? { role: user, content: cnt } : cnt;
+const errorMessage = 'Invalid file data.';
 
 let openai;
 
@@ -33,7 +32,7 @@ const init = async (options) => {
     return client;
 };
 
-const complete = async (content, options) => {
+const promptChatGPT = async (content, options) => {
     const client = await init({ ...openaiProvider, ...options });
     // https://github.com/openai/openai-node?tab=readme-ov-file#streaming-responses
     // https://github.com/openai/openai-node?tab=readme-ov-file#streaming-responses-1
@@ -55,7 +54,7 @@ const createAssistant = async (options) => {
     const client = await init({ ...openaiProviderBeta, ...options });
     // https://platform.openai.com/docs/api-reference/assistants/createAssistant
     return await client.assistants.create({
-        model: gpt4_1106, name,
+        model: GPT4_1106, name,
         instructions: 'You are a helpful assistant.',
         tools: [
             { type: 'code_interpreter' },
@@ -81,18 +80,22 @@ const ensureAssistant = async (options) => {
 const createThread = async (options) => {
     const client = await init({ ...openaiProviderBeta, ...options });
     // https://platform.openai.com/docs/api-reference/threads/createThread
-    return await client.threads.create(options);
+    return await client.threads.create({ ...options?.params || {} });
 };
 
 const getThread = async (threadId, options) => {
     const client = await init({ ...openaiProviderBeta, ...options });
-    assert(threadId, 'Thread ID is required.', 400)
     // https://platform.openai.com/docs/api-reference/threads/getThread
     return await client.threads.retrieve(threadId);
 };
 
-const ensureThread = async opts => await (
-    opts?.threadId ? getThread(opts?.threadId) : createThread(opts?.params)
+const deleteThread = async (threadId, options) => {
+    const client = await init({ ...openaiProviderBeta, ...options });
+    return await client.threads.del(threadId);
+};
+
+const ensureThread = async options => await (
+    options?.threadId ? getThread(options?.threadId) : createThread(options)
 );
 
 const createMessage = async (threadId, content, options) => {
@@ -101,14 +104,14 @@ const createMessage = async (threadId, content, options) => {
     return await client.threads.messages.create(threadId, getMsg(content));
 };
 
-const listMessages = async (threadId, options) => {
-    const client = await init({ ...openaiProviderBeta, ...options });
+const listMessages = async (threadId, o) => {
+    const client = await init({ ...openaiProviderBeta, ...o });
     // https://platform.openai.com/docs/api-reference/messages/listMessages
-    return await client.threads.messages.list(threadId, options);
+    return await client.threads.messages.list(threadId, { ...o?.params || {} });
 };
 
 const getLatestMessage = async (threadId, options) => (
-    await listMessages(threadId, { limit: 1, ...options })
+    await listMessages(threadId, { ...options, params: { limit: 1 } })
 )?.data?.[0];
 
 const run = async (assistantId, threadId, options) => {
@@ -123,7 +126,7 @@ const getRun = async (threadId, runId, options) => {
     return await client.threads.runs.retrieve(threadId, runId);
 };
 
-const prompt = async (content, options) => {
+const promptAssistant = async (content, options) => {
     const assistant = await ensureAssistant(options);
     const thread = await ensureThread(options);
     const messageSent = await createMessage(thread.id, content, options);
@@ -143,19 +146,90 @@ const prompt = async (content, options) => {
         }, 1000);
     });
     const messageReceived = await getLatestMessage(thread.id, options);
+    const threadDeleted = options?.deleteThread ? await deleteThread(thread.id) : null;
     return {
         assistant, thread, messageSent, run: objRun, messageReceived,
-        response: messageReceived.content[0].text.value,
+        threadDeleted, response: messageReceived.content[0].text.value,
     };
 };
 
+const uploadFile = async (input, options) => {
+    const client = await init({ ...openaiProvider, ...options });
+    const { content: file, cleanup } = await convert(input, {
+        input: options?.input, ...options || {}, expected: STREAM, errorMessage,
+        suffix: options?.suffix,
+        withCleanupFunc: true,
+    });
+    const resp = await client.files.create({ file, ...options?.params || {} });
+    await cleanup();
+    return resp;
+};
+
+const uploadFileForAssistants = async (content, options) => await uploadFile(
+    content, { ...options, params: { purpose: 'assistants' } }
+);
+
+const attachFileToAssistant = async (assistantId, file_id, options) => {
+    const client = await init({ ...openaiProviderBeta, ...options });
+    return await client.assistants.files.create(assistantId, { file_id });
+};
+
+const detachFileFromAssistant = async (assistantId, file_id, options) => {
+    const client = await init({ ...openaiProviderBeta, ...options });
+    return await client.assistants.files.del(assistantId, file_id);
+};
+
+const deleteFileFromAssistant = async (assistantId, file_id, options) => {
+    const detach = await detachFileFromAssistant(assistantId, file_id, options);
+    const respDel = await deleteFile(file_id, options);
+    return { detach, delete: respDel };
+};
+
+const deleteAllFilesFromAssistant = async (assistantId, options) => {
+    const files = await listAssistantFiles(assistantId, options);
+    const delPms = [];
+    for (const file of files) {
+        delPms.push(deleteFileFromAssistant(assistantId, file.id, options));
+    }
+    return await Promise.all(delPms);
+};
+
+const uploadFileForRetrieval = async (assistantId, content, options) => {
+    const file = await uploadFileForAssistants(content, options);
+    return await attachFileToAssistant(assistantId, file.id, options);
+};
+
+const listFiles = async (options) => {
+    const client = await init({ ...openaiProvider, ...options });
+    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 init({ ...openaiProvider, ...options });
+    return await client.files.del(file_id);
+};
+
+const listAssistantFiles = async (assistant_id, options) => {
+    const client = await init({ ...openaiProviderBeta, ...options });
+    const resp = await client.assistants.files.list(
+        assistant_id, { limit: 100, ...options?.params }
+    );
+    return options?.raw ? resp : resp.data;
+};
 
 export default init;
 export {
     _NEED,
-    complete,
     createAssistant,
     createMessage,
+    deleteAllFilesFromAssistant,
+    deleteFile,
+    deleteFileFromAssistant,
+    deleteThread,
+    detachFileFromAssistant,
     ensureAssistant,
     ensureThread,
     getLatestMessage,
@@ -163,7 +237,13 @@ export {
     getThread,
     init,
     listAssistant,
+    listAssistantFiles,
+    listFiles,
     listMessages,
-    prompt,
+    promptAssistant,
+    promptChatGPT,
     run,
+    uploadFile,
+    uploadFileForAssistants,
+    uploadFileForRetrieval,
 };

package/lib/manifest.mjs

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