Commit 902f71e

committed

Merge branch 'update_llm_models' into 'master'

Assistant UI: Switch to bot_llm_models API endpoint See merge request postgres-ai/database-lab!946

2 parents f6c2887 + cc1fdc0 commit 902f71eCopy full SHA for 902f71e

File tree

+16

-9

lines changed

+16

-9

lines changed

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,28 @@`
`1`	`1`	`import {request} from "../../helpers/request";`
`2`	`2`	`import { AiModel } from "../../types/api/entities/bot";`
`3`	`3`
`4`		`-export const getAiModels = async (): Promise<{ response: AiModel[] \| null; error: Response \| null }> => {`
	`4`	`+export const getAiModels = async (orgId?: number): Promise<{ response: AiModel[] \| null; error: Response \| null }> => {`
`5`	`5`	`const apiServer = process.env.REACT_APP_API_URL_PREFIX \|\| '';`
`6`		`-`
	`6`	`+ const body = {`
	`7`	`+ org_id: orgId`
	`8`	`+ }`
`7`	`9`	`try {`
`8`		- const response = await request(`${apiServer}/llm_models`, {
`9`		`- method: 'GET',`
	`10`	+ const response = await request(`${apiServer}/rpc/bot_llm_models`, {
	`11`	`+ method: 'POST',`
	`12`	`+ body: JSON.stringify(body),`
	`13`	`+ headers: {`
	`14`	`+ 'Accept': 'application/vnd.pgrst.object+json',`
	`15`	`+ 'Prefer': 'return=representation',`
	`16`	`+ }`
`10`	`17`	`});`
`11`	`18`
`12`	`19`	`if (!response.ok) {`
`13`	`20`	`return { response: null, error: response };`
`14`	`21`	`}`
`15`	`22`
`16`		`- const responseData: AiModel[] = await response.json();`
	`23`	`+ const responseData: {bot_llm_models: AiModel[]\|null} = await response.json();`
`17`	`24`
`18`		`- return { response: responseData, error: null };`
	`25`	`+ return { response: responseData?.bot_llm_models, error: null };`
`19`	`26`
`20`	`27`	`} catch (error) {`
`21`	`28`	`return { response: null, error: error as Response };`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ export const useAiBotProviderValue = (args: UseAiBotArgs): UseAiBotReturnType =>`
`89`	`89`	`aiModel,`
`90`	`90`	`setAiModel,`
`91`	`91`	`loading: aiModelsLoading`
`92`		`- } = useAiModelsList();`
	`92`	`+ } = useAiModelsList(orgId);`
`93`	`93`	`let location = useLocation<{skipReloading?: boolean}>();`
`94`	`94`
`95`	`95`	`const {`
`@@ -567,7 +567,7 @@ type UseAiModelsList = {`
`567`	`567`	`setAiModel: (model: AiModel) => void`
`568`	`568`	`}`
`569`	`569`
`570`		`-export const useAiModelsList = (): UseAiModelsList => {`
	`570`	`+export const useAiModelsList = (orgId?: number): UseAiModelsList => {`
`571`	`571`	`const [llmModels, setLLMModels] = useState<UseAiModelsList['aiModels']>(null);`
`572`	`572`	`const [error, setError] = useState<Response \| null>(null);`
`573`	`573`	`const [userModel, setUserModel] = useState<AiModel \| null>(null);`
`@@ -577,7 +577,7 @@ export const useAiModelsList = (): UseAiModelsList => {`
`577`	`577`	`let models = null;`
`578`	`578`	`setLoading(true);`
`579`	`579`	`try {`
`580`		`- const { response } = await getAiModels();`
	`580`	`+ const { response } = await getAiModels(orgId);`
`581`	`581`	`setLLMModels(response);`
`582`	`582`	`const currentModel = window.localStorage.getItem('bot.ai_model');`
`583`	`583`	`const parsedModel: AiModel = currentModel ? JSON.parse(currentModel) : null;`

Comments

(0)