VSCode: 1.36.1 Release (#5801)

- Autocomplete: The PR fixes the slowness in vscode because because of
completions by using local cache instead of querying vscode
localStorage. [pull/5798](#5798)
- Sourcegraph API GraphQL: Increase the default timeout from 6sec to
20sec. [pull/5789](#5789)

## Test plan
Cherry-pick commits & update changelog, version

---------

Co-authored-by: Quinn Slack <quinn@slack.org>

lib/shared/src/experimentation/FeatureFlagProvider.ts

@@ -35,7 +35,7 @@ export enum FeatureFlag {
     CodyAutocompleteDeepseekV2LiteBase = 'cody-autocomplete-deepseek-v2-lite-base',
 
     // Data collection variants used for completions and next edit completions
-    CodyAutocompleteDataCollectionFlag = 'cody-autocomplete-data-collection-flag',
+    CodyAutocompleteDataCollectionFlag = 'cody-autocomplete-logs-collection-flag',
 
     // Enable various feature flags to experiment with FIM trained fine-tuned models via Fireworks
     CodyAutocompleteFIMModelExperimentBaseFeatureFlag = 'cody-autocomplete-fim-model-experiment-flag',

lib/shared/src/sourcegraph-api/graphql/client.ts

@@ -581,6 +581,8 @@ export function setUserAgent(newUseragent: string): void {
 
 const QUERY_TO_NAME_REGEXP = /^\s*(?:query|mutation)\s+(\w+)/m
 
+const DEFAULT_TIMEOUT_MSEC = 20000
+
 export class SourcegraphGraphQLAPIClient {
     private dotcomUrl = DOTCOM_URL
 
@@ -1426,8 +1428,7 @@ export class SourcegraphGraphQLAPIClient {
             baseUrl: config.auth.serverEndpoint,
         })
 
-        // Default timeout of 6 seconds.
-        const timeoutMs = typeof signalOrTimeout === 'number' ? signalOrTimeout : 6000
+        const timeoutMs = typeof signalOrTimeout === 'number' ? signalOrTimeout : DEFAULT_TIMEOUT_MSEC
         const timeoutSignal = AbortSignal.timeout(timeoutMs)
 
         const abortController = dependentAbortController(
@@ -1529,7 +1530,7 @@ export class SourcegraphGraphQLAPIClient {
         addCustomUserAgent(headers)
 
         // Timeout of 6 seconds.
-        const timeoutSignal = AbortSignal.timeout(6000)
+        const timeoutSignal = AbortSignal.timeout(DEFAULT_TIMEOUT_MSEC)
 
         const abortController = dependentAbortController(signal)
         onAbort(timeoutSignal, () => abortController.abort())

vscode/CHANGELOG.md

@@ -10,6 +10,13 @@ This is a log of all notable changes to Cody for VS Code. [Unreleased] changes a
 
 ### Changed
 
+## 1.36.1
+
+### Fixed
+
+- Autocomplete: The PR fixes the slowness in vscode because because of completions by using local cache instead of querying vscode localStorage. [pull/5798](https://github.com/sourcegraph/cody/pull/5798)
+- Sourcegraph API GraphQL: Increase the default timeout from 6sec to 20sec. [pull/5789](https://github.com/sourcegraph/cody/pull/5789)
+
 ## 1.36.0
 
 ### Added

vscode/package.json

@@ -3,7 +3,7 @@
   "name": "cody-ai",
   "private": true,
   "displayName": "Cody: AI Coding Assistant with Autocomplete & Chat",
-  "version": "1.36.0",
+  "version": "1.36.1",
   "publisher": "sourcegraph",
   "license": "Apache-2.0",
   "icon": "resources/cody.png",

vscode/src/completions/inline-completion-item-provider.ts

@@ -843,7 +843,7 @@ export class InlineCompletionItemProvider
                 takeSuggestWidgetSelectionIntoAccount,
                 undefined
             )
-            completion.requestParams.docContext.position
+
             if (isStillVisible) {
                 suggestionEvent.markAsRead({
                     document: invokedDocument,

vscode/src/completions/providers/fireworks.ts

@@ -22,6 +22,9 @@ import {
 export const DEEPSEEK_CODER_V2_LITE_BASE = 'deepseek-coder-v2-lite-base'
 // Context window experiments with DeepSeek Model
 export const DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_4096 = 'deepseek-coder-v2-lite-base-context-4096'
+export const DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_8192 = 'deepseek-coder-v2-lite-base-context-8192'
+export const DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_16384 = 'deepseek-coder-v2-lite-base-context-16384'
+
 export const CODE_QWEN_7B_V2P5 = 'code-qwen-7b-v2p5'
 
 // Model identifiers can be found in https://docs.fireworks.ai/explore/ and in our internal
@@ -36,6 +39,8 @@ const MODEL_MAP = {
     'llama-code-13b': 'fireworks/accounts/fireworks/models/llama-v2-13b-code',
     [DEEPSEEK_CODER_V2_LITE_BASE]: 'fireworks/deepseek-coder-v2-lite-base',
     [DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_4096]: 'accounts/fireworks/models/deepseek-coder-v2-lite-base',
+    [DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_8192]: 'accounts/fireworks/models/deepseek-coder-v2-lite-base',
+    [DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_16384]: 'accounts/fireworks/models/deepseek-coder-v2-lite-base',
     [CODE_QWEN_7B_V2P5]: 'accounts/fireworks/models/qwen-v2p5-7b',
 } as const
 
@@ -64,6 +69,10 @@ function getMaxContextTokens(model: FireworksModel): number {
         }
         case DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_4096:
             return 4096
+        case DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_8192:
+            return 8192
+        case DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_16384:
+            return 16384
         default:
             return 1200
     }

vscode/src/completions/providers/shared/get-experiment-model.ts

@@ -14,6 +14,8 @@ import {
     CODE_QWEN_7B_V2P5,
     DEEPSEEK_CODER_V2_LITE_BASE,
     DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_4096,
+    DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_8192,
+    DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_16384,
 } from '../fireworks'
 
 interface ProviderConfigFromFeatureFlags {
@@ -86,22 +88,38 @@ function resolveFIMModelExperimentFromFeatureFlags(): ReturnType<typeof getDotCo
     return combineLatest(
         featureFlagProvider.evaluatedFeatureFlag(FeatureFlag.CodyAutocompleteFIMModelExperimentControl),
         featureFlagProvider.evaluatedFeatureFlag(FeatureFlag.CodyAutocompleteFIMModelExperimentVariant1),
-        featureFlagProvider.evaluatedFeatureFlag(FeatureFlag.CodyAutocompleteFIMModelExperimentVariant2)
+        featureFlagProvider.evaluatedFeatureFlag(FeatureFlag.CodyAutocompleteFIMModelExperimentVariant2),
+        featureFlagProvider.evaluatedFeatureFlag(FeatureFlag.CodyAutocompleteFIMModelExperimentVariant3),
+        featureFlagProvider.evaluatedFeatureFlag(FeatureFlag.CodyAutocompleteFIMModelExperimentVariant4)
     ).pipe(
-        map(([fimModelControl, fimModelVariant1, fimModelVariant2]) => {
-            if (fimModelVariant1) {
-                return { provider: 'fireworks', model: DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_4096 }
-            }
-            if (fimModelVariant2) {
-                return { provider: 'fireworks', model: CODE_QWEN_7B_V2P5 }
-            }
-            if (fimModelControl) {
-                // Current production model
+        map(
+            ([
+                fimModelControl,
+                fimModelVariant1,
+                fimModelVariant2,
+                fimModelVariant3,
+                fimModelVariant4,
+            ]) => {
+                if (fimModelVariant1) {
+                    return { provider: 'fireworks', model: DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_4096 }
+                }
+                if (fimModelVariant2) {
+                    return { provider: 'fireworks', model: CODE_QWEN_7B_V2P5 }
+                }
+                if (fimModelVariant3) {
+                    return { provider: 'fireworks', model: DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_8192 }
+                }
+                if (fimModelVariant4) {
+                    return { provider: 'fireworks', model: DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_16384 }
+                }
+                if (fimModelControl) {
+                    // Current production model
+                    return { provider: 'fireworks', model: DEEPSEEK_CODER_V2_LITE_BASE }
+                }
+                // Extra free traffic - redirect to the current production model which could be different than control
                 return { provider: 'fireworks', model: DEEPSEEK_CODER_V2_LITE_BASE }
             }
-            // Extra free traffic - redirect to the current production model which could be different than control
-            return { provider: 'fireworks', model: DEEPSEEK_CODER_V2_LITE_BASE }
-        }),
+        ),
         distinctUntilChanged()
     )
 }

vscode/src/repository/githubRepoMetadata.ts

@@ -10,7 +10,6 @@ import {
 } from '@sourcegraph/cody-shared'
 import { Observable, map } from 'observable-fns'
 import { logDebug } from '../log'
-import { localStorage } from '../services/LocalStorageProvider'
 import { remoteReposForAllWorkspaceFolders } from './remoteRepos'
 
 interface GitHubDotComRepoMetaData {
@@ -22,6 +21,7 @@ interface GitHubDotComRepoMetaData {
 export class GitHubDotComRepoMetadata {
     // This class is used to get the metadata from the gitApi.
     private static instance: GitHubDotComRepoMetadata | null = null
+    private cache = new Map<string /* repoName */, GitHubDotComRepoMetaData | undefined>()
 
     private constructor() {}
 
@@ -37,14 +37,7 @@ export class GitHubDotComRepoMetadata {
         if (!normalizedRepoName) {
             return undefined
         }
-        const repoVisibility = localStorage.getGitHubRepoVisibility(normalizedRepoName)
-        if (!repoVisibility) {
-            return undefined
-        }
-        return {
-            repoName: normalizedRepoName,
-            isPublic: repoVisibility,
-        }
+        return this.cache.get(normalizedRepoName)
     }
 
     public async getRepoMetadataUsingRepoName(
@@ -57,7 +50,7 @@ export class GitHubDotComRepoMetadata {
         }
         const repoMetaData = await this.ghMetadataFromGit(repoBaseName, signal)
         if (repoMetaData) {
-            await localStorage.setGitHubRepoVisibility(repoBaseName, repoMetaData.isPublic)
+            this.cache.set(repoMetaData.repoName, repoMetaData)
         }
         return repoMetaData
     }

vscode/src/services/LocalStorageProvider.ts

@@ -32,7 +32,6 @@ class LocalStorage implements LocalStorageForModelPreferences {
     protected readonly CODY_ENDPOINT_HISTORY = 'SOURCEGRAPH_CODY_ENDPOINT_HISTORY'
     protected readonly CODY_ENROLLMENT_HISTORY = 'SOURCEGRAPH_CODY_ENROLLMENTS'
     protected readonly LAST_USED_CHAT_MODALITY = 'cody-last-used-chat-modality'
-    protected readonly GIT_REPO_VISIBILITY_KEY = 'cody-git-repo-visibility'
     public readonly ANONYMOUS_USER_ID_KEY = 'sourcegraphAnonymousUid'
     public readonly LAST_USED_ENDPOINT = 'SOURCEGRAPH_CODY_ENDPOINT'
     public readonly LAST_USED_USERNAME = 'SOURCEGRAPH_CODY_USERNAME'
@@ -228,34 +227,6 @@ class LocalStorage implements LocalStorageForModelPreferences {
         return this.get<string | null>(this.KEY_LOCAL_MINION_HISTORY)
     }
 
-    public async setGitHubRepoVisibility(repoName: string, visibility: boolean): Promise<void> {
-        const visibilityKey = `${this.GIT_REPO_VISIBILITY_KEY}_${repoName}`
-        const visibilityValue = {
-            visibility: visibility,
-            timestamp: Date.now(),
-        }
-        await this.set(visibilityKey, visibilityValue)
-    }
-
-    public getGitHubRepoVisibility(repoName: string): boolean | null {
-        const visibilityKey = `${this.GIT_REPO_VISIBILITY_KEY}_${repoName}`
-        const visibilityValue = this.get<{ visibility: boolean; timestamp: number } | null>(
-            visibilityKey
-        )
-
-        if (visibilityValue) {
-            const currentTime = Date.now()
-            const timeDifference = currentTime - visibilityValue.timestamp
-            // If the visibility value is older than 24 hours, delete it.
-            if (timeDifference > 24 * 60 * 60 * 1000) {
-                this.delete(visibilityKey)
-                return null
-            }
-            return visibilityValue.visibility
-        }
-        return null
-    }
-
     public async removeChatHistory(authStatus: AuthenticatedAuthStatus): Promise<void> {
         try {
             await this.setChatHistory(authStatus, { chat: {} })