backend-manager 3.2.78 → 3.2.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.2.78",
+  "version": "3.2.80",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -35,7 +35,7 @@
   "homepage": "https://itwcreativeworks.com",
   "dependencies": {
     "@firebase/rules-unit-testing": "^2.0.7",
-    "@google-cloud/storage": "^7.7.0",
+    "@google-cloud/storage": "^7.8.0",
     "@sendgrid/mail": "^7.7.0",
     "@sentry/node": "^6.19.7",
     "busboy": "^1.6.0",
@@ -43,7 +43,7 @@
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "firebase-admin": "^11.11.1",
-    "firebase-functions": "^4.7.0",
+    "firebase-functions": "^4.8.0",
     "fs-jetpack": "^5.1.0",
     "hcaptcha": "^0.1.1",
     "inquirer": "^8.2.5",
@@ -56,7 +56,7 @@
     "moment": "^2.30.1",
     "nanoid": "^3.3.7",
     "node-fetch": "^2.7.0",
-    "node-powertools": "^1.2.3",
+    "node-powertools": "^1.3.0",
     "npm-api": "^1.0.1",
     "paypal-server-api": "^2.0.0",
     "pushid": "^1.0.0",

package/src/manager/libraries/openai.js

@@ -82,6 +82,9 @@ OpenAI.prototype.request = function (options) {
     options.log = typeof options.log === 'undefined' ? false : options.log;
     options.user = options.user || assistant.getUser();
 
+    options.retries = typeof options.retries === 'undefined' ? 0 : options.retries;
+    options.retryTriggers = typeof options.retryTriggers === 'undefined' ? ['network', 'parse'] : options.retryTriggers;
+
     options.prompt = options.prompt || {};
     options.prompt.path = options.prompt.path || '';
     options.prompt.content = options.prompt.content || '';
@@ -100,6 +103,8 @@ OpenAI.prototype.request = function (options) {
     options.temperature = typeof options.temperature === 'undefined' ? 0.7 : options.temperature;
     options.maxTokens = typeof options.maxTokens === 'undefined' ? 512 : options.maxTokens;
 
+    let attempt = 0;
+
     function _log() {
       if (!options.log)  {
         return;
@@ -249,31 +254,59 @@ OpenAI.prototype.request = function (options) {
       }
     }
 
-    // Request
-    await _request('chatgpt', options)
-    .then((r) => {
-      _log('Response', r);
+    function _attempt() {
+      const retries = options.retries;
+      const triggers = options.retryTriggers;
 
-      // Try to parse JSON response if needed
-      try {
-        const content = options.response === 'json' ? JSON5.parse(r) : r;
+      // Increment attempt
+      attempt++;
 
-        // Return
-        return resolve({
-          content: content,
-          tokens: self.tokens,
-          moderation: moderation,
-        })
-      } catch (e) {
-        assistant.error('Error parsing response', r, e);
+      // Log
+      _log(`Request ${attempt}/${retries}`);
+
+      // Request
+      _request('chatgpt', options)
+      .then((r) => {
+        _log('Response', r);
+
+        // Try to parse JSON response if needed
+        try {
+          const content = options.response === 'json' ? JSON5.parse(r) : r;
+
+          // Return
+          return resolve({
+            content: content,
+            tokens: self.tokens,
+            moderation: moderation,
+          })
+        } catch (e) {
+          assistant.error('Error parsing response', r, e);
+
+          // Retry
+          if (attempt < retries && triggers.includes('parse')) {
+            return _attempt();
+          }
+
+          // Return
+          return reject(e);
+        }
+      })
+      .catch((e) => {
+        assistant.error('Error requesting', e);
+
+        // Retry
+        if (attempt < retries && triggers.includes('network')) {
+          return _attempt();
+        }
 
         // Return
         return reject(e);
-      }
-    })
-    .catch((e) => reject(e));
+      });
+    }
+
+    // Make attempt
+    _attempt();
   });
 }
 
-
 module.exports = OpenAI;