refactor: more cleanup

Author: alenakhineika

src/editors/playgroundController.ts

@@ -503,12 +503,7 @@ export default class PlaygroundController {
         title: 'Running MongoDB playground...',
         cancellable: true,
       },
-      async (progress, token): Promise<ShellEvaluateResult> => {
-        token.onCancellationRequested(() => {
-          // If the user clicks the cancel button,
-          // terminate all processes running on the language server.
-          this._languageServerController.cancelAll();
-        });
+      (progress, token): Promise<ShellEvaluateResult> => {
         return this._evaluate(codeToEvaluate, token);
       }
     );

src/language/languageServerController.ts

@@ -28,7 +28,6 @@ const log = createLogger('language server controller');
  */
 export default class LanguageServerController {
   _context: ExtensionContext;
-  _isExecutingInProgress = false;
   _client: LanguageClient;
   _currentConnectionId: string | null = null;
   _currentConnectionString?: string;
@@ -185,7 +184,6 @@ export default class LanguageServerController {
       filePath: playgroundExecuteParameters.filePath,
       inputLength: playgroundExecuteParameters.codeToEvaluate.length,
     });
-    this._isExecutingInProgress = true;
     this._consoleOutputChannel.clear();
 
     // Send a request with a cancellation token
@@ -197,8 +195,6 @@ export default class LanguageServerController {
       token
     );
 
