From 20fb7f05aeae9712be42689646c2829c31aa92d4 Mon Sep 17 00:00:00 2001 From: adrianfagerland Date: Sat, 19 Oct 2024 14:24:07 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=83=20refactor:=20rename=20all=20serve?= =?UTF-8?q?r=20endpoints=20to=20use=20same=20file=20names=20(#4364)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/server/services/Endpoints/agents/initialize.js | 4 ++-- .../Endpoints/anthropic/{buildOptions.js => build.js} | 0 api/server/services/Endpoints/anthropic/index.js | 6 +++--- .../anthropic/{initializeClient.js => initialize.js} | 0 .../services/Endpoints/anthropic/{addTitle.js => title.js} | 0 .../Endpoints/assistants/{buildOptions.js => build.js} | 0 api/server/services/Endpoints/assistants/index.js | 6 +++--- .../assistants/{initializeClient.js => initalize.js} | 0 .../{initializeClient.spec.js => initialize.spec.js} | 2 +- .../services/Endpoints/assistants/{addTitle.js => title.js} | 0 .../Endpoints/azureAssistants/{buildOptions.js => build.js} | 0 api/server/services/Endpoints/azureAssistants/index.js | 4 ++-- .../azureAssistants/{initializeClient.js => initialize.js} | 0 .../{initializeClient.spec.js => initialize.spec.js} | 2 +- .../services/Endpoints/custom/{buildOptions.js => build.js} | 0 api/server/services/Endpoints/custom/index.js | 4 ++-- .../Endpoints/custom/{initializeClient.js => initialize.js} | 0 .../services/Endpoints/google/{buildOptions.js => build.js} | 0 api/server/services/Endpoints/google/index.js | 6 +++--- .../Endpoints/google/{initializeClient.js => initialize.js} | 0 .../google/{initializeClient.spec.js => initialize.spec.js} | 2 +- .../services/Endpoints/google/{addTitle.js => title.js} | 2 +- .../Endpoints/gptPlugins/{buildOptions.js => build.js} | 0 api/server/services/Endpoints/gptPlugins/index.js | 4 ++-- .../gptPlugins/{initializeClient.js => initialize.js} | 0 .../{initializeClient.spec.js => initialize.spec.js} | 2 +- .../services/Endpoints/openAI/{buildOptions.js => build.js} | 0 api/server/services/Endpoints/openAI/index.js | 6 +++--- .../Endpoints/openAI/{initializeClient.js => initialize.js} | 0 .../openAI/{initializeClient.spec.js => initialize.spec.js} | 2 +- .../services/Endpoints/openAI/{addTitle.js => title.js} | 0 31 files changed, 26 insertions(+), 26 deletions(-) rename api/server/services/Endpoints/anthropic/{buildOptions.js => build.js} (100%) rename api/server/services/Endpoints/anthropic/{initializeClient.js => initialize.js} (100%) rename api/server/services/Endpoints/anthropic/{addTitle.js => title.js} (100%) rename api/server/services/Endpoints/assistants/{buildOptions.js => build.js} (100%) rename api/server/services/Endpoints/assistants/{initializeClient.js => initalize.js} (100%) rename api/server/services/Endpoints/assistants/{initializeClient.spec.js => initialize.spec.js} (98%) rename api/server/services/Endpoints/assistants/{addTitle.js => title.js} (100%) rename api/server/services/Endpoints/azureAssistants/{buildOptions.js => build.js} (100%) rename api/server/services/Endpoints/azureAssistants/{initializeClient.js => initialize.js} (100%) rename api/server/services/Endpoints/azureAssistants/{initializeClient.spec.js => initialize.spec.js} (98%) rename api/server/services/Endpoints/custom/{buildOptions.js => build.js} (100%) rename api/server/services/Endpoints/custom/{initializeClient.js => initialize.js} (100%) rename api/server/services/Endpoints/google/{buildOptions.js => build.js} (100%) rename api/server/services/Endpoints/google/{initializeClient.js => initialize.js} (100%) rename api/server/services/Endpoints/google/{initializeClient.spec.js => initialize.spec.js} (97%) rename api/server/services/Endpoints/google/{addTitle.js => title.js} (97%) rename api/server/services/Endpoints/gptPlugins/{buildOptions.js => build.js} (100%) rename api/server/services/Endpoints/gptPlugins/{initializeClient.js => initialize.js} (100%) rename api/server/services/Endpoints/gptPlugins/{initializeClient.spec.js => initialize.spec.js} (99%) rename api/server/services/Endpoints/openAI/{buildOptions.js => build.js} (100%) rename api/server/services/Endpoints/openAI/{initializeClient.js => initialize.js} (100%) rename api/server/services/Endpoints/openAI/{initializeClient.spec.js => initialize.spec.js} (99%) rename api/server/services/Endpoints/openAI/{addTitle.js => title.js} (100%) diff --git a/api/server/services/Endpoints/agents/initialize.js b/api/server/services/Endpoints/agents/initialize.js index d01d8388a0..b756b781ee 100644 --- a/api/server/services/Endpoints/agents/initialize.js +++ b/api/server/services/Endpoints/agents/initialize.js @@ -21,8 +21,8 @@ const { getDefaultHandlers, createToolEndCallback, } = require('~/server/controllers/agents/callbacks'); -const initAnthropic = require('~/server/services/Endpoints/anthropic/initializeClient'); -const initOpenAI = require('~/server/services/Endpoints/openAI/initializeClient'); +const initAnthropic = require('~/server/services/Endpoints/anthropic/initialize'); +const initOpenAI = require('~/server/services/Endpoints/openAI/initialize'); const getBedrockOptions = require('~/server/services/Endpoints/bedrock/options'); const { loadAgentTools } = require('~/server/services/ToolService'); const AgentClient = require('~/server/controllers/agents/client'); diff --git a/api/server/services/Endpoints/anthropic/buildOptions.js b/api/server/services/Endpoints/anthropic/build.js similarity index 100% rename from api/server/services/Endpoints/anthropic/buildOptions.js rename to api/server/services/Endpoints/anthropic/build.js diff --git a/api/server/services/Endpoints/anthropic/index.js b/api/server/services/Endpoints/anthropic/index.js index 772b1efb11..c4e7533c5d 100644 --- a/api/server/services/Endpoints/anthropic/index.js +++ b/api/server/services/Endpoints/anthropic/index.js @@ -1,6 +1,6 @@ -const addTitle = require('./addTitle'); -const buildOptions = require('./buildOptions'); -const initializeClient = require('./initializeClient'); +const addTitle = require('./title'); +const buildOptions = require('./build'); +const initializeClient = require('./initialize'); module.exports = { addTitle, diff --git a/api/server/services/Endpoints/anthropic/initializeClient.js b/api/server/services/Endpoints/anthropic/initialize.js similarity index 100% rename from api/server/services/Endpoints/anthropic/initializeClient.js rename to api/server/services/Endpoints/anthropic/initialize.js diff --git a/api/server/services/Endpoints/anthropic/addTitle.js b/api/server/services/Endpoints/anthropic/title.js similarity index 100% rename from api/server/services/Endpoints/anthropic/addTitle.js rename to api/server/services/Endpoints/anthropic/title.js diff --git a/api/server/services/Endpoints/assistants/buildOptions.js b/api/server/services/Endpoints/assistants/build.js similarity index 100% rename from api/server/services/Endpoints/assistants/buildOptions.js rename to api/server/services/Endpoints/assistants/build.js diff --git a/api/server/services/Endpoints/assistants/index.js b/api/server/services/Endpoints/assistants/index.js index 772b1efb11..15fca45a34 100644 --- a/api/server/services/Endpoints/assistants/index.js +++ b/api/server/services/Endpoints/assistants/index.js @@ -1,6 +1,6 @@ -const addTitle = require('./addTitle'); -const buildOptions = require('./buildOptions'); -const initializeClient = require('./initializeClient'); +const addTitle = require('./title'); +const buildOptions = require('./build'); +const initializeClient = require('./initalize'); module.exports = { addTitle, diff --git a/api/server/services/Endpoints/assistants/initializeClient.js b/api/server/services/Endpoints/assistants/initalize.js similarity index 100% rename from api/server/services/Endpoints/assistants/initializeClient.js rename to api/server/services/Endpoints/assistants/initalize.js diff --git a/api/server/services/Endpoints/assistants/initializeClient.spec.js b/api/server/services/Endpoints/assistants/initialize.spec.js similarity index 98% rename from api/server/services/Endpoints/assistants/initializeClient.spec.js rename to api/server/services/Endpoints/assistants/initialize.spec.js index 3879fc0ffc..261f37e9d1 100644 --- a/api/server/services/Endpoints/assistants/initializeClient.spec.js +++ b/api/server/services/Endpoints/assistants/initialize.spec.js @@ -2,7 +2,7 @@ const { HttpsProxyAgent } = require('https-proxy-agent'); const { ErrorTypes } = require('librechat-data-provider'); const { getUserKey, getUserKeyExpiry, getUserKeyValues } = require('~/server/services/UserService'); -const initializeClient = require('./initializeClient'); +const initializeClient = require('./initalize'); // const { OpenAIClient } = require('~/app'); jest.mock('~/server/services/UserService', () => ({ diff --git a/api/server/services/Endpoints/assistants/addTitle.js b/api/server/services/Endpoints/assistants/title.js similarity index 100% rename from api/server/services/Endpoints/assistants/addTitle.js rename to api/server/services/Endpoints/assistants/title.js diff --git a/api/server/services/Endpoints/azureAssistants/buildOptions.js b/api/server/services/Endpoints/azureAssistants/build.js similarity index 100% rename from api/server/services/Endpoints/azureAssistants/buildOptions.js rename to api/server/services/Endpoints/azureAssistants/build.js diff --git a/api/server/services/Endpoints/azureAssistants/index.js b/api/server/services/Endpoints/azureAssistants/index.js index 3994468306..202cb0e4d7 100644 --- a/api/server/services/Endpoints/azureAssistants/index.js +++ b/api/server/services/Endpoints/azureAssistants/index.js @@ -1,5 +1,5 @@ -const buildOptions = require('./buildOptions'); -const initializeClient = require('./initializeClient'); +const buildOptions = require('./build'); +const initializeClient = require('./initialize'); module.exports = { buildOptions, diff --git a/api/server/services/Endpoints/azureAssistants/initializeClient.js b/api/server/services/Endpoints/azureAssistants/initialize.js similarity index 100% rename from api/server/services/Endpoints/azureAssistants/initializeClient.js rename to api/server/services/Endpoints/azureAssistants/initialize.js diff --git a/api/server/services/Endpoints/azureAssistants/initializeClient.spec.js b/api/server/services/Endpoints/azureAssistants/initialize.spec.js similarity index 98% rename from api/server/services/Endpoints/azureAssistants/initializeClient.spec.js rename to api/server/services/Endpoints/azureAssistants/initialize.spec.js index 6dc4a6d47a..d0c8a364eb 100644 --- a/api/server/services/Endpoints/azureAssistants/initializeClient.spec.js +++ b/api/server/services/Endpoints/azureAssistants/initialize.spec.js @@ -2,7 +2,7 @@ const { HttpsProxyAgent } = require('https-proxy-agent'); const { ErrorTypes } = require('librechat-data-provider'); const { getUserKey, getUserKeyExpiry, getUserKeyValues } = require('~/server/services/UserService'); -const initializeClient = require('./initializeClient'); +const initializeClient = require('./initialize'); // const { OpenAIClient } = require('~/app'); jest.mock('~/server/services/UserService', () => ({ diff --git a/api/server/services/Endpoints/custom/buildOptions.js b/api/server/services/Endpoints/custom/build.js similarity index 100% rename from api/server/services/Endpoints/custom/buildOptions.js rename to api/server/services/Endpoints/custom/build.js diff --git a/api/server/services/Endpoints/custom/index.js b/api/server/services/Endpoints/custom/index.js index 3cda8d5fec..5a70d78749 100644 --- a/api/server/services/Endpoints/custom/index.js +++ b/api/server/services/Endpoints/custom/index.js @@ -1,5 +1,5 @@ -const initializeClient = require('./initializeClient'); -const buildOptions = require('./buildOptions'); +const initializeClient = require('./initialize'); +const buildOptions = require('./build'); module.exports = { initializeClient, diff --git a/api/server/services/Endpoints/custom/initializeClient.js b/api/server/services/Endpoints/custom/initialize.js similarity index 100% rename from api/server/services/Endpoints/custom/initializeClient.js rename to api/server/services/Endpoints/custom/initialize.js diff --git a/api/server/services/Endpoints/google/buildOptions.js b/api/server/services/Endpoints/google/build.js similarity index 100% rename from api/server/services/Endpoints/google/buildOptions.js rename to api/server/services/Endpoints/google/build.js diff --git a/api/server/services/Endpoints/google/index.js b/api/server/services/Endpoints/google/index.js index 772b1efb11..c4e7533c5d 100644 --- a/api/server/services/Endpoints/google/index.js +++ b/api/server/services/Endpoints/google/index.js @@ -1,6 +1,6 @@ -const addTitle = require('./addTitle'); -const buildOptions = require('./buildOptions'); -const initializeClient = require('./initializeClient'); +const addTitle = require('./title'); +const buildOptions = require('./build'); +const initializeClient = require('./initialize'); module.exports = { addTitle, diff --git a/api/server/services/Endpoints/google/initializeClient.js b/api/server/services/Endpoints/google/initialize.js similarity index 100% rename from api/server/services/Endpoints/google/initializeClient.js rename to api/server/services/Endpoints/google/initialize.js diff --git a/api/server/services/Endpoints/google/initializeClient.spec.js b/api/server/services/Endpoints/google/initialize.spec.js similarity index 97% rename from api/server/services/Endpoints/google/initializeClient.spec.js rename to api/server/services/Endpoints/google/initialize.spec.js index 657dcbcaa8..e5391107bd 100644 --- a/api/server/services/Endpoints/google/initializeClient.spec.js +++ b/api/server/services/Endpoints/google/initialize.spec.js @@ -1,6 +1,6 @@ // file deepcode ignore HardcodedNonCryptoSecret: No hardcoded secrets const { getUserKey } = require('~/server/services/UserService'); -const initializeClient = require('./initializeClient'); +const initializeClient = require('./initialize'); const { GoogleClient } = require('~/app'); jest.mock('~/server/services/UserService', () => ({ diff --git a/api/server/services/Endpoints/google/addTitle.js b/api/server/services/Endpoints/google/title.js similarity index 97% rename from api/server/services/Endpoints/google/addTitle.js rename to api/server/services/Endpoints/google/title.js index f21d123214..b93f13797f 100644 --- a/api/server/services/Endpoints/google/addTitle.js +++ b/api/server/services/Endpoints/google/title.js @@ -3,7 +3,7 @@ const getLogStores = require('~/cache/getLogStores'); const { isEnabled } = require('~/server/utils'); const { saveConvo } = require('~/models'); const { logger } = require('~/config'); -const initializeClient = require('./initializeClient'); +const initializeClient = require('./initialize'); const addTitle = async (req, { text, response, client }) => { const { TITLE_CONVO = 'true' } = process.env ?? {}; diff --git a/api/server/services/Endpoints/gptPlugins/buildOptions.js b/api/server/services/Endpoints/gptPlugins/build.js similarity index 100% rename from api/server/services/Endpoints/gptPlugins/buildOptions.js rename to api/server/services/Endpoints/gptPlugins/build.js diff --git a/api/server/services/Endpoints/gptPlugins/index.js b/api/server/services/Endpoints/gptPlugins/index.js index 3994468306..202cb0e4d7 100644 --- a/api/server/services/Endpoints/gptPlugins/index.js +++ b/api/server/services/Endpoints/gptPlugins/index.js @@ -1,5 +1,5 @@ -const buildOptions = require('./buildOptions'); -const initializeClient = require('./initializeClient'); +const buildOptions = require('./build'); +const initializeClient = require('./initialize'); module.exports = { buildOptions, diff --git a/api/server/services/Endpoints/gptPlugins/initializeClient.js b/api/server/services/Endpoints/gptPlugins/initialize.js similarity index 100% rename from api/server/services/Endpoints/gptPlugins/initializeClient.js rename to api/server/services/Endpoints/gptPlugins/initialize.js diff --git a/api/server/services/Endpoints/gptPlugins/initializeClient.spec.js b/api/server/services/Endpoints/gptPlugins/initialize.spec.js similarity index 99% rename from api/server/services/Endpoints/gptPlugins/initializeClient.spec.js rename to api/server/services/Endpoints/gptPlugins/initialize.spec.js index 2dc5bc0653..54dfffc795 100644 --- a/api/server/services/Endpoints/gptPlugins/initializeClient.spec.js +++ b/api/server/services/Endpoints/gptPlugins/initialize.spec.js @@ -1,7 +1,7 @@ // gptPlugins/initializeClient.spec.js const { EModelEndpoint, ErrorTypes, validateAzureGroups } = require('librechat-data-provider'); const { getUserKey, getUserKeyValues } = require('~/server/services/UserService'); -const initializeClient = require('./initializeClient'); +const initializeClient = require('./initialize'); const { PluginsClient } = require('~/app'); // Mock getUserKey since it's the only function we want to mock diff --git a/api/server/services/Endpoints/openAI/buildOptions.js b/api/server/services/Endpoints/openAI/build.js similarity index 100% rename from api/server/services/Endpoints/openAI/buildOptions.js rename to api/server/services/Endpoints/openAI/build.js diff --git a/api/server/services/Endpoints/openAI/index.js b/api/server/services/Endpoints/openAI/index.js index 772b1efb11..c4e7533c5d 100644 --- a/api/server/services/Endpoints/openAI/index.js +++ b/api/server/services/Endpoints/openAI/index.js @@ -1,6 +1,6 @@ -const addTitle = require('./addTitle'); -const buildOptions = require('./buildOptions'); -const initializeClient = require('./initializeClient'); +const addTitle = require('./title'); +const buildOptions = require('./build'); +const initializeClient = require('./initialize'); module.exports = { addTitle, diff --git a/api/server/services/Endpoints/openAI/initializeClient.js b/api/server/services/Endpoints/openAI/initialize.js similarity index 100% rename from api/server/services/Endpoints/openAI/initializeClient.js rename to api/server/services/Endpoints/openAI/initialize.js diff --git a/api/server/services/Endpoints/openAI/initializeClient.spec.js b/api/server/services/Endpoints/openAI/initialize.spec.js similarity index 99% rename from api/server/services/Endpoints/openAI/initializeClient.spec.js rename to api/server/services/Endpoints/openAI/initialize.spec.js index 0988a0fcb7..b1a702e995 100644 --- a/api/server/services/Endpoints/openAI/initializeClient.spec.js +++ b/api/server/services/Endpoints/openAI/initialize.spec.js @@ -1,6 +1,6 @@ const { EModelEndpoint, ErrorTypes, validateAzureGroups } = require('librechat-data-provider'); const { getUserKey, getUserKeyValues } = require('~/server/services/UserService'); -const initializeClient = require('./initializeClient'); +const initializeClient = require('./initialize'); const { OpenAIClient } = require('~/app'); // Mock getUserKey since it's the only function we want to mock diff --git a/api/server/services/Endpoints/openAI/addTitle.js b/api/server/services/Endpoints/openAI/title.js similarity index 100% rename from api/server/services/Endpoints/openAI/addTitle.js rename to api/server/services/Endpoints/openAI/title.js