WIP - problem is models service requires auth for feature flags, but …

…auth is set first in authprovider...
sourcegraph · Sep 14, 2024 · ee9894a · ee9894a
1 parent d1f849a
commit ee9894a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/lib/shared/src/models/index.ts b/lib/shared/src/models/index.ts
@@ -394,6 +394,7 @@ export class ModelsService {
         } catch {
             this.localModels = []
         }
+        this._modelsChanges.next()
     }
 
     public async setAuthStatus(authStatus: AuthStatus) {
@@ -410,6 +411,7 @@ export class ModelsService {
     public setModels(models: Model[]): void {
         logDebug('ModelsService', `Setting primary models: ${JSON.stringify(models.map(m => m.id))}`)
         this.primaryModels = models
+        this._modelsChanges.next()
     }
 
     /**
@@ -440,6 +442,11 @@ export class ModelsService {
         await this.flush()
     }
 
+    private readonly _modelsChanges = new Subject<void>()
+    public get modelsChanges(): Observable<void> {
+        return this._modelsChanges
+    }
+
     private readonly _selectedOrDefaultModelChanges = new Subject<void>()
     public get selectedOrDefaultModelChanges(): Observable<void> {
         return this._selectedOrDefaultModelChanges
@@ -463,6 +470,7 @@ export class ModelsService {
             ...this.primaryModels,
             ...models.filter(model => !existingIds.has(model.id)),
         ]
+        this._modelsChanges.next()
     }
 
     private getModelsByType(usage: ModelUsage): Model[] {

diff --git a/vscode/playwright.config.ts b/vscode/playwright.config.ts
@@ -8,9 +8,9 @@ export default defineConfig({
     retries: isWin ? 4 : isCI ? 1 : 0, // give flaky tests more chances, but we should fix flakiness when we see it
     forbidOnly: isCI,
     testDir: 'test/e2e',
-    timeout: isWin || isCI ? 30000 : 20000,
+    timeout: isWin || isCI ? 30000 : 9920000,
     expect: {
-        timeout: isWin || isCI ? 5000 : 2000,
+        timeout: isWin || isCI ? 5000 : 992000,
     },
     reporter: isCI ? [['github'], ['buildkite-test-collector/playwright/reporter']] : [['list']],
     globalSetup: require.resolve('./test/e2e/utils/setup'),

diff --git a/vscode/src/chat/chat-view/ChatController.ts b/vscode/src/chat/chat-view/ChatController.ts
@@ -1668,9 +1668,11 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
                     models: () =>
                         combineLatest([
                             resolvedConfig,
+                            authStatus,
                             modelsService.instance!.selectedOrDefaultModelChanges.pipe(
                                 startWith(undefined)
                             ),
+                            modelsService.instance!.modelsChanges.pipe(startWith(undefined)),
                         ]).pipe(map(() => modelsService.instance!.getModels(ModelUsage.Chat))),
                     highlights: parameters =>
                         promiseFactoryToObservable(() =>

diff --git a/vscode/src/services/AuthProvider.ts b/vscode/src/services/AuthProvider.ts
@@ -238,6 +238,7 @@ export class AuthProvider implements vscode.Disposable {
         } catch (error) {
             logDebug('AuthProvider', 'updateAuthStatus error', error)
         } finally {
+            this.status.next(authStatus) // call again for ChatsController
             let eventValue: 'disconnected' | 'connected' | 'failed'
             if (authStatus.authenticated) {
                 eventValue = 'connected'

diff --git a/vscode/test/e2e/chat-input.test.ts b/vscode/test/e2e/chat-input.test.ts
@@ -201,6 +201,8 @@ test.extend<DotcomUrlOverride>({ dotcomUrl: mockServer.SERVER_URL }).extend<Expe
     await expect(modelSelect).toBeEnabled()
     await expect(modelSelect).toHaveText(/^Claude 3.5 Sonnet/)
 
+    await page.waitForTimeout(3000000)
+
     await firstChatInput.fill('to model1')
     await firstChatInput.press('Enter')
 
@@ -209,6 +211,7 @@ test.extend<DotcomUrlOverride>({ dotcomUrl: mockServer.SERVER_URL }).extend<Expe
     }
 
     // Verify tooltip shows the correct model
+    await page.waitForTimeout(30000)
     await expectModelName('Claude 3.5 Sonnet')
 
     // Change model and send another message.