From d339c291fad6041f33d3cb6169d35bad1e03a134 Mon Sep 17 00:00:00 2001
From: Daniel Avila <messagedaniel@protonmail.com>
Date: Wed, 14 Jun 2023 13:09:49 -0400
Subject: [PATCH] refactor(langchain/tools): move availableTools import to
 tools/index.js

---
 api/app/langchain/tools/index.js                 | 2 ++
 api/app/langchain/tools/util/handleTools.js      | 2 +-
 api/app/langchain/tools/util/handleTools.test.js | 4 ++--
 api/app/langchain/tools/util/index.js            | 4 +---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/app/langchain/tools/index.js b/api/app/langchain/tools/index.js
index 84a8f86501..ba3ceb288c 100644
--- a/api/app/langchain/tools/index.js
+++ b/api/app/langchain/tools/index.js
@@ -6,8 +6,10 @@ const StructuredSD = require('./structured/StableDiffusion');
 const StableDiffusionAPI = require('./StableDiffusion');
 const WolframAlphaAPI = require('./Wolfram');
 const SelfReflectionTool = require('./SelfReflection');
+const availableTools = require('./manifest.json');
 
 module.exports = {
+  availableTools,
   GoogleSearchAPI,
   HttpRequestTool,
   AIPluginTool,
diff --git a/api/app/langchain/tools/util/handleTools.js b/api/app/langchain/tools/util/handleTools.js
index 34e727ec20..2e71946839 100644
--- a/api/app/langchain/tools/util/handleTools.js
+++ b/api/app/langchain/tools/util/handleTools.js
@@ -9,6 +9,7 @@ const { ChatOpenAI } = require('langchain/chat_models/openai');
 const { Calculator } = require('langchain/tools/calculator');
 const { WebBrowser } = require('langchain/tools/webbrowser');
 const {
+  availableTools,
   AIPluginTool,
   GoogleSearchAPI,
   WolframAlphaAPI,
@@ -17,7 +18,6 @@ const {
   StableDiffusionAPI,
   StructuredSD,
 } = require('../'); 
-const availableTools = require('../manifest.json');
 
 const validateTools = async (user, tools = []) => {
   try {
diff --git a/api/app/langchain/tools/util/handleTools.test.js b/api/app/langchain/tools/util/handleTools.test.js
index d0e89ea3fa..20c792c847 100644
--- a/api/app/langchain/tools/util/handleTools.test.js
+++ b/api/app/langchain/tools/util/handleTools.test.js
@@ -20,11 +20,11 @@ jest.mock('../../../../models/User', () => {
 jest.mock('../../../../server/services/PluginService', () => mockPluginService);
 
 const User = require('../../../../models/User');
-const { validateTools, loadTools, availableTools } = require('./');
+const { validateTools, loadTools } = require('./');
 const PluginService = require('../../../../server/services/PluginService');
 const { BaseChatModel } = require('langchain/chat_models/openai');
 const { Calculator } = require('langchain/tools/calculator');
-const { OpenAICreateImage, GoogleSearchAPI } = require('../');
+const { availableTools, OpenAICreateImage, GoogleSearchAPI } = require('../');
 
 describe('Tool Handlers', () => {
   let fakeUser;
diff --git a/api/app/langchain/tools/util/index.js b/api/app/langchain/tools/util/index.js
index e2c28e5de7..e39faea9c1 100644
--- a/api/app/langchain/tools/util/index.js
+++ b/api/app/langchain/tools/util/index.js
@@ -1,8 +1,6 @@
-const availableTools = require('../manifest.json');
 const { validateTools, loadTools } = require('./handleTools');
 
 module.exports = {
   validateTools,
-  loadTools,
-  availableTools
+  loadTools
 };