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
Revert "add thinking tag and a model card for dropdown" (#6111)
Shahmir Varqha8eeb59979f50
diff --git a/frontend/src/components/ai/ai-model-dropdown.tsx b/frontend/src/components/ai/ai-model-dropdown.tsxindex a2b6758605..e25e6c2dff 100644--- a/frontend/src/components/ai/ai-model-dropdown.tsx+++ b/frontend/src/components/ai/ai-model-dropdown.tsx@@ -2,12 +2,7 @@import type { Role } from "@marimo-team/llm-info";import { capitalize } from "lodash-es";-import {- BotIcon,- BrainIcon,- ChevronDownIcon,- CircleHelpIcon,-} from "lucide-react";+import { ChevronDownIcon, CircleHelpIcon } from "lucide-react";import {AiModelId,isKnownAIProvider,@@ -27,7 +22,6 @@ import {DropdownMenuSubTrigger,DropdownMenuTrigger,} from "../ui/dropdown-menu";-import { Tooltip } from "../ui/tooltip";import { AiProviderIcon } from "./ai-provider-icon";interface AIModelDropdownProps {@@ -101,14 +95,12 @@ export const AIModelDropdown = ({</div><div className="ml-auto flex gap-1">- <Tooltip content={getTagTooltip(role)}>- <span- key={role}- className={`text-xs px-1.5 py-0.5 rounded font-medium ${getTagColour(role)}`}- >- {role}- </span>- </Tooltip>+ <span+ key={role}+ className={`text-xs px-1.5 py-0.5 rounded font-medium ${getTagColour(role)}`}+ >+ {role}+ </span></div></div>);@@ -185,11 +177,13 @@ const ProviderDropdownContent = ({provider,onSelect,models,+ customModelIcon,iconSizeClass,}: {provider: ProviderId;onSelect: (modelId: QualifiedModelId) => void;models: AiModel[];+ customModelIcon?: React.ReactNode;iconSizeClass: string;}) => {const iconProvider = isKnownAIProvider(provider)@@ -242,25 +236,22 @@ const ProviderDropdownContent = ({const qualifiedModelId =`${provider}/${model.model}` as QualifiedModelId;return (- <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"- sideOffset={2}- alignOffset={-4}- >- <AiModelInfoDisplay model={model} provider={provider} />- </DropdownMenuSubContent>- </DropdownMenuSub>+ <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>);})}</DropdownMenuSubContent>@@ -269,99 +260,6 @@ 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) {@@ -370,7 +268,7 @@ function getProviderLabel(provider: ProviderId): string {return capitalize(provider);}-function getTagColour(role: Role | "thinking"): string {+function getTagColour(role: Role): string {switch (role) {case "chat":return "bg-[var(--purple-3)] text-[var(--purple-11)]";@@ -378,23 +276,6 @@ function getTagColour(role: Role | "thinking"): 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 cf5f0a211c..66a3aac6a7 100644--- a/frontend/src/components/ui/dropdown-menu.tsx+++ b/frontend/src/components/ui/dropdown-menu.tsx@@ -25,26 +25,25 @@ const DropdownMenuSub = DropdownMenuPrimitive.Sub;const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;const DropdownMenuSubTrigger = React.forwardRef<- React.ComponentRef<typeof DropdownMenuPrimitive.SubTrigger>,+ React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {inset?: boolean;- showChevron?: boolean;}->(({ className, inset, showChevron = true, children, ...props }, ref) => (+>(({ className, inset, children, ...props }, ref) => (<DropdownMenuPrimitive.SubTriggerref={ref}className={menuSubTriggerVariants({ className, inset })}{...props}>{children}- {showChevron && <ChevronRight className="ml-auto h-4 w-4" />}+ <ChevronRight className="ml-auto h-4 w-4" /></DropdownMenuPrimitive.SubTrigger>));DropdownMenuSubTrigger.displayName =DropdownMenuPrimitive.SubTrigger.displayName;const DropdownMenuSubContent = React.forwardRef<- React.ComponentRef<typeof DropdownMenuPrimitive.SubContent>,+ React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubContent>>(({ className, ...props }, ref) => (<DropdownMenuPrimitive.SubContent@@ -61,7 +60,7 @@ DropdownMenuSubContent.displayName =DropdownMenuPrimitive.SubContent.displayName;const DropdownMenuContent = React.forwardRef<- React.ComponentRef<typeof DropdownMenuPrimitive.Content>,+ React.ElementRef<typeof DropdownMenuPrimitive.Content>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Content> & {scrollable?: boolean;}@@ -91,7 +90,7 @@ const DropdownMenuContent = React.forwardRef<DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;const DropdownMenuItem = React.forwardRef<- React.ComponentRef<typeof DropdownMenuPrimitive.Item>,+ React.ElementRef<typeof DropdownMenuPrimitive.Item>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> &VariantProps<typeof menuItemVariants>>(({ className, inset, variant, ...props }, ref) => (@@ -104,7 +103,7 @@ const DropdownMenuItem = React.forwardRef<DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName;const DropdownMenuCheckboxItem = React.forwardRef<- React.ComponentRef<typeof DropdownMenuPrimitive.CheckboxItem>,+ React.ElementRef<typeof DropdownMenuPrimitive.CheckboxItem>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>>(({ className, children, checked, ...props }, ref) => (<DropdownMenuPrimitive.CheckboxItem@@ -125,7 +124,7 @@ DropdownMenuCheckboxItem.displayName =DropdownMenuPrimitive.CheckboxItem.displayName;const DropdownMenuRadioItem = React.forwardRef<- React.ComponentRef<typeof DropdownMenuPrimitive.RadioItem>,+ React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.RadioItem>>(({ className, children, ...props }, ref) => (<DropdownMenuPrimitive.RadioItem@@ -144,7 +143,7 @@ const DropdownMenuRadioItem = React.forwardRef<DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName;const DropdownMenuLabel = React.forwardRef<- React.ComponentRef<typeof DropdownMenuPrimitive.Label>,+ React.ElementRef<typeof DropdownMenuPrimitive.Label>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Label> & {inset?: boolean;}@@ -158,7 +157,7 @@ const DropdownMenuLabel = React.forwardRef<DropdownMenuLabel.displayName = DropdownMenuPrimitive.Label.displayName;const DropdownMenuSeparator = React.forwardRef<- React.ComponentRef<typeof DropdownMenuPrimitive.Separator>,+ React.ElementRef<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 477efeb530..c8a1a2db15 100644--- a/frontend/src/core/ai/__tests__/model-registry.test.ts+++ b/frontend/src/core/ai/__tests__/model-registry.test.ts@@ -66,14 +66,6 @@ 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(- "openai/custom-gpt",- );- expect(registry.getModelsByProvider("anthropic")[0].name).toBe(- "anthropic/custom-claude",- );});it("should create registry with displayed models", () => {diff --git a/frontend/src/core/ai/model-registry.ts b/frontend/src/core/ai/model-registry.tsindex 6d8f782c0a..18c7b65c1d 100644--- a/frontend/src/core/ai/model-registry.ts+++ b/frontend/src/core/ai/model-registry.ts@@ -19,6 +19,25 @@ export interface AiModel extends AiModelType {custom: boolean;}+const getKnownModelMap = once((): ReadonlyMap<QualifiedModelId, AiModel> => {+ const modelMap = new Map<QualifiedModelId, AiModel>();+ for (const model of models) {+ const modelId = model.model as ShortModelId;+ const modelInfo: AiModel = {+ ...model,+ roles: model.roles.map((role) => role as Role),+ providers: model.providers as ProviderId[],+ custom: false,+ };++ for (const provider of modelInfo.providers) {+ const qualifiedModelId: QualifiedModelId = `${provider}/${modelId}`;+ modelMap.set(qualifiedModelId, modelInfo);+ }+ }+ return modelMap;+});+const getProviderMap = once((): ReadonlyMap<ProviderId, AiProvider> => {const providerMap = new Map<ProviderId, AiProvider>();for (const provider of providers) {@@ -63,19 +82,40 @@ 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 modelsMap = new Map<QualifiedModelId, AiModel>();+ const knownModelMap = getKnownModelMap();+ let modelsMap = 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);+ }- // Start with custom models as they are specified by the user, so we want to surface them first+ // Add custom modelsfor (const model of this.customModels) {- // Skip models that are not included in displayed list+ // 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,@@ -89,33 +129,6 @@ export class AiModelRegistry {modelsMap.set(model, modelInfo);}- // Process models from the default list- for (const model of models) {- const modelId = model.model as ShortModelId;- const modelInfo: AiModel = {- ...model,- roles: model.roles.map((role) => role as Role),- providers: model.providers as ProviderId[],- custom: false,- };-- // Model can have multiple providers- for (const provider of modelInfo.providers) {- const qualifiedModelId: QualifiedModelId = `${provider}/${modelId}`;-- if (hasDisplayedModels && !displayedModels.has(qualifiedModelId)) {- continue;- }-- // Skip if already added (e.g., by a custom model)- if (modelsMap.has(qualifiedModelId)) {- continue;- }-- modelsMap.set(qualifiedModelId, modelInfo);- }- }-// Group by providerfor (const [qualifiedModelId, model] of modelsMap.entries()) {const modelId = AiModelId.parse(qualifiedModelId);