-    this._isExecutingInProgress = false;
-
     log.info('Evaluate response', {
       namespace: res?.result?.namespace,
       type: res?.result?.type,
@@ -263,17 +259,6 @@ export default class LanguageServerController {
     );
   }
 
-  cancelAll(): void {
-    log.info('Canceling a playground...');
-    // Send a request for cancellation. As a result
-    // the associated CancellationToken will be notified of the cancellation,
-    // the onCancellationRequested event will be fired,
-    // and IsCancellationRequested will return true.
-    if (this._isExecutingInProgress) {
-      this._isExecutingInProgress = false;
-    }
-  }
-
   async updateCurrentSessionFields(params): Promise<void> {
     await this._client.sendRequest(
       ServerCommands.UPDATE_CURRENT_SESSION_FIELDS,

src/participant/participant.ts

@@ -134,44 +134,6 @@ export default class ParticipantController {
     return this._participant;
   }
 
-  handleError(err: any, command: string): void {
-    let errorCode: string | undefined;
-    let errorName: ParticipantErrorTypes;
-    // Making the chat request might fail because
-    // - model does not exist
-    // - user consent not given
-    // - quote limits exceeded
-    if (err instanceof vscode.LanguageModelError) {
-      errorCode = err.code;
-    }
-
-    if (err instanceof Error) {
-      // Unwrap the error if a cause is provided
-      err = err.cause || err;
-    }
-
-    const message: string = err.message || err.toString();
-
-    if (message.includes('off_topic')) {
-      errorName = ParticipantErrorTypes.CHAT_MODEL_OFF_TOPIC;
-    } else if (message.includes('Filtered by Responsible AI Service')) {
-      errorName = ParticipantErrorTypes.FILTERED;
-    } else if (message.includes('Prompt failed validation')) {
-      errorName = ParticipantErrorTypes.INVALID_PROMPT;
-    } else {
-      errorName = ParticipantErrorTypes.OTHER;
-    }
-
-    this._telemetryService.track(
-      TelemetryEventTypes.PARTICIPANT_RESPONSE_FAILED,
-      {
-        command,
-        error_code: errorCode,
-        error_name: errorName,
-      }
-    );
-  }
-
   /**
    * In order to get access to the model, and to write more messages to the chat after
    * an async event that occurs after we've already completed our response, we need
@@ -1222,7 +1184,7 @@ export default class ParticipantController {
           title: 'Exporting code to a playground...',
           cancellable: true,
         },
-        async (progress, token): Promise<string | undefined> => {
+        (progress, token): Promise<string | undefined> => {
           token.onCancellationRequested(async () => {
             await vscode.window.showInformationMessage(
               'The running export to a playground operation was canceled.'
@@ -1263,7 +1225,10 @@ export default class ParticipantController {
 
       return true;
     } catch (error) {
-      this.handleError(error, 'exportToPlayground');
+      this._telemetryService.trackCopilotParticipantError(
+        error,
+        'exportToPlayground'
+      );
       await vscode.window.showErrorMessage(
         `An error occurred exporting to a playground: ${
           formatError(error).message
@@ -1319,10 +1284,13 @@ Please see our [FAQ](https://www.mongodb.com/docs/generative-ai-faq/) for more i
 
           return await this.handleGenericRequest(...args);
       }
-    } catch (e) {
-      this.handleError(e, request.command || 'generic');
+    } catch (error) {
+      this._telemetryService.trackCopilotParticipantError(
+        error,
+        request.command || 'generic'
+      );
       // Re-throw other errors so they show up in the UI.
-      throw e;
+      throw error;
     }
   }
 

src/participant/prompts/exportToPlayground.ts

@@ -3,13 +3,51 @@ import * as vscode from 'vscode';
 export class ExportToPlaygroundPrompt {
   static getAssistantPrompt(): vscode.LanguageModelChatMessage {
     const prompt = `You are a MongoDB expert.
-Your task is to help the user build MongoDB queries and aggregation pipelines that perform their task.
-You convert user's code written in any programming language to the MongoDB Shell syntax.
+Your task is to convert user's code written in any programming language to the MongoDB mongosh shell script.
+
+Example:
+User:
+public class InsertMany {
+  public static void main(String[] args) {
+    // Replace the uri string with your MongoDB deployment's connection string
+    String uri = "<connection string uri>";
+    try (MongoClient mongoClient = MongoClients.create(uri)) {
+      MongoDatabase database = mongoClient.getDatabase("sample_mflix");
+      MongoCollection<Document> collection = database.getCollection("movies");
+      List<Document> movieList = Arrays.asList(
+        new Document().append("title", "Short Circuit 3"),
+        new Document().append("title", "The Lego Frozen Movie"));
+      try {
+        InsertManyResult result = collection.insertMany(movieList);
+        System.out.println("Inserted document ids: " + result.getInsertedIds());
+      } catch (MongoException me) {
+        System.err.println("Unable to insert due to an error: " + me);
+      }
+    }
+  }
+}
+Response:
+class InsertMany {
+  main(args) {
+    const uri = "<connection string uri>/sample_mflix";
+    // Replace the uri string with your MongoDB deployment's connection string
+    db = connect(uri);
+
+    try {
+      const ids = db.movies.insertMany([
+        { "title": "Short Circuit 3" },
+        { "title": "The Lego Frozen Movie" },
+      ]);
+      printjson(ids.insertedIds);
+    } catch (error) {
+      print(error);
+    }
+  }
+}
+
 Take a user prompt as an input string and translate it to the MongoDB Shell language.
 Keep your response concise.
-You should suggest queries that are performant and correct.
-Respond with markdown, suggest code in a Markdown code block that begins with \`\`\`javascript and ends with \`\`\`.
-Respond in MongoDB shell syntax using the \`\`\`javascript code block syntax.`;
+Respond with markdown, suggest code in a Markdown code block that begins with \`\`\`javascript and ends with \`\`\`.`;
 
     // eslint-disable-next-line new-cap
     return vscode.LanguageModelChatMessage.Assistant(prompt);

src/telemetry/telemetryService.ts

@@ -430,4 +430,39 @@ export default class TelemetryService {
   trackCopilotParticipantFeedback(props: ParticipantFeedbackProperties): void {
     this.track(TelemetryEventTypes.PARTICIPANT_FEEDBACK, props);
   }
+
+  trackCopilotParticipantError(err: any, command: string): void {
+    let errorCode: string | undefined;
+    let errorName: ParticipantErrorTypes;
+    // Making the chat request might fail because
+    // - model does not exist
+    // - user consent not given
+    // - quote limits exceeded
+    if (err instanceof vscode.LanguageModelError) {
+      errorCode = err.code;
+    }
+
+    if (err instanceof Error) {
+      // Unwrap the error if a cause is provided
+      err = err.cause || err;
+    }
+
+    const message: string = err.message || err.toString();
+
+    if (message.includes('off_topic')) {
+      errorName = ParticipantErrorTypes.CHAT_MODEL_OFF_TOPIC;
+    } else if (message.includes('Filtered by Responsible AI Service')) {
+      errorName = ParticipantErrorTypes.FILTERED;
+    } else if (message.includes('Prompt failed validation')) {
+      errorName = ParticipantErrorTypes.INVALID_PROMPT;
+    } else {
+      errorName = ParticipantErrorTypes.OTHER;
+    }
+
+    this.track(TelemetryEventTypes.PARTICIPANT_RESPONSE_FAILED, {
+      command,
+      error_code: errorCode,
+      error_name: errorName,
+    });
+  }
 }

src/test/suite/editors/playgroundController.test.ts

@@ -317,20 +317,6 @@ suite('Playground Controller Test Suite', function () {
         expect(showTextDocumentOptions.viewColumn).to.be.equal(-2);
       });
 
-      test('close cancelation modal when a playground is canceled', async () => {
-        sandbox.replace(
-          testPlaygroundController,
-          '_evaluate',
-          sandbox.fake.resolves(null)
-        );
-
-        const result = await testPlaygroundController._evaluateWithCancelModal(
-          ''
-        );
-
-        expect(result).to.deep.equal(null);
-      });
-
       test('playground controller loads the active editor on start', () => {
         sandbox.replaceGetter(
           vscode.window,

src/test/suite/language/languageServerController.test.ts

@@ -105,37 +105,6 @@ suite('Language Server Controller Test Suite', () => {
     sandbox.restore();
   });
 
-  test('cancel a long-running script', async () => {
-    expect(languageServerControllerStub._isExecutingInProgress).to.equal(false);
-    const source = new vscode.CancellationTokenSource();
-    await languageServerControllerStub.evaluate(
-      {
-        codeToEvaluate: `
-        const names = [
-          "flour",
-          "butter",
-          "water",
-          "salt",
-          "onions",
-          "leek"
-        ];
-        let currentName = '';
-        names.forEach((name) => {
-          setTimeout(() => {
-            currentName = name;
-          }, 500);
-        });
-        currentName
-      `,
-        connectionId: 'pineapple',
-      },
-      source.token
-    );
-
-    languageServerControllerStub.cancelAll();
-    expect(languageServerControllerStub._isExecutingInProgress).to.equal(false);
-  });
-
   test('the language server dependency bundle exists', async () => {
     const extensionPath = mdbTestExtension.extensionContextStub.extensionPath;
     const languageServerModuleBundlePath = path.join(

src/test/suite/participant/participant.test.ts

@@ -1440,7 +1440,10 @@ Schema:
 
     test('reports error', function () {
       const err = Error('Filtered by Responsible AI Service');
-      testParticipantController.handleError(err, 'query');
+      testParticipantController._telemetryService.trackCopilotParticipantError(
+        err,
+        'query'
+      );
       sinon.assert.calledOnce(telemetryTrackStub);
 
       expect(telemetryTrackStub.lastCall.args[0]).to.be.equal(
@@ -1458,7 +1461,10 @@ Schema:
     test('reports nested error', function () {
       const err = new Error('Parent error');
       err.cause = Error('This message is flagged as off topic: off_topic.');
-      testParticipantController.handleError(err, 'docs');
+      testParticipantController._telemetryService.trackCopilotParticipantError(
+        err,
+        'docs'
+      );
       sinon.assert.calledOnce(telemetryTrackStub);
 
       expect(telemetryTrackStub.lastCall.args[0]).to.be.equal(
@@ -1474,7 +1480,10 @@ Schema:
     test('Reports error code when available', function () {
       // eslint-disable-next-line new-cap
       const err = vscode.LanguageModelError.NotFound('Model not found');
-      testParticipantController.handleError(err, 'schema');
+      testParticipantController._telemetryService.trackCopilotParticipantError(
+        err,
+        'schema'
+      );
       sinon.assert.calledOnce(telemetryTrackStub);
 
       expect(telemetryTrackStub.lastCall.args[0]).to.be.equal(

src/test/suite/stubs.ts

@@ -265,7 +265,6 @@ class LanguageServerControllerStub {
   _context: ExtensionContextStub;
   _storageController?: StorageController;
   _source?: CancellationTokenSource;
-  _isExecutingInProgress: boolean;
   _client: LanguageClient;
   _currentConnectionId: string | null = null;
   _consoleOutputChannel =
@@ -331,7 +330,6 @@ class LanguageServerControllerStub {
       serverOptions,
       clientOptions
     );
-    this._isExecutingInProgress = false;
   }
 
   startLanguageServer(): Promise<void> {