From 4aa15da120e0c5665c40c3069339c5497cd5e26c Mon Sep 17 00:00:00 2001 From: derpystuff <3515180-derpystuff@users.noreply.gitlab.com> Date: Wed, 13 Dec 2023 18:44:31 +0100 Subject: [PATCH] fix bard --- commands/message/limited/bard.js | 19 ++++++------------- labscore/api/obelisk/endpoints.js | 2 ++ labscore/api/obelisk/index.js | 8 ++++++++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/commands/message/limited/bard.js b/commands/message/limited/bard.js index 2565277..e41fa78 100644 --- a/commands/message/limited/bard.js +++ b/commands/message/limited/bard.js @@ -9,6 +9,7 @@ const { iconPill, stringwrap } = require('../../../labscore/utils/markdown') const { Permissions, InteractionCallbackTypes } = require("detritus-client/lib/constants"); const { Components } = require('detritus-client/lib/utils'); +const { bard } = require('../../../labscore/api/obelisk'); module.exports = { name: 'bard', @@ -33,27 +34,19 @@ module.exports = { try{ await editOrReply(context, createEmbed("ai_custom", context, STATIC_ICONS.ai_bard)) - let res = await superagent.post(`${process.env.AI_SERVER}/google/bard`) - .set({ - Authorization: process.env.AI_SERVER_KEY - }) - .query({ - with_drafts: true - }) - .send({ - input - }) + let res = await bard(context, input) + res = res.response let description = [] let files = []; - if(!res.body.output) return editOrReply(context, createEmbed("error", context, `Bard returned an error. Try again later.`)) + if(!res.body.drafts) return editOrReply(context, createEmbed("error", context, `Bard returned an error. Try again later.`)) - if(res.body.output.length <= 4000) description.push(res.body.output) + if(res.body.drafts[0].length <= 4000) description.push(res.body.drafts[0]) else { files.push({ filename: `chat.${Date.now().toString(36)}.txt`, - value: Buffer.from(res.body.output) + value: Buffer.from(res.body.drafts[0]) }) } diff --git a/labscore/api/obelisk/endpoints.js b/labscore/api/obelisk/endpoints.js index 6e4dca1..c0dcf93 100644 --- a/labscore/api/obelisk/endpoints.js +++ b/labscore/api/obelisk/endpoints.js @@ -6,6 +6,8 @@ const ObeliskHosts = Object.freeze({ const ObeliskApi = Object.freeze({ HOST: ObeliskHosts.prod, + GOOGLE_BARD: "/parrot/v1/google:bard", + SUMMARIZE_WEBPAGES: "/flamingo/v1/web:summarize" }) diff --git a/labscore/api/obelisk/index.js b/labscore/api/obelisk/index.js index 6e26084..9e234a2 100644 --- a/labscore/api/obelisk/index.js +++ b/labscore/api/obelisk/index.js @@ -40,6 +40,14 @@ async function request(path, type, headers, args, host) { throw new Error("unsupported, must either use GET or POST"); } +// GENERATIVEAI +module.exports.bard = async function(context, input){ + return await request(ObeliskApi.GOOGLE_BARD, "POST", {}, { + input + }) +} + +// FLAMINGO module.exports.summarizeWebpage = async function(context, url){ return await request(ObeliskApi.SUMMARIZE_WEBPAGES, "POST", {}, { url