fg-lib-gpt 1.1.1 → 1.1.3

package/main.js

@@ -1,10 +1,10 @@
-const axios = require('axios')
+const axios = require('axios');
 
-const OPENAI_API_KEY = process.env.OPENAI_API_KEY
+const OPENAI_API_KEY = process.env.OPENAI_API_KEY;
 
-const DEFAULT_MODEL = process.env.GPT_DEFAULT_MODEL || 'gpt-4o-mini'
-const DEFAULT_TIMEOUT = process.env.GPT_TIMEOUT || 180000
-const DEFAULT_TEMPERATURE = process.env.GPT_TEMPERATURE || 0.7
+const DEFAULT_MODEL = process.env.GPT_DEFAULT_MODEL || 'gpt-4o-mini';
+const DEFAULT_TIMEOUT = process.env.GPT_TIMEOUT || 180000;
+const DEFAULT_TEMPERATURE = process.env.GPT_TEMPERATURE || 0.7;
 
 
 const doGpt = async ({
@@ -13,51 +13,51 @@ const doGpt = async ({
     timeout = DEFAULT_TIMEOUT,
     temperature = DEFAULT_TEMPERATURE,
     validate,
-    response_format = { 'type': 'text' }
+    response_format = { 'type': 'text' },
+    max_tokens
 }) => {
 
+    const json = response_format.type === 'json' || response_format.type === 'json_schema';
+
     try {
         const response = await Promise.race([
-            getGptResponse({ messages, model, temperature, response_format }),
+            getGptResponse({ messages, model, temperature, response_format, max_tokens }),
             new Promise((_, reject) =>
                 setTimeout(() => reject(new Error('Custom timeout')), timeout))
-        ])
+        ]);
 
         if (typeof validate === 'function')
-            validate(response)
-
-
-        const json = response_format.type === 'json' || response_format.type === 'json_schema'
+            validate(response);
 
         // JSON.parse might also fail
         return {
             success: true,
             content: json ? JSON.parse(response) : response
-        }
+        };
     }
     catch (e) {
-        console.error('**** ERROR ***** OpenAI Error (1): ' + e.message)
+        console.error('**** ERROR ***** OpenAI Error (1): ' + e.message);
         try {
-            const response = await getGptResponse({ messages, model, temperature, response_format })
+            const response = await getGptResponse({ messages, model, temperature, response_format, max_tokens });
 
             return {
                 success: true,
                 content: json ? JSON.parse(response) : response
-            }
+            };
         }
         catch (e2) {
-            console.error('**** ERROR ***** OpenAI Error (2): ' + e2.message)
+            console.error('**** ERROR ***** OpenAI Error (2): ' + e2.message);
             return {
                 success: false,
                 content: '🚫 An error occurred. Please try again. If the problem persists, please contact @fgalkov.'
-            }
-        }
-    }
-}
+            };
+        };
+    };
+};
 
 
 
-const getGptResponse = async ({ messages, model, response_format, temperature }) => {
+const getGptResponse = async ({ messages, model, response_format, temperature, max_tokens }) => {
 
     const res = await axios.post(
         'https://api.openai.com/v1/chat/completions',
@@ -65,7 +65,8 @@ const getGptResponse = async ({ messages, model, response_format, temperature })
             messages,
             model,
             response_format,
-            temperature
+            temperature,
+            max_completion_tokens: max_tokens
         },
         {
             headers: {
@@ -73,9 +74,9 @@ const getGptResponse = async ({ messages, model, response_format, temperature })
                 'Content-Type': 'application/json',
             }
         }
-    )
-    return res.data.choices[0].message.content.trim()
-}
+    );
+    return res.data.choices[0].message.content.trim();
+};
 
 
 
@@ -121,18 +122,18 @@ const generateSchema = (schemaObj, name = 'schema') => {
             return { type: 'boolean' }
 
         else
-            return {}
-    }
+            return {};
+    };
 
     return {
         name,
         strict: true,
         schema: schema(schemaObj)
-    }
-}
+    };
+};
 
 
 module.exports = {
     doGpt: doGpt,
     generateSchema: generateSchema,
-}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fg-lib-gpt",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"