Skip to content

Commit

Permalink
fix: validate max_token from context_length value (janhq#2870)
Browse files Browse the repository at this point in the history
  • Loading branch information
urmauur authored May 6, 2024
1 parent 86fda1c commit a6ccd67
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 2 deletions.
8 changes: 7 additions & 1 deletion web/hooks/useCreateNewThread.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ export const useCreateNewThread = () => {
? { ctx_len: 2048 }
: {}

const overriddenParameters =
defaultModel?.parameters.max_tokens && defaultModel.parameters.max_tokens
? { max_tokens: 2048 }
: {}

const createdAt = Date.now()
const assistantInfo: ThreadAssistantInfo = {
assistant_id: assistant.id,
Expand All @@ -107,7 +112,8 @@ export const useCreateNewThread = () => {
model: {
id: defaultModel?.id ?? '*',
settings: { ...defaultModel?.settings, ...overriddenSettings } ?? {},
parameters: defaultModel?.parameters ?? {},
parameters:
{ ...defaultModel?.parameters, ...overriddenParameters } ?? {},
engine: defaultModel?.engine,
},
instructions: assistant.instructions,
Expand Down
14 changes: 13 additions & 1 deletion web/screens/Chat/ModelSetting/SettingComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ import {
SliderComponentProps,
} from '@janhq/core'

import { useAtomValue } from 'jotai/react'

import Checkbox from '@/containers/Checkbox'
import ModelConfigInput from '@/containers/ModelConfigInput'
import SliderRightPanel from '@/containers/SliderRightPanel'

import { activeThreadAtom } from '@/helpers/atoms/Thread.atom'

type Props = {
componentProps: SettingComponentProps[]
disabled?: boolean
Expand All @@ -20,6 +24,7 @@ const SettingComponent: React.FC<Props> = ({
disabled = false,
onValueUpdated,
}) => {
const activeThread = useAtomValue(activeThreadAtom)
const components = componentProps.map((data) => {
switch (data.controllerType) {
case 'slider': {
Expand All @@ -31,7 +36,14 @@ const SettingComponent: React.FC<Props> = ({
title={data.title}
description={data.description}
min={min}
max={max}
max={
data.key === 'max_tokens'
? Number(
activeThread &&
activeThread.assistants[0].model.settings.ctx_len
)
: max
}
step={step}
value={value}
name={data.key}
Expand Down
26 changes: 26 additions & 0 deletions web/screens/Chat/Sidebar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,32 @@ const Sidebar: React.FC = () => {
updateModelParameter(activeThread, {
params: { [key]: value },
})

if (
activeThread.assistants[0].model.parameters.max_tokens &&
activeThread.assistants[0].model.settings.ctx_len
) {
if (
key === 'max_tokens' &&
Number(value) > activeThread.assistants[0].model.settings.ctx_len
) {
updateModelParameter(activeThread, {
params: {
max_tokens: activeThread.assistants[0].model.settings.ctx_len,
},
})
}
if (
key === 'ctx_len' &&
Number(value) < activeThread.assistants[0].model.parameters.max_tokens
) {
updateModelParameter(activeThread, {
params: {
max_tokens: activeThread.assistants[0].model.settings.ctx_len,
},
})
}
}
},
[activeThread, setEngineParamsUpdate, stopModel, updateModelParameter]
)
Expand Down

0 comments on commit a6ccd67

Please sign in to comment.