From 66f9e6f54c20d514c695afeb891f043448526469 Mon Sep 17 00:00:00 2001 From: Djebran Lezzoum Date: Tue, 18 Feb 2025 09:06:48 +0100 Subject: [PATCH] Update dependencies to API v1 Signed-off-by: Djebran Lezzoum --- .../config/webpack.mock.api.keys.modelids.ts | 14 +++++++------- .../config/webpack.mock.api.telemetry.ts | 4 ++-- ansible_ai_connect_admin_portal/src/api/api.ts | 10 +++++----- ansible_ai_connect_chatbot/src/types/Message.ts | 2 +- .../src/useChatbot/useChatbot.ts | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ansible_ai_connect_admin_portal/config/webpack.mock.api.keys.modelids.ts b/ansible_ai_connect_admin_portal/config/webpack.mock.api.keys.modelids.ts index ff54a9309..cc6f10c89 100644 --- a/ansible_ai_connect_admin_portal/config/webpack.mock.api.keys.modelids.ts +++ b/ansible_ai_connect_admin_portal/config/webpack.mock.api.keys.modelids.ts @@ -16,7 +16,7 @@ export default webpackMockServer.add((app, helper) => { const modelIds = new Map(); //API KEY RELATED ENDPOINTS - app.get("/api/v0/wca/apikey/", async (_req, res) => { + app.get("/api/v1/wca/apikey/", async (_req, res) => { await delay(DELAY_MS); if (keys.has(ORG_ID)) { // Key response only contains the Last Updated field @@ -27,7 +27,7 @@ export default webpackMockServer.add((app, helper) => { } }); - app.get("/api/v0/wca/apikey/test/", async (_req, res) => { + app.get("/api/v1/wca/apikey/test/", async (_req, res) => { await delay(DELAY_MS); if (!keys.has(ORG_ID)) { res.sendStatus(404); @@ -49,7 +49,7 @@ export default webpackMockServer.add((app, helper) => { res.sendStatus(200); }); - app.post("/api/v0/wca/apikey/", async (_req, res) => { + app.post("/api/v1/wca/apikey/", async (_req, res) => { await delay(DELAY_MS); const key = _req.body["key"]; if (key === "error") { @@ -67,7 +67,7 @@ export default webpackMockServer.add((app, helper) => { res.sendStatus(200); }); - app.delete("/api/v0/wca/apikey/", async (_req, res) => { + app.delete("/api/v1/wca/apikey/", async (_req, res) => { await delay(DELAY_MS); if (keys.has(ORG_ID)) { keys.delete(ORG_ID); @@ -81,7 +81,7 @@ export default webpackMockServer.add((app, helper) => { }); //MODEL ID RELATED ENDPOINTS - app.get("/api/v0/wca/modelid/", async (_req, res) => { + app.get("/api/v1/wca/modelid/", async (_req, res) => { await delay(DELAY_MS); if (modelIds.has(ORG_ID)) { res.json(modelIds.get(ORG_ID)); @@ -90,7 +90,7 @@ export default webpackMockServer.add((app, helper) => { } }); - app.get("/api/v0/wca/modelid/test/", async (_req, res) => { + app.get("/api/v1/wca/modelid/test/", async (_req, res) => { await delay(DELAY_MS); if (!modelIds.has(ORG_ID)) { res.sendStatus(404); @@ -112,7 +112,7 @@ export default webpackMockServer.add((app, helper) => { res.sendStatus(200); }); - app.post("/api/v0/wca/modelid/", async (_req, res) => { + app.post("/api/v1/wca/modelid/", async (_req, res) => { await delay(DELAY_MS); const modelId = _req.body[MODEL_ID_FIELD]; if (modelId === "error") { diff --git a/ansible_ai_connect_admin_portal/config/webpack.mock.api.telemetry.ts b/ansible_ai_connect_admin_portal/config/webpack.mock.api.telemetry.ts index 4692a6921..381cced5a 100644 --- a/ansible_ai_connect_admin_portal/config/webpack.mock.api.telemetry.ts +++ b/ansible_ai_connect_admin_portal/config/webpack.mock.api.telemetry.ts @@ -5,12 +5,12 @@ const webpackMockServer = require("webpack-mock-server"); export default webpackMockServer.add((app, helper) => { let optOut = false; - app.get("/api/v0/telemetry/", async (_req, res) => { + app.get("/api/v1/telemetry/", async (_req, res) => { await delay(DELAY_MS); res.json({ optOut: optOut }); }); - app.post("/api/v0/telemetry/", async (_req, res) => { + app.post("/api/v1/telemetry/", async (_req, res) => { await delay(DELAY_MS); const _optOut = _req.body["optOut"]; optOut = _optOut; diff --git a/ansible_ai_connect_admin_portal/src/api/api.ts b/ansible_ai_connect_admin_portal/src/api/api.ts index 395761cd7..e18c3813c 100644 --- a/ansible_ai_connect_admin_portal/src/api/api.ts +++ b/ansible_ai_connect_admin_portal/src/api/api.ts @@ -1,11 +1,11 @@ import { TelemetryRequest, WcaKeyRequest, WcaModelIdRequest } from "./types"; import axios from "axios"; -export const API_TELEMETRY_PATH = "/api/v0/telemetry/"; -export const API_WCA_KEY_PATH = "/api/v0/wca/apikey/"; -export const API_WCA_MODEL_ID_PATH = "/api/v0/wca/modelid/"; -export const API_WCA_KEY_TEST_PATH = "/api/v0/wca/apikey/test"; -export const API_WCA_MODEL_ID_TEST_PATH = "/api/v0/wca/modelid/test"; +export const API_TELEMETRY_PATH = "/api/v1/telemetry/"; +export const API_WCA_KEY_PATH = "/api/v1/wca/apikey/"; +export const API_WCA_MODEL_ID_PATH = "/api/v1/wca/modelid/"; +export const API_WCA_KEY_TEST_PATH = "/api/v1/wca/apikey/test/"; +export const API_WCA_MODEL_ID_TEST_PATH = "/api/v1/wca/modelid/test/"; export const readCookie = (name: string): string | null => { const nameEQ = name + "="; diff --git a/ansible_ai_connect_chatbot/src/types/Message.ts b/ansible_ai_connect_chatbot/src/types/Message.ts index be1a507b6..8a969361f 100644 --- a/ansible_ai_connect_chatbot/src/types/Message.ts +++ b/ansible_ai_connect_chatbot/src/types/Message.ts @@ -19,7 +19,7 @@ type LLMResponse = { truncated: boolean; }; -// Type for Ansible AI Connct service /api/v0/ai/talk API +// Type for Ansible AI Connct service /api/v1/ai/talk API // Currently they are defined in the same way as OLS API export type ChatRequest = LLMRequest; export type ChatResponse = LLMResponse; diff --git a/ansible_ai_connect_chatbot/src/useChatbot/useChatbot.ts b/ansible_ai_connect_chatbot/src/useChatbot/useChatbot.ts index 526eb83b2..d128f544d 100644 --- a/ansible_ai_connect_chatbot/src/useChatbot/useChatbot.ts +++ b/ansible_ai_connect_chatbot/src/useChatbot/useChatbot.ts @@ -285,7 +285,7 @@ export const useChatbot = () => { const csrfToken = readCookie("csrftoken"); const resp = await axios.post( import.meta.env.PROD - ? "/api/v0/ai/feedback/" + ? "/api/v1/ai/feedback/" : "http://localhost:8080/v1/feedback/", { chatFeedback: feedbackRequest, @@ -415,7 +415,7 @@ export const useChatbot = () => { } else { const resp = await axios.post( import.meta.env.PROD - ? "/api/v0/ai/chat/" + ? "/api/v1/ai/chat/" : "http://localhost:8080/v1/query/", chatRequest, {