utilitas 1995.2.25 → 1995.2.26

package/lib/alan.mjs

@@ -6,9 +6,12 @@ const _NEED = [
 
 const [OPENAI] = ['OPENAI'];
 const [name] = ['Alan'];
+const [user] = ['user'];
+const [gpt4, gpt4_1106] = ['gpt-4', 'gpt-4-1106-preview'];
 const openaiProvider = { provider: OPENAI };
 const openaiProviderBeta = { ...openaiProvider, beta: true };
-const openaiDefaultModel = 'gpt-4';
+const openaiDefaultModel = gpt4;
+const getMsg = cnt => String.isString(cnt) ? { role: user, content: cnt } : cnt;
 
 let openai;
 
@@ -32,9 +35,10 @@ const init = async (options) => {
 
 const complete = 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
     let [resp, result, chunk] = [await client.chat.completions.create({
-        messages: [...options?.messages || [], { role: 'user', content }],
+        messages: [...options?.messages || [], getMsg(content)],
         model: openaiDefaultModel, stream: !!options?.stream,
     }), '', null];
     if (!options?.stream) {
@@ -51,10 +55,11 @@ 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: 'gpt-4', name, instructions: 'You are a helpful assistant.',
+        model: gpt4_1106, name,
+        instructions: 'You are a helpful assistant.',
         tools: [
             { type: 'code_interpreter' },
-            // { type: 'retrieval' },
+            { type: 'retrieval' },
             // { type: 'function' },
         ], ...options?.params || {},
         // description: null, file_ids: [], metadata: {},
@@ -79,7 +84,7 @@ const createThread = async (options) => {
     return await client.threads.create(options);
 };
 
-const getThread = async (threadId) => {
+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
@@ -90,25 +95,26 @@ const ensureThread = async opts => await (
     opts?.threadId ? getThread(opts?.threadId) : createThread(opts?.params)
 );
 
-const createMessage = async (threadId, message, options) => {
+const createMessage = async (threadId, content, options) => {
     const client = await init({ ...openaiProviderBeta, ...options });
     // https://platform.openai.com/docs/api-reference/messages/createMessage
-    return await client.threads.messages.create(threadId, message);
+    return await client.threads.messages.create(threadId, getMsg(content));
 };
 
 const listMessages = async (threadId, options) => {
     const client = await init({ ...openaiProviderBeta, ...options });
     // https://platform.openai.com/docs/api-reference/messages/listMessages
-    return JSON.stringify((await client.threads.messages.list(
-        threadId, { limit: 1, ...options?.params || {} }
-    )).data[0], null, 2);
+    return await client.threads.messages.list(threadId, options);
 };
 
+const getLatestMessage = async (threadId, options) => (
+    await listMessages(threadId, { limit: 1, ...options })
+)?.data?.[0];
+
 const run = async (assistantId, threadId, options) => {
     const client = await init({ ...openaiProviderBeta, ...options });
     return await client.threads.runs.create(
-        threadId,
-        { assistant_id: assistantId }
+        threadId, { assistant_id: assistantId }
     );
 };
 
@@ -117,6 +123,33 @@ const getRun = async (threadId, runId, options) => {
     return await client.threads.runs.retrieve(threadId, runId);
 };
 
+const prompt = async (content, options) => {
+    const assistant = await ensureAssistant(options);
+    const thread = await ensureThread(options);
+    const messageSent = await createMessage(thread.id, content, options);
+    let objRun = await run(assistant.id, thread.id, options);
+    objRun = await new Promise((resolve, reject) => {
+        const timer = setInterval(async () => {
+            try {
+                const resp = await getRun(thread.id, objRun.id);
+                if (resp?.status === 'completed') {
+                    clearInterval(timer);
+                    resolve(resp);
+                }
+            } catch (err) {
+                clearInterval(timer);
+                reject(err);
+            }
+        }, 1000);
+    });
+    const messageReceived = await getLatestMessage(thread.id, options);
+    return {
+        assistant, thread, messageSent, run: objRun, messageReceived,
+        response: messageReceived.content[0].text.value,
+    };
+};
+
+
 export default init;
 export {
     _NEED,
@@ -125,10 +158,12 @@ export {
     createMessage,
     ensureAssistant,
     ensureThread,
+    getLatestMessage,
     getRun,
     getThread,
     init,
     listAssistant,
     listMessages,
+    prompt,
     run,
 };

package/lib/manifest.mjs

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