Add back "Select Python Interpreter"

iterative · Apr 27, 2023 · d9662cc · d9662cc
1 parent a05091b
commit d9662cc
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 80 deletions.
diff --git a/extension/src/setup/index.ts b/extension/src/setup/index.ts
@@ -24,7 +24,6 @@ import { BaseWebview } from '../webview'
 import { ViewKey } from '../webview/constants'
 import { BaseRepository } from '../webview/repository'
 import { Resource } from '../resourceLocator'
-import { isPythonExtensionInstalled } from '../extensions/python'
 import {
   findAbsoluteDvcRootPath,
   findDvcRootPaths,
@@ -354,10 +353,19 @@ export class Setup
     }
   }
 
+  private isDVCBeingUsedGlobally() {
+    const dvcPath = this.config.getCliPath()
+    const pythonBinPath = this.config.getPythonBinPath()
+
+    return dvcPath || !pythonBinPath
+  }
+
   private async sendDataToWebview() {
     const projectInitialized = this.hasRoots()
     const hasData = this.getHasData()
 
+    const isPythonExtensionUsed = await this.isPythonExtensionUsed()
+
     const needsGitInitialized =
       !projectInitialized && !!(await this.needsGitInit())
 
@@ -375,7 +383,8 @@ export class Setup
       cliCompatible: this.cliCompatible,
       dvcCliDetails,
       hasData,
-      isPythonExtensionInstalled: isPythonExtensionInstalled(),
+      isPythonExtensionUsed:
+        !this.isDVCBeingUsedGlobally() && isPythonExtensionUsed,
       isStudioConnected: this.studioIsConnected,
       needsGitCommit,
       needsGitInitialized,

diff --git a/extension/src/setup/webview/contract.ts b/extension/src/setup/webview/contract.ts
@@ -8,7 +8,7 @@ export type SetupData = {
   cliCompatible: boolean | undefined
   dvcCliDetails: DvcCliDetails
   hasData: boolean | undefined
-  isPythonExtensionInstalled: boolean
+  isPythonExtensionUsed: boolean
   isStudioConnected: boolean
   needsGitCommit: boolean
   needsGitInitialized: boolean | undefined

diff --git a/extension/src/setup/webview/messages.ts b/extension/src/setup/webview/messages.ts
@@ -37,7 +37,7 @@ export class WebviewMessages {
     cliCompatible,
     dvcCliDetails,
     hasData,
-    isPythonExtensionInstalled,
+    isPythonExtensionUsed,
     isStudioConnected,
     needsGitCommit,
     needsGitInitialized,
@@ -51,7 +51,7 @@ export class WebviewMessages {
       cliCompatible,
       dvcCliDetails,
       hasData,
-      isPythonExtensionInstalled,
+      isPythonExtensionUsed,
       isStudioConnected,
       needsGitCommit,
       needsGitInitialized,

diff --git a/extension/src/test/suite/setup/index.test.ts b/extension/src/test/suite/setup/index.test.ts
@@ -241,7 +241,7 @@ suite('Setup Test Suite', () => {
         cliCompatible: undefined,
         dvcCliDetails: { command: 'dvc', version: undefined },
         hasData: false,
-        isPythonExtensionInstalled: false,
+        isPythonExtensionUsed: false,
         isStudioConnected: false,
         needsGitCommit: true,
         needsGitInitialized: true,
@@ -282,7 +282,7 @@ suite('Setup Test Suite', () => {
         cliCompatible: true,
         dvcCliDetails: { command: 'dvc', version: MIN_CLI_VERSION },
         hasData: false,
-        isPythonExtensionInstalled: false,
+        isPythonExtensionUsed: false,
         isStudioConnected: false,
         needsGitCommit: true,
         needsGitInitialized: true,
@@ -332,7 +332,7 @@ suite('Setup Test Suite', () => {
           version: MIN_CLI_VERSION
         },
         hasData: false,
-        isPythonExtensionInstalled: false,
+        isPythonExtensionUsed: false,
         isStudioConnected: false,
         needsGitCommit: false,
         needsGitInitialized: false,
@@ -382,7 +382,7 @@ suite('Setup Test Suite', () => {
           version: MIN_CLI_VERSION
         },
         hasData: false,
-        isPythonExtensionInstalled: false,
+        isPythonExtensionUsed: false,
         isStudioConnected: false,
         needsGitCommit: true,
         needsGitInitialized: false,