Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🏞️ fix: Gemini Image Filenames and Add Tool Cache Safety (#11306)

Danny Avilacdffdd292600
diff --git a/api/server/controllers/agents/callbacks.js b/api/server/controllers/agents/callbacks.js
index aee419577a..0d2a7bc317 100644
--- a/api/server/controllers/agents/callbacks.js
+++ b/api/server/controllers/agents/callbacks.js
@@ -408,7 +408,7 @@ function createToolEndCallback({ req, res, artifactPromises, streamId = null })
const { url } = part.image_url;
artifactPromises.push(
(async () => {
- const filename = `${output.name}_${output.tool_call_id}_img_${nanoid()}`;
+ const filename = `${output.name}_img_${nanoid()}`;
const file_id = output.artifact.file_ids?.[i];
const file = await saveBase64Image(url, {
req,
diff --git a/api/server/controllers/agents/v1.js b/api/server/controllers/agents/v1.js
index 5c2ac8bb06..19a185279e 100644
--- a/api/server/controllers/agents/v1.js
+++ b/api/server/controllers/agents/v1.js
@@ -119,7 +119,7 @@ const createAgentHandler = async (req, res) => {
agentData.author = userId;
agentData.tools = [];
- const availableTools = await getCachedTools();
+ const availableTools = (await getCachedTools()) ?? {};
for (const tool of tools) {
if (availableTools[tool]) {
agentData.tools.push(tool);
diff --git a/api/server/controllers/assistants/v1.js b/api/server/controllers/assistants/v1.js
index 32842deb0f..5d13d30334 100644
--- a/api/server/controllers/assistants/v1.js
+++ b/api/server/controllers/assistants/v1.js
@@ -31,7 +31,7 @@ const createAssistant = async (req, res) => {
delete assistantData.conversation_starters;
delete assistantData.append_current_datetime;
- const toolDefinitions = await getCachedTools();
+ const toolDefinitions = (await getCachedTools()) ?? {};
assistantData.tools = tools
.map((tool) => {
@@ -136,7 +136,7 @@ const patchAssistant = async (req, res) => {
...updateData
} = req.body;
- const toolDefinitions = await getCachedTools();
+ const toolDefinitions = (await getCachedTools()) ?? {};
updateData.tools = (updateData.tools ?? [])
.map((tool) => {
diff --git a/api/server/controllers/assistants/v2.js b/api/server/controllers/assistants/v2.js
index 278dd13021..b9c5cd709f 100644
--- a/api/server/controllers/assistants/v2.js
+++ b/api/server/controllers/assistants/v2.js
@@ -28,7 +28,7 @@ const createAssistant = async (req, res) => {
delete assistantData.conversation_starters;
delete assistantData.append_current_datetime;
- const toolDefinitions = await getCachedTools();
+ const toolDefinitions = (await getCachedTools()) ?? {};
assistantData.tools = tools
.map((tool) => {
@@ -125,7 +125,7 @@ const updateAssistant = async ({ req, openai, assistant_id, updateData }) => {
let hasFileSearch = false;
for (const tool of updateData.tools ?? []) {
- const toolDefinitions = await getCachedTools();
+ const toolDefinitions = (await getCachedTools()) ?? {};
let actualTool = typeof tool === 'string' ? toolDefinitions[tool] : tool;
if (!actualTool && manifestToolMap[tool] && manifestToolMap[tool].toolkit === true) {
diff --git a/api/server/services/ToolService.js b/api/server/services/ToolService.js
index 1e2074cdf4..62d25b23eb 100644
--- a/api/server/services/ToolService.js
+++ b/api/server/services/ToolService.js
@@ -79,7 +79,7 @@ async function processRequiredActions(client, requiredActions) {
requiredActions,
);
const appConfig = client.req.config;
- const toolDefinitions = await getCachedTools();
+ const toolDefinitions = (await getCachedTools()) ?? {};
const seenToolkits = new Set();
const tools = requiredActions
.map((action) => {