Remove Lightspeed Enabled setting

docs/README.md

@@ -221,7 +221,6 @@ any level (User, Remote, Workspace and/or Folder).
   completing module options.
 - `ansibleServer.trace.server`: Traces the communication between VS Code and the
   ansible language server.
-- `ansible.lightspeed.enabled`: Enable Ansible Lightspeed.
 - `ansible.lightspeed.URL`: URL for Ansible Lightspeed.
 - `ansible.lightspeed.suggestions.enabled`: Enable Ansible Lightspeed with
   watsonx Code Assistant inline suggestions.

package.json

@@ -82,7 +82,7 @@
         "steps": [
           {
             "id": "enable-lightspeed-playbook",
-            "title": "Enable Ansible Lightspeed",
+            "title": "Log in to Ansible Lightspeed",
             "description": "Use generative AI to assist in your automation content creation.\nAnsible Lightspeed is available to Ansible Automation Platform users.\nCheck availability by logging in with your Red Hat account.\n[Log in with Red Hat ↗](command:ansible.lightspeed.signInWithLightspeed)\n[Learn more ↗](https://www.redhat.com/en/technologies/management/ansible/ansible-lightspeed) ",
             "media": {
               "markdown": "media/walkthroughs/startAutomatingPlaybook/enable-lightspeed.md"
@@ -329,7 +329,7 @@
       },
       {
         "command": "ansible.create-playbook-options",
-        "title": "Ansible: Create an empty playbook or with Lightspeed (if enabled)"
+        "title": "Ansible: Create a playbook with Lightspeed"
       },
       {
         "command": "ansible.content-creator.menu",
@@ -656,39 +656,32 @@
       {
         "title": "Ansible Lightspeed",
         "properties": {
-          "ansible.lightspeed.enabled": {
-            "scope": "resource",
-            "type": "boolean",
-            "default": false,
-            "markdownDescription": "Enable Ansible Lightspeed.",
-            "order": 0
-          },
           "ansible.lightspeed.URL": {
             "scope": "resource",
             "type": "string",
             "default": "https://c.ai.ansible.redhat.com",
             "markdownDescription": "URL for Ansible Lightspeed.",
-            "order": 1
+            "order": 0
           },
           "ansible.lightspeed.suggestions.enabled": {
             "scope": "resource",
             "type": "boolean",
             "default": false,
             "markdownDescription": "Enable Ansible Lightspeed with watsonx Code Assistant inline suggestions.",
-            "order": 2
+            "order": 1
           },
           "ansible.lightspeed.suggestions.waitWindow": {
             "scope": "resource",
             "type": "number",
             "default": 0,
             "markdownDescription": "Delay (in msecs) prior to sending an inline suggestion request to Ansible Lightspeed with watsonx Code Assistant.",
-            "order": 3
+            "order": 2
           },
           "ansible.lightspeed.modelIdOverride": {
             "scope": "resource",
             "type": "string",
             "markdownDescription": "Model ID to override your organization's default model. This setting is only applicable to commercial users with an Ansible Lightspeed seat assignment.",
-            "order": 4
+            "order": 3
           }
         }
       },
@@ -742,7 +735,7 @@
         "command": "ansible.lightspeed.inlineSuggest.trigger",
         "extensionName": "Ansible",
         "source": "extension",
-        "when": "config.ansible.lightspeed.enabled && config.ansible.lightspeed.suggestions.enabled && editorTextFocus && !editorHasSelection && !inlineSuggestionVisible && editorLangId == 'ansible'"
+        "when": "config.ansible.lightspeed.suggestions.enabled && editorTextFocus && !editorHasSelection && !inlineSuggestionVisible && editorLangId == 'ansible'"
       }
     ],
     "languages": [

src/extension.ts

@@ -794,15 +794,7 @@
     vscode.commands.registerCommand(
       "ansible.create-playbook-options",
       async () => {
-        if (
-          await workspace.getConfiguration("ansible").get("lightspeed.enabled")
-        ) {
-          vscode.commands.executeCommand(
-            "ansible.lightspeed.playbookGeneration",
-          );
-        } else {
-          vscode.commands.executeCommand("ansible.create-empty-playbook");
-        }
+        vscode.commands.executeCommand("ansible.lightspeed.playbookGeneration");
       },
     ),
   );
@@ -949,24 +941,9 @@
   }
 }
 
