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

chore: output logs to file for nitro debugging

Browse Source
This commit is contained in:
Louis 2023-11-21 13:47:47 +07:00
parent de562ecaed
commit ca3c6f73f8
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/inference-plugin/package.json
View File

@ -36,6 +36,7 @@
"dependencies": { "dependencies": {
"@janhq/core": "file:../../core", "@janhq/core": "file:../../core",
"download-cli": "^1.1.1", "download-cli": "^1.1.1",
"electron-log": "^5.0.1",
"fetch-retry": "^5.0.6", "fetch-retry": "^5.0.6",
"kill-port": "^2.0.1", "kill-port": "^2.0.1",
"path-browserify": "^1.0.1", "path-browserify": "^1.0.1",
@ -55,6 +56,7 @@
"bundleDependencies": [ "bundleDependencies": [
"tcp-port-used", "tcp-port-used",
"kill-port", "kill-port",
"fetch-retry" "fetch-retry",
"electron-log"
] ]
} }

15
plugins/inference-plugin/src/module.ts
View File

@ -5,6 +5,8 @@ const { spawn } = require("child_process");
const tcpPortUsed = require("tcp-port-used"); const tcpPortUsed = require("tcp-port-used");
const fetchRetry = require("fetch-retry")(global.fetch); const fetchRetry = require("fetch-retry")(global.fetch);
const log = require("electron-log");
// The PORT to use for the Nitro subprocess // The PORT to use for the Nitro subprocess
const PORT = 3928; const PORT = 3928;
const LOCAL_HOST = "127.0.0.1"; const LOCAL_HOST = "127.0.0.1";
@ -35,6 +37,7 @@ interface InitModelResponse {
function initModel(modelFile: string): Promise<InitModelResponse> { function initModel(modelFile: string): Promise<InitModelResponse> {
// 1. Check if the model file exists // 1. Check if the model file exists
currentModelFile = modelFile; currentModelFile = modelFile;
log.info("Started to load model " + modelFile);
return ( return (
// 1. Check if the port is used, if used, attempt to unload model / kill nitro process // 1. Check if the port is used, if used, attempt to unload model / kill nitro process
@ -49,6 +52,7 @@ function initModel(modelFile: string): Promise<InitModelResponse> {
// 5. Check if the model is loaded successfully // 5. Check if the model is loaded successfully
.then(validateModelStatus) .then(validateModelStatus)
.catch((err) => { .catch((err) => {
log.error("error: " + JSON.stringify(err));
return { error: err }; return { error: err };
}) })
); );
@ -77,6 +81,7 @@ function loadLLMModel(): Promise<Response> {
retryDelay: 500, retryDelay: 500,
}).catch((err) => { }).catch((err) => {
console.error(err); console.error(err);
log.error("error: " + JSON.stringify(err));
// Fetch error, Nitro server might not started properly // Fetch error, Nitro server might not started properly
throw new Error("Model loading failed."); throw new Error("Model loading failed.");
}); });
@ -192,6 +197,7 @@ function spawnNitroProcess() {
}); });
subprocess.stderr.on("data", (data) => { subprocess.stderr.on("data", (data) => {
log.error("subprocess error:" + data.toString());
console.error(`stderr: ${data}`); console.error(`stderr: ${data}`);
}); });
@ -206,11 +212,14 @@ function spawnNitroProcess() {
* @returns A Promise that resolves when the model is loaded successfully, or rejects with an error message if the model is not found or fails to load. * @returns A Promise that resolves when the model is loaded successfully, or rejects with an error message if the model is not found or fails to load.
*/ */
function validateModelVersion(): Promise<void> { function validateModelVersion(): Promise<void> {
log.info("validateModelVersion");
// Read the file // Read the file
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
fs.open(currentModelFile, "r", (err, fd) => { fs.open(currentModelFile, "r", (err, fd) => {
if (err) { if (err) {
log.error("validateModelVersion error" + JSON.stringify(err));
console.error(err.message); console.error(err.message);
reject(err);
return; return;
} }
@ -220,7 +229,13 @@ function validateModelVersion(): Promise<void> {
// Model version will be the 5th byte of the file // Model version will be the 5th byte of the file
fs.read(fd, buffer, 0, 1, 4, (err, bytesRead, buffer) => { fs.read(fd, buffer, 0, 1, 4, (err, bytesRead, buffer) => {
if (err) { if (err) {
log.error("validateModelVersion open error" + JSON.stringify(err));
console.error(err.message); console.error(err.message);
fs.close(fd, (err) => {
log.error("validateModelVersion close error" + JSON.stringify(err));
if (err) console.error(err.message);
});
reject(err);
} else { } else {
// Interpret the byte as ASCII // Interpret the byte as ASCII
if (buffer[0] === 0x01) { if (buffer[0] === 0x01) {