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

feat: Add api to kill nitro

Browse Source
This commit is contained in:
hiro 2023-12-13 16:35:59 +07:00
parent 7f60265b3e
commit 539f11e583
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/inference-nitro-extension/src/module.ts
View File

@ -15,6 +15,7 @@ const NITRO_HTTP_SERVER_URL = `http://${LOCAL_HOST}:${PORT}`;
const NITRO_HTTP_LOAD_MODEL_URL = `${NITRO_HTTP_SERVER_URL}/inferences/llamacpp/loadmodel`; const NITRO_HTTP_LOAD_MODEL_URL = `${NITRO_HTTP_SERVER_URL}/inferences/llamacpp/loadmodel`;
const NITRO_HTTP_UNLOAD_MODEL_URL = `${NITRO_HTTP_SERVER_URL}/inferences/llamacpp/unloadModel`; const NITRO_HTTP_UNLOAD_MODEL_URL = `${NITRO_HTTP_SERVER_URL}/inferences/llamacpp/unloadModel`;
const NITRO_HTTP_VALIDATE_MODEL_URL = `${NITRO_HTTP_SERVER_URL}/inferences/llamacpp/modelstatus`; const NITRO_HTTP_VALIDATE_MODEL_URL = `${NITRO_HTTP_SERVER_URL}/inferences/llamacpp/modelstatus`;
const NITRO_HTTP_KILL_URL = `${NITRO_HTTP_SERVER_URL}/processmanager/destroy`;
// The subprocess instance for Nitro // The subprocess instance for Nitro
let subprocess = null; let subprocess = null;
@ -188,9 +189,14 @@ async function validateModelStatus(): Promise<ModelOperationResponse> {
*/ */
function killSubprocess(): Promise<void> { function killSubprocess(): Promise<void> {
if (subprocess) { if (subprocess) {
subprocess.kill(); fetch(NITRO_HTTP_KILL_URL, {
subprocess = null; method: "DELETE",
console.debug("Subprocess terminated."); }).catch((err) => {
console.error(err);
subprocess.kill();
subprocess = null;
return killSubprocess();
});
} else { } else {
return kill(PORT, "tcp").then(console.log).catch(console.log); return kill(PORT, "tcp").then(console.log).catch(console.log);
} }
@ -207,9 +213,6 @@ async function checkAndUnloadNitro() {
// Attempt to unload model // Attempt to unload model
return fetch(NITRO_HTTP_UNLOAD_MODEL_URL, { return fetch(NITRO_HTTP_UNLOAD_MODEL_URL, {
method: "GET", method: "GET",
headers: {
"Content-Type": "application/json",
},
}).catch((err) => { }).catch((err) => {
console.error(err); console.error(err);
// Fallback to kill the port // Fallback to kill the port