Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Tue Sep 19 2023.
+This document was automatically generated on Thu Sep 21 2023.
 
 ## List of dependencies
 

package-lock.json

@@ -299,7 +299,7 @@ describe('AtlasServiceMain', function () {
         } catch (err) {
           expect(err).to.have.property(
             'message',
-            'Error: too large of a request to send to the ai. Please use a smaller prompt or collection with smaller documents.'
+            'Sorry, your request is too large. Please use a smaller prompt or try using this feature on a collection with smaller documents.'
           );
         }
       });
@@ -339,6 +339,7 @@ describe('AtlasServiceMain', function () {
           ok: false,
           status: 500,
           statusText: 'Internal Server Error',
+          json: sandbox.stub().rejects(new Error('invalid json')),
         }) as any;
 
         try {
@@ -349,7 +350,7 @@ describe('AtlasServiceMain', function () {
           });
           expect.fail(`Expected ${functionName} to throw`);
         } catch (err) {
-          expect(err).to.have.property('message', '500 Internal Server Error');
+          expect(err).to.have.property('message', '500: Internal Server Error');
         }
       });
     });
@@ -367,7 +368,7 @@ describe('AtlasServiceMain', function () {
       });
     });
 
-    it('should throw network error if res is not ok', async function () {
+    it('should throw network error if res is not an atlas error', async function () {
       try {
         await throwIfNotOk({
           ok: false,
@@ -380,7 +381,7 @@ describe('AtlasServiceMain', function () {
         expect.fail('Expected throwIfNotOk to throw');
       } catch (err) {
         expect(err).to.have.property('name', 'NetworkError');
-        expect(err).to.have.property('message', '500 Whoops');
+        expect(err).to.have.property('message', '500: Whoops');
       }
     });
 
@@ -402,6 +403,9 @@ describe('AtlasServiceMain', function () {
       } catch (err) {
         expect(err).to.have.property('name', 'ServerError');
         expect(err).to.have.property('message', 'ExampleCode: tortillas');
+        expect(err).to.have.property('detail', 'tortillas');
+        expect(err).to.have.property('errorCode', 'ExampleCode');
+        expect(err).to.have.property('statusCode', 500);
       }
     });
   });

packages/atlas-service/src/main.spec.ts

@@ -2,7 +2,7 @@ import { ipcMain, shell, app } from 'electron';
 import { URL, URLSearchParams } from 'url';
 import { createHash } from 'crypto';
 import type { AuthFlowType, MongoDBOIDCPlugin } from '@mongodb-js/oidc-plugin';
-import type { AtlasServiceError } from './renderer';
+import { AtlasServiceError } from './util';
 import {
   createMongoDBOIDCPlugin,
   hookLoggerToMongoLogWriter as oidcPluginHookLoggerToMongoLogWriter,
@@ -72,24 +72,22 @@ export async function throwIfNotOk(
     return;
   }
 
-  let serverErrorName = 'NetworkError';
-  let serverErrorMessage = `${res.status} ${res.statusText}`;
-  // We try to parse the response to see if the server returned any information
-  // we can show a user.
-  try {
-    const messageJSON = await res.json();
-    if (isServerError(messageJSON)) {
-      serverErrorName = 'ServerError';
-      serverErrorMessage = `${messageJSON.errorCode}: ${messageJSON.detail}`;
-    }
-  } catch (err) {
-    // no-op, use the default status and statusText in the message.
+  const messageJSON = await res.json().catch(() => undefined);
+  if (messageJSON && isServerError(messageJSON)) {
+    throw new AtlasServiceError(
+      'ServerError',
+      res.status,
+      messageJSON.detail ?? 'Internal server error',
+      messageJSON.errorCode ?? 'INTERNAL_SERVER_ERROR'
+    );
+  } else {
+    throw new AtlasServiceError(
+      'NetworkError',
+      res.status,
+      res.statusText,
+      `${res.status}`
+    );
   }
-
-  const err = new Error(serverErrorMessage);
-  err.name = serverErrorName;
-  (err as AtlasServiceError).statusCode = res.status;
-  throw err;
 }
 
 function throwIfAINotEnabled(atlasService: typeof AtlasService) {
@@ -639,7 +637,7 @@ export class AtlasService {
       });
       if (msgBody.length > AI_MAX_REQUEST_SIZE) {
         throw new Error(
-          'Error: too large of a request to send to the ai. Please use a smaller prompt or collection with smaller documents.'
+          'Sorry, your request is too large. Please use a smaller prompt or try using this feature on a collection with smaller documents.'
         );
       }
     }
@@ -651,7 +649,13 @@ export class AtlasService {
       mongoLogId(1_001_000_247),
       'AtlasService',
       'Running aggregation generation request',
-      { url, body: msgBody }
+      {
+        url,
+        userInput,
+        collectionName,
+        databaseName,
+        messageBodyLength: msgBody.length,
+      }
     );
 
     const res = await this.fetch(url, {
@@ -720,7 +724,7 @@ export class AtlasService {
       });
       if (msgBody.length > AI_MAX_REQUEST_SIZE) {
         throw new Error(
-          'Error: too large of a request to send to the ai. Please use a smaller prompt or collection with smaller documents.'
+          'Sorry, your request is too large. Please use a smaller prompt or try using this feature on a collection with smaller documents.'
         );
       }
     }
@@ -732,7 +736,13 @@ export class AtlasService {
       mongoLogId(1_001_000_249),
       'AtlasService',
       'Running query generation request',
-      { url, body: msgBody }
+      {
+        url,
+        userInput,
+        collectionName,
+        databaseName,
+        messageBodyLength: msgBody.length,
+      }
     );
 
     const res = await this.fetch(url, {

packages/atlas-service/src/main.ts

@@ -146,12 +146,12 @@ export class AtlasService {
 
 export { AtlasSignIn } from './components/atlas-signin';
 
+export { AtlasServiceError } from './util';
 export type {
   AtlasUserInfo,
   AtlasUserConfig,
   IntrospectInfo,
   Token,
-  AtlasServiceError,
   AIQuery,
   AIAggregation,
 } from './util';