From 84f68f9a15516d225e2acb82c42594f3d5b73d79 Mon Sep 17 00:00:00 2001 From: Danny Avila Date: Sun, 19 May 2024 12:41:35 -0400 Subject: [PATCH] feat: add additional metadata: endpoint, author ID --- api/server/controllers/assistants/chatV1.js | 4 ++-- api/server/controllers/assistants/v1.js | 7 ++++++- api/server/controllers/assistants/v2.js | 7 ++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/api/server/controllers/assistants/chatV1.js b/api/server/controllers/assistants/chatV1.js index 7da31ca84a..34f9e9203c 100644 --- a/api/server/controllers/assistants/chatV1.js +++ b/api/server/controllers/assistants/chatV1.js @@ -43,7 +43,7 @@ const ten_minutes = 1000 * 60 * 10; * @param {Express.Response} res - The response object, used to send back a response. * @returns {void} */ -const chatV2 = async (req, res) => { +const chatV1 = async (req, res) => { logger.debug('[/assistants/chat/] req.body', req.body); const { @@ -647,4 +647,4 @@ const chatV2 = async (req, res) => { } }; -module.exports = chatV2; +module.exports = chatV1; diff --git a/api/server/controllers/assistants/v1.js b/api/server/controllers/assistants/v1.js index 44d1c0fbc6..3bbd6b63dd 100644 --- a/api/server/controllers/assistants/v1.js +++ b/api/server/controllers/assistants/v1.js @@ -17,7 +17,7 @@ const createAssistant = async (req, res) => { try { const { openai } = await getOpenAIClient({ req, res }); - const { tools = [], endpoint: _e, ...assistantData } = req.body; + const { tools = [], endpoint, ...assistantData } = req.body; assistantData.tools = tools .map((tool) => { if (typeof tool !== 'string') { @@ -34,6 +34,11 @@ const createAssistant = async (req, res) => { assistantData.model = openai.locals.azureOptions.azureOpenAIApiDeploymentName; } + assistantData.metadata = { + author: req.user.id, + endpoint, + }; + const assistant = await openai.beta.assistants.create(assistantData); if (azureModelIdentifier) { assistant.model = azureModelIdentifier; diff --git a/api/server/controllers/assistants/v2.js b/api/server/controllers/assistants/v2.js index c56313b792..81f55607a7 100644 --- a/api/server/controllers/assistants/v2.js +++ b/api/server/controllers/assistants/v2.js @@ -14,7 +14,7 @@ const createAssistant = async (req, res) => { /** @type {{ openai: OpenAIClient }} */ const { openai } = await getOpenAIClient({ req, res }); - const { tools = [], endpoint: _e, ...assistantData } = req.body; + const { tools = [], endpoint, ...assistantData } = req.body; assistantData.tools = tools .map((tool) => { if (typeof tool !== 'string') { @@ -31,6 +31,11 @@ const createAssistant = async (req, res) => { assistantData.model = openai.locals.azureOptions.azureOpenAIApiDeploymentName; } + assistantData.metadata = { + author: req.user.id, + endpoint, + }; + const assistant = await openai.beta.assistants.create(assistantData); if (azureModelIdentifier) { assistant.model = azureModelIdentifier;