Autocomplete: Mark Ollama support experimental (#3077)

## Test plan

- Try with both `"cody.autocomplete.advanced.provider":
"unstable-ollama"` and `"cody.autocomplete.advanced.provider":
"experimental-ollama"`in the settings
- Check that it resolves to the correct provider by logging: 
    ```
█ CodyCompletionProvider:initialized:
experimental-ollama/deepseek-coder:6.7b-base-q4_K_M
    ```

<img width="808" alt="Screenshot 2024-02-07 at 20 21 37"
src="https://github.com/sourcegraph/cody/assets/458591/ab7dbf4f-8e8e-4371-aef1-be9d7afc4b49">

lib/shared/src/configuration.ts

@@ -32,7 +32,12 @@ export interface Configuration {
      */
     autocomplete: boolean
     autocompleteLanguages: Record<string, boolean>
-    autocompleteAdvancedProvider: 'anthropic' | 'fireworks' | 'unstable-openai' | null
+    autocompleteAdvancedProvider:
+        | 'anthropic'
+        | 'fireworks'
+        | 'unstable-openai'
+        | 'experimental-ollama'
+        | null
     autocompleteAdvancedModel: string | null
     autocompleteCompleteSuggestWidgetSelection?: boolean
     autocompleteFormatOnAccept?: boolean

vscode/CHANGELOG.md

@@ -31,6 +31,7 @@ This is a log of all notable changes to Cody for VS Code. [Unreleased] changes a
 - Chat: Edit buttons are disabled on messages generated by the default commands. [pull/3005](https://github.com/sourcegraph/cody/pull/3005)
 - Autocomplete: Expanded the configuration list to include `astro`, `rust`, `svelte`, and `elixir` for enhanced detection of multiline triggers. [pulls/3044](https://github.com/sourcegraph/cody/pull/3044)
 - Autocomplete: Multiline completions are now enabled only for languages from a predefined list. [pulls/3044](https://github.com/sourcegraph/cody/pull/3044)
+- Autocomplete: Rename `unstable-ollama` option to `experimental-ollama` to better communicate the current state. We still support `unstable-ollama` in the config for backward compatibility. [pull/3077](https://github.com/sourcegraph/cody/pull/3077)
 
 ## [1.2.3]
 

vscode/doc/ollama.md

@@ -6,5 +6,5 @@
 2. Download one of the support local models:
   - `ollama pull deepseek-coder:6.7b-base-q4_K_M` for [deepseek-coder](https://ollama.ai/library/deepseek-coder)
   - `ollama pull codellama:7b-code` for [codellama](https://ollama.ai/library/codellama)
-3. Update Cody's VS Code settings to use the `unstable-ollama` autocomplete provider.
+3. Update Cody's VS Code settings to use the `experimental-ollama` autocomplete provider.
 4. Confirm Cody uses Ollama by looking at the Cody output channel or the autocomplete trace view (in the command palette).

vscode/package.json

@@ -877,7 +877,7 @@
                 "cody.autocomplete.advanced.provider": {
                     "type": "string",
                     "default": null,
-                    "enum": [null, "anthropic", "fireworks", "unstable-openai", "unstable-ollama"],
+                    "enum": [null, "anthropic", "fireworks", "unstable-openai", "experimental-ollama"],
                     "markdownDescription": "The provider used for code autocomplete. Most providers other than `anthropic` require the `cody.autocomplete.advanced.serverEndpoint` and `cody.autocomplete.advanced.accessToken` settings to also be set. Check the Cody output channel for error messages if autocomplete is not working as expected."
                 },
                 "cody.autocomplete.advanced.serverEndpoint": {

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

@@ -44,7 +44,7 @@ import {
     type AutocompleteItem,
 } from './suggested-autocomplete-items-cache'
 import type { ProvideInlineCompletionItemsTracer, ProvideInlineCompletionsItemTraceData } from './tracer'
-import { isLocalCompletionsProvider } from './providers/unstable-ollama'
+import { isLocalCompletionsProvider } from './providers/experimental-ollama'
 import { completionProviderConfig } from './completion-provider-config'
 
 interface AutocompleteResult extends vscode.InlineCompletionList {

vscode/src/completions/providers/create-provider.ts

@@ -13,7 +13,7 @@ import {
     type FireworksOptions,
 } from './fireworks'
 import type { ProviderConfig } from './provider'
-import { createProviderConfig as createUnstableOllamaProviderConfig } from './unstable-ollama'
+import { createProviderConfig as createExperimentalOllamaProviderConfig } from './experimental-ollama'
 import { createProviderConfig as createUnstableOpenAIProviderConfig } from './unstable-openai'
 import type { AuthStatus } from '../../chat/protocol'
 
@@ -49,8 +49,11 @@ export async function createProviderConfig(
             case 'anthropic': {
                 return createAnthropicProviderConfig({ client })
             }
+            case 'experimental-ollama':
             case 'unstable-ollama': {
-                return createUnstableOllamaProviderConfig(config.autocompleteExperimentalOllamaOptions)
+                return createExperimentalOllamaProviderConfig(
+                    config.autocompleteExperimentalOllamaOptions
+                )
             }
             default:
                 logError(

vscode/src/completions/providers/unstable-ollama.ts → vscode/src/completions/providers/experimental-ollama.ts

@@ -49,7 +49,7 @@ function fileNameLine(uri: vscode.Uri, commentStart: string): string {
  * The provider communicates with an Ollama server's [REST
  * API](https://github.com/jmorganca/ollama#rest-api).
  */
-class UnstableOllamaProvider extends Provider {
+class ExperimentalOllamaProvider extends Provider {
     constructor(
         options: ProviderOptions,
         private readonly ollamaOptions: OllamaOptions
@@ -167,7 +167,7 @@ class UnstableOllamaProvider extends Provider {
     }
 }
 
-const PROVIDER_IDENTIFIER = 'unstable-ollama'
+const PROVIDER_IDENTIFIER = 'experimental-ollama'
 
 export function isLocalCompletionsProvider(providerId: string): boolean {
     return providerId === PROVIDER_IDENTIFIER
@@ -176,7 +176,7 @@ export function isLocalCompletionsProvider(providerId: string): boolean {
 export function createProviderConfig(ollamaOptions: OllamaOptions): ProviderConfig {
     return {
         create(options: Omit<ProviderOptions, 'id'>) {
-            return new UnstableOllamaProvider(
+            return new ExperimentalOllamaProvider(
                 {
                     ...options,
                     // Always generate just one completion for a better perf.

vscode/src/completions/request-manager.ts

@@ -22,7 +22,7 @@ import {
 import type { ContextSnippet } from './types'
 import { lines, removeIndentation } from './text-processing'
 import { logDebug } from '../log'
-import { isLocalCompletionsProvider } from './providers/unstable-ollama'
+import { isLocalCompletionsProvider } from './providers/experimental-ollama'
 
 export interface RequestParams {
     /** The request's document */

vscode/src/configuration.ts

@@ -50,13 +50,18 @@ export function getConfiguration(
         debugRegex = /.*/
     }
 
-    let autocompleteAdvancedProvider: Configuration['autocompleteAdvancedProvider'] = config.get(
-        CONFIG_KEY.autocompleteAdvancedProvider,
-        null
-    )
-    // Handle the old `unstable-fireworks` option
-    if (autocompleteAdvancedProvider === 'unstable-fireworks') {
-        autocompleteAdvancedProvider = 'fireworks'
+    let autocompleteAdvancedProvider = config.get<
+        Configuration['autocompleteAdvancedProvider'] | 'unstable-ollama' | 'unstable-fireworks'
+    >(CONFIG_KEY.autocompleteAdvancedProvider, null)
+
+    // Handle deprecated provider identifiers
+    switch (autocompleteAdvancedProvider) {
+        case 'unstable-fireworks':
+            autocompleteAdvancedProvider = 'fireworks'
+            break
+        case 'unstable-ollama':
+            autocompleteAdvancedProvider = 'experimental-ollama'
+            break
     }
 
     // check if the configured enum values are valid