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

chore: calculate model label (#4585)

Browse Source 
* chore: fix claculate model label

* chore: update test model label
This commit is contained in:
Faisal Amir 2025-02-05 20:29:46 +07:00 committed by GitHub
parent 4846befd4a
commit f2f31d8dc8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/yarn.lock
View File

@ -509,61 +509,61 @@ __metadata:
"@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fassistant-extension%40workspace%3Aassistant-extension": "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fassistant-extension%40workspace%3Aassistant-extension":
version: 0.1.10 version: 0.1.10
resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=28a570&locator=%40janhq%2Fassistant-extension%40workspace%3Aassistant-extension" resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=3d036d&locator=%40janhq%2Fassistant-extension%40workspace%3Aassistant-extension"
dependencies: dependencies:
rxjs: "npm:^7.8.1" rxjs: "npm:^7.8.1"
ulidx: "npm:^2.3.0" ulidx: "npm:^2.3.0"
checksum: 10c0/db6db06721a2eff01d4400d87645529f5447b31274132931cb0848a9bb397b32bc3805105be2f31ca1843be926f4102dbf9fb529502f5f48afb73ae726891232 checksum: 10c0/17705794156b91070790dc0bc9adf1ff65405c06b057c9103f325c350f22e25e530fccd9c634b2633d842f8e95eccc30d66370353734f4620ce99657ad4307bd
languageName: node languageName: node
linkType: hard linkType: hard
"@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fconversational-extension%40workspace%3Aconversational-extension": "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fconversational-extension%40workspace%3Aconversational-extension":
version: 0.1.10 version: 0.1.10
resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=28a570&locator=%40janhq%2Fconversational-extension%40workspace%3Aconversational-extension" resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=3d036d&locator=%40janhq%2Fconversational-extension%40workspace%3Aconversational-extension"
dependencies: dependencies:
rxjs: "npm:^7.8.1" rxjs: "npm:^7.8.1"
ulidx: "npm:^2.3.0" ulidx: "npm:^2.3.0"
checksum: 10c0/db6db06721a2eff01d4400d87645529f5447b31274132931cb0848a9bb397b32bc3805105be2f31ca1843be926f4102dbf9fb529502f5f48afb73ae726891232 checksum: 10c0/17705794156b91070790dc0bc9adf1ff65405c06b057c9103f325c350f22e25e530fccd9c634b2633d842f8e95eccc30d66370353734f4620ce99657ad4307bd
languageName: node languageName: node
linkType: hard linkType: hard
"@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fengine-management-extension%40workspace%3Aengine-management-extension": "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fengine-management-extension%40workspace%3Aengine-management-extension":
version: 0.1.10 version: 0.1.10
resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=28a570&locator=%40janhq%2Fengine-management-extension%40workspace%3Aengine-management-extension" resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=3d036d&locator=%40janhq%2Fengine-management-extension%40workspace%3Aengine-management-extension"
dependencies: dependencies:
rxjs: "npm:^7.8.1" rxjs: "npm:^7.8.1"
ulidx: "npm:^2.3.0" ulidx: "npm:^2.3.0"
checksum: 10c0/db6db06721a2eff01d4400d87645529f5447b31274132931cb0848a9bb397b32bc3805105be2f31ca1843be926f4102dbf9fb529502f5f48afb73ae726891232 checksum: 10c0/17705794156b91070790dc0bc9adf1ff65405c06b057c9103f325c350f22e25e530fccd9c634b2633d842f8e95eccc30d66370353734f4620ce99657ad4307bd
languageName: node languageName: node
linkType: hard linkType: hard
"@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fhardware-management-extension%40workspace%3Ahardware-management-extension": "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fhardware-management-extension%40workspace%3Ahardware-management-extension":
version: 0.1.10 version: 0.1.10
resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=28a570&locator=%40janhq%2Fhardware-management-extension%40workspace%3Ahardware-management-extension" resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=3d036d&locator=%40janhq%2Fhardware-management-extension%40workspace%3Ahardware-management-extension"
dependencies: dependencies:
rxjs: "npm:^7.8.1" rxjs: "npm:^7.8.1"
ulidx: "npm:^2.3.0" ulidx: "npm:^2.3.0"
checksum: 10c0/db6db06721a2eff01d4400d87645529f5447b31274132931cb0848a9bb397b32bc3805105be2f31ca1843be926f4102dbf9fb529502f5f48afb73ae726891232 checksum: 10c0/17705794156b91070790dc0bc9adf1ff65405c06b057c9103f325c350f22e25e530fccd9c634b2633d842f8e95eccc30d66370353734f4620ce99657ad4307bd
languageName: node languageName: node
linkType: hard linkType: hard
"@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-cortex-extension%40workspace%3Ainference-cortex-extension": "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-cortex-extension%40workspace%3Ainference-cortex-extension":
version: 0.1.10 version: 0.1.10
resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=28a570&locator=%40janhq%2Finference-cortex-extension%40workspace%3Ainference-cortex-extension" resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=3d036d&locator=%40janhq%2Finference-cortex-extension%40workspace%3Ainference-cortex-extension"
dependencies: dependencies:
rxjs: "npm:^7.8.1" rxjs: "npm:^7.8.1"
ulidx: "npm:^2.3.0" ulidx: "npm:^2.3.0"
checksum: 10c0/db6db06721a2eff01d4400d87645529f5447b31274132931cb0848a9bb397b32bc3805105be2f31ca1843be926f4102dbf9fb529502f5f48afb73ae726891232 checksum: 10c0/17705794156b91070790dc0bc9adf1ff65405c06b057c9103f325c350f22e25e530fccd9c634b2633d842f8e95eccc30d66370353734f4620ce99657ad4307bd
languageName: node languageName: node
linkType: hard linkType: hard
"@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fmodel-extension%40workspace%3Amodel-extension": "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fmodel-extension%40workspace%3Amodel-extension":
version: 0.1.10 version: 0.1.10
resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=28a570&locator=%40janhq%2Fmodel-extension%40workspace%3Amodel-extension" resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=3d036d&locator=%40janhq%2Fmodel-extension%40workspace%3Amodel-extension"
dependencies: dependencies:
rxjs: "npm:^7.8.1" rxjs: "npm:^7.8.1"
ulidx: "npm:^2.3.0" ulidx: "npm:^2.3.0"
checksum: 10c0/db6db06721a2eff01d4400d87645529f5447b31274132931cb0848a9bb397b32bc3805105be2f31ca1843be926f4102dbf9fb529502f5f48afb73ae726891232 checksum: 10c0/17705794156b91070790dc0bc9adf1ff65405c06b057c9103f325c350f22e25e530fccd9c634b2633d842f8e95eccc30d66370353734f4620ce99657ad4307bd
languageName: node languageName: node
linkType: hard linkType: hard

2
web/containers/ModelLabel/ModelLabel.test.tsx
View File

@ -54,7 +54,7 @@ describe('ModelLabel', () => {
it('renders SlowOnYourDeviceLabel when minimumRamModel is less than totalRam but greater than availableRam', async () => { it('renders SlowOnYourDeviceLabel when minimumRamModel is less than totalRam but greater than availableRam', async () => {
mockUseAtomValue mockUseAtomValue
.mockReturnValueOnce(100) .mockReturnValueOnce(50)
.mockReturnValueOnce(50) .mockReturnValueOnce(50)
.mockReturnValueOnce(10) .mockReturnValueOnce(10)
mockUseActiveModel.mockReturnValue({ mockUseActiveModel.mockReturnValue({

4
web/containers/ModelLabel/index.tsx
View File

@ -38,10 +38,12 @@ const ModelLabel = ({ metadata, compact }: Props) => {
const { settings } = useSettings() const { settings } = useSettings()
const getLabel = (size: number) => { const getLabel = (size: number) => {
const minimumRamModel = size * 1.25 const minimumRamModel = (size * 1.25) / (1024 * 1024)
const availableRam = settings?.gpus?.some((gpu) => gpu.activated) const availableRam = settings?.gpus?.some((gpu) => gpu.activated)
? availableVram * 1000000 // MB to bytes ? availableVram * 1000000 // MB to bytes
: totalRam - usedRam + (activeModel?.metadata?.size ?? 0) : totalRam - usedRam + (activeModel?.metadata?.size ?? 0)
if (minimumRamModel > totalRam) { if (minimumRamModel > totalRam) {
return ( return (
<NotEnoughMemoryLabel <NotEnoughMemoryLabel

10
yarn.lock
View File

@ -1127,7 +1127,7 @@ __metadata:
jotai: "npm:^2.6.0" jotai: "npm:^2.6.0"
katex: "npm:^0.16.10" katex: "npm:^0.16.10"
lodash: "npm:^4.17.21" lodash: "npm:^4.17.21"
lucide-react: "npm:^0.291.0" lucide-react: "npm:^0.311.0"
marked: "npm:^9.1.2" marked: "npm:^9.1.2"
next: "npm:14.2.3" next: "npm:14.2.3"
next-themes: "npm:^0.2.1" next-themes: "npm:^0.2.1"
@ -12205,12 +12205,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"lucide-react@npm:^0.291.0": "lucide-react@npm:^0.311.0":
version: 0.291.0 version: 0.311.0
resolution: "lucide-react@npm:0.291.0" resolution: "lucide-react@npm:0.311.0"
peerDependencies: peerDependencies:
react: ^16.5.1 || ^17.0.0 || ^18.0.0 react: ^16.5.1 || ^17.0.0 || ^18.0.0
checksum: 10c0/4a26b884b7da87887faed79275d9e6038bc352c2082fa493dffa1e138c74fc1120742370bd4a3ea0811d258708a993c76dbea79a7af07c1ffd5d785f4688fe14 checksum: 10c0/64b21c93e2d36c9fae7c2e360bd697dc5c2e33e469cf3e3425414e3a0b3e2d9292c7526a1cf78daa0ff25bae03fbc9f65b5d1243a9ba14cbad156bd0755afe83
languageName: node languageName: node
linkType: hard linkType: hard