split dbt version check and dbt installed check

Author: mdesmet

src/dbt_client/dbtCommandFactory.ts

@@ -13,17 +13,25 @@ export interface CommandProcessExecutionParams {
 }
 
 export interface DBTCommand {
-  commandAsString: string;
+  commandAsString?: string;
   statusMessage: string;
   processExecutionParams: CommandProcessExecutionParams;
   focus?: boolean;
 }
 
 @provideSingleton(DBTCommandFactory)
 export class DBTCommandFactory {
+  createImportDBTCommand(): DBTCommand {
+    return {
+      statusMessage: "Detecting dbt installation...",
+      processExecutionParams: {
+        args: ["-c", 'import dbt.main; print("dbt is installed")'],
+      },
+    };
+  }
+
   createVersionCommand(): DBTCommand {
     return {
-      commandAsString: "dbt --version",
       statusMessage: "Detecting dbt version...",
       processExecutionParams: {
         args: ["-c", this.dbtCommand("'--version'")],

src/dbt_client/index.ts

@@ -92,19 +92,36 @@ export class DBTClient implements Disposable {
 
   async checkIfDBTIsInstalled(): Promise<void> {
     const checkDBTInstalledProcess = this.executeCommand(
-      this.dbtCommandFactory.createVersionCommand()
+      this.dbtCommandFactory.createImportDBTCommand()
     );
+
+    this.raiseDBTInstallationCheckEvent();
     try {
-      this.raiseDBTInstallationCheckEvent();
       await checkDBTInstalledProcess.complete();
-      checkDBTInstalledProcess.dispose();
+    }catch(_) {
+      this.raiseDBTNotInstalledEvent();
+      return;
+    }
+
+    const checkDBTVersionProcess = this.executeCommand(
+      this.dbtCommandFactory.createVersionCommand()
+    );
+    const timeoutCmd = new Promise((resolve, _) => {
+      setTimeout(resolve, 5000, 'Could not connect');
+    });
+    try {
+      await Promise.race([
+        checkDBTVersionProcess.complete(),
+        timeoutCmd,
+      ]);
+      checkDBTVersionProcess.dispose();
     } catch (err) {
       if (err.match(DBTClient.IS_INSTALLED)) {
         this.checkIfDBTIsUpToDate(err);
         return;
       }
-      this.raiseDBTNotInstalledEvent();
     }
+    this.raiseDBTVersionCouldNotBeDeterminedEvent();
   }
 
   addCommandToQueue(command: DBTCommand) {
@@ -151,13 +168,17 @@ export class DBTClient implements Disposable {
         },
       });
     }
-    this.writeEmitter.fire(
-      `\r> Executing task:  ${command.commandAsString}\n\r\n\r`
-    );
 
-    if (command.focus) {
-      this.terminal.show(true);
+    if (command.commandAsString !== undefined) {
+      this.writeEmitter.fire(
+        `\r> Executing task:  ${command.commandAsString}\n\r\n\r`
+      );
+
+      if (command.focus) {
+        this.terminal.show(true);
+      }
     }
+    
     return this.commandProcessExecutionFactory.createCommandProcessExecution(
       this.pythonPath!,
       args,
@@ -178,6 +199,12 @@ export class DBTClient implements Disposable {
     });
   }
 
+  private raiseDBTVersionCouldNotBeDeterminedEvent(): void {
+    this._onDBTInstallationFound.fire({
+      installed: true
+    });
+  }
+
   private raiseDBTVersionEvent(
     installedVersion: string,
     latestVersion: string

src/statusbar/versionStatusBar.ts

@@ -43,10 +43,16 @@ export class VersionStatusBar implements Disposable {
       return;
     }
     if (!event.upToDate) {
-      this.showTextInStatusBar(
-        `$(error) dbt ${event.installedVersion!} is not up to date`,
-        { title: "Update dbt", command: "dbtPowerUser.updateDBT" }
-      );
+      if(event.installedVersion !== undefined) {
+        this.showTextInStatusBar(
+          `$(error) dbt ${event.installedVersion} is not up to date`,
+          { title: "Update dbt", command: "dbtPowerUser.updateDBT" }
+        );
+      } else {
+        this.showTextInStatusBar(
+          `$(check) dbt`
+        );
+      }      
       return;
     }
     this.showTextInStatusBar(`$(check) dbt ${event.installedVersion}`);