Merge branch 'main' into endpoint_to_path

Author: savannahostrowski

bun.lock

@@ -14,7 +14,7 @@
   },
   "homepage": "https://github.com/fastapi/fastapi-vscode#readme",
   "engines": {
-    "vscode": "^1.85.0"
+    "vscode": "^1.95.0"
   },
   "main": "./dist/extension.js",
   "browser": "./dist/web/extension.js",
@@ -303,7 +303,7 @@
           "type": "string",
           "default": "",
           "scope": "resource",
-          "description": "Path to the main FastAPI application file (e.g., 'src/main.py'). If not set, the extension will search common locations."
+          "description": "Entrypoint for the main FastAPI application in module notation (e.g., 'my_app.main:app'). If not set, the extension will search pyproject.toml and common locations."
         },
         "fastapi.codeLens.enabled": {
           "type": "boolean",
@@ -344,7 +344,7 @@
     "@types/bun": "latest",
     "@types/mocha": "^10.0.10",
     "@types/sinon": "^21.0.0",
-    "@types/vscode": "^1.85.0",
+    "@types/vscode": "^1.95.0",
     "@vscode/test-cli": "^0.0.12",
     "@vscode/test-electron": "^2.5.2",
     "@vscode/vsce": "^3.7.1",

package.json

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -e
 
+# Clean dist to avoid stale files from previous bundled builds
+rm -rf dist
+
 # Build without bundling (required for per-file coverage)
 bun run esbuild.js --no-bundle
 

scripts/test-coverage.sh

@@ -18,6 +18,25 @@ import { vscodeFileSystem } from "./vscode/vscodeFileSystem"
 
 export type { EntryPoint }
 
+/**
+ * Parses an entrypoint string in module:variable notation.
+ * Supports formats like "my_app.main:app" or "main".
+ * Returns the relative file path and optional variable name.
+ */
+export function parseEntrypointString(value: string): {
+  relativePath: string
+  variableName?: string
+} {
+  const colonIndex = value.indexOf(":")
+  const modulePath = colonIndex === -1 ? value : value.slice(0, colonIndex)
+  const variableName =
+    colonIndex === -1 ? undefined : value.slice(colonIndex + 1)
+
+  const relativePath = `${modulePath.replace(/\./g, "/")}.py`
+
+  return { relativePath, variableName }
+}
+
 /**
  * Scans for common FastAPI entry point files (main.py, __init__.py).
  * Returns URI strings sorted by depth (shallower first).
@@ -64,18 +83,8 @@ async function parsePyprojectForEntryPoint(
       return null
     }
 
-    // Parse "my_app.main:app" or "api.py:app" format (variable name after : is optional)
-    const colonIndex = entrypointValue.indexOf(":")
-    const modulePath =
-      colonIndex === -1 ? entrypointValue : entrypointValue.slice(0, colonIndex)
-    const variableName =
-      colonIndex === -1 ? undefined : entrypointValue.slice(colonIndex + 1)
-
-    // Handle both module format (api.module) and file format (api.py)
-    const relativePath =
-      modulePath.endsWith(".py") && !modulePath.includes("/")
-        ? modulePath // Simple file path: api.py -> api.py
-        : `${modulePath.replace(/\./g, "/")}.py` // Module path: my_app.main -> my_app/main.py
+    const { relativePath, variableName } =
+      parseEntrypointString(entrypointValue)
     const fullUri = vscode.Uri.joinPath(folderUri, relativePath)
 
     return (await vscodeFileSystem.exists(fullUri.toString()))
@@ -117,9 +126,9 @@ export async function discoverFastAPIApps(
 
     // If user specified an entry point in settings, use that
     if (customEntryPoint) {
-      const entryUri = customEntryPoint.startsWith("/")
-        ? vscode.Uri.file(customEntryPoint)
-        : vscode.Uri.joinPath(folder.uri, customEntryPoint)
+      const { relativePath, variableName } =
+        parseEntrypointString(customEntryPoint)
+      const entryUri = vscode.Uri.joinPath(folder.uri, relativePath)
 
       if (!(await vscodeFileSystem.exists(entryUri.toString()))) {
         log(`Custom entry point not found: ${customEntryPoint}`)
@@ -130,7 +139,7 @@ export async function discoverFastAPIApps(
       }
 
       log(`Using custom entry point: ${customEntryPoint}`)
-      candidates = [{ filePath: entryUri.toString() }]
+      candidates = [{ filePath: entryUri.toString(), variableName }]
       detectionMethod = "config"
     } else {
       // Otherwise, check pyproject.toml or auto-detect

src/appDiscovery.ts

@@ -247,6 +247,11 @@ export class CloudAuthenticationProvider
 
     const sessions = await this.getSessions()
     const session = sessions[0]
+
+    window.showInformationMessage(
+      `Signed in to FastAPI Cloud as ${session.account.label}`,
+    )
+
     this._onDidChangeSessions.fire({
       added: [session],
       removed: [],

src/cloud/auth.ts

@@ -134,12 +134,12 @@ export function getWebviewHtml(
             <div class="filter-hint">Filters apply to displayed logs</div>
         </div>
     </div>
-    <button id="stream-btn" title="Start streaming"><span id="stream-label">Stream</span></button>
+    <button id="stream-btn" title="Start streaming"><span id="stream-label">Start</span></button>
     <span id="app-label"></span>
     <div class="spacer"></div>
     <button class="icon-btn" id="clear-btn" title="Clear logs"><svg width="12" height="12" viewBox="0 0 16 16"><path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/><path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/></svg>Clear</button>
 </div>
-<div id="logs"><span class="status">Click Stream to fetch logs.</span></div>
+<div id="logs"><span class="status">Click "Start" to stream logs.</span></div>
 <script src="${scriptUri}"></script>
 </body>
 </html>`

src/cloud/commands/logs.ts

@@ -37,6 +37,15 @@ streamBtn.addEventListener("click", () => {
   }
 })
 
+sinceFilter.addEventListener("change", () => {
+  if (isStreaming) {
+    vscode.postMessage({
+      type: "startStream",
+      since: sinceFilter.value,
+    })
+  }
+})
+
 filterBtn.addEventListener("click", (e) => {
   e.stopPropagation()
   filterPopup.classList.toggle("open")
@@ -116,7 +125,6 @@ function setStreamingState(streaming: boolean, appLabel?: string): void {
     label.textContent = "Stream"
     streamBtn.title = "Start streaming"
   }
-  sinceFilter.disabled = streaming
   appLabelEl.textContent =
     streaming && appLabel ? `Streaming logs for ${appLabel}...` : ""
 }

src/cloud/ui/panel/webview.ts

@@ -275,12 +275,17 @@ export async function activate(context: vscode.ExtensionContext) {
     )
   }
 
-  // Watch for cloud.enabled setting changes
   context.subscriptions.push(
     vscode.workspace.onDidChangeConfiguration(async (e) => {
-      if (e.affectsConfiguration("fastapi.cloud.enabled")) {
+      const requiresReload =
+        e.affectsConfiguration("fastapi.cloud.enabled") ||
+        e.affectsConfiguration("fastapi.codeLens.enabled") ||
+        e.affectsConfiguration("fastapi.entryPoint") ||
+        e.affectsConfiguration("fastapi.telemetry.enabled")
+
+      if (requiresReload) {
         const action = await vscode.window.showWarningMessage(
-          "FastAPI Cloud setting changed. Reload the window to apply changes.",
+          "FastAPI setting changed. Reload the window to apply changes.",
           "Reload Window",
         )
         if (action === "Reload Window") {
@@ -435,6 +440,7 @@ function registerCommands(
 
         const selected = await vscode.window.showQuickPick(items, {
           placeHolder: "Search FastAPI path operations...",
+          matchOnDescription: true,
         })
         trackSearchExecuted(items.length, selected !== undefined)
         if (selected) {

src/extension.ts

@@ -0,0 +1,34 @@
+import * as assert from "node:assert"
+import { parseEntrypointString } from "../appDiscovery"
+
+suite("parseEntrypointString", () => {
+  test("module notation with variable: my_app.main:app", () => {
+    const result = parseEntrypointString("my_app.main:app")
+    assert.strictEqual(result.relativePath, "my_app/main.py")
+    assert.strictEqual(result.variableName, "app")
+  })
+
+  test("module notation without variable: my_app.main", () => {
+    const result = parseEntrypointString("my_app.main")
+    assert.strictEqual(result.relativePath, "my_app/main.py")
+    assert.strictEqual(result.variableName, undefined)
+  })
+
+  test("deeply nested module: a.b.c.main:application", () => {
+    const result = parseEntrypointString("a.b.c.main:application")
+    assert.strictEqual(result.relativePath, "a/b/c/main.py")
+    assert.strictEqual(result.variableName, "application")
+  })
+
+  test("single module name: app", () => {
+    const result = parseEntrypointString("app")
+    assert.strictEqual(result.relativePath, "app.py")
+    assert.strictEqual(result.variableName, undefined)
+  })
+
+  test("single module with variable: app:my_app", () => {
+    const result = parseEntrypointString("app:my_app")
+    assert.strictEqual(result.relativePath, "app.py")
+    assert.strictEqual(result.variableName, "my_app")
+  })
+})

src/test/appDiscovery.test.ts

@@ -387,6 +387,57 @@ suite("cloud/auth", () => {
         await provider.dispose()
       })
 
+      test("shows notification after device code sign-in", async () => {
+        fsStub.fake.readFile.rejects(new Error("File not found"))
+
+        const token = validToken()
+        const fetchStub = sinon.stub(globalThis, "fetch")
+        fetchStub.onFirstCall().resolves(
+          mockResponse({
+            device_code: "dev123",
+            user_code: "USER-CODE",
+            verification_uri: "https://auth.example.com/device",
+            verification_uri_complete:
+              "https://auth.example.com/device?code=USER-CODE",
+            interval: 1,
+          }),
+        )
+        fetchStub.onSecondCall().resolves(mockResponse({ access_token: token }))
+        fetchStub
+          .onThirdCall()
+          .resolves(
+            mockResponse({ email: "new@example.com", full_name: "New" }),
+          )
+
+        sinon.stub(vscode.env, "openExternal")
+        sinon
+          .stub(vscode.window, "withProgress")
+          .callsFake(async (_opts, task) => {
+            const cancellationToken = {
+              isCancellationRequested: false,
+              onCancellationRequested: sinon.stub(),
+            }
+            return task({ report: sinon.stub() }, cancellationToken as any)
+          })
+        const infoStub = sinon.stub(vscode.window, "showInformationMessage")
+
+        fsStub.fake.createDirectory.resolves()
+        fsStub.fake.writeFile.callsFake(async () => {
+          fsStub.fake.readFile.resolves(
+            Buffer.from(JSON.stringify({ access_token: token })),
+          )
+        })
+
+        const { provider } = createProvider()
+        await provider.createSession()
+
+        assert.ok(
+          infoStub.calledWith("Signed in to FastAPI Cloud as new@example.com"),
+        )
+
+        await provider.dispose()
+      })
+
       test("wraps network error with friendly message", async () => {
         fsStub.fake.readFile.rejects(new Error("File not found"))