A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
Add back thinking & model card (#6113)
Shahmir Varqhac2f0baceb74a
diff --git a/frontend/src/components/ai/ai-model-dropdown.tsx b/frontend/src/components/ai/ai-model-dropdown.tsxindex e25e6c2dff..d2cdf48615 100644--- a/frontend/src/components/ai/ai-model-dropdown.tsx+++ b/frontend/src/components/ai/ai-model-dropdown.tsx@@ -1,8 +1,15 @@/* Copyright 2024 Marimo. All rights reserved. */import type { Role } from "@marimo-team/llm-info";+import { useAtomValue } from "jotai";import { capitalize } from "lodash-es";-import { ChevronDownIcon, CircleHelpIcon } from "lucide-react";+import {+ BotIcon,+ BrainIcon,+ ChevronDownIcon,+ CircleHelpIcon,+} from "lucide-react";+import React from "react";import {AiModelId,isKnownAIProvider,@@ -10,7 +17,7 @@ import {type QualifiedModelId,} from "@/core/ai/ids/ids";import { type AiModel, AiModelRegistry } from "@/core/ai/model-registry";-import { useResolvedMarimoConfig } from "@/core/config/config";+import { aiAtom, completionAtom } from "@/core/config/config";import {DropdownMenu,DropdownMenuContent,@@ -22,6 +29,7 @@ import {DropdownMenuSubTrigger,DropdownMenuTrigger,} from "../ui/dropdown-menu";+import { Tooltip } from "../ui/tooltip";import { AiProviderIcon } from "./ai-provider-icon";interface AIModelDropdownProps {@@ -46,36 +54,37 @@ export const AIModelDropdown = ({forRole,}: AIModelDropdownProps) => {const currentValue = value ? AiModelId.parse(value) : undefined;+ const [isOpen, setIsOpen] = React.useState(false);- const [marimoConfig] = useResolvedMarimoConfig();- const configModels = marimoConfig.ai?.models;+ const ai = useAtomValue(aiAtom);+ const completion = useAtomValue(completionAtom);// Only include autocompleteModel if copilot is set to "custom"const autocompleteModel =- marimoConfig.completion.copilot === "custom"- ? configModels?.autocomplete_model+ completion.copilot === "custom"+ ? ai?.models?.autocomplete_model: undefined;const aiModelRegistry = AiModelRegistry.create({// We add all the custom models and the models used in the editor.// If they among the known models, they won't overwrite them.customModels: [- ...(configModels?.custom_models ?? []),- configModels?.chat_model,+ ...(ai?.models?.custom_models ?? []),+ ai?.models?.chat_model,autocompleteModel,- configModels?.edit_model,+ ai?.models?.edit_model,].filter(Boolean),- displayedModels: configModels?.displayed_models,+ displayedModels: ai?.models?.displayed_models,});const modelsByProvider = aiModelRegistry.getGroupedModelsByProvider();const activeModel =forRole === "autocomplete"- ? configModels?.autocomplete_model+ ? ai?.models?.autocomplete_model: forRole === "chat"- ? configModels?.chat_model+ ? ai?.models?.chat_model: forRole === "edit"- ? configModels?.edit_model+ ? ai?.models?.edit_model: undefined;const iconSizeClass = iconSize === "medium" ? "h-4 w-4" : "h-3 w-3";@@ -95,19 +104,26 @@ export const AIModelDropdown = ({</div><div className="ml-auto flex gap-1">- <span- key={role}- className={`text-xs px-1.5 py-0.5 rounded font-medium ${getTagColour(role)}`}- >- {role}- </span>+ <Tooltip content={getTagTooltip(role)}>+ <span+ key={role}+ className={`text-xs px-1.5 py-0.5 rounded font-medium ${getTagColour(role)}`}+ >+ {role}+ </span>+ </Tooltip></div></div>);};+ const handleSelect = (modelId: QualifiedModelId) => {+ onSelect(modelId);+ setIsOpen(false);+ };+return (- <DropdownMenu>+ <DropdownMenu open={isOpen} onOpenChange={setIsOpen}><DropdownMenuTriggerclassName={`flex items-center justify-between px-2 py-0.5 border rounded-mdhover:bg-accent hover:text-accent-foreground ${triggerClassName}`}@@ -144,7 +160,7 @@ export const AIModelDropdown = ({<ProviderDropdownContentkey={provider}provider={provider}- onSelect={onSelect}+ onSelect={handleSelect}models={models}iconSizeClass={iconSizeClass}/>@@ -177,13 +193,11 @@ const ProviderDropdownContent = ({provider,onSelect,models,- customModelIcon,iconSizeClass,}: {provider: ProviderId;onSelect: (modelId: QualifiedModelId) => void;models: AiModel[];- customModelIcon?: React.ReactNode;iconSizeClass: string;}) => {const iconProvider = isKnownAIProvider(provider)@@ -207,7 +221,8 @@ const ProviderDropdownContent = ({<DropdownMenuPortal><DropdownMenuSubContentclassName="max-h-[40vh] overflow-y-auto"- alignOffset={-90}+ alignOffset={maybeProviderInfo ? -90 : 0}+ sideOffset={5}>{maybeProviderInfo && (<>@@ -236,22 +251,21 @@ const ProviderDropdownContent = ({const qualifiedModelId =`${provider}/${model.model}` as QualifiedModelId;return (- <DropdownMenuItem- key={qualifiedModelId}- className="flex items-center gap-2"- onSelect={() => {- onSelect(qualifiedModelId);- }}- >- <AiProviderIcon provider={iconProvider} className="h-4 w-4" />- <div className="pl-1 flex flex-col">- <span>{model.name}</span>- <span className="text-xs text-muted-foreground">- {model.model}- </span>- </div>- {model.custom && customModelIcon}- </DropdownMenuItem>+ <DropdownMenuSub key={qualifiedModelId}>+ <DropdownMenuSubTrigger showChevron={false} className="py-2">+ <div+ className="flex items-center gap-2 w-full cursor-pointer"+ onClick={() => {+ onSelect(qualifiedModelId);+ }}+ >+ <AiModelDropdownItem model={model} provider={provider} />+ </div>+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent className="p-4 w-80">+ <AiModelInfoDisplay model={model} provider={provider} />+ </DropdownMenuSubContent>+ </DropdownMenuSub>);})}</DropdownMenuSubContent>@@ -260,6 +274,99 @@ const ProviderDropdownContent = ({);};+const AiModelDropdownItem = ({+ model,+ provider,+}: {+ model: AiModel;+ provider: ProviderId;+}) => {+ const iconProvider = isKnownAIProvider(provider)+ ? provider+ : "openai-compatible";++ return (+ <>+ <AiProviderIcon provider={iconProvider} className="h-4 w-4" />+ <div className="flex flex-row w-full items-center">+ <span>{model.name}</span>+ <div className="ml-auto">+ {model.thinking && (+ <Tooltip content="Reasoning model">+ <BrainIcon+ className={`h-5 w-5 rounded-md p-1 ${getTagColour("thinking")}`}+ />+ </Tooltip>+ )}+ </div>+ </div>+ {model.custom && (+ <Tooltip content="Custom model">+ <BotIcon className="h-5 w-5" />+ </Tooltip>+ )}+ </>+ );+};++const AiModelInfoDisplay = ({+ model,+ provider,+}: {+ model: AiModel;+ provider: ProviderId;+}) => {+ return (+ <div className="space-y-3">+ <div>+ <h4 className="font-semibold text-base text-foreground">+ {model.name}+ </h4>+ <p className="text-xs text-muted-foreground font-mono">{model.model}</p>+ </div>++ <p className="text-sm text-muted-foreground leading-relaxed">+ {model.description}+ </p>++ {model.roles.length > 0 && (+ <div>+ <p className="text-xs font-medium text-muted-foreground mb-2">+ Capabilities:+ </p>+ <div className="flex flex-wrap gap-1">+ {model.roles.map((role) => (+ <span+ key={role}+ className={`px-2 py-1 text-xs rounded-md font-medium ${getTagColour(role)}`}+ title={getTagTooltip(role)}+ >+ {role}+ </span>+ ))}+ </div>+ </div>+ )}++ {model.thinking && (+ <div className="flex items-center gap-2">+ <div className="w-2 h-2 bg-purple-500 rounded-full animate-pulse" />+ <span className="text-xs text-muted-foreground">+ Supports thinking mode+ </span>+ </div>+ )}++ <div className="flex items-center gap-2 pt-2 border-t border-border">+ <AiProviderIcon provider={provider} className="h-4 w-4" />+ <span className="text-xs text-muted-foreground">+ {getProviderLabel(provider)}+ </span>+ </div>+ </div>+ );+};+function getProviderLabel(provider: ProviderId): string {const providerInfo = AiModelRegistry.getProviderInfo(provider);if (providerInfo) {@@ -268,7 +375,7 @@ function getProviderLabel(provider: ProviderId): string {return capitalize(provider);}-function getTagColour(role: Role): string {+function getTagColour(role: Role | "thinking"): string {switch (role) {case "chat":return "bg-[var(--purple-3)] text-[var(--purple-11)]";@@ -276,6 +383,23 @@ function getTagColour(role: Role): string {return "bg-[var(--green-3)] text-[var(--green-11)]";case "edit":return "bg-[var(--blue-3)] text-[var(--blue-11)]";+ case "thinking":+ return "bg-[var(--purple-4)] text-[var(--purple-12)]";}return "bg-[var(--mauve-3)] text-[var(--mauve-11)]";}++function getTagTooltip(role: Role): string {+ switch (role) {+ case "chat":+ return "Current model used for chat conversations";+ case "autocomplete":+ return "Current model used for autocomplete autocomplete";+ case "edit":+ return "Current model used for code edits";+ case "rerank":+ return "Current model used for reranking completions";+ case "embed":+ return "Current model used for embedding";+ }+}diff --git a/frontend/src/components/ui/dropdown-menu.tsx b/frontend/src/components/ui/dropdown-menu.tsxindex 66a3aac6a7..cf5f0a211c 100644--- a/frontend/src/components/ui/dropdown-menu.tsx+++ b/frontend/src/components/ui/dropdown-menu.tsx@@ -25,25 +25,26 @@ const DropdownMenuSub = DropdownMenuPrimitive.Sub;const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;const DropdownMenuSubTrigger = React.forwardRef<- React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,+ React.ComponentRef<typeof DropdownMenuPrimitive.SubTrigger>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {inset?: boolean;+ showChevron?: boolean;}->(({ className, inset, children, ...props }, ref) => (+>(({ className, inset, showChevron = true, children, ...props }, ref) => (<DropdownMenuPrimitive.SubTriggerref={ref}className={menuSubTriggerVariants({ className, inset })}{...props}>{children}- <ChevronRight className="ml-auto h-4 w-4" />+ {showChevron && <ChevronRight className="ml-auto h-4 w-4" />}</DropdownMenuPrimitive.SubTrigger>));DropdownMenuSubTrigger.displayName =DropdownMenuPrimitive.SubTrigger.displayName;const DropdownMenuSubContent = React.forwardRef<- React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,+ React.ComponentRef<typeof DropdownMenuPrimitive.SubContent>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>>(({ className, ...props }, ref) => (<DropdownMenuPrimitive.SubContent@@ -60,7 +61,7 @@ DropdownMenuSubContent.displayName =DropdownMenuPrimitive.SubContent.displayName;const DropdownMenuContent = React.forwardRef<- React.ElementRef<typeof DropdownMenuPrimitive.Content>,+ React.ComponentRef<typeof DropdownMenuPrimitive.Content>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content> & {scrollable?: boolean;}@@ -90,7 +91,7 @@ const DropdownMenuContent = React.forwardRef<DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;const DropdownMenuItem = React.forwardRef<- React.ElementRef<typeof DropdownMenuPrimitive.Item>,+ React.ComponentRef<typeof DropdownMenuPrimitive.Item>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> &VariantProps<typeof menuItemVariants>>(({ className, inset, variant, ...props }, ref) => (@@ -103,7 +104,7 @@ const DropdownMenuItem = React.forwardRef<DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName;const DropdownMenuCheckboxItem = React.forwardRef<- React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,+ React.ComponentRef<typeof DropdownMenuPrimitive.CheckboxItem>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>>(({ className, children, checked, ...props }, ref) => (<DropdownMenuPrimitive.CheckboxItem@@ -124,7 +125,7 @@ DropdownMenuCheckboxItem.displayName =DropdownMenuPrimitive.CheckboxItem.displayName;const DropdownMenuRadioItem = React.forwardRef<- React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,+ React.ComponentRef<typeof DropdownMenuPrimitive.RadioItem>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>>(({ className, children, ...props }, ref) => (<DropdownMenuPrimitive.RadioItem@@ -143,7 +144,7 @@ const DropdownMenuRadioItem = React.forwardRef<DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName;const DropdownMenuLabel = React.forwardRef<- React.ElementRef<typeof DropdownMenuPrimitive.Label>,+ React.ComponentRef<typeof DropdownMenuPrimitive.Label>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & {inset?: boolean;}@@ -157,7 +158,7 @@ const DropdownMenuLabel = React.forwardRef<DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName;const DropdownMenuSeparator = React.forwardRef<- React.ElementRef<typeof DropdownMenuPrimitive.Separator>,+ React.ComponentRef<typeof DropdownMenuPrimitive.Separator>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Separator>>(({ className, ...props }, ref) => (<DropdownMenuPrimitive.Separatordiff --git a/frontend/src/core/ai/__tests__/model-registry.test.ts b/frontend/src/core/ai/__tests__/model-registry.test.tsindex c8a1a2db15..bdf83eee7c 100644--- a/frontend/src/core/ai/__tests__/model-registry.test.ts+++ b/frontend/src/core/ai/__tests__/model-registry.test.ts@@ -66,6 +66,12 @@ describe("AiModelRegistry", () => {expect(registry.getCustomModels()).toEqual(new Set(customModels));expect(registry.getDisplayedModels()).toEqual(new Set());++ // Expect custom models to appear first+ expect(registry.getModelsByProvider("openai")[0].name).toBe("custom-gpt");+ expect(registry.getModelsByProvider("anthropic")[0].name).toBe(+ "custom-claude",+ );});it("should create registry with displayed models", () => {@@ -114,7 +120,7 @@ describe("AiModelRegistry", () => {const customModel = openaiModels.find((model) => model.custom);expect(customModel).toBeDefined();- expect(customModel?.name).toBe("openai/custom-gpt");+ expect(customModel?.name).toBe("custom-gpt");expect(customModel?.model).toBe("custom-gpt");expect(customModel?.description).toBe("Custom model");expect(customModel?.providers).toEqual(["openai"]);@@ -142,16 +148,10 @@ describe("AiModelRegistry", () => {const openaiModels = registry.getModelsByProvider("openai");const anthropicModels = registry.getModelsByProvider("anthropic");- expect(- openaiModels.some(- (model) => model.custom && model.model === "custom-gpt",- ),- ).toBe(true);- expect(- anthropicModels.some(- (model) => model.custom && model.model === "custom-claude",- ),- ).toBe(false);+ expect(openaiModels.length).toBe(1);+ expect(openaiModels[0].name).toBe("custom-gpt");++ expect(anthropicModels.length).toBe(0);});});@@ -328,7 +328,7 @@ describe("AiModelRegistry", () => {"custom": true,"description": "Custom model","model": "custom-gpt",- "name": "openai/custom-gpt",+ "name": "custom-gpt","providers": ["openai",],diff --git a/frontend/src/core/ai/model-registry.ts b/frontend/src/core/ai/model-registry.tsindex 18c7b65c1d..5454297f98 100644--- a/frontend/src/core/ai/model-registry.ts+++ b/frontend/src/core/ai/model-registry.ts@@ -82,43 +82,22 @@ export class AiModelRegistry {/*** Builds the maps of models by provider and custom models.- * Custom models are added first as they are specified by the user, so we want to surface them first.*/private buildMaps() {const displayedModels = this.displayedModels;const hasDisplayedModels = displayedModels.size > 0;const knownModelMap = getKnownModelMap();- let modelsMap = new Map<QualifiedModelId, AiModel>();+ const customModelsMap = new Map<QualifiedModelId, AiModel>();- // Start with known models- if (hasDisplayedModels) {- for (const model of displayedModels) {- if (knownModelMap.has(model)) {- const knownModel = knownModelMap.get(model);- if (knownModel) {- modelsMap.set(model, knownModel);- }- }- }- } else {- modelsMap = new Map(knownModelMap);- }+ let modelsMap = new Map<QualifiedModelId, AiModel>();- // Add custom modelsfor (const model of this.customModels) {- // Skip custom models that are not displayedif (hasDisplayedModels && !displayedModels.has(model)) {continue;}-- // If custom model conflicts with a known model, skip it- if (modelsMap.has(model)) {- continue;- }-const modelId = AiModelId.parse(model);const modelInfo: AiModel = {- name: modelId.id,+ name: modelId.shortModelId,model: modelId.shortModelId,description: "Custom model",providers: [modelId.providerId],@@ -126,9 +105,24 @@ export class AiModelRegistry {thinking: false,custom: true,};- modelsMap.set(model, modelInfo);+ customModelsMap.set(model, modelInfo);}+ // Add known models+ if (hasDisplayedModels) {+ for (const model of displayedModels) {+ const modelInfo = knownModelMap.get(model);+ if (modelInfo) {+ modelsMap.set(model, modelInfo);+ }+ }+ } else {+ modelsMap = new Map(knownModelMap);+ }++ // Set custom models first, then known models+ modelsMap = new Map([...customModelsMap, ...modelsMap]);+// Group by providerfor (const [qualifiedModelId, model] of modelsMap.entries()) {const modelId = AiModelId.parse(qualifiedModelId);diff --git a/frontend/src/core/config/config.ts b/frontend/src/core/config/config.tsindex dc47f6c3ce..8b5de4039b 100644--- a/frontend/src/core/config/config.ts+++ b/frontend/src/core/config/config.ts@@ -48,6 +48,10 @@ export const aiAtom = atom((get) => {return get(resolvedMarimoConfigAtom).ai;});+export const completionAtom = atom((get) => {+ return get(resolvedMarimoConfigAtom).completion;+});+export const keymapPresetAtom = atom((get) => {return get(resolvedMarimoConfigAtom).keymap.preset;});