From 9df7c10293018753cd940ee5fd8f371987482503 Mon Sep 17 00:00:00 2001
From: Jonathan Addington <jonathan.addington@jmaddington.com>
Date: Mon, 9 Dec 2024 13:41:05 +0000
Subject: [PATCH] Fix: fix mistaken lines in merge

---
 api/app/clients/tools/index.js            | 1 +
 api/app/clients/tools/util/handleTools.js | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/api/app/clients/tools/index.js b/api/app/clients/tools/index.js
index 9b399c662c6..25814d71422 100644
--- a/api/app/clients/tools/index.js
+++ b/api/app/clients/tools/index.js
@@ -8,6 +8,7 @@ const StructuredSD = require('./structured/StableDiffusion');
 const GoogleSearchAPI = require('./structured/GoogleSearch');
 const TraversaalSearch = require('./structured/TraversaalSearch');
 const TavilySearchResults = require('./structured/TavilySearchResults');
+const FluxAPI = require('./structured/FluxAPI');
 const WebNavigator = require('./structured/WebNavigator');
 
 module.exports = {
diff --git a/api/app/clients/tools/util/handleTools.js b/api/app/clients/tools/util/handleTools.js
index cc2e26372ca..53419f1c3d1 100644
--- a/api/app/clients/tools/util/handleTools.js
+++ b/api/app/clients/tools/util/handleTools.js
@@ -16,7 +16,6 @@ const {
   TavilySearchResults,
   FluxAPI,
   WebNavigator,
-  FluxAPI,
 } = require('../');
 const { primeFiles: primeCodeFiles } = require('~/server/services/Files/Code/process');
 const { createFileSearchTool, primeFiles: primeSearchFiles } = require('./fileSearch');
@@ -165,7 +164,6 @@ const loadTools = async ({
     tavily_search_results_json: TavilySearchResults,
     flux: FluxAPI,
     WebNavigator: WebNavigator,
-    flux: FluxAPI,
   };
 
   const customConstructors = {
@@ -202,12 +200,10 @@ const loadTools = async ({
     dalle: imageGenOptions,
     'stable-diffusion': imageGenOptions,
     'flux' : imageGenOptions,
-    'flux' : imageGenOptions,
   };
 
   const toolAuthFields = {};
   toolAuthFields['flux'] = ['FLUX_API_KEY'];
-  toolAuthFields['flux'] = ['FLUX_API_KEY']; //I'm not sure if this is correct
 
   availableTools.forEach((tool) => {
     if (customConstructors[tool.pluginKey]) {