-export async function isLightspeedEnabled(): Promise<boolean> {
-  if (
-    !(await workspace.getConfiguration("ansible").get("lightspeed.enabled"))
-  ) {
-    await window.showErrorMessage(
-      "Enable lightspeed services from settings to use the feature.",
-    );
-    return false;
-  }
-  return true;
-}
-
 async function lightspeedLogin(
   providerType: AuthProviderType | undefined,
 ): Promise<void> {
-  if (!(await isLightspeedEnabled())) {
-    return;
-  }
   lightSpeedManager.currentModelValue = undefined;
   const authenticatedUser =
     await lightSpeedManager.lightspeedAuthenticatedUser.getLightspeedUserDetails(

src/features/ansibleMetaData.ts

@@ -19,7 +19,6 @@ interface ansibleMetadataEvent {
   pythonVersion?: string;
   ansibleLintVersion?: string;
   eeEnabled: boolean;
-  lightSpeedEnabled: boolean;
   lightSpeedCodeAssistEnabled: boolean;
 }
 
@@ -156,8 +155,6 @@ export class MetadataManager {
       ansibleVersion,
       pythonVersion,
       eeEnabled: this.extensionSettings.settings.executionEnvironment.enabled,
-      lightSpeedEnabled:
-        this.extensionSettings.settings.lightSpeedService.enabled,
       lightSpeedCodeAssistEnabled:
         this.extensionSettings.settings.lightSpeedService.suggestions.enabled,
     };

src/features/lightspeed/base.ts

@@ -58,9 +58,8 @@
         ANSIBLE_LIGHTSPEED_AUTH_ID,
         ANSIBLE_LIGHTSPEED_AUTH_NAME,
       );
-    if (this.settingsManager.settings.lightSpeedService.enabled) {
-      this.lightSpeedAuthenticationProvider.initialize();
-    }
+    this.lightSpeedAuthenticationProvider.initialize();
+
     this.lightspeedAuthenticatedUser = new LightspeedUser(
       this.context,
       this.settingsManager,
@@ -109,29 +108,21 @@
     const lightspeedSettings = <LightSpeedServiceSettings>(
       vscode.workspace.getConfiguration("ansible").get("lightspeed")
     );
-    const lightspeedEnabled = lightspeedSettings.enabled;
 
-    if (!lightspeedEnabled) {
-      this.resetContext();
-      await this.lightSpeedAuthenticationProvider.dispose();
-      this.statusBarProvider.statusBar.hide();
-      return;
-    } else {
-      this.lightSpeedAuthenticationProvider.initialize();
-      this.statusBarProvider.setLightSpeedStatusBarTooltip();
-      this.setContext();
-      if (lightspeedSettings.suggestions.enabled) {
-        const githubConfig = (<unknown>(
-          vscode.workspace.getConfiguration("github")
-        )) as {
-          copilot: { enable?: { ansible?: boolean } };
-        };
-        const copilotEnableForAnsible = githubConfig?.copilot?.enable?.ansible;
-        if (copilotEnableForAnsible) {
-          vscode.window.showInformationMessage(
-            "Please disable GitHub Copilot for Ansible Lightspeed file types to use Ansible Lightspeed.",
-          );
-        }
+    this.lightSpeedAuthenticationProvider.initialize();
+    this.statusBarProvider.setLightSpeedStatusBarTooltip();
+    this.setContext();
+    if (lightspeedSettings.suggestions.enabled) {
+      const githubConfig = (<unknown>(
+        vscode.workspace.getConfiguration("github")
+      )) as {
+        copilot: { enable?: { ansible?: boolean } };
+      };
+      const copilotEnableForAnsible = githubConfig?.copilot?.enable?.ansible;
+      if (copilotEnableForAnsible) {
+        vscode.window.showInformationMessage(
+          "Please disable GitHub Copilot for Ansible Lightspeed file types to use Ansible Lightspeed.",
+        );
       }
     }
 
@@ -165,10 +156,9 @@
     const lightspeedSettings = <LightSpeedServiceSettings>(
       vscode.workspace.getConfiguration("ansible").get("lightspeed")
     );
-    const lightspeedEnabled = lightspeedSettings?.enabled;
     const lightspeedSuggestionsEnabled =
       lightspeedSettings?.suggestions.enabled;
-    return lightspeedEnabled && lightspeedSuggestionsEnabled;
+    return lightspeedSuggestionsEnabled;
   }
 
   private setCustomWhenClauseContext(): void {

src/features/lightspeed/inlineSuggestions.ts

@@ -167,7 +167,7 @@ function getCompletionState(
   if (isCancellationRequested) {
     return CompletionState.CancellationRequested;
   }
-  if (!lightSpeedSetting.enabled || !lightSpeedSetting.suggestions.enabled) {
+  if (!lightSpeedSetting.suggestions.enabled) {
     return CompletionState.LightspeedIsDisabled;
   }
 

src/features/lightspeed/lightspeedUser.ts

@@ -368,10 +368,6 @@ export class LightspeedUser {
     createIfNone: boolean,
     useProviderType: AuthProviderType | undefined = undefined,
   ) {
-    // Ensure we don't try to get a lightspeed auth session when the provider is not initialized
-    if (!this._settingsManager.settings.lightSpeedService.enabled) {
-      return undefined;
-    }
     if (
       this._userDetails &&
       (!useProviderType || useProviderType === this._userType)
@@ -388,10 +384,6 @@ export class LightspeedUser {
     createIfNone: boolean,
     useProviderType: AuthProviderType | undefined = undefined,
   ) {
-    // Ensure we don't try to get a lightspeed auth session when the provider is not initialized
-    if (!this._settingsManager.settings.lightSpeedService.enabled) {
-      return undefined;
-    }
     if (
       this._markdownUserDetails &&
       (!useProviderType || useProviderType === this._userType)
@@ -405,11 +397,6 @@ export class LightspeedUser {
   }
 
   public async getLightspeedUserContent() {
-    // Ensure we don't try to get a lightspeed auth session when the provider is not initialized
-    if (!this._settingsManager.settings.lightSpeedService.enabled) {
-      return undefined;
-    }
-
     const markdownUserDetails =
       await this.getMarkdownLightspeedUserDetails(false);
     const userDetails = await this.getLightspeedUserDetails(false);

src/features/lightspeed/playbookGeneration.ts

@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from "uuid";
 import { Webview, Uri } from "vscode";
 import { getNonce } from "../utils/getNonce";
 import { getUri } from "../utils/getUri";
-import { isLightspeedEnabled, lightSpeedManager } from "../../extension";
+import { lightSpeedManager } from "../../extension";
 import { IError } from "./utils/errors";
 import { PlaybookGenerationResponseParams } from "../../interfaces/lightspeed";
 import {
@@ -93,8 +93,13 @@ async function generatePlaybook(
 }
 
 export async function showPlaybookGenerationPage(extensionUri: vscode.Uri) {
-  // Check if Lightspeed is enabled or not.  If it is not, return without opening the panel.
-  if (!(await isLightspeedEnabled())) {
+  const isAuthenticated =
+    await lightSpeedManager.lightspeedAuthenticatedUser.isAuthenticated();
+  if (!isAuthenticated) {
+    await vscode.window.showErrorMessage(
+      "Log in to lightspeed services to use the feature.",
+    );
+
     return;
   }
 

src/features/lightspeed/roleGeneration.ts

@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from "uuid";
 import { Webview, Uri, workspace } from "vscode";
 import { getNonce } from "../utils/getNonce";
 import { getUri } from "../utils/getUri";
-import { isLightspeedEnabled, lightSpeedManager } from "../../extension";
+import { lightSpeedManager } from "../../extension";
 import { IError } from "./utils/errors";
 import {
   RoleGenerationResponseParams,
@@ -101,12 +101,6 @@ async function fileExists(uri: Uri): Promise<boolean> {
 }
 
 export async function showRoleGenerationPage(extensionUri: vscode.Uri) {
-  // Check if Lightspeed is enabled or not.  If it is not, return without opening the panel.
-  if (!(await isLightspeedEnabled())) {
-    vscode.window.showErrorMessage("Lightspeed is not enabled.");
-    return;
-  }
-
   function addLog(message: string) {
     panel.webview.postMessage({
       command: "addGenerateRoleLogEntry",

src/features/lightspeed/statusBar.ts

@@ -80,10 +80,7 @@ export class LightspeedStatusBar {
       );
     }
 
-    if (
-      this.settingsManager.settings.lightSpeedService.enabled &&
-      this.settingsManager.settings.lightSpeedService.suggestions.enabled
-    ) {
+    if (this.settingsManager.settings.lightSpeedService.suggestions.enabled) {
       this.statusBar.backgroundColor = new vscode.ThemeColor(
         "statusBarItem.prominentForeground",
       );
@@ -97,10 +94,7 @@ export class LightspeedStatusBar {
   }
 
   public async updateLightSpeedStatusbar(): Promise<void> {
-    if (
-      vscode.window.activeTextEditor?.document.languageId !== "ansible" ||
-      !this.settingsManager.settings.lightSpeedService.enabled
-    ) {
+    if (vscode.window.activeTextEditor?.document.languageId !== "ansible") {
       this.statusBar.hide();
       return;
     }

src/interfaces/extensionSettings.ts

@@ -40,7 +40,6 @@ export interface UserResponse {
 
 // Settings appear on VS Code Settings UI
 export interface LightSpeedServiceSettings {
-  enabled: boolean;
   URL: string;
   suggestions: { enabled: boolean; waitWindow: number };
   model: string | undefined;

src/settings.ts

@@ -40,7 +40,6 @@ export class SettingsManager {
         volumeMounts: eeSettings.get("volumeMounts", []),
       },
       lightSpeedService: {
-        enabled: lightSpeedSettings.get("enabled", false),
         URL: lightSpeedSettings.get("URL", "https://c.ai.ansible.redhat.com"),
         suggestions: {
           enabled: lightSpeedSettings.get("suggestions.enabled", false),

test/helper.ts

@@ -134,7 +134,6 @@ export async function disableExecutionEnvironmentSettings(): Promise<void> {
 }
 
 export async function enableLightspeedSettings(): Promise<void> {
-  await updateSettings("lightspeed.enabled", true);
   await updateSettings("lightspeed.suggestions.enabled", true);
   await updateSettings("lightspeed.URL", process.env.TEST_LIGHTSPEED_URL);
 
@@ -152,7 +151,6 @@ export async function enableLightspeedSettings(): Promise<void> {
 }
 
 export async function disableLightspeedSettings(): Promise<void> {
-  await updateSettings("lightspeed.enabled", false);
   await updateSettings("lightspeed.suggestions.enabled", false);
   await updateSettings("lightspeed.URL", "");
 }

test/testFixtures/settings.json

@@ -18,7 +18,6 @@
   "ansible.python.activationScript": "",
   "ansible.python.interpreterPath": "python3",
   "ansibleServer.trace.server": "verbose",
-  "ansible.lightspeed.enabled": false,
   "ansible.lightspeed.suggestions.enabled": false,
   "ansible.lightspeed.URL": "https://c.ai.ansible.redhat.com",
 

test/ui-test/lightspeedAuthUiTest.ts

@@ -37,7 +37,6 @@ describe("Login to Lightspeed", () => {
     // Enable Lightspeed and open Ansible Light view on sidebar
     workbench = new Workbench();
     const settingsEditor = await workbench.openSettings();
-    await updateSettings(settingsEditor, "ansible.lightspeed.enabled", true);
     await updateSettings(
       settingsEditor,
       "ansible.lightspeed.URL",

test/ui-test/lightspeedOneClickTrialUITest.ts

@@ -1,4 +1,4 @@
-// BEFORE: ansible.lightspeed.enabled: true
+// BEFORE: ansible.lightspeed.suggestions.enabled: true
 import {
   ActionsControl,
   ActivityBar,

test/ui-test/lightspeedRoleGenTest.ts

@@ -1,4 +1,4 @@
-// BEFORE: ansible.lightspeed.enabled: true
+// BEFORE: ansible.lightspeed.suggestions.enabled: true
 
 import { expect, config } from "chai";
 import fs from "fs";