Merge pull request #9 from Zipstack/update-client_for_status_api

Changes to handle status API change

Author: jaseemjaskp

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Jest Tests",
+      "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
+      "args": ["--runInBand"],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
+    }
+  ]
+}

index.js

@@ -11,12 +11,11 @@
  * 
 
  */
-
+require("dotenv").config();
 const axios = require("axios");
 const winston = require("winston");
 const fs = require("fs");
 const { register } = require("module");
-
 const BASE_URL = "https://llmwhisperer-api.unstract.com/v1";
 const BASE_URL_V2 = "https://llmwhisperer-api.us-central.unstract.com/api/v2";
 
@@ -374,8 +373,12 @@ class LLMWhispererClientV2 {
 
     this.headers = {
       "unstract-key": this.apiKey,
-      "Subscription-Id": "test", //TODO: Remove this line. For testing only
-      "Start-Date": "9-07-2024", //TODO: Remove this line. For testing only
+      // "Subscription-Id": "jsclient-client",
+      // "Subscription-Name": "jsclient-client",
+      // "User-Id": "jsclient-client-user",
+      // "Product-Id": "jsclient-client-product",
+      // "Product-Name": "jsclient-client-product",
+      // "Start-Date": "2024-07-09",
     };
   }
 
@@ -532,34 +535,30 @@ class LLMWhispererClientV2 {
             message["extraction"] = {};
             message["status_code"] = -1;
             message["message"] = "Whisper client operation timed out";
-            break;
+            return message;
           }
           const whisperStatus = await this.whisperStatus(whisperHash);
+          this.logger.debug(`whisperStatus: ${JSON.stringify(whisperStatus)}`);
+
           if (whisperStatus.statusCode !== 200) {
             message["extraction"] = {};
             message["status_code"] = whisperStatus.statusCode;
             message["message"] = "Whisper client operation failed";
-            break;
+            return message;
           }
-          if (whisperStatus.status === "processing") {
-            this.logger.debug("Status: processing");
-          } else if (whisperStatus.status === "delivered") {
-            this.logger.debug("Status: delivered");
-            throw new LLMWhispererClientException(
-              "Whisper operation already delivered",
-              -1,
+          if (whisperStatus.status === "accepted") {
+            this.logger.debug("Status: accepted...");
+          } else if (whisperStatus.status === "processing") {
+            this.logger.debug("Status: processing...");
+          } else if (whisperStatus.status === "error") {
+            this.logger.debug("Status: error");
+            this.logger.error(
+              "Whisper-hash: ${whisperHash} | STATUS: failed with ${whisperStatus.message}",
             );
-          } else if (whisperStatus.status === "unknown") {
-            this.logger.debug("Status: unknown");
-            throw new LLMWhispererClientException(
-              "Whisper operation status unknown",
-              -1,
-            );
-          } else if (whisperStatus.status === "failed") {
-            this.logger.debug("Status: failed");
             message["extraction"] = {};
             message["status_code"] = -1;
-            message["message"] = "Whisper client operation failed";
+            message["status"] = "error";
+            message["message"] = whisperStatus.message;
             break;
           } else if (whisperStatus.status === "processed") {
             this.logger.debug("Status: processed");
@@ -602,25 +601,30 @@ class LLMWhispererClientV2 {
    * @throws {LLMWhispererClientException} Throws an LLMWhispererClientException if an error occurs during the operation.
    */
   async whisperStatus(whisperHash) {
-    this.logger.debug("whisper_status called");
+    this.logger.debug(`whisper_status called for ${whisperHash}`);
     const url = `${this.baseUrl}/whisper-status`;
     const params = { whisper_hash: whisperHash };
     this.logger.debug(`url: ${url}`);
+    this.logger.debug(`params: ${JSON.stringify(params)}`);
+    delete this.headers["Content-Length"];
+    this.logger.debug(`headers: ${JSON.stringify(this.headers)}`);
 
     try {
       const response = await axios.get(url, {
         headers: this.headers,
         params,
         timeout: this.apiTimeout * 1000,
       });
-
       const message = response.data;
       message.statusCode = response.status;
       return message;
     } catch (error) {
+      this.logger.debug("Hel00000000002");
+      this.logger.debug(`error: ${JSON.stringify(error)}`);
       const err = error.response
         ? error.response.data
         : { message: error.message };
+      this.logger.debug(`error: ${JSON.stringify(err)}`);
       err.statusCode = error.response ? error.response.status : -1;
       throw new LLMWhispererClientException(err.message, err.statusCode);
     }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "llmwhisperer-client",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "LLMWhisper JS Client",
   "main": "index.js",
   "scripts": {
@@ -14,11 +14,13 @@
   "license": "MIT",
   "dependencies": {
     "axios": "~1.7.2",
+    "llmwhisperer-client": "^2.0.1",
+    "string-similarity": "^4.0.4",
     "winston": "~3.13.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.4.0",
-    "dotenv": "^16.4.5",
+    "dotenv": "^16.4.7",
     "eslint": "^9.4.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-turbo": "^1.13.3",

package.json

@@ -0,0 +1,3 @@
+LLMWHISPERER_BASE_URL_V2=https://llmwhisperer-api.us-central.unstract.com/api/v2
+LLMWHISPERER_LOG_LEVEL=DEBUG
+LLMWHISPERER_API_KEY=