Skip to content

fix: remote model always active badges #1113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2023
Merged

fix: remote model always active badges #1113

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82a16d1
fix: remote model always active badge and doesn't have menu start and…
urmauur Dec 20, 2023
5c63185
fix: remote model condition check
louis-jan Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions web/screens/Settings/Models/Row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from 'react'

import { Model } from '@janhq/core'
import { InferenceEngine, Model } from '@janhq/core'
import { Badge } from '@janhq/uikit'

import {
Expand Down Expand Up @@ -33,6 +33,10 @@ export default function RowModel(props: RowModelProps) {

const isActiveModel = stateModel.model === props.data.id

const isRemoteModel =
props.data.engine === InferenceEngine.openai ||
InferenceEngine.triton_trtllm

const onModelActionClick = (modelId: string) => {
if (activeModel && activeModel.id === modelId) {
stopModel(modelId)
Expand All @@ -56,7 +60,15 @@ export default function RowModel(props: RowModelProps) {
<Badge themes="secondary">v{props.data.version}</Badge>
</td>
<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
className="inline-flex items-center space-x-2"
themes="secondary"
Expand Down Expand Up @@ -85,15 +97,17 @@ export default function RowModel(props: RowModelProps) {
)}
</td>
<td className="px-6 py-4 text-center">
<div
className="cursor-pointer"
ref={setToggle}
onClick={() => {
setMore(!more)
}}
>
<MoreVerticalIcon className="h-5 w-5" />
</div>
{!isRemoteModel && (
<div
className="cursor-pointer"
ref={setToggle}
onClick={() => {
setMore(!more)
}}
>
<MoreVerticalIcon className="h-5 w-5" />
</div>
)}
{more && (
<div
className="absolute right-4 top-10 z-20 w-52 overflow-hidden rounded-lg border border-border bg-background py-2 shadow-lg"
Expand Down