Fix default states for the model selector

This commit is contained in:
sabaimran
2025-01-20 10:18:09 -08:00
parent 98baa93a31
commit d7800812ad
4 changed files with 11 additions and 5 deletions

View File

@@ -24,7 +24,7 @@ import {
PopoverTrigger,
} from "@/components/ui/popover";
import { ModelOptions, useChatModelOptions } from "./auth";
import { ModelOptions, useChatModelOptions, useUserConfig } from "./auth";
import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card";
import { Skeleton } from "@/components/ui/skeleton";
@@ -39,6 +39,7 @@ export function ModelSelector({ ...props }: ModelSelectorProps) {
const { models, isLoading, error } = useChatModelOptions();
const [peekedModel, setPeekedModel] = useState<ModelOptions | undefined>(undefined);
const [selectedModel, setSelectedModel] = useState<ModelOptions | undefined>(undefined);
const { userConfig } = useUserConfig();
useEffect(() => {
if (!models?.length) return;
@@ -47,10 +48,14 @@ export function ModelSelector({ ...props }: ModelSelectorProps) {
const model = models.find(model => model.name === props.selectedModel);
setSelectedModel(model || models[0]);
return;
} else if (userConfig) {
const model = models.find(model => model.id === userConfig.selected_chat_model_config);
setSelectedModel(model || models[0]);
return;
}
setSelectedModel(models[0]);
}, [models, props.selectedModel]);
}, [models, props.selectedModel, userConfig]);
useEffect(() => {
if (selectedModel) {

View File

@@ -282,7 +282,6 @@ export default function ChatHistory(props: ChatHistoryProps) {
function constructAgentName() {
if (!data || !data.agent || !data.agent?.name) return `Agent`;
if (data.agent.is_hidden) return 'Khoj';
console.log(data.agent);
return data.agent?.name;
}

View File

@@ -78,7 +78,6 @@ function ChatSidebarInternal({ ...props }: ChatSideBarProps) {
function setupAgentData() {
if (agentData) {
setSelectedModel(agentData.chat_model);
setInputTools(agentData.input_tools);
if (agentData.input_tools === undefined || agentData.input_tools.length === 0) {
setInputTools(agentConfigurationOptions?.input_tools ? Object.keys(agentConfigurationOptions.input_tools) : []);
@@ -94,8 +93,11 @@ function ChatSidebarInternal({ ...props }: ChatSideBarProps) {
if (agentData.slug.toLowerCase() === "khoj") {
setIsDefaultAgent(true);
setSelectedModel(undefined);
setCustomPrompt(undefined);
} else {
setCustomPrompt(agentData.persona);
setSelectedModel(agentData.chat_model);
}
}
}