@inductiv/node-red-openai-api 0.3.8 → 0.4.0

package/node.js

@@ -1,113 +1,76 @@
-'use strict';
-const lib = require('./lib.js');
+"use strict";
+const lib = require("./lib.js");
 
 module.exports = function (RED) {
-    class OpenaiApiNode {
-        constructor(config) {
-            RED.nodes.createNode(this, config);
-            this.service = RED.nodes.getNode(config.service);
-            this.method = config.method;
+  class OpenaiApiNode {
+    constructor(config) {
+      RED.nodes.createNode(this, config);
+      this.service = RED.nodes.getNode(config.service);
+      this.method = config.method;
 
-            let node = this;
+      let node = this;
 
-            node.on('input', function (msg) {
-                let errorFlag = false;
-                let client = new lib.OpenaiApi();
-                if (!errorFlag && this.service) {
-                    client.setApiBase(this.service.apiBase);
-                    client.setOrganizationIdHeader(this.service.organizationId);
-                }
+      node.on("input", function (msg) {
+        let client = new lib.OpenaiApi();
 
-                if (!errorFlag && this.service && this.service.credentials && this.service.credentials.secureApiKeyValue) {
-                    if (this.service.secureApiKeyIsQuery) {
-                        client.setApiKey(this.service.credentials.secureApiKeyValue,
-                            this.service.secureApiKeyHeaderOrQueryName, true);
-                    } else {
-                        client.setApiKey(this.service.credentials.secureApiKeyValue,
-                            this.service.secureApiKeyHeaderOrQueryName, false);
-                    }
-                }
+        const serviceName = node.method; // Set the service name to call.
+        let serviceParametersObject = {
+          organization: node.service.organizationId,
+          apiBase: node.service.apiBase,
+          apiKey: node.service.credentials.secureApiKeyValue || "",
+          _node: node,
+          payload: { ...msg.payload },
+        };
 
-                if (!errorFlag){
-                    client.setNodeRef(node);
-                }
+        // Dynamically call the function based on the service name
+        const functionName = `${serviceName}`;
+        if (typeof client[functionName] === "function") {
+          node.status({
+            fill: "blue",
+            shape: "dot",
+            text: "OpenaiApi.status.requesting",
+          });
 
-                if (!errorFlag) {
-                    client.body = msg.payload;
-                }
-
-                let result;
-
-                if (!errorFlag) {
-                    const serviceName = node.method; // Specify the service you want to process
-                    let serviceParametersObject = {};
-
-                    // Dynamically call the function based on the service name
-                    const functionName = `${serviceName}`;
-                    if (typeof client[functionName] === 'function') {
-                        serviceParametersObject.body = msg.payload || {};
-                        result = client[functionName](serviceParametersObject);
-                    } else {
-                        console.error(`Function ${functionName} does not exist on client.`);
-                    }
-                }
-
-                if (!errorFlag && result === undefined) {
-                    node.error('Method is not specified.', msg);
-                    errorFlag = true;
-                }
-
-                let setData = function (msg, response) {
-                    if (response) {
-                        if (response.status) {
-                            msg.statusCode = response.status;
-                        }
-                        if (response.headers) {
-                            msg.headers = response.headers;
-                        }
-                        if (response.config && response.config.url) {
-                            msg.responseUrl = response.config.url;
-                        }
-                        if (response.data) {
-                            msg.payload = response.data;
-                        }
-                    }
-                    return msg;
-                };
-
-                if (!errorFlag) {
-                    node.status({ fill: 'blue', shape: 'dot', text: 'OpenaiApi.status.requesting' });
-                    result.then(function (response) {
-                        node.send(setData(msg, response));
-                        node.status({});
-                    }).catch(function (error) {
-                        let message = error.message;
-                        let errorData = error.response || {}; // Fallback to an empty object if response is not available
-                        node.error(message, setData(msg, errorData));
-                        node.status({ fill: 'red', shape: 'ring', text: 'node-red:common.status.error' });
-                    });
-                }
+          client[functionName](serviceParametersObject)
+            .then((payload) => {
+              // Update `msg.payload` with the payload from the API response.
+              msg.payload = payload;
+              node.send(msg);
+              node.status({});
+            })
+            .catch(function (error) {
+              node.status({
+                fill: "red",
+                shape: "ring",
+                text: "node-red:common.status.error",
+              });
+              let errorMessage = error.message;
+              node.error(errorMessage, { payload: {} });
             });
+        } else {
+          console.error(`Function ${functionName} does not exist on client.`);
         }
+      });
     }
+  }
 
-    RED.nodes.registerType('OpenAI API', OpenaiApiNode);
-    class ServiceHostNode {
-        constructor(n) {
-            RED.nodes.createNode(this, n);
+  RED.nodes.registerType("OpenAI API", OpenaiApiNode);
+  class ServiceHostNode {
+    constructor(n) {
+      RED.nodes.createNode(this, n);
 
-            this.secureApiKeyValue = n.secureApiKeyValue;
-            this.apiBase = n.apiBase;
-            this.secureApiKeyHeaderOrQueryName = n.secureApiKeyHeaderOrQueryName;
-            this.secureApiKeyIsQuery = n.secureApiKeyIsQuery;
-            this.organizationId = n.organizationId;
-        }
+      this.secureApiKeyValue = n.secureApiKeyValue;
+      this.apiBase = n.apiBase;
+      this.secureApiKeyHeaderOrQueryName = n.secureApiKeyHeaderOrQueryName;
+      this.secureApiKeyIsQuery = n.secureApiKeyIsQuery;
+      this.organizationId = n.organizationId;
     }
+  }
 
-    RED.nodes.registerType('Service Host', ServiceHostNode, {
-        credentials: {
-            secureApiKeyValue: { type: 'password' },
-            temp: { type: 'text' }
-        }
-    });
+  RED.nodes.registerType("Service Host", ServiceHostNode, {
+    credentials: {
+      secureApiKeyValue: { type: "password" },
+      temp: { type: "text" },
+    },
+  });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inductiv/node-red-openai-api",
-  "version": "0.3.8",
+  "version": "0.4.0",
   "description": "Go beyond ChatGPT and DALL·E 3: this Node-RED node seamlessly integrates a range of OpenAI services, including Assistants, Threads, Vision, and Audio, enabling feature-rich enhancement of your AI workflows with any OpenAI REST API-compatible solution.",
   "main": "node.js",
   "engines": {
@@ -27,8 +27,7 @@
     "ai"
   ],
   "dependencies": {
-    "axios": "^1.6.0",
-    "form-data": "^4.0.0"
+    "openai": "^4.26.1"
   },
   "devDependencies": {
     "eslint": "^8.54.0",