Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remote model always active badges (#1113)

Browse Source 
* fix: remote model always active badge and doesn't have menu start and stop model

* fix: remote model condition check

---------

Co-authored-by: Louis <louis@jan.ai>
This commit is contained in:
Faisal Amir 2023-12-20 15:11:55 +07:00 committed by GitHub
parent a485fa9c1f
commit 040987d1cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
web/screens/Settings/Models/Row.tsx
View File

@ -1,6 +1,6 @@
import { useState } from 'react' import { useState } from 'react'
import { Model } from '@janhq/core' import { InferenceEngine, Model } from '@janhq/core'
import { Badge } from '@janhq/uikit' import { Badge } from '@janhq/uikit'
import { import {
@ -33,6 +33,10 @@ export default function RowModel(props: RowModelProps) {
const isActiveModel = stateModel.model === props.data.id const isActiveModel = stateModel.model === props.data.id
const isRemoteModel =
props.data.engine === InferenceEngine.openai ||
InferenceEngine.triton_trtllm
const onModelActionClick = (modelId: string) => { const onModelActionClick = (modelId: string) => {
if (activeModel && activeModel.id === modelId) { if (activeModel && activeModel.id === modelId) {
stopModel(modelId) stopModel(modelId)
@ -56,7 +60,15 @@ export default function RowModel(props: RowModelProps) {
<Badge themes="secondary">v{props.data.version}</Badge> <Badge themes="secondary">v{props.data.version}</Badge>
</td> </td>
<td className="px-6 py-4"> <td className="px-6 py-4">
{stateModel.loading && stateModel.model === props.data.id ? ( {isRemoteModel ? (
<Badge
themes="success"
className="inline-flex items-center space-x-2"
>
<span className="h-2 w-2 rounded-full bg-green-500" />
<span>Active</span>
</Badge>
) : stateModel.loading && stateModel.model === props.data.id ? (
<Badge <Badge
className="inline-flex items-center space-x-2" className="inline-flex items-center space-x-2"
themes="secondary" themes="secondary"
@ -85,15 +97,17 @@ export default function RowModel(props: RowModelProps) {
)} )}
</td> </td>
<td className="px-6 py-4 text-center"> <td className="px-6 py-4 text-center">
<div {!isRemoteModel && (
className="cursor-pointer" <div
ref={setToggle} className="cursor-pointer"
onClick={() => { ref={setToggle}
setMore(!more) onClick={() => {
}} setMore(!more)
> }}
<MoreVerticalIcon className="h-5 w-5" /> >
</div> <MoreVerticalIcon className="h-5 w-5" />
</div>
)}
{more && ( {more && (
<div <div
className="absolute right-4 top-10 z-20 w-52 overflow-hidden rounded-lg border border-border bg-background py-2 shadow-lg" className="absolute right-4 top-10 z-20 w-52 overflow-hidden rounded-lg border border-border bg-background py-2 shadow-lg"