bugfix: server health

Author: gespispace

package.json

@@ -171,4 +171,4 @@
     "@grafana/faro-core": "^1.3.5",
     "@grafana/faro-web-sdk": "^1.3.5"
   }
-}
+}

src/common/chat/localChat.ts

@@ -71,48 +71,14 @@ export async function* sendChatRequest(
       }
     }
 
-    // if (!response.ok) {
-    //   Logger.error(response.statusText);
-
-    //   vscode.window.showErrorMessage(
-    //     `Error: ${response.status} ${response.statusText}`
-    //   );
-    //   return null;
-    // }
-
-    // const completion: {
-    //   content: string;
-    //   slot_id: number;
-    //   timings: {
-    //     predicted_ms: number;
-    //     predicted_n: number;
-    //     predicted_per_second: number;
-    //     predicted_per_token_ms: number;
-    //     prompt_ms: number;
-    //     prompt_n: number;
-    //     prompt_per_second: number;
-    //     prompt_per_token_ms: number;
-    //   };
-    // } = (await response.json()) as any;
-
-    // if (completion.content === "") {
-    //   return null;
-    // }
-
     loggerCompletion.info(
-      // `Slot Id: ${completion.slot_id}; ` +
       `Total time: ${(performance.now() - startTime).toFixed(2)}; ` +
         `PP: ${timings?.prompt_per_second?.toFixed(2)}; [t/s] ` +
         `TG: ${timings?.predicted_per_second?.toFixed(2)}; [t/s]`
     );
 
-    // const timing = completion?.timings?.prompt_ms
-    //   ? completion?.timings?.prompt_ms
-    //   : performance.now() - startTime;
-
     loggerCompletion.info("Request: finished");
     return;
-    // return { content: completion.content } as const;
   } catch (error) {
     const Error = error as Error;
     if (Error.name === "AbortError") {

src/common/server/index.ts

@@ -59,7 +59,6 @@ class Server {
     const osplatform = os.platform();
     const osmachine = os.machine();
     const isMacArm64 = osplatform === "darwin" && osmachine === "arm64";
-    const isBaseModel = Object.keys(modelsBase).includes(this.typeModel);
 
     const serverIsStarted = await this.checkServerStatus();
     if (serverIsStarted) {
@@ -112,6 +111,7 @@ class Server {
     const port = models[this.typeModel].port;
 
     const isChatModel = this.typeModel in modelsChat;
+    const isBaseModel = this.typeModel in modelsBase;
 
     this.serverProcess = spawn(
       serverPath,
@@ -189,7 +189,7 @@ class Server {
     });
 
     const isServerStarted = await this.checkServerStatusIntervalWithTimeout(
-      5000
+      10000
     );
 
     if (!isServerStarted) {
@@ -224,8 +224,9 @@ class Server {
 
   public async checkServerStatus() {
     try {
-      // const isMacArm64 = osplatform === "darwin" && osmachine === "arm64";
-      const isMacArm64 = true;
+      const osplatform = os.platform();
+      const osmachine = os.machine();
+      const isMacArm64 = osplatform === "darwin" && osmachine === "arm64";
       const res = await fetch(
         `${this.serverUrl}/${isMacArm64 ? "model.json" : "health"}`,
         {