Cleanup

Author: savannahostrowski

src/extension/debugger/configuration/dynamicdebugConfigurationService.ts

@@ -8,10 +8,9 @@ import * as path from 'path';
 import { CancellationToken, DebugConfiguration, WorkspaceFolder } from 'vscode';
 import { IDynamicDebugConfigurationService } from '../types';
 import { DebuggerTypeName } from '../../constants';
-import { getDjangoPaths, getFastApiPaths, getFlaskPaths, isFastApiCliAvailable } from './utils/configuration';
+import { getDjangoPaths, getFastApiPaths, getFlaskPaths } from './utils/configuration';
 import { sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
-import { replaceAll } from '../../common/stringUtils';
 
 const workspaceFolderToken = '${workspaceFolder}';
 
@@ -64,38 +63,22 @@ export class DynamicPythonDebugConfigurationService implements IDynamicDebugConf
 
         const fastApiPaths = await getFastApiPaths(folder);
         if (fastApiPaths?.length) {
-            const hasFastApiCli = await isFastApiCliAvailable(folder.uri);
-            if (hasFastApiCli) {
-                providers.push({
-                    name: 'Python Debugger: FastAPI',
-                    type: DebuggerTypeName,
-                    request: 'launch',
-                    module: 'fastapi',
-                    args: ['dev'],
-                    jinja: true,
-                    subProcess: true,
-                });
-                providers.push({
-                    name: 'Python Debugger: FastAPI File',
-                    type: DebuggerTypeName,
-                    request: 'launch',
-                    module: 'fastapi',
-                    args: ['dev', '${file}'],
-                    jinja: true,
-                    subProcess: true,
-                });
-            } else {
-                // Legacy fallback when fastapi-cli is not available.
-                const fastApiPath = replaceAll(path.relative(folder.uri.fsPath, fastApiPaths[0].fsPath), path.sep, '.').replace('.py', '');
-                providers.push({
-                    name: 'Python Debugger: FastAPI',
-                    type: DebuggerTypeName,
-                    request: 'launch',
-                    module: 'uvicorn',
-                    args: [`${fastApiPath}:app`, '--reload'],
-                    jinja: true,
-                });
-            }
+            providers.push({
+                name: 'Python Debugger: FastAPI',
+                type: DebuggerTypeName,
+                request: 'launch',
+                module: 'fastapi',
+                args: ['run'],
+                jinja: true,
+            });
+            providers.push({
+                name: 'Python Debugger: FastAPI File',
+                type: DebuggerTypeName,
+                request: 'launch',
+                module: 'fastapi',
+                args: ['run', '${file}'],
+                jinja: true,
+            });
         }
 
         sendTelemetryEvent(EventName.DEBUGGER_DYNAMIC_CONFIGURATION, undefined, { providers: providers });

src/extension/debugger/configuration/providers/fastapiLaunch.ts

@@ -20,9 +20,8 @@ export async function buildFastAPILaunchDebugConfiguration(
         type: DebuggerTypeName,
         request: 'launch',
         module: 'fastapi',
-        args: ['dev'],
+        args: ['run'],
         jinja: true,
-        subProcess: true,
     };
     sendTelemetryEvent(EventName.DEBUGGER_CONFIGURATION_PROMPTS, undefined, {
         configurationType: DebugConfigurationType.launchFastAPI,
@@ -39,9 +38,8 @@ export async function buildFastAPIWithFileLaunchDebugConfiguration(
         type: DebuggerTypeName,
         request: 'launch',
         module: 'fastapi',
-        args: ['dev', '${file}'],
+        args: ['run', '${file}'],
         jinja: true,
-        subProcess: true,
     };
     sendTelemetryEvent(EventName.DEBUGGER_CONFIGURATION_PROMPTS, undefined, {
         configurationType: DebugConfigurationType.launchFastAPIWithFile,

src/extension/debugger/configuration/utils/configuration.ts

@@ -15,11 +15,8 @@ import { AttachRequestArguments } from '../../../types';
 import { DebugConfigurationState, DebugConfigurationType } from '../../types';
 import { Uri, WorkspaceFolder, workspace } from 'vscode';
 import { asyncFilter } from '../../../common/utilities';
-import { getInterpreterDetails } from '../../../common/python';
-import { plainExec } from '../../../common/process/rawProcessApis';
 
 const defaultPort = 5678;
-const fastApiCliCache = new Map<string, Promise<boolean>>();
 
 export async function configurePort(
     input: MultiStepInput<DebugConfigurationState>,
@@ -84,22 +81,6 @@ export async function getFastApiPaths(folder: WorkspaceFolder | undefined) {
     return fastApiPaths;
 }
 
-export async function isFastApiCliAvailable(resource?: Uri): Promise<boolean> {
-    const interpreterDetails = await getInterpreterDetails(resource);
-    const pythonPath = interpreterDetails?.path?.[0];
-    if (!pythonPath) {
-        return false;
-    }
-    if (fastApiCliCache.has(pythonPath)) {
-        return fastApiCliCache.get(pythonPath)!;
-    }
-    const promise = plainExec(pythonPath, ['-c', 'import fastapi_cli'], { throwOnStdErr: false })
-        .then(() => true)
-        .catch(() => false);
-    fastApiCliCache.set(pythonPath, promise);
-    return promise;
-}
-
 export async function getFlaskPaths(folder: WorkspaceFolder | undefined) {
     if (!folder) {
         return [];

src/test/unittest/configuration/providers/fastapiLaunch.unit.test.ts

@@ -31,9 +31,8 @@ suite('Debugging - Configuration Provider FastAPI', () => {
             type: DebuggerTypeName,
             request: 'launch',
             module: 'fastapi',
-            args: ['dev'],
+            args: ['run'],
             jinja: true,
-            subProcess: true,
         };
 
         expect(state.config).to.be.deep.equal(config);
@@ -50,9 +49,8 @@ suite('Debugging - Configuration Provider FastAPI', () => {
             type: DebuggerTypeName,
             request: 'launch',
             module: 'fastapi',
-            args: ['dev', '${file}'],
+            args: ['run', '${file}'],
             jinja: true,
-            subProcess: true,
         };
 
         expect(state.config).to.be.deep.equal(config);