From c9e65658ebfc949624693d26fc20c40761d997e6 Mon Sep 17 00:00:00 2001
From: Shlomo Hershkop <shlomo.hershkop@ironcladhq.com>
Date: Mon, 22 Sep 2025 12:34:56 -0400
Subject: [PATCH 1/4] adding host setting to embedded

---
 .../core/src/integrations/openai/OpenAIEmbeddingGenerator.ts     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/src/integrations/openai/OpenAIEmbeddingGenerator.ts b/packages/core/src/integrations/openai/OpenAIEmbeddingGenerator.ts
index 6989ec521..db0330f2f 100644
--- a/packages/core/src/integrations/openai/OpenAIEmbeddingGenerator.ts
+++ b/packages/core/src/integrations/openai/OpenAIEmbeddingGenerator.ts
@@ -15,6 +15,7 @@ export class OpenAIEmbeddingGenerator implements EmbeddingGenerator {
     const api = new OpenAI({
       apiKey: this.#settings.openAiKey,
       organization: this.#settings.openAiOrganization,
+      baseURL: this.#settings.openAiEndpoint,
       dangerouslyAllowBrowser: true, // It's fine in Rivet
     });
 

From 3c2b0643667221c6869a57b80b7a99b9cc2d770c Mon Sep 17 00:00:00 2001
From: Shlomo Hershkop <shlomo.hershkop@ironcladhq.com>
Date: Mon, 22 Sep 2025 12:42:26 -0400
Subject: [PATCH 2/4] fixing general case to always use the openAiEndpoint as
 hostname for calling service

---
 packages/core/src/model/nodes/ChatNodeBase.ts   |  3 ++-
 .../openai/nodes/AttachAssistantFileNode.ts     |  3 ++-
 .../plugins/openai/nodes/CreateAssistantNode.ts |  5 +++--
 .../openai/nodes/CreateThreadMessageNode.ts     |  3 ++-
 .../plugins/openai/nodes/CreateThreadNode.ts    |  3 ++-
 .../plugins/openai/nodes/DeleteAssistantNode.ts |  3 ++-
 .../plugins/openai/nodes/DeleteThreadNode.ts    |  3 ++-
 .../plugins/openai/nodes/GetAssistantNode.ts    |  3 ++-
 .../plugins/openai/nodes/GetOpenAIFileNode.ts   |  3 ++-
 .../src/plugins/openai/nodes/GetThreadNode.ts   |  3 ++-
 .../plugins/openai/nodes/ListAssistantsNode.ts  |  3 ++-
 .../plugins/openai/nodes/ListOpenAIFilesNode.ts |  3 ++-
 .../openai/nodes/ListThreadMessagesNode.ts      |  3 ++-
 .../src/plugins/openai/nodes/RunThreadNode.ts   | 17 +++++++++--------
 .../src/plugins/openai/nodes/UploadFileNode.ts  |  3 ++-
 15 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/packages/core/src/model/nodes/ChatNodeBase.ts b/packages/core/src/model/nodes/ChatNodeBase.ts
index 06df5157c..0c1edbe27 100644
--- a/packages/core/src/model/nodes/ChatNodeBase.ts
+++ b/packages/core/src/model/nodes/ChatNodeBase.ts
@@ -1008,7 +1008,8 @@ export const ChatNodeBase = {
     const isMultiResponse = data.useNumberOfChoicesInput || (data.numberOfChoices ?? 1) > 1;
 
     // Resolve to final endpoint if configured in ProcessContext
-    const configuredEndpoint = endpoint || context.settings.openAiEndpoint || DEFAULT_CHAT_ENDPOINT;
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const configuredEndpoint = endpoint || `${baseUrl}/chat/completions`;
     const resolvedEndpointAndHeaders = context.getChatNodeEndpoint
       ? await context.getChatNodeEndpoint(configuredEndpoint, finalModel)
       : {
diff --git a/packages/core/src/plugins/openai/nodes/AttachAssistantFileNode.ts b/packages/core/src/plugins/openai/nodes/AttachAssistantFileNode.ts
index 7cac1e67d..bf373bf3f 100644
--- a/packages/core/src/plugins/openai/nodes/AttachAssistantFileNode.ts
+++ b/packages/core/src/plugins/openai/nodes/AttachAssistantFileNode.ts
@@ -120,7 +120,8 @@ export const AttachAssistantFileNodeImpl: PluginNodeImpl<AttachAssistantFileNode
       throw new Error('OpenAI key is not set.');
     }
 
-    const url = `https://api.openai.com/v1/assistants/${assistantId}/files`;
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const url = `${baseUrl}/assistants/${assistantId}/files`;
 
     const response = await fetch(url, {
       method: 'POST',
diff --git a/packages/core/src/plugins/openai/nodes/CreateAssistantNode.ts b/packages/core/src/plugins/openai/nodes/CreateAssistantNode.ts
index 159886f2b..7b7382b83 100644
--- a/packages/core/src/plugins/openai/nodes/CreateAssistantNode.ts
+++ b/packages/core/src/plugins/openai/nodes/CreateAssistantNode.ts
@@ -323,9 +323,10 @@ export const CreateAssistantNodeImpl: PluginNodeImpl<CreateAssistantNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
     const url = assistantId.trim()
-      ? `https://api.openai.com/v1/assistants/${assistantId}`
-      : 'https://api.openai.com/v1/assistants';
+      ? `${baseUrl}/assistants/${assistantId}`
+      : `${baseUrl}/assistants`;
 
     const response = await fetch(url, {
       method: 'POST',
diff --git a/packages/core/src/plugins/openai/nodes/CreateThreadMessageNode.ts b/packages/core/src/plugins/openai/nodes/CreateThreadMessageNode.ts
index 6985be9d8..f6fe888be 100644
--- a/packages/core/src/plugins/openai/nodes/CreateThreadMessageNode.ts
+++ b/packages/core/src/plugins/openai/nodes/CreateThreadMessageNode.ts
@@ -194,7 +194,8 @@ export const CreateThreadMessageNodeImpl: PluginNodeImpl<CreateThreadMessageNode
       throw new Error('OpenAI key is not set.');
     }
 
-    const url = `https://api.openai.com/v1/threads/${threadId}/messages`;
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const url = `${baseUrl}/threads/${threadId}/messages`;
 
     const response = await fetch(url, {
       method: 'POST',
diff --git a/packages/core/src/plugins/openai/nodes/CreateThreadNode.ts b/packages/core/src/plugins/openai/nodes/CreateThreadNode.ts
index 85ada3deb..fa6f2b054 100644
--- a/packages/core/src/plugins/openai/nodes/CreateThreadNode.ts
+++ b/packages/core/src/plugins/openai/nodes/CreateThreadNode.ts
@@ -161,7 +161,8 @@ export const CreateThreadNodeImpl: PluginNodeImpl<CreateThreadNode> = {
       return message as CreateMessageBody;
     });
 
-    const url = threadId.trim() ? `https://api.openai.com/v1/threads/${threadId}` : 'https://api.openai.com/v1/threads';
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const url = threadId.trim() ? `${baseUrl}/threads/${threadId}` : `${baseUrl}/threads`;
 
     if (threadId && messages.length > 0) {
       throw new Error('Cannot provide messages when modifying an existing thread.');
diff --git a/packages/core/src/plugins/openai/nodes/DeleteAssistantNode.ts b/packages/core/src/plugins/openai/nodes/DeleteAssistantNode.ts
index 24074d23f..366f0f747 100644
--- a/packages/core/src/plugins/openai/nodes/DeleteAssistantNode.ts
+++ b/packages/core/src/plugins/openai/nodes/DeleteAssistantNode.ts
@@ -99,7 +99,8 @@ export const DeleteAssistantNodeImpl: PluginNodeImpl<DeleteAssistantNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const response = await fetch(`https://api.openai.com/v1/assistants/${assistantId}`, {
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const response = await fetch(`${baseUrl}/assistants/${assistantId}`, {
       method: 'DELETE',
       headers: {
         'OpenAI-Beta': 'assistants=v1',
diff --git a/packages/core/src/plugins/openai/nodes/DeleteThreadNode.ts b/packages/core/src/plugins/openai/nodes/DeleteThreadNode.ts
index 8640854ad..e14b43e57 100644
--- a/packages/core/src/plugins/openai/nodes/DeleteThreadNode.ts
+++ b/packages/core/src/plugins/openai/nodes/DeleteThreadNode.ts
@@ -90,7 +90,8 @@ export const DeleteThreadNodeImpl: PluginNodeImpl<DeleteThreadNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const response = await fetch(`https://api.openai.com/v1/threads/${threadId}`, {
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const response = await fetch(`${baseUrl}/threads/${threadId}`, {
       method: 'DELETE',
       headers: {
         'OpenAI-Beta': 'assistants=v1',
diff --git a/packages/core/src/plugins/openai/nodes/GetAssistantNode.ts b/packages/core/src/plugins/openai/nodes/GetAssistantNode.ts
index d9b96cbff..b29933143 100644
--- a/packages/core/src/plugins/openai/nodes/GetAssistantNode.ts
+++ b/packages/core/src/plugins/openai/nodes/GetAssistantNode.ts
@@ -106,7 +106,8 @@ export const GetAssistantNodeImpl: PluginNodeImpl<GetAssistantNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const response = await fetch(`https://api.openai.com/v1/assistants/${assistantId}`, {
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const response = await fetch(`${baseUrl}/assistants/${assistantId}`, {
       method: 'GET',
       headers: {
         'OpenAI-Beta': 'assistants=v1',
diff --git a/packages/core/src/plugins/openai/nodes/GetOpenAIFileNode.ts b/packages/core/src/plugins/openai/nodes/GetOpenAIFileNode.ts
index df3dda2cc..a6e4b0bf8 100644
--- a/packages/core/src/plugins/openai/nodes/GetOpenAIFileNode.ts
+++ b/packages/core/src/plugins/openai/nodes/GetOpenAIFileNode.ts
@@ -96,7 +96,8 @@ export const GetOpenAIFileNodeImpl: PluginNodeImpl<GetOpenAIFileNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const url = `https://api.openai.com/v1/files/${fileId}`;
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const url = `${baseUrl}/files/${fileId}`;
 
     const response = await fetch(url, {
       method: 'GET',
diff --git a/packages/core/src/plugins/openai/nodes/GetThreadNode.ts b/packages/core/src/plugins/openai/nodes/GetThreadNode.ts
index a4edc3246..23a1b9483 100644
--- a/packages/core/src/plugins/openai/nodes/GetThreadNode.ts
+++ b/packages/core/src/plugins/openai/nodes/GetThreadNode.ts
@@ -104,7 +104,8 @@ export const GetThreadNodeImpl: PluginNodeImpl<GetThreadNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const response = await fetch(`https://api.openai.com/v1/threads/${threadId}`, {
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const response = await fetch(`${baseUrl}/threads/${threadId}`, {
       method: 'GET',
       headers: {
         'OpenAI-Beta': 'assistants=v1',
diff --git a/packages/core/src/plugins/openai/nodes/ListAssistantsNode.ts b/packages/core/src/plugins/openai/nodes/ListAssistantsNode.ts
index f14a868b5..401a027f8 100644
--- a/packages/core/src/plugins/openai/nodes/ListAssistantsNode.ts
+++ b/packages/core/src/plugins/openai/nodes/ListAssistantsNode.ts
@@ -212,7 +212,8 @@ ${
     }
 
     const query = new URLSearchParams(queryParams);
-    const url = `https://api.openai.com/v1/assistants?${query.toString()}`;
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const url = `${baseUrl}/assistants?${query.toString()}`;
 
     const response = await fetch(url, {
       method: 'GET',
diff --git a/packages/core/src/plugins/openai/nodes/ListOpenAIFilesNode.ts b/packages/core/src/plugins/openai/nodes/ListOpenAIFilesNode.ts
index 308ff17a2..bb6cd9e21 100644
--- a/packages/core/src/plugins/openai/nodes/ListOpenAIFilesNode.ts
+++ b/packages/core/src/plugins/openai/nodes/ListOpenAIFilesNode.ts
@@ -98,7 +98,8 @@ export const ListOpenAIFilesNodeImpl: PluginNodeImpl<ListOpenAIFilesNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const url = `https://api.openai.com/v1/files?purpose=${purpose}`;
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const url = `${baseUrl}/files?purpose=${purpose}`;
 
     const response = await fetch(url, {
       method: 'GET',
diff --git a/packages/core/src/plugins/openai/nodes/ListThreadMessagesNode.ts b/packages/core/src/plugins/openai/nodes/ListThreadMessagesNode.ts
index 5dd3b0aad..13d5df017 100644
--- a/packages/core/src/plugins/openai/nodes/ListThreadMessagesNode.ts
+++ b/packages/core/src/plugins/openai/nodes/ListThreadMessagesNode.ts
@@ -238,7 +238,8 @@ ${
     }
 
     const query = new URLSearchParams(queryParams);
-    const url = `https://api.openai.com/v1/threads/${threadId}/messages?${query.toString()}`;
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const url = `${baseUrl}/threads/${threadId}/messages?${query.toString()}`;
 
     const response = await fetch(url, {
       method: 'GET',
diff --git a/packages/core/src/plugins/openai/nodes/RunThreadNode.ts b/packages/core/src/plugins/openai/nodes/RunThreadNode.ts
index b3e06cc61..2580fb0ba 100644
--- a/packages/core/src/plugins/openai/nodes/RunThreadNode.ts
+++ b/packages/core/src/plugins/openai/nodes/RunThreadNode.ts
@@ -380,6 +380,7 @@ export const RunThreadNodeImpl: PluginNodeImpl<RunThreadNode> = {
   async process(data, inputData, context) {
     const threadId = getInputOrData(data, inputData, 'threadId');
     const assistantId = getInputOrData(data, inputData, 'assistantId');
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
 
     let metadata = data.metadata.reduce(
       (acc, { key, value }) => {
@@ -448,7 +449,7 @@ export const RunThreadNodeImpl: PluginNodeImpl<RunThreadNode> = {
         ? arrayizeDataValue(unwrapDataValue(messagesInput)).map((message) => coerceToThreadMessage(message))
         : [];
 
-      response = await fetch('https://api.openai.com/v1/threads/runs', {
+      response = await fetch(`${baseUrl}/threads/runs`, {
         method: 'POST',
         headers: {
           'OpenAI-Beta': 'assistants=v1',
@@ -465,7 +466,7 @@ export const RunThreadNodeImpl: PluginNodeImpl<RunThreadNode> = {
         }),
       });
     } else {
-      response = await fetch(`https://api.openai.com/v1/threads/${threadId}/runs`, {
+      response = await fetch(`${baseUrl}/threads/${threadId}/runs`, {
         method: 'POST',
         headers: {
           'OpenAI-Beta': 'assistants=v1',
@@ -509,7 +510,7 @@ export const RunThreadNodeImpl: PluginNodeImpl<RunThreadNode> = {
           order: 'desc',
         } satisfies OpenAIPaginationQuery);
 
-        const url = `https://api.openai.com/v1/threads/${body.thread_id}/runs/${body.id}/steps?${query.toString()}`;
+        const url = `${baseUrl}/threads/${body.thread_id}/runs/${body.id}/steps?${query.toString()}`;
         const response = await fetch(url, {
           method: 'GET',
           headers: {
@@ -547,7 +548,7 @@ export const RunThreadNodeImpl: PluginNodeImpl<RunThreadNode> = {
           const messageId = step.step_details.message_creation.message_id;
 
           const messageResponse = await fetch(
-            `https://api.openai.com/v1/threads/${body.thread_id}/messages/${messageId}`,
+            `${baseUrl}/threads/${body.thread_id}/messages/${messageId}`,
             {
               method: 'GET',
               headers: {
@@ -598,7 +599,7 @@ export const RunThreadNodeImpl: PluginNodeImpl<RunThreadNode> = {
         latestBody.status === 'queued' ||
         latestBody.status === 'requires_action'
       ) {
-        const runResponse = await fetch(`https://api.openai.com/v1/threads/${body.thread_id}/runs/${body.id}`, {
+        const runResponse = await fetch(`${baseUrl}/threads/${body.thread_id}/runs/${body.id}`, {
           method: 'GET',
           headers: {
             'OpenAI-Beta': 'assistants=v1',
@@ -681,7 +682,7 @@ export const RunThreadNodeImpl: PluginNodeImpl<RunThreadNode> = {
           }));
 
           const submitResponse = await fetch(
-            `https://api.openai.com/v1/threads/${body.thread_id}/runs/${body.id}/submit_tool_outputs`,
+            `${baseUrl}/threads/${body.thread_id}/runs/${body.id}/submit_tool_outputs`,
             {
               method: 'POST',
               headers: {
@@ -720,7 +721,7 @@ export const RunThreadNodeImpl: PluginNodeImpl<RunThreadNode> = {
       });
 
       const listStepsResponsePromise = await fetch(
-        `https://api.openai.com/v1/threads/${body.thread_id}/runs/${body.id}/steps?${listStepsQuery.toString()}`,
+        `${baseUrl}/threads/${body.thread_id}/runs/${body.id}/steps?${listStepsQuery.toString()}`,
         {
           method: 'GET',
           headers: {
@@ -738,7 +739,7 @@ export const RunThreadNodeImpl: PluginNodeImpl<RunThreadNode> = {
       } satisfies OpenAIPaginationQuery);
 
       const messagesResponsePromise = await fetch(
-        `https://api.openai.com/v1/threads/${body.thread_id}/messages?${getMessagesQuery.toString()}`,
+        `${baseUrl}/threads/${body.thread_id}/messages?${getMessagesQuery.toString()}`,
         {
           method: 'GET',
           headers: {
diff --git a/packages/core/src/plugins/openai/nodes/UploadFileNode.ts b/packages/core/src/plugins/openai/nodes/UploadFileNode.ts
index 22abdbb2e..15bc4812e 100644
--- a/packages/core/src/plugins/openai/nodes/UploadFileNode.ts
+++ b/packages/core/src/plugins/openai/nodes/UploadFileNode.ts
@@ -124,7 +124,8 @@ export const UploadFileNodeImpl: PluginNodeImpl<UploadFileNode> = {
     formData.append('purpose', purpose);
     formData.append('file', file);
 
-    const response = await fetch('https://api.openai.com/v1/files', {
+    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const response = await fetch(`${baseUrl}/files`, {
       method: 'POST',
       headers: {
         Authorization: `Bearer ${context.settings.openAiKey}`,

From 4b6b6e070056d19243cb16341eb54761a097e996 Mon Sep 17 00:00:00 2001
From: Adam Weber <adam.weber@ironcladhq.com>
Date: Mon, 22 Sep 2025 11:24:38 -0700
Subject: [PATCH 3/4] remove now ununsed DEFAULT_CHAT_ENDPOINT

---
 packages/core/src/model/nodes/ChatNodeBase.ts | 1 -
 packages/core/src/utils/defaults.ts           | 2 --
 2 files changed, 3 deletions(-)

diff --git a/packages/core/src/model/nodes/ChatNodeBase.ts b/packages/core/src/model/nodes/ChatNodeBase.ts
index 0c1edbe27..c5033aef1 100644
--- a/packages/core/src/model/nodes/ChatNodeBase.ts
+++ b/packages/core/src/model/nodes/ChatNodeBase.ts
@@ -22,7 +22,6 @@ import type { Inputs, Outputs } from '../GraphProcessor.js';
 import { cleanHeaders, getInputOrData } from '../../utils/inputs.js';
 import type { InternalProcessContext } from '../ProcessContext.js';
 import { chatMessageToOpenAIChatCompletionMessage } from '../../utils/chatMessageToOpenAIChatCompletionMessage.js';
-import { DEFAULT_CHAT_ENDPOINT } from '../../utils/defaults.js';
 import type { TokenizerCallInfo } from '../../integrations/Tokenizer.js';
 import { addWarning } from '../../utils/outputs.js';
 import retry from 'p-retry';
diff --git a/packages/core/src/utils/defaults.ts b/packages/core/src/utils/defaults.ts
index 7ffc76f88..d73a3bce1 100644
--- a/packages/core/src/utils/defaults.ts
+++ b/packages/core/src/utils/defaults.ts
@@ -1,3 +1 @@
-export const DEFAULT_CHAT_ENDPOINT = 'https://api.openai.com/v1/chat/completions';
-
 export const DEFAULT_CHAT_NODE_TIMEOUT = 30_000;

From b606de0e015715d6cd023de2260199bc8101b0ab Mon Sep 17 00:00:00 2001
From: Adam Weber <adam.weber@ironcladhq.com>
Date: Mon, 22 Sep 2025 11:25:00 -0700
Subject: [PATCH 4/4] use null-coalescing operator instead of OR

---
 packages/core/src/model/nodes/ChatNodeBase.ts                   | 2 +-
 .../core/src/plugins/openai/nodes/AttachAssistantFileNode.ts    | 2 +-
 packages/core/src/plugins/openai/nodes/CreateAssistantNode.ts   | 2 +-
 .../core/src/plugins/openai/nodes/CreateThreadMessageNode.ts    | 2 +-
 packages/core/src/plugins/openai/nodes/CreateThreadNode.ts      | 2 +-
 packages/core/src/plugins/openai/nodes/DeleteAssistantNode.ts   | 2 +-
 packages/core/src/plugins/openai/nodes/DeleteThreadNode.ts      | 2 +-
 packages/core/src/plugins/openai/nodes/GetAssistantNode.ts      | 2 +-
 packages/core/src/plugins/openai/nodes/GetOpenAIFileNode.ts     | 2 +-
 packages/core/src/plugins/openai/nodes/GetThreadNode.ts         | 2 +-
 packages/core/src/plugins/openai/nodes/ListAssistantsNode.ts    | 2 +-
 packages/core/src/plugins/openai/nodes/ListOpenAIFilesNode.ts   | 2 +-
 .../core/src/plugins/openai/nodes/ListThreadMessagesNode.ts     | 2 +-
 packages/core/src/plugins/openai/nodes/RunThreadNode.ts         | 2 +-
 packages/core/src/plugins/openai/nodes/UploadFileNode.ts        | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/core/src/model/nodes/ChatNodeBase.ts b/packages/core/src/model/nodes/ChatNodeBase.ts
index c5033aef1..80647e77d 100644
--- a/packages/core/src/model/nodes/ChatNodeBase.ts
+++ b/packages/core/src/model/nodes/ChatNodeBase.ts
@@ -1007,7 +1007,7 @@ export const ChatNodeBase = {
     const isMultiResponse = data.useNumberOfChoicesInput || (data.numberOfChoices ?? 1) > 1;
 
     // Resolve to final endpoint if configured in ProcessContext
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const configuredEndpoint = endpoint || `${baseUrl}/chat/completions`;
     const resolvedEndpointAndHeaders = context.getChatNodeEndpoint
       ? await context.getChatNodeEndpoint(configuredEndpoint, finalModel)
diff --git a/packages/core/src/plugins/openai/nodes/AttachAssistantFileNode.ts b/packages/core/src/plugins/openai/nodes/AttachAssistantFileNode.ts
index bf373bf3f..0ba319fa7 100644
--- a/packages/core/src/plugins/openai/nodes/AttachAssistantFileNode.ts
+++ b/packages/core/src/plugins/openai/nodes/AttachAssistantFileNode.ts
@@ -120,7 +120,7 @@ export const AttachAssistantFileNodeImpl: PluginNodeImpl<AttachAssistantFileNode
       throw new Error('OpenAI key is not set.');
     }
 
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const url = `${baseUrl}/assistants/${assistantId}/files`;
 
     const response = await fetch(url, {
diff --git a/packages/core/src/plugins/openai/nodes/CreateAssistantNode.ts b/packages/core/src/plugins/openai/nodes/CreateAssistantNode.ts
index 7b7382b83..b1f053032 100644
--- a/packages/core/src/plugins/openai/nodes/CreateAssistantNode.ts
+++ b/packages/core/src/plugins/openai/nodes/CreateAssistantNode.ts
@@ -323,7 +323,7 @@ export const CreateAssistantNodeImpl: PluginNodeImpl<CreateAssistantNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const url = assistantId.trim()
       ? `${baseUrl}/assistants/${assistantId}`
       : `${baseUrl}/assistants`;
diff --git a/packages/core/src/plugins/openai/nodes/CreateThreadMessageNode.ts b/packages/core/src/plugins/openai/nodes/CreateThreadMessageNode.ts
index f6fe888be..2eb495062 100644
--- a/packages/core/src/plugins/openai/nodes/CreateThreadMessageNode.ts
+++ b/packages/core/src/plugins/openai/nodes/CreateThreadMessageNode.ts
@@ -194,7 +194,7 @@ export const CreateThreadMessageNodeImpl: PluginNodeImpl<CreateThreadMessageNode
       throw new Error('OpenAI key is not set.');
     }
 
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const url = `${baseUrl}/threads/${threadId}/messages`;
 
     const response = await fetch(url, {
diff --git a/packages/core/src/plugins/openai/nodes/CreateThreadNode.ts b/packages/core/src/plugins/openai/nodes/CreateThreadNode.ts
index fa6f2b054..02302c4df 100644
--- a/packages/core/src/plugins/openai/nodes/CreateThreadNode.ts
+++ b/packages/core/src/plugins/openai/nodes/CreateThreadNode.ts
@@ -161,7 +161,7 @@ export const CreateThreadNodeImpl: PluginNodeImpl<CreateThreadNode> = {
       return message as CreateMessageBody;
     });
 
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const url = threadId.trim() ? `${baseUrl}/threads/${threadId}` : `${baseUrl}/threads`;
 
     if (threadId && messages.length > 0) {
diff --git a/packages/core/src/plugins/openai/nodes/DeleteAssistantNode.ts b/packages/core/src/plugins/openai/nodes/DeleteAssistantNode.ts
index 366f0f747..ca9c45967 100644
--- a/packages/core/src/plugins/openai/nodes/DeleteAssistantNode.ts
+++ b/packages/core/src/plugins/openai/nodes/DeleteAssistantNode.ts
@@ -99,7 +99,7 @@ export const DeleteAssistantNodeImpl: PluginNodeImpl<DeleteAssistantNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const response = await fetch(`${baseUrl}/assistants/${assistantId}`, {
       method: 'DELETE',
       headers: {
diff --git a/packages/core/src/plugins/openai/nodes/DeleteThreadNode.ts b/packages/core/src/plugins/openai/nodes/DeleteThreadNode.ts
index e14b43e57..a118dc383 100644
--- a/packages/core/src/plugins/openai/nodes/DeleteThreadNode.ts
+++ b/packages/core/src/plugins/openai/nodes/DeleteThreadNode.ts
@@ -90,7 +90,7 @@ export const DeleteThreadNodeImpl: PluginNodeImpl<DeleteThreadNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const response = await fetch(`${baseUrl}/threads/${threadId}`, {
       method: 'DELETE',
       headers: {
diff --git a/packages/core/src/plugins/openai/nodes/GetAssistantNode.ts b/packages/core/src/plugins/openai/nodes/GetAssistantNode.ts
index b29933143..9c728f94d 100644
--- a/packages/core/src/plugins/openai/nodes/GetAssistantNode.ts
+++ b/packages/core/src/plugins/openai/nodes/GetAssistantNode.ts
@@ -106,7 +106,7 @@ export const GetAssistantNodeImpl: PluginNodeImpl<GetAssistantNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const response = await fetch(`${baseUrl}/assistants/${assistantId}`, {
       method: 'GET',
       headers: {
diff --git a/packages/core/src/plugins/openai/nodes/GetOpenAIFileNode.ts b/packages/core/src/plugins/openai/nodes/GetOpenAIFileNode.ts
index a6e4b0bf8..990f061fe 100644
--- a/packages/core/src/plugins/openai/nodes/GetOpenAIFileNode.ts
+++ b/packages/core/src/plugins/openai/nodes/GetOpenAIFileNode.ts
@@ -96,7 +96,7 @@ export const GetOpenAIFileNodeImpl: PluginNodeImpl<GetOpenAIFileNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const url = `${baseUrl}/files/${fileId}`;
 
     const response = await fetch(url, {
diff --git a/packages/core/src/plugins/openai/nodes/GetThreadNode.ts b/packages/core/src/plugins/openai/nodes/GetThreadNode.ts
index 23a1b9483..ffe3b877a 100644
--- a/packages/core/src/plugins/openai/nodes/GetThreadNode.ts
+++ b/packages/core/src/plugins/openai/nodes/GetThreadNode.ts
@@ -104,7 +104,7 @@ export const GetThreadNodeImpl: PluginNodeImpl<GetThreadNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const response = await fetch(`${baseUrl}/threads/${threadId}`, {
       method: 'GET',
       headers: {
diff --git a/packages/core/src/plugins/openai/nodes/ListAssistantsNode.ts b/packages/core/src/plugins/openai/nodes/ListAssistantsNode.ts
index 401a027f8..18ba7c39e 100644
--- a/packages/core/src/plugins/openai/nodes/ListAssistantsNode.ts
+++ b/packages/core/src/plugins/openai/nodes/ListAssistantsNode.ts
@@ -212,7 +212,7 @@ ${
     }
 
     const query = new URLSearchParams(queryParams);
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const url = `${baseUrl}/assistants?${query.toString()}`;
 
     const response = await fetch(url, {
diff --git a/packages/core/src/plugins/openai/nodes/ListOpenAIFilesNode.ts b/packages/core/src/plugins/openai/nodes/ListOpenAIFilesNode.ts
index bb6cd9e21..a0ddb6d5a 100644
--- a/packages/core/src/plugins/openai/nodes/ListOpenAIFilesNode.ts
+++ b/packages/core/src/plugins/openai/nodes/ListOpenAIFilesNode.ts
@@ -98,7 +98,7 @@ export const ListOpenAIFilesNodeImpl: PluginNodeImpl<ListOpenAIFilesNode> = {
       throw new Error('OpenAI key is not set.');
     }
 
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const url = `${baseUrl}/files?purpose=${purpose}`;
 
     const response = await fetch(url, {
diff --git a/packages/core/src/plugins/openai/nodes/ListThreadMessagesNode.ts b/packages/core/src/plugins/openai/nodes/ListThreadMessagesNode.ts
index 13d5df017..281ff3737 100644
--- a/packages/core/src/plugins/openai/nodes/ListThreadMessagesNode.ts
+++ b/packages/core/src/plugins/openai/nodes/ListThreadMessagesNode.ts
@@ -238,7 +238,7 @@ ${
     }
 
     const query = new URLSearchParams(queryParams);
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const url = `${baseUrl}/threads/${threadId}/messages?${query.toString()}`;
 
     const response = await fetch(url, {
diff --git a/packages/core/src/plugins/openai/nodes/RunThreadNode.ts b/packages/core/src/plugins/openai/nodes/RunThreadNode.ts
index 2580fb0ba..d747f23c3 100644
--- a/packages/core/src/plugins/openai/nodes/RunThreadNode.ts
+++ b/packages/core/src/plugins/openai/nodes/RunThreadNode.ts
@@ -380,7 +380,7 @@ export const RunThreadNodeImpl: PluginNodeImpl<RunThreadNode> = {
   async process(data, inputData, context) {
     const threadId = getInputOrData(data, inputData, 'threadId');
     const assistantId = getInputOrData(data, inputData, 'assistantId');
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
 
     let metadata = data.metadata.reduce(
       (acc, { key, value }) => {
diff --git a/packages/core/src/plugins/openai/nodes/UploadFileNode.ts b/packages/core/src/plugins/openai/nodes/UploadFileNode.ts
index 15bc4812e..6c579e6e5 100644
--- a/packages/core/src/plugins/openai/nodes/UploadFileNode.ts
+++ b/packages/core/src/plugins/openai/nodes/UploadFileNode.ts
@@ -124,7 +124,7 @@ export const UploadFileNodeImpl: PluginNodeImpl<UploadFileNode> = {
     formData.append('purpose', purpose);
     formData.append('file', file);
 
-    const baseUrl = context.settings.openAiEndpoint || 'https://api.openai.com/v1';
+    const baseUrl = context.settings.openAiEndpoint ?? 'https://api.openai.com/v1';
     const response = await fetch(`${baseUrl}/files`, {
       method: 'POST',
       headers: {