diff --git a/front/components/assistant_builder/InstructionScreen.tsx b/front/components/assistant_builder/InstructionScreen.tsx index 2e1d8aec5ffd..22c15f231193 100644 --- a/front/components/assistant_builder/InstructionScreen.tsx +++ b/front/components/assistant_builder/InstructionScreen.tsx @@ -29,7 +29,6 @@ import { GPT_4_TURBO_MODEL_CONFIG, MISTRAL_LARGE_MODEL_CONFIG, MISTRAL_MEDIUM_MODEL_CONFIG, - MISTRAL_NEXT_MODEL_CONFIG, MISTRAL_SMALL_MODEL_CONFIG, Ok, } from "@dust-tt/types"; @@ -97,7 +96,6 @@ export function InstructionScreen({
{ @@ -134,12 +132,10 @@ export function InstructionScreen({ } function AdvancedSettings({ - owner, plan, generationSettings, setGenerationSettings, }: { - owner: WorkspaceType; plan: PlanType; generationSettings: AssistantBuilderState["generationSettings"]; setGenerationSettings: ( @@ -156,9 +152,6 @@ function AdvancedSettings({ MISTRAL_LARGE_MODEL_CONFIG, GEMINI_PRO_DEFAULT_MODEL_CONFIG, ]; - if (owner.flags.includes("mistral_next")) { - usedModelConfigs.push(MISTRAL_NEXT_MODEL_CONFIG); - } const supportedModelConfig = getSupportedModelConfig( generationSettings.modelSettings diff --git a/front/lib/api/assistant/global_agents.ts b/front/lib/api/assistant/global_agents.ts index dceb05ed32ae..1e95798a8190 100644 --- a/front/lib/api/assistant/global_agents.ts +++ b/front/lib/api/assistant/global_agents.ts @@ -21,7 +21,6 @@ import { GPT_3_5_TURBO_MODEL_CONFIG, MISTRAL_LARGE_MODEL_CONFIG, MISTRAL_MEDIUM_MODEL_CONFIG, - MISTRAL_NEXT_MODEL_CONFIG, MISTRAL_SMALL_MODEL_CONFIG, } from "@dust-tt/types"; import { DustAPI } from "@dust-tt/types"; @@ -283,40 +282,6 @@ async function _getMistralLargeGlobalAgent({ }; } -async function _getMistralNextGlobalAgent({ - auth, - settings, -}: { - auth: Authenticator; - settings: GlobalAgentSettings | null; -}): Promise { - const status = !auth.isUpgraded() ? "disabled_free_workspace" : "active"; - - return { - id: -1, - sId: GLOBAL_AGENTS_SID.MISTRAL_NEXT, - version: 0, - versionCreatedAt: null, - versionAuthorId: null, - name: "mistral-next", - description: MISTRAL_NEXT_MODEL_CONFIG.description, - pictureUrl: "https://dust.tt/static/systemavatar/mistral_avatar_full.png", - status: settings ? settings.status : status, - scope: "global", - userListStatus: status === "active" ? "in-list" : "not-in-list", - generation: { - id: -1, - prompt: "", - model: { - providerId: MISTRAL_NEXT_MODEL_CONFIG.providerId, - modelId: MISTRAL_NEXT_MODEL_CONFIG.modelId, - }, - temperature: 0.7, - }, - action: null, - }; -} - async function _getMistralMediumGlobalAgent({ auth, settings, @@ -809,12 +774,6 @@ export async function getGlobalAgent( auth, }); break; - case GLOBAL_AGENTS_SID.MISTRAL_NEXT: - agentConfiguration = await _getMistralNextGlobalAgent({ - settings, - auth, - }); - break; case GLOBAL_AGENTS_SID.MISTRAL_MEDIUM: agentConfiguration = await _getMistralMediumGlobalAgent({ settings, @@ -898,14 +857,7 @@ export async function getGlobalAgents( } const preFetchedDataSources = dsRes.value; - let agentsIdsToFetch = Object.values(agentIds ?? GLOBAL_AGENTS_SID); - - // Mistral-next flag. - if (!owner.flags.includes("mistral_next")) { - agentsIdsToFetch = agentsIdsToFetch.filter( - (agentId) => agentId !== GLOBAL_AGENTS_SID.MISTRAL_NEXT - ); - } + const agentsIdsToFetch = Object.values(agentIds ?? GLOBAL_AGENTS_SID); // For now we retrieve them all // We will store them in the database later to allow admin enable them or not diff --git a/front/lib/assistant.ts b/front/lib/assistant.ts index d57febfbc075..59ead9b9622f 100644 --- a/front/lib/assistant.ts +++ b/front/lib/assistant.ts @@ -48,7 +48,6 @@ export enum GLOBAL_AGENTS_SID { CLAUDE_INSTANT = "claude-instant-1", MISTRAL_LARGE = "mistral-large", MISTRAL_MEDIUM = "mistral-medium", - MISTRAL_NEXT = "mistral-next", //!\ TEMPORARY WORKAROUND: Renaming 'mistral' to 'mistral-small' is not feasible since // it interferes with the retrieval of ongoing conversations involving this agent. // Needed to preserve ongoing chat integrity due to 'sId=mistral' references in legacy messages. @@ -69,7 +68,6 @@ const CUSTOM_ORDER: string[] = [ GLOBAL_AGENTS_SID.CLAUDE_INSTANT, GLOBAL_AGENTS_SID.MISTRAL_LARGE, GLOBAL_AGENTS_SID.MISTRAL_MEDIUM, - GLOBAL_AGENTS_SID.MISTRAL_NEXT, GLOBAL_AGENTS_SID.MISTRAL_SMALL, GLOBAL_AGENTS_SID.GEMINI_PRO, GLOBAL_AGENTS_SID.HELPER, diff --git a/types/src/front/feature_flags.ts b/types/src/front/feature_flags.ts index 391f8ef71e0b..0524fc025d6a 100644 --- a/types/src/front/feature_flags.ts +++ b/types/src/front/feature_flags.ts @@ -1,6 +1,5 @@ export const WHITELISTABLE_FEATURES = [ "auto_pre_ingest_all_databases", - "mistral_next", "structured_data", "workspace_analytics", "usage_data_api", diff --git a/types/src/front/lib/assistant.ts b/types/src/front/lib/assistant.ts index f42734d1c613..01c8209f0bb9 100644 --- a/types/src/front/lib/assistant.ts +++ b/types/src/front/lib/assistant.ts @@ -75,7 +75,6 @@ export const CLAUDE_INSTANT_DEFAULT_MODEL_CONFIG = { export const MISTRAL_LARGE_MODEL_ID = "mistral-large-latest" as const; export const MISTRAL_MEDIUM_MODEL_ID = "mistral-medium" as const; -export const MISTRAL_NEXT_MODEL_ID = "mistral-next" as const; export const MISTRAL_SMALL_MODEL_ID = "mistral-small" as const; export const MISTRAL_LARGE_MODEL_CONFIG = { @@ -85,21 +84,10 @@ export const MISTRAL_LARGE_MODEL_CONFIG = { contextSize: 31500, recommendedTopK: 16, largeModel: true, - description: "Mistral latest `large` model (32k context).", + description: "Mistral's latest `large` model (32k context).", shortDescription: "Mistral's large model.", } as const; -export const MISTRAL_NEXT_MODEL_CONFIG = { - providerId: "mistral" as const, - modelId: MISTRAL_NEXT_MODEL_ID, - displayName: "Mistral (next)", - contextSize: 31500, - recommendedTopK: 16, - largeModel: true, - description: "Mistral's next generation model (32k context).", - shortDescription: "Mistral's next model.", -} as const; - export const MISTRAL_MEDIUM_MODEL_CONFIG = { providerId: "mistral" as const, modelId: MISTRAL_MEDIUM_MODEL_ID, @@ -107,7 +95,7 @@ export const MISTRAL_MEDIUM_MODEL_CONFIG = { contextSize: 31500, recommendedTopK: 16, largeModel: true, - description: "Mistral latest `medium` model (32k context).", + description: "Mistral's latest `medium` model (32k context).", shortDescription: "Mistral's smartest model.", } as const; @@ -118,7 +106,7 @@ export const MISTRAL_SMALL_MODEL_CONFIG = { contextSize: 31500, recommendedTopK: 16, largeModel: false, - description: "Mistral latest model (8x7B Instruct, 32k context).", + description: "Mistral's latest model (8x7B Instruct, 32k context).", shortDescription: "Mistral's fast model.", } as const; @@ -142,7 +130,6 @@ export const SUPPORTED_MODEL_CONFIGS = [ CLAUDE_INSTANT_DEFAULT_MODEL_CONFIG, MISTRAL_LARGE_MODEL_CONFIG, MISTRAL_MEDIUM_MODEL_CONFIG, - MISTRAL_NEXT_MODEL_CONFIG, MISTRAL_SMALL_MODEL_CONFIG, GEMINI_PRO_DEFAULT_MODEL_CONFIG, ] as const;