Skip to content

Commit 93ebca8

Browse files
committed
fix: model setting issues
1 parent a601434 commit 93ebca8

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed

web-app/src/containers/ModelSetting.tsx

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import {
1111
} from '@/components/ui/sheet'
1212
import { DynamicControllerSetting } from '@/containers/dynamicControllerSetting'
1313
import { useModelProvider } from '@/hooks/useModelProvider'
14-
import { updateModel, stopModel } from '@/services/models'
15-
import { ModelSettingParams } from '@janhq/core'
14+
import { stopModel } from '@/services/models'
1615
import { cn } from '@/lib/utils'
1716
import { useTranslation } from '@/i18n/react-i18next-compat'
1817

@@ -71,22 +70,6 @@ export function ModelSetting({
7170
models: updatedModels,
7271
})
7372

74-
const params = Object.entries(updatedModel.settings).reduce(
75-
(acc, [key, value]) => {
76-
const rawVal = value.controller_props?.value
77-
const num = parseFloat(rawVal as string)
78-
acc[key] = !isNaN(num) ? num : rawVal
79-
return acc
80-
},
81-
{} as Record<string, unknown>
82-
) as ModelSettingParams
83-
84-
updateModel({
85-
id: model.id,
86-
settings: params,
87-
...(params as unknown as object),
88-
})
89-
9073
// Call debounced stopModel only when updating ctx_len or ngl
9174
if (key === 'ctx_len' || key === 'ngl') {
9275
debouncedStopModel(model.id)

web-app/src/hooks/useModelProvider.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,17 @@ export const useModelProvider = create<ModelProviderState>()(
7474
),
7575
...models,
7676
]
77+
const updatedModels = provider.models?.map((model) => {
78+
return {
79+
...model,
80+
settings:
81+
models.find((m) => m.id === model.id)?.settings ||
82+
model.settings,
83+
}
84+
})
7785
return {
7886
...provider,
79-
models: provider.persist ? provider?.models : mergedModels,
87+
models: provider.persist ? updatedModels : mergedModels,
8088
settings: provider.settings.map((setting) => {
8189
const existingSetting = provider.persist
8290
? undefined

web-app/src/locales/en/common.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
"createAssistant": "Create Assistant",
120120
"enterApiKey": "Enter API Key",
121121
"scrollToBottom": "Scroll to bottom",
122+
"generateAiResponse": "Generate AI Response",
122123
"addModel": {
123124
"title": "Add Model",
124125
"modelId": "Model ID",

web-app/src/routes/threads/$threadId.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ function ThreadDetail() {
325325
className="bg-main-view-fg/10 px-4 border border-main-view-fg/5 flex items-center justify-center rounded-xl gap-x-2 cursor-pointer pointer-events-auto"
326326
onClick={generateAIResponse}
327327
>
328-
<p className="text-xs">{t('Generate AI Response')}</p>
328+
<p className="text-xs">{t('common:generateAiResponse')}</p>
329329
<Play size={12} />
330330
</div>
331331
)}

0 commit comments

Comments
 (0)