Merge pull request #4935 from ConnectAI-E/feature/get-client-api
feat: add getClientApi method
This commit is contained in:
commit
fa31e7802c
|
@ -200,3 +200,14 @@ export function getHeaders() {
|
||||||
|
|
||||||
return headers;
|
return headers;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function getClientApi(provider: ServiceProvider): ClientApi {
|
||||||
|
switch (provider) {
|
||||||
|
case ServiceProvider.Google:
|
||||||
|
return new ClientApi(ModelProvider.GeminiPro);
|
||||||
|
case ServiceProvider.Anthropic:
|
||||||
|
return new ClientApi(ModelProvider.Claude);
|
||||||
|
default:
|
||||||
|
return new ClientApi(ModelProvider.GPT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -36,13 +36,9 @@ import { toBlob, toPng } from "html-to-image";
|
||||||
import { DEFAULT_MASK_AVATAR } from "../store/mask";
|
import { DEFAULT_MASK_AVATAR } from "../store/mask";
|
||||||
|
|
||||||
import { prettyObject } from "../utils/format";
|
import { prettyObject } from "../utils/format";
|
||||||
import {
|
import { EXPORT_MESSAGE_CLASS_NAME } from "../constant";
|
||||||
EXPORT_MESSAGE_CLASS_NAME,
|
|
||||||
ModelProvider,
|
|
||||||
ServiceProvider,
|
|
||||||
} from "../constant";
|
|
||||||
import { getClientConfig } from "../config/client";
|
import { getClientConfig } from "../config/client";
|
||||||
import { ClientApi } from "../client/api";
|
import { type ClientApi, getClientApi } from "../client/api";
|
||||||
import { getMessageTextContent } from "../utils";
|
import { getMessageTextContent } from "../utils";
|
||||||
|
|
||||||
const Markdown = dynamic(async () => (await import("./markdown")).Markdown, {
|
const Markdown = dynamic(async () => (await import("./markdown")).Markdown, {
|
||||||
|
@ -316,14 +312,7 @@ export function PreviewActions(props: {
|
||||||
const onRenderMsgs = (msgs: ChatMessage[]) => {
|
const onRenderMsgs = (msgs: ChatMessage[]) => {
|
||||||
setShouldExport(false);
|
setShouldExport(false);
|
||||||
|
|
||||||
var api: ClientApi;
|
const api: ClientApi = getClientApi(config.modelConfig.providerName);
|
||||||
if (config.modelConfig.providerName == ServiceProvider.Google) {
|
|
||||||
api = new ClientApi(ModelProvider.GeminiPro);
|
|
||||||
} else if (config.modelConfig.providerName == ServiceProvider.Anthropic) {
|
|
||||||
api = new ClientApi(ModelProvider.Claude);
|
|
||||||
} else {
|
|
||||||
api = new ClientApi(ModelProvider.GPT);
|
|
||||||
}
|
|
||||||
|
|
||||||
api
|
api
|
||||||
.share(msgs)
|
.share(msgs)
|
||||||
|
|
|
@ -12,7 +12,7 @@ import LoadingIcon from "../icons/three-dots.svg";
|
||||||
import { getCSSVar, useMobileScreen } from "../utils";
|
import { getCSSVar, useMobileScreen } from "../utils";
|
||||||
|
|
||||||
import dynamic from "next/dynamic";
|
import dynamic from "next/dynamic";
|
||||||
import { ServiceProvider, ModelProvider, Path, SlotID } from "../constant";
|
import { Path, SlotID } from "../constant";
|
||||||
import { ErrorBoundary } from "./error";
|
import { ErrorBoundary } from "./error";
|
||||||
|
|
||||||
import { getISOLang, getLang } from "../locales";
|
import { getISOLang, getLang } from "../locales";
|
||||||
|
@ -27,7 +27,7 @@ import { SideBar } from "./sidebar";
|
||||||
import { useAppConfig } from "../store/config";
|
import { useAppConfig } from "../store/config";
|
||||||
import { AuthPage } from "./auth";
|
import { AuthPage } from "./auth";
|
||||||
import { getClientConfig } from "../config/client";
|
import { getClientConfig } from "../config/client";
|
||||||
import { ClientApi } from "../client/api";
|
import { type ClientApi, getClientApi } from "../client/api";
|
||||||
import { useAccessStore } from "../store";
|
import { useAccessStore } from "../store";
|
||||||
|
|
||||||
export function Loading(props: { noLogo?: boolean }) {
|
export function Loading(props: { noLogo?: boolean }) {
|
||||||
|
@ -170,14 +170,8 @@ function Screen() {
|
||||||
export function useLoadData() {
|
export function useLoadData() {
|
||||||
const config = useAppConfig();
|
const config = useAppConfig();
|
||||||
|
|
||||||
var api: ClientApi;
|
const api: ClientApi = getClientApi(config.modelConfig.providerName);
|
||||||
if (config.modelConfig.providerName == ServiceProvider.Google) {
|
|
||||||
api = new ClientApi(ModelProvider.GeminiPro);
|
|
||||||
} else if (config.modelConfig.providerName == ServiceProvider.Anthropic) {
|
|
||||||
api = new ClientApi(ModelProvider.Claude);
|
|
||||||
} else {
|
|
||||||
api = new ClientApi(ModelProvider.GPT);
|
|
||||||
}
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
(async () => {
|
(async () => {
|
||||||
const models = await api.llm.models();
|
const models = await api.llm.models();
|
||||||
|
|
|
@ -15,7 +15,12 @@ import {
|
||||||
SUMMARIZE_MODEL,
|
SUMMARIZE_MODEL,
|
||||||
GEMINI_SUMMARIZE_MODEL,
|
GEMINI_SUMMARIZE_MODEL,
|
||||||
} from "../constant";
|
} from "../constant";
|
||||||
import { ClientApi, RequestMessage, MultimodalContent } from "../client/api";
|
import { getClientApi } from "../client/api";
|
||||||
|
import type {
|
||||||
|
ClientApi,
|
||||||
|
RequestMessage,
|
||||||
|
MultimodalContent,
|
||||||
|
} from "../client/api";
|
||||||
import { ChatControllerPool } from "../client/controller";
|
import { ChatControllerPool } from "../client/controller";
|
||||||
import { prettyObject } from "../utils/format";
|
import { prettyObject } from "../utils/format";
|
||||||
import { estimateTokenLength } from "../utils/token";
|
import { estimateTokenLength } from "../utils/token";
|
||||||
|
@ -363,15 +368,7 @@ export const useChatStore = createPersistStore(
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
var api: ClientApi;
|
const api: ClientApi = getClientApi(modelConfig.providerName);
|
||||||
if (modelConfig.providerName == ServiceProvider.Google) {
|
|
||||||
api = new ClientApi(ModelProvider.GeminiPro);
|
|
||||||
} else if (modelConfig.providerName == ServiceProvider.Anthropic) {
|
|
||||||
api = new ClientApi(ModelProvider.Claude);
|
|
||||||
} else {
|
|
||||||
api = new ClientApi(ModelProvider.GPT);
|
|
||||||
}
|
|
||||||
|
|
||||||
// make request
|
// make request
|
||||||
api.llm.chat({
|
api.llm.chat({
|
||||||
messages: sendMessages,
|
messages: sendMessages,
|
||||||
|
@ -547,14 +544,7 @@ export const useChatStore = createPersistStore(
|
||||||
const session = get().currentSession();
|
const session = get().currentSession();
|
||||||
const modelConfig = session.mask.modelConfig;
|
const modelConfig = session.mask.modelConfig;
|
||||||
|
|
||||||
var api: ClientApi;
|
const api: ClientApi = getClientApi(modelConfig.providerName);
|
||||||
if (modelConfig.providerName == ServiceProvider.Google) {
|
|
||||||
api = new ClientApi(ModelProvider.GeminiPro);
|
|
||||||
} else if (modelConfig.providerName == ServiceProvider.Anthropic) {
|
|
||||||
api = new ClientApi(ModelProvider.Claude);
|
|
||||||
} else {
|
|
||||||
api = new ClientApi(ModelProvider.GPT);
|
|
||||||
}
|
|
||||||
|
|
||||||
// remove error messages if any
|
// remove error messages if any
|
||||||
const messages = session.messages;
|
const messages = session.messages;
|
||||||
|
|
Loading…
Reference in New Issue