From d8bb946eca66e1f43fd734cbcc57c867ea1cbeb9 Mon Sep 17 00:00:00 2001 From: bignutty <3515180-bignutty@users.noreply.gitlab.com> Date: Fri, 17 May 2024 23:25:17 +0200 Subject: [PATCH] migrate wa to mono2 --- commands/message/search/wolfram-alpha.js | 4 ++-- labscore/api/obelisk/endpoints.js | 4 ++-- labscore/api/obelisk/index.js | 12 +++++------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/commands/message/search/wolfram-alpha.js b/commands/message/search/wolfram-alpha.js index 5c7d841..aadfeab 100644 --- a/commands/message/search/wolfram-alpha.js +++ b/commands/message/search/wolfram-alpha.js @@ -3,7 +3,7 @@ const { editOrReply } = require('../../../labscore/utils/message') const { STATICS } = require('../../../labscore/utils/statics') const { paginator } = require('../../../labscore/client'); -const { wolframQuery } = require('../../../labscore/api/obelisk'); +const { wolframQuery, WolframQueryCompute } = require('../../../labscore/api/obelisk'); const { citation, smallIconPill } = require('../../../labscore/utils/markdown'); const { Permissions } = require("detritus-client/lib/constants"); @@ -62,7 +62,7 @@ module.exports = { if (!args.query) return editOrReply(context, createEmbed("warning", context, `Missing Parameter (query).`)) try { - let search = await wolframQuery(context, args.query) + let search = await WolframQueryCompute(context, args.query) search = search.response if (search.body.status == 1) return editOrReply(context, createEmbed("warning", context, search.body.message)) diff --git a/labscore/api/obelisk/endpoints.js b/labscore/api/obelisk/endpoints.js index e5d2338..3b1ebad 100644 --- a/labscore/api/obelisk/endpoints.js +++ b/labscore/api/obelisk/endpoints.js @@ -11,6 +11,8 @@ const ObeliskApi = Object.freeze({ LLM_MODELS_GENERATE: "/llm/v1/generate", GENERATIVEIMAGES_MODELS_IMAGEN: "/generativeimages/v1/models/imagen", + + WOLFRAM_QUERY_COMPUTE: "/wolfram/v1/query:compute", GOOGLE_BARD: "/parrot/v1/google:bard", GOOGLE_GEMINI_PRO: "/parrot/v1/google:gemini", @@ -28,8 +30,6 @@ const ObeliskApi = Object.freeze({ WEBSHOT: "/peacock/v1/screenshot", TRANSCRIBE: "/peacock/v1/transcribe", - - WOLFRAM_QUERY: "/wolfram/v1/wolframalpha:query", }) module.exports = { diff --git a/labscore/api/obelisk/index.js b/labscore/api/obelisk/index.js index 15b0186..0d3119c 100644 --- a/labscore/api/obelisk/index.js +++ b/labscore/api/obelisk/index.js @@ -62,7 +62,11 @@ module.exports.GenerativeImagesModelsImagen = async function(context, prompt){ }) } - +module.exports.WolframQueryCompute = async function(context, query){ + return await request(ObeliskApi.WOLFRAM_QUERY_COMPUTE, "POST", {}, { + query + }) +} // GENERATIVEAI module.exports.bard = async function(context, input){ @@ -145,10 +149,4 @@ module.exports.transcribeWithSpeakerLabelsObelisk = async function(context, url) return await request(ObeliskApi.TRANSCRIBE, "POST", {}, { url }) -} - -module.exports.wolframQuery = async function(context, query){ - return await request(ObeliskApi.WOLFRAM_QUERY, "POST", {}, { - q: query - }) } \ No newline at end of file