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

fix: cortex process is not terminated properly (#2921)

Browse Source 
* chore: bump cortex-cpp to 0.4.6

* Bump cortex 0.4.7

---------

Co-authored-by: Van Pham <64197333+Van-QA@users.noreply.github.com>
This commit is contained in:
Louis 2024-05-18 14:14:56 +07:00 committed by GitHub
parent 537ef20a54
commit e78d057f0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/inference-nitro-extension/bin/version.txt
View File

@ -1 +1 @@
0.4.4
0.4.7

20
extensions/inference-nitro-extension/src/node/index.ts
View File

@ -50,7 +50,8 @@ const SUPPORTED_MODEL_FORMAT = '.gguf'
let subprocess: ChildProcessWithoutNullStreams | undefined = undefined
// The current model settings
let currentSettings: ModelSettingParams & { model?: string } | undefined = undefined
let currentSettings: (ModelSettingParams & { model?: string }) | undefined =
undefined
/**
* Stops a Nitro subprocess.
@ -153,7 +154,10 @@ async function loadModel(
* 3. Validate model status
* @returns
*/
async function runNitroAndLoadModel(modelId: string, systemInfo?: SystemInformation) {
async function runNitroAndLoadModel(
modelId: string,
systemInfo?: SystemInformation
) {
// Gather system information for CPU physical cores and memory
return killSubprocess()
.then(() =>
@ -320,19 +324,23 @@ async function killSubprocess(): Promise<void> {
})
}
if (subprocess?.pid) {
if (subprocess?.pid && process.platform !== 'darwin') {
log(`[CORTEX]::Debug: Killing PID ${subprocess.pid}`)
const pid = subprocess.pid
return new Promise((resolve, reject) => {
terminate(pid, function (err) {
if (err) {
log('[CORTEX]::Failed to kill PID - sending request to kill')
killRequest().then(resolve).catch(reject)
} else {
tcpPortUsed
.waitUntilFree(PORT, NITRO_PORT_FREE_CHECK_INTERVAL, 5000)
.then(() => resolve())
.then(() => log(`[CORTEX]::Debug: cortex process is terminated`))
.then(() => resolve())
.catch(() => {
log(
'[CORTEX]::Failed to kill PID (Port check timeout) - sending request to kill'
)
killRequest().then(resolve).catch(reject)
})
}
@ -358,9 +366,7 @@ function spawnNitroProcess(systemInfo?: SystemInformation): Promise<any> {
log(
`[CORTEX]::Debug: Spawn cortex at path: ${executableOptions.executablePath}, and args: ${args}`
)
log(
path.parse(executableOptions.executablePath).dir
)
log(path.parse(executableOptions.executablePath).dir)
subprocess = spawn(
executableOptions.executablePath,
['1', LOCAL_HOST, PORT.toString()],