ai-functions 0.0.5 → 0.1.1

package/example.js

@@ -1,4 +1,4 @@
-import { AI } from './ai.js'
+import { AI } from './proxy.js'
 
 const { ai, list, gpt } = AI()
 
@@ -16,11 +16,23 @@ const writeBlogPost = title => gpt`write a blog post in markdown starting with "
 
 async function* writeBlog(count, topic) {
   for await (const title of listBlogPosts(count, topic)) {
-    const content = await writeBlogPost(title)
-    yield { title, content }
+    const contentPromise = writeBlogPost(title).then(content => {
+      console.log({ title, content })
+      return { title, content }
+    })
+    yield { title, contentPromise }
   }
 }
 
-for await (const post of writeBlog(5, 'future of car sales')) {
+for await (const post of writeBlog(3, 'future of car sales')) {
   console.log({ post })
-}
+}
+
+const product = await ai.categorizeProduct({ domain: 'OpenSaaS.org' }, { 
+  productType: 'App | API | Marketplace | Platform | Packaged Service | Professional Service | Website',
+  customer: 'ideal customer profile in 3-5 words',
+  solution: 'describe the offer in 4-10 words',
+  description: 'website meta description',
+})
+
+console.log({ product })

package/fetcher.js

@@ -0,0 +1,48 @@
+const headers = {
+  'Authorization': `Bearer ${process.env.OPENAI_API_KEY}`,
+  'Content-Type': 'application/json',
+}
+const openaiFetch = obj => fetch('https://api.openai.com/v1/chat/completions', { method: 'POST', headers, body: JSON.stringify(obj) }).then(res => res.json())
+
+const openaiStream = obj => fetch('https://api.openai.com/v1/chat/completions', { method: 'POST', headers, body: JSON.stringify(obj) })
+
+
+const response = await openaiStream({ 
+	model: 'gpt-3.5-turbo',
+	messages: [{ role: 'user', content: 'Tell me a funny joke about OpenAI' }],
+	stream: true
+})
+
+const decoder = new TextDecoder('utf-8')
+let completion = ''
+
+try {
+	for await (const chunk of response.body) {
+		let done = false
+		const currentChunk = decoder.decode(chunk)
+		const lines = currentChunk.split('\n').filter(Boolean)
+		// console.log(lines)
+		for (const line of lines) {
+			if (line.includes('[DONE]')) { 
+				done = true 
+				break
+			}
+			try {
+				const data = JSON.parse(line.replace('data: ', ''))
+				if (data.choices[0].delta.content) {
+					const deltaContent = data.choices[0].delta.content
+					completion += deltaContent
+					console.log(deltaContent)
+				}
+				// console.log(chunks)
+			} catch (error) {
+				console.log(error.message, line)
+			}
+		}
+		if (done) break
+	}
+} catch (err) {
+	console.error(err.stack);
+}
+console.log({ completion })
+

package/index.js

@@ -1,3 +1,3 @@
-export * from './ai.js'
+export * from './proxy.js'
 export * from './schema.js'
 export * from './withAI.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-functions",
-  "version": "0.0.5",
+  "version": "0.1.1",
   "description": "Library for Developing and Managing AI Functions (including OpenAI GPT4 / GPT3.5)",
   "main": "index.js",
   "type": "module",
@@ -23,10 +23,7 @@
     "vitest": "^0.33.0"
   },
   "dependencies": {
-    "camelcase-keys": "^9.1.0",
     "js-yaml": "^4.1.0",
-    "openai": "^4.11.1",
-    "partial-json-parser": "^1.2.2",
-    "yaml": "^2.3.2"
+    "partial-json-parser": "^1.2.2"
   }
 }

package/{ai.js → proxy.js}

@@ -1,13 +1,18 @@
-import { OpenAI } from 'openai'
-import camelcaseKeys from 'camelcase-keys'
+// import { OpenAI } from 'openai'
+// import camelcaseKeys from 'camelcase-keys'
 import { dump } from 'js-yaml'
 import { schema } from './schema.js'
 
 export const AI = opts => {
   const { system, model = 'gpt-3.5-turbo', apiKey, OPENAI_API_KEY, ...rest } = opts || {}
 
-  const openai = new OpenAI({ apiKey: apiKey ?? OPENAI_API_KEY, ...rest })
-
+  // const openai = new OpenAI({ apiKey: apiKey ?? OPENAI_API_KEY, ...rest })
+  const headers = {
+    'Authorization': `Bearer ${apiKey ?? OPENAI_API_KEY ?? globalThis.process?.env?.OPENAI_API_KEY}`,
+    'Content-Type': 'application/json',
+  }
+  const openaiFetch = obj => fetch('https://api.openai.com/v1/chat/completions', { method: 'POST', headers, body: JSON.stringify(obj) }).then(res => res.json())
+  
   const gpt = async (strings, ...values) => {
     const user = values.map((value, i) => strings[i] + value).join('') + strings[strings.length - 1]
     const prompt = {
@@ -17,7 +22,7 @@ export const AI = opts => {
       ],
     }
     if (system) prompt.messages.unshift({ role: 'system', content: system })
-    const completion = await openai.chat.completions.create(prompt)
+    const completion = await openaiFetch(prompt)
     return completion.choices?.[0].message.content
   }
 
@@ -39,7 +44,7 @@ export const AI = opts => {
           ...rest,
         }
         if (system) prompt.messages.unshift({ role: 'system', content: system })
-        const completion = await openai.chat.completions.create(prompt)
+        const completion = await openaiFetch(prompt)
         let data, error
         const { message } = completion.choices?.[0]
         prompt.messages.push(message)
@@ -55,7 +60,7 @@ export const AI = opts => {
         const cost = Math.round((gpt4 
           ? completion.usage.prompt_tokens * 0.003 + completion.usage.completion_tokens * 0.006 
           : completion.usage.prompt_tokens * 0.00015 + completion.usage.completion_tokens * 0.0002) * 100000) / 100000
-        completion.usage = camelcaseKeys(completion.usage)
+        // completion.usage = camelcaseKeys(completion.usage)
         console.log({ data, content, error, cost })
         return meta ? { prompt, content, data, error, cost, ...completion } : data ?? content
       }
@@ -70,36 +75,47 @@ export const AI = opts => {
       stream: true,
     }
     if (system) prompt.messages.unshift({ role: 'system', content: system })
-    const stream = await openai.chat.completions.create(prompt)
+    const response = await fetch('https://api.openai.com/v1/chat/completions', { method: 'POST', headers, body: JSON.stringify(prompt) })
+    const decoder = new TextDecoder('utf-8')
+
     let content = ''
     let seperator = undefined
     let numberedList = undefined
 
-    for await (const part of stream) {
-      const { delta, finish_reason } = part.choices[0]
-      content += delta?.content || ''
-      if (seperator === undefined && content.length > 4) {
-        numberedList = content.match(/(\d+\.\s)/g)
-        seperator = numberedList ? '\n' : ', '
-      }
+    for await (const chunk of response.body) {
+      const lines = decoder.decode(chunk).split('\n').filter(Boolean)
+      for (const line of lines) {
+        try {
+          if (line.includes('[DONE]')) break
+          const part = JSON.parse(line.replace('data: ', ''))
+          const { delta, finish_reason } = part.choices[0]
+          content += delta?.content || ''
+          if (seperator === undefined && content.length > 4) {
+            numberedList = content.match(/(\d+\.\s)/g)
+            seperator = numberedList ? '\n' : ', '
+          }
+
+          const numberedRegex = /\d+\.\s(?:")?([^"]+)(?:")?/
 
-      const numberedRegex = /\d+\.\s(?:")?([^"]+)(?:")?/
+          if (content.includes(seperator)) {
+            // get the string before the newline, and modify `content` to be the string after the newline
+            // then yield the string before the newline
+            const items = content.split(seperator)
+            while (items.length > 1) {
+              const item = items.shift()
+              yield numberedList ? item.match(numberedRegex)?.[1] : item
+            }
+            content = items[0]
+          }
 
-      if (content.includes(seperator)) {
-        // get the string before the newline, and modify `content` to be the string after the newline
-        // then yield the string before the newline
-        const items = content.split(seperator)
-        while (items.length > 1) {
-          const item = items.shift()
-          yield numberedList ? item.match(numberedRegex)?.[1] : item
+          if (finish_reason) yield numberedList ? content.match(numberedRegex)?.[1] : content
+        } catch (error) {
+          console.log(error.message, line)
         }
-        content = items[0]
       }
-
-      if (finish_reason) yield numberedList ? content.match(numberedRegex)?.[1] : content
     }
     
   }
 
-  return { ai, list, gpt, openai }
+  return { ai, list, gpt }
 }

package/withAI.js

@@ -1,4 +1,4 @@
-import { AI } from './ai.js'
+import { AI } from './proxy.js'
 
 export const withAI = options => (req, env) => {
   const { ai, gpt, list } = AI({ apiKey: env.OPENAI_API_KEY, ...options })