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

chore: binary naming convention - following llama.cpp release

Browse Source
This commit is contained in:
Louis 2024-10-23 15:33:14 +07:00
parent 6c0c2a00d6
commit a0e2f16a3b
No known key found for this signature in database
GPG Key ID: 44FA9F4D33C37DE2
8 changed files with 97 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/inference-cortex-extension/bin/version.txt Normal file
View File

@ -0,0 +1 @@
1.0.1

19
extensions/inference-cortex-extension/download.bat
View File

@ -8,13 +8,18 @@ set DOWNLOAD_URL=https://github.com/janhq/cortex.llamacpp/releases/download/%VER
set SUBFOLDERS=win-cuda-12-0 win-cuda-11-7 win-noavx win-avx win-avx2 win-avx512 win-vulkan set SUBFOLDERS=win-cuda-12-0 win-cuda-11-7 win-noavx win-avx win-avx2 win-avx512 win-vulkan
call .\node_modules\.bin\download -e --strip 1 -o %BIN_PATH% https://github.com/janhq/cortex/releases/download/v%CORTEX_VERSION%/cortex-%CORTEX_VERSION%-windows-amd64.tar.gz call .\node_modules\.bin\download -e --strip 1 -o %BIN_PATH% https://github.com/janhq/cortex/releases/download/v%CORTEX_VERSION%/cortex-%CORTEX_VERSION%-windows-amd64.tar.gz
call .\node_modules\.bin\download %DOWNLOAD_URL%-avx2-cuda-12-0.tar.gz -e --strip 1 -o %BIN_PATH%/win-cuda-12-0/engines/cortex.llamacpp call .\node_modules\.bin\download %DOWNLOAD_URL%-avx2-cuda-12-0.tar.gz -e --strip 1 -o %BIN_PATH%/avx2-cuda-12-0/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-avx2-cuda-11-7.tar.gz -e --strip 1 -o %BIN_PATH%/win-cuda-11-7/engines/cortex.llamacpp call .\node_modules\.bin\download %DOWNLOAD_URL%-avx2-cuda-11-7.tar.gz -e --strip 1 -o %BIN_PATH%/avx2-cuda-11-7/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-noavx.tar.gz -e --strip 1 -o %BIN_PATH%/win-noavx/engines/cortex.llamacpp call .\node_modules\.bin\download %DOWNLOAD_URL%-noavx-cuda-12-0.tar.gz -e --strip 1 -o %BIN_PATH%/noavx-cuda-12-0/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-avx.tar.gz -e --strip 1 -o %BIN_PATH%/win-avx/engines/cortex.llamacpp call .\node_modules\.bin\download %DOWNLOAD_URL%-noavx-cuda-11-7.tar.gz -e --strip 1 -o %BIN_PATH%/noavx-cuda-11-7/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-avx2.tar.gz -e --strip 1 -o %BIN_PATH%/win-avx2/engines/cortex.llamacpp call .\node_modules\.bin\download %DOWNLOAD_URL%-noavx.tar.gz -e --strip 1 -o %BIN_PATH%/noavx/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-avx512.tar.gz -e --strip 1 -o %BIN_PATH%/win-avx512/engines/cortex.llamacpp call .\node_modules\.bin\download %DOWNLOAD_URL%-avx.tar.gz -e --strip 1 -o %BIN_PATH%/avx/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-vulkan.tar.gz -e --strip 1 -o %BIN_PATH%/win-vulkan/engines/cortex.llamacpp call .\node_modules\.bin\download %DOWNLOAD_URL%-avx2.tar.gz -e --strip 1 -o %BIN_PATH%/avx2/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-avx512.tar.gz -e --strip 1 -o %BIN_PATH%/avx512/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-vulkan.tar.gz -e --strip 1 -o %BIN_PATH%/vulkan/engines/cortex.llamacpp
call .\node_modules\.bin\download %DOWNLOAD_URL%-cuda-12-0-windows-amd64.tar.gz -e --strip 1 -o %BIN_PATH%
call .\node_modules\.bin\download %DOWNLOAD_URL%-cuda-11-7-windows-amd64.tar.gz -e --strip 1 -o %BIN_PATH%
@REM Loop through each folder and move DLLs (excluding engine.dll) @REM Loop through each folder and move DLLs (excluding engine.dll)
for %%F in (%SUBFOLDERS%) do ( for %%F in (%SUBFOLDERS%) do (

22
extensions/inference-cortex-extension/download.sh
View File

@ -13,13 +13,17 @@ if [ "$OS_TYPE" == "Linux" ]; then
chmod +x "./bin/cortex" chmod +x "./bin/cortex"
# Download engines for Linux # Download engines for Linux
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-noavx.tar.gz" -e --strip 1 -o "./bin/linux-noavx/engines/cortex.llamacpp" 1 download "${ENGINE_DOWNLOAD_URL}-linux-amd64-noavx.tar.gz" -e --strip 1 -o "./bin/noavx/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx.tar.gz" -e --strip 1 -o "./bin/linux-avx/engines/cortex.llamacpp" 1 download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx.tar.gz" -e --strip 1 -o "./bin/avx/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx2.tar.gz" -e --strip 1 -o "./bin/linux-avx2/engines/cortex.llamacpp" 1 download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx2.tar.gz" -e --strip 1 -o "./bin/avx2/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx512.tar.gz" -e --strip 1 -o "./bin/linux-avx512/engines/cortex.llamacpp" 1 download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx512.tar.gz" -e --strip 1 -o "./bin/avx512/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx2-cuda-12-0.tar.gz" -e --strip 1 -o "./bin/linux-cuda-12-0/engines/cortex.llamacpp" 1 download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx2-cuda-12-0.tar.gz" -e --strip 1 -o "./bin/avx2-cuda-12-0/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx2-cuda-11-7.tar.gz" -e --strip 1 -o "./bin/linux-cuda-11-7/engines/cortex.llamacpp" 1 download "${ENGINE_DOWNLOAD_URL}-linux-amd64-avx2-cuda-11-7.tar.gz" -e --strip 1 -o "./bin/avx2-cuda-11-7/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-vulkan.tar.gz" -e --strip 1 -o "./bin/linux-vulkan/engines/cortex.llamacpp" 1 download "${ENGINE_DOWNLOAD_URL}-linux-amd64-noavx-cuda-12-0.tar.gz" -e --strip 1 -o "./bin/noavx-cuda-12-0/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-noavx-cuda-11-7.tar.gz" -e --strip 1 -o "./bin/noavx-cuda-11-7/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-linux-amd64-vulkan.tar.gz" -e --strip 1 -o "./bin/vulkan/engines/cortex.llamacpp" 1
download "${ENGINE_DOWNLOAD_URL}-cuda-12-0-linux-amd64.tar.gz" -e --strip 1 -o "./bin" 1
download "${ENGINE_DOWNLOAD_URL}-cuda-11-7-linux-amd64.tar.gz" -e --strip 1 -o "./bin" 1
elif [ "$OS_TYPE" == "Darwin" ]; then elif [ "$OS_TYPE" == "Darwin" ]; then
# macOS downloads # macOS downloads
@ -27,8 +31,8 @@ elif [ "$OS_TYPE" == "Darwin" ]; then
chmod +x "./bin/cortex" chmod +x "./bin/cortex"
# Download engines for macOS # Download engines for macOS
download "${ENGINE_DOWNLOAD_URL}-mac-arm64.tar.gz" -e --strip 1 -o ./bin/mac-arm64/engines/cortex.llamacpp download "${ENGINE_DOWNLOAD_URL}-mac-arm64.tar.gz" -e --strip 1 -o ./bin/arm64/engines/cortex.llamacpp
download "${ENGINE_DOWNLOAD_URL}-mac-amd64.tar.gz" -e --strip 1 -o ./bin/mac-x64/engines/cortex.llamacpp download "${ENGINE_DOWNLOAD_URL}-mac-amd64.tar.gz" -e --strip 1 -o ./bin/x64/engines/cortex.llamacpp
else else
echo "Unsupported operating system: $OS_TYPE" echo "Unsupported operating system: $OS_TYPE"

59
extensions/inference-cortex-extension/src/node/execute.test.ts
View File

@ -27,8 +27,8 @@ jest.mock('cpu-instructions', () => ({
cpuInfo: jest.fn(), cpuInfo: jest.fn(),
}, },
})) }))
let mock = cpuInfo.cpuInfo as jest.Mock let mockCpuInfo = cpuInfo.cpuInfo as jest.Mock
mock.mockReturnValue([]) mockCpuInfo.mockReturnValue([])
describe('test executable cortex file', () => { describe('test executable cortex file', () => {
afterAll(function () { afterAll(function () {
@ -46,7 +46,8 @@ describe('test executable cortex file', () => {
}) })
expect(executableCortexFile(testSettings)).toEqual( expect(executableCortexFile(testSettings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`mac-arm64`), enginePath: expect.stringContaining(`/bin/arm64`),
binPath: expect.stringContaining(`/bin`),
executablePath: executablePath:
originalPlatform === 'darwin' originalPlatform === 'darwin'
? expect.stringContaining(`/cortex-server`) ? expect.stringContaining(`/cortex-server`)
@ -60,7 +61,8 @@ describe('test executable cortex file', () => {
}) })
expect(executableCortexFile(testSettings)).toEqual( expect(executableCortexFile(testSettings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`mac-x64`), enginePath: expect.stringContaining(`/bin/x64`),
binPath: expect.stringContaining(`/bin`),
executablePath: executablePath:
originalPlatform === 'darwin' originalPlatform === 'darwin'
? expect.stringContaining(`/cortex-server`) ? expect.stringContaining(`/cortex-server`)
@ -79,9 +81,11 @@ describe('test executable cortex file', () => {
...testSettings, ...testSettings,
run_mode: 'cpu', run_mode: 'cpu',
} }
mockCpuInfo.mockReturnValue(['avx'])
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`win`), enginePath: expect.stringContaining(`/bin/avx`),
binPath: expect.stringContaining(`/bin`),
executablePath: expect.stringContaining(`/cortex-server.exe`), executablePath: expect.stringContaining(`/cortex-server.exe`),
cudaVisibleDevices: '', cudaVisibleDevices: '',
vkVisibleDevices: '', vkVisibleDevices: '',
@ -115,7 +119,8 @@ describe('test executable cortex file', () => {
} }
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`win-cuda-11-7`), enginePath: expect.stringContaining(`cuda-11-7`),
binPath: expect.stringContaining(`/bin`),
executablePath: expect.stringContaining(`/cortex-server.exe`), executablePath: expect.stringContaining(`/cortex-server.exe`),
cudaVisibleDevices: '0', cudaVisibleDevices: '0',
vkVisibleDevices: '0', vkVisibleDevices: '0',
@ -149,7 +154,8 @@ describe('test executable cortex file', () => {
} }
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`win-cuda-12-0`), enginePath: expect.stringContaining(`cuda-12-0`),
binPath: expect.stringContaining(`/bin`),
executablePath: expect.stringContaining(`/cortex-server.exe`), executablePath: expect.stringContaining(`/cortex-server.exe`),
cudaVisibleDevices: '0', cudaVisibleDevices: '0',
vkVisibleDevices: '0', vkVisibleDevices: '0',
@ -165,9 +171,10 @@ describe('test executable cortex file', () => {
...testSettings, ...testSettings,
run_mode: 'cpu', run_mode: 'cpu',
} }
mockCpuInfo.mockReturnValue(['noavx'])
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`linux`), enginePath: expect.stringContaining(`noavx`),
executablePath: expect.stringContaining(`/cortex-server`), executablePath: expect.stringContaining(`/cortex-server`),
cudaVisibleDevices: '', cudaVisibleDevices: '',
vkVisibleDevices: '', vkVisibleDevices: '',
@ -201,7 +208,8 @@ describe('test executable cortex file', () => {
} }
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`linux-cuda-11-7`), enginePath: expect.stringContaining(`cuda-11-7`),
binPath: expect.stringContaining(`/bin`),
executablePath: expect.stringContaining(`/cortex-server`), executablePath: expect.stringContaining(`/cortex-server`),
cudaVisibleDevices: '0', cudaVisibleDevices: '0',
vkVisibleDevices: '0', vkVisibleDevices: '0',
@ -235,7 +243,8 @@ describe('test executable cortex file', () => {
} }
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`linux-cuda-12-0`), enginePath: expect.stringContaining(`cuda-12-0`),
binPath: expect.stringContaining(`/bin`),
executablePath: expect.stringContaining(`/cortex-server`), executablePath: expect.stringContaining(`/cortex-server`),
cudaVisibleDevices: '0', cudaVisibleDevices: '0',
vkVisibleDevices: '0', vkVisibleDevices: '0',
@ -255,11 +264,12 @@ describe('test executable cortex file', () => {
const cpuInstructions = ['avx512', 'avx2', 'avx', 'noavx'] const cpuInstructions = ['avx512', 'avx2', 'avx', 'noavx']
cpuInstructions.forEach((instruction) => { cpuInstructions.forEach((instruction) => {
mock.mockReturnValue([instruction]) mockCpuInfo.mockReturnValue([instruction])
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`linux-${instruction}`), enginePath: expect.stringContaining(instruction),
binPath: expect.stringContaining(`/bin`),
executablePath: expect.stringContaining(`/cortex-server`), executablePath: expect.stringContaining(`/cortex-server`),
cudaVisibleDevices: '', cudaVisibleDevices: '',
@ -279,10 +289,11 @@ describe('test executable cortex file', () => {
} }
const cpuInstructions = ['avx512', 'avx2', 'avx', 'noavx'] const cpuInstructions = ['avx512', 'avx2', 'avx', 'noavx']
cpuInstructions.forEach((instruction) => { cpuInstructions.forEach((instruction) => {
mock.mockReturnValue([instruction]) mockCpuInfo.mockReturnValue([instruction])
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`win-${instruction}`), enginePath: expect.stringContaining(instruction),
binPath: expect.stringContaining(`/bin`),
executablePath: expect.stringContaining(`/cortex-server.exe`), executablePath: expect.stringContaining(`/cortex-server.exe`),
cudaVisibleDevices: '', cudaVisibleDevices: '',
vkVisibleDevices: '', vkVisibleDevices: '',
@ -318,10 +329,11 @@ describe('test executable cortex file', () => {
} }
const cpuInstructions = ['avx512', 'avx2', 'avx', 'noavx'] const cpuInstructions = ['avx512', 'avx2', 'avx', 'noavx']
cpuInstructions.forEach((instruction) => { cpuInstructions.forEach((instruction) => {
mock.mockReturnValue([instruction]) mockCpuInfo.mockReturnValue([instruction])
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`win-cuda-12-0`), enginePath: expect.stringContaining(`cuda-12-0`),
binPath: expect.stringContaining(`/bin`),
executablePath: expect.stringContaining(`/cortex-server.exe`), executablePath: expect.stringContaining(`/cortex-server.exe`),
cudaVisibleDevices: '0', cudaVisibleDevices: '0',
vkVisibleDevices: '0', vkVisibleDevices: '0',
@ -357,10 +369,11 @@ describe('test executable cortex file', () => {
], ],
} }
cpuInstructions.forEach((instruction) => { cpuInstructions.forEach((instruction) => {
mock.mockReturnValue([instruction]) mockCpuInfo.mockReturnValue([instruction])
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`linux-cuda-12-0`), enginePath: expect.stringContaining(`cuda-12-0`),
binPath: expect.stringContaining(`/bin`),
executablePath: expect.stringContaining(`/cortex-server`), executablePath: expect.stringContaining(`/cortex-server`),
cudaVisibleDevices: '0', cudaVisibleDevices: '0',
vkVisibleDevices: '0', vkVisibleDevices: '0',
@ -397,10 +410,11 @@ describe('test executable cortex file', () => {
], ],
} }
cpuInstructions.forEach((instruction) => { cpuInstructions.forEach((instruction) => {
mock.mockReturnValue([instruction]) mockCpuInfo.mockReturnValue([instruction])
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`linux-vulkan`), enginePath: expect.stringContaining(`vulkan`),
binPath: expect.stringContaining(`/bin`),
executablePath: expect.stringContaining(`/cortex-server`), executablePath: expect.stringContaining(`/cortex-server`),
cudaVisibleDevices: '0', cudaVisibleDevices: '0',
vkVisibleDevices: '0', vkVisibleDevices: '0',
@ -423,10 +437,11 @@ describe('test executable cortex file', () => {
...testSettings, ...testSettings,
run_mode: 'cpu', run_mode: 'cpu',
} }
mock.mockReturnValue([]) mockCpuInfo.mockReturnValue([])
expect(executableCortexFile(settings)).toEqual( expect(executableCortexFile(settings)).toEqual(
expect.objectContaining({ expect.objectContaining({
enginePath: expect.stringContaining(`mac-x64`), enginePath: expect.stringContaining(`x64`),
binPath: expect.stringContaining(`/bin`),
executablePath: executablePath:
originalPlatform === 'darwin' originalPlatform === 'darwin'
? expect.stringContaining(`/cortex-server`) ? expect.stringContaining(`/cortex-server`)

31
extensions/inference-cortex-extension/src/node/execute.ts
View File

@ -4,6 +4,7 @@ import { cpuInfo } from 'cpu-instructions'
export interface CortexExecutableOptions { export interface CortexExecutableOptions {
enginePath: string enginePath: string
binPath: string
executablePath: string executablePath: string
cudaVisibleDevices: string cudaVisibleDevices: string
vkVisibleDevices: string vkVisibleDevices: string
@ -36,8 +37,8 @@ const os = (): string => {
? 'win' ? 'win'
: process.platform === 'darwin' : process.platform === 'darwin'
? process.arch === 'arm64' ? process.arch === 'arm64'
? 'mac-arm64' ? 'arm64'
: 'mac-x64' : 'x64'
: 'linux' : 'linux'
} }
@ -66,7 +67,7 @@ const cudaVersion = (settings?: GpuSetting): '11-7' | '12-0' | undefined => {
* The CPU instructions that will be set - either 'avx512', 'avx2', 'avx', or 'noavx'. * The CPU instructions that will be set - either 'avx512', 'avx2', 'avx', or 'noavx'.
* @returns * @returns
*/ */
const cpuInstructions = () => { const cpuInstructions = (): string => {
if (process.platform === 'darwin') return '' if (process.platform === 'darwin') return ''
return cpuInfo.cpuInfo().some((e) => e.toUpperCase() === 'AVX512') return cpuInfo.cpuInfo().some((e) => e.toUpperCase() === 'AVX512')
? 'avx512' ? 'avx512'
@ -84,26 +85,30 @@ const cpuInstructions = () => {
export const executableCortexFile = ( export const executableCortexFile = (
gpuSetting?: GpuSetting gpuSetting?: GpuSetting
): CortexExecutableOptions => { ): CortexExecutableOptions => {
let engineFolder = [ const cpuInstruction = cpuInstructions()
os(), let engineFolder = gpuSetting?.vulkan
...(gpuSetting?.vulkan ? 'vulkan'
? [] : process.platform === 'darwin'
? os()
: [ : [
gpuRunMode(gpuSetting) !== 'cuda' ? cpuInstructions() : '', gpuRunMode(gpuSetting) !== 'cuda' ||
cpuInstruction === 'avx' ||
cpuInstruction === 'noavx'
? cpuInstruction
: '',
gpuRunMode(gpuSetting), gpuRunMode(gpuSetting),
cudaVersion(gpuSetting), cudaVersion(gpuSetting),
]),
gpuSetting?.vulkan ? 'vulkan' : undefined,
] ]
.filter((e) => !!e) .filter((e) => !!e)
.join('-') .join('-')
let cudaVisibleDevices = gpuSetting?.gpus_in_use.join(',') ?? '' let cudaVisibleDevices = gpuSetting?.gpus_in_use.join(',') ?? ''
let vkVisibleDevices = gpuSetting?.gpus_in_use.join(',') ?? '' let vkVisibleDevices = gpuSetting?.gpus_in_use.join(',') ?? ''
let binaryName = `cortex-server${extension()}` let binaryName = `cortex-server${extension()}`
const binPath = path.join(__dirname, '..', 'bin')
return { return {
enginePath: path.join(__dirname, '..', 'bin', engineFolder), enginePath: path.join(binPath, engineFolder),
executablePath: path.join(__dirname, '..', 'bin', binaryName), executablePath: path.join(binPath, binaryName),
binPath: binPath,
cudaVisibleDevices, cudaVisibleDevices,
vkVisibleDevices, vkVisibleDevices,
} }

10
extensions/inference-cortex-extension/src/node/index.ts
View File

@ -27,17 +27,21 @@ function run(systemInfo?: SystemInformation): Promise<any> {
// Execute the binary // Execute the binary
log(`[CORTEX]:: Spawn cortex at path: ${executableOptions.executablePath}`) log(`[CORTEX]:: Spawn cortex at path: ${executableOptions.executablePath}`)
log(`[CORTEX]::Debug: Cortex engine path: ${executableOptions.enginePath}`) log(`[CORTEX]:: Cortex engine path: ${executableOptions.enginePath}`)
// Add engine path to the PATH and LD_LIBRARY_PATH // Add engine path to the PATH and LD_LIBRARY_PATH
process.env.PATH = (process.env.PATH || '').concat( process.env.PATH = (process.env.PATH || '').concat(
path.delimiter, path.delimiter,
executableOptions.enginePath executableOptions.enginePath,
path.delimiter,
executableOptions.binPath
) )
log(`[CORTEX] PATH: ${process.env.PATH}`) log(`[CORTEX] PATH: ${process.env.PATH}`)
process.env.LD_LIBRARY_PATH = (process.env.LD_LIBRARY_PATH || '').concat( process.env.LD_LIBRARY_PATH = (process.env.LD_LIBRARY_PATH || '').concat(
path.delimiter, path.delimiter,
executableOptions.enginePath executableOptions.enginePath,
path.delimiter,
executableOptions.binPath
) )
const dataFolderPath = getJanDataFolderPath() const dataFolderPath = getJanDataFolderPath()

3
web/hooks/useModels.test.ts
View File

@ -6,6 +6,9 @@ import { extensionManager } from '@/extension'
// Mock dependencies // Mock dependencies
jest.mock('@janhq/core') jest.mock('@janhq/core')
jest.mock('@/extension') jest.mock('@/extension')
jest.mock('use-debounce', () => ({
useDebouncedCallback: jest.fn().mockImplementation((fn) => fn),
}))
import useModels from './useModels' import useModels from './useModels'

2
web/hooks/useModels.ts
View File

@ -59,7 +59,7 @@ const useModels = () => {
useEffect(() => { useEffect(() => {
// Try get data on mount // Try get data on mount
getData() reloadData()
// Listen for model updates // Listen for model updates
events.on(ModelEvent.OnModelsUpdate, async () => reloadData()) events.on(ModelEvent.OnModelsUpdate, async () => reloadData())