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

package/lib.js

@@ -22,6 +22,11 @@ var OpenaiApi = (function () {
     setApiBase(apiBase) {
       this.domain = apiBase;
     }
+
+    setOrganizationIdHeader(organizationId) {
+      this.organizationId = organizationId;
+    }
+
     setAuthHeaders(headerParams) {
       var headers = headerParams ? headerParams : {};
       if (!this.apiKey.isQuery && this.apiKey.headerOrQueryName) {
@@ -30,18 +35,22 @@ var OpenaiApi = (function () {
       return headers;
     }
 
-    setNodeRef(node){
+    setNodeRef(node) {
       this.node = node;
     }
 
-    getFromEndpoint(path, parameters, expectedQueryParams, customHeaders) {
+    getFromEndpoint(path, parameters, expectedQueryParams, customHeaders = {}) {
       return new Promise((resolve, reject) => {
         var domain = this.domain;
-        var queryParameters = {},
-          baseHeaders = {};
+        var organizationId = this.organizationId;
+        var queryParameters = {};
+        var baseHeaders = {};
 
         baseHeaders = this.setAuthHeaders(headers);
         baseHeaders["Accept"] = "application/json";
+        if (organizationId) {
+          customHeaders["OpenAI-Organization"] = organizationId;
+        }
 
         var headers = {
           ...baseHeaders,
@@ -78,26 +87,32 @@ var OpenaiApi = (function () {
           });
       });
     }
+
     postToEndpoint(
       path,
       parameters,
       expectedQueryParams,
       contentType,
       filePath,
-      customHeaders,
+      customHeaders = {},
     ) {
       return new Promise((resolve, reject) => {
         const _path = require("path");
 
         parameters = parameters || {};
         var domain = this.domain;
+        var organizationId = this.organizationId;
         var queryParameters = {},
           baseHeaders = {},
           data;
 
-        baseHeaders = this.setAuthHeaders({});
+        baseHeaders = this.setAuthHeaders(baseHeaders);
         baseHeaders["Accept"] = "application/json";
 
+        if (organizationId) {
+          customHeaders["OpenAI-Organization"] = organizationId;
+        }
+
         var headers = {
           ...baseHeaders,
           ...customHeaders,
@@ -153,26 +168,29 @@ var OpenaiApi = (function () {
           headers: headers,
           params: queryParameters,
           data: data,
-          responseType: data.stream === true ? "stream" : "json"
+          responseType: data.stream === true ? "stream" : "json",
         };
 
         axios(config)
           .then((response) => {
             if (config.responseType === "stream") {
               // Handle the stream response
-              response.data.on('data', (chunk) => {
-                // Convert chunk from Uint8Array to string
-                const chunkAsString = new TextDecoder().decode(chunk);
-        
-                // Emit converted data chunks as Node-RED messages
-                this.node.send({ payload: chunkAsString });
-              }).on('end', () => {
-                // Handle the end of the stream
-                resolve({ payload: "Stream ended" });
-              }).on('error', (err) => {
-                // Handle any errors
-                reject(err);
-              });
+              response.data
+                .on("data", (chunk) => {
+                  // Convert chunk from Uint8Array to string
+                  const chunkAsString = new TextDecoder().decode(chunk);
+
+                  // Emit converted data chunks as Node-RED messages
+                  this.node.send({ payload: chunkAsString });
+                })
+                .on("end", () => {
+                  // Handle the end of the stream
+                  resolve({ payload: "Stream ended" });
+                })
+                .on("error", (err) => {
+                  // Handle any errors
+                  reject(err);
+                });
             } else {
               // Handle non-stream response (e.g., JSON)
               resolve(response);
@@ -184,16 +202,26 @@ var OpenaiApi = (function () {
       });
     }
 
-    deleteFromEndpoint(path, parameters, expectedQueryParams, customHeaders) {
+    deleteFromEndpoint(
+      path,
+      parameters,
+      expectedQueryParams,
+      customHeaders = {},
+    ) {
       return new Promise((resolve, reject) => {
         parameters = parameters || {};
         var domain = this.domain;
+        var organizationId = this.organizationId;
         var queryParameters = {},
           baseHeaders = {};
 
         baseHeaders = this.setAuthHeaders(headers);
         baseHeaders["Accept"] = "application/json";
 
+        if (organizationId) {
+          customHeaders["OpenAI-Organization"] = organizationId;
+        }
+
         var headers = {
           ...baseHeaders,
           ...customHeaders,
@@ -229,6 +257,7 @@ var OpenaiApi = (function () {
           });
       });
     }
+
     createChatCompletion(parameters) {
       const response = this.postToEndpoint("/chat/completions", parameters);
       return response;

package/locales/en-US/node.json

@@ -6,6 +6,7 @@
             "method": "Method",
             "host": "Host",
             "header": "Auth Header",
+            "organizationId": "Org Id",
             "apiKey": "API Key",
             "isQuery": "isQuery"
         },

package/node.html

@@ -715,6 +715,7 @@
         defaults: {
             apiBase: { value: "https://api.openai.com/v1", required: true },
             secureApiKeyHeaderOrQueryName: { value: "Authorization" },
+            organizationId: { value: "" },
             secureApiKeyIsQuery: { value: false },
             name: { value: "" },
         },
@@ -753,6 +754,10 @@
         <label id="node-config-input-secureApiKeyValue-label" for="node-config-input-secureApiKeyValue"><i class="fa fa-lock"></i> <span data-i18n="OpenaiApi.label.apiKey"></span></label>
         <input type="password" id="node-config-input-secureApiKeyValue" placeholder="">
     </div>
+    <div class="form-row">
+        <label id="node-config-input-organizationId-label" for="node-config-input-organizationId"><i class="fa fa-list"></i> <span data-i18n="OpenaiApi.label.organizationId"></span></label>
+        <input type="text" id="node-config-input-organizationId" placeholder="OpenAI Organization Id">
+    </div>
     <div class="form-row">
         <label id="node-config-input-secureApiKeyIsQuery-label" for="node-config-input-secureApiKeyIsQuery"><i class="fa fa-dot-circle-o"></i> <span data-i18n="OpenaiApi.label.isQuery"></span></label>
         <select id="node-config-input-secureApiKeyIsQuery">

package/node.js

@@ -15,6 +15,7 @@ module.exports = function (RED) {
                 let client = new lib.OpenaiApi();
                 if (!errorFlag && this.service) {
                     client.setApiBase(this.service.apiBase);
+                    client.setOrganizationIdHeader(this.service.organizationId);
                 }
 
                 if (!errorFlag && this.service && this.service.credentials && this.service.credentials.secureApiKeyValue) {
@@ -99,6 +100,7 @@ module.exports = function (RED) {
             this.apiBase = n.apiBase;
             this.secureApiKeyHeaderOrQueryName = n.secureApiKeyHeaderOrQueryName;
             this.secureApiKeyIsQuery = n.secureApiKeyIsQuery;
+            this.organizationId = n.organizationId;
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inductiv/node-red-openai-api",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "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": {