cleanup

Author: dlarocque

.vscode/launch.json

@@ -37,7 +37,7 @@
         "src/index.node.ts",
         "--timeout",
         "5000",
-        "integration/**/prompt-templates.test.ts"
+        "integration/**/*.test.ts"
       ],
       "env": {
         "TS_NODE_COMPILER_OPTIONS": "{\"module\":\"commonjs\"}"

packages/ai/integration/prompt-templates.test.ts

@@ -35,25 +35,16 @@ describe('Prompt templates', function () {
     describe(`${testConfig.toString()}`, () => {
       describe('Generative Model', () => {
         it('successfully generates content', async () => {
-          const a = new AbortController();
           const model = getTemplateGenerativeModel(testConfig.ai, {
             baseUrl: STAGING_URL
           });
-          // a.abort();
-          try {
-            await model.generateContent(
-              `sassy-greeting-${templateBackendSuffix(
-                testConfig.ai.backend.backendType
-              )}`,
-              { name: 'John' },
-              { signal: a.signal, timeout: 100 }
-            );
-          } catch (e) {
-            console.error(e);
-            if ((e as DOMException).name === 'AbortError') {
-              console.log(1);
-            }
-          }
+          const { response } = await model.generateContent(
+            `sassy-greeting-${templateBackendSuffix(
+              testConfig.ai.backend.backendType
+            )}`,
+            { name: 'John' }
+          );
+          expect(response.text()).to.contain('John'); // Template asks to address directly by name
         });
       });
       describe('Imagen model', async () => {
@@ -65,8 +56,7 @@ describe('Prompt templates', function () {
             `portrait-${templateBackendSuffix(
               testConfig.ai.backend.backendType
             )}`,
-            { animal: 'Rhino' },
-            { timeout: 100 }
+            { animal: 'Rhino' }
           );
           expect(images.length).to.equal(2); // We ask for two images in the prompt template
         });

packages/ai/package.json

@@ -41,7 +41,7 @@
     "test:browser": "yarn testsetup && karma start",
     "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --require ts-node/register --require src/index.node.ts 'src/**/!(*-browser)*.test.ts' --config ../../config/mocharc.node.js",
     "test:integration": "karma start --integration",
-    "test:integration:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha integration/**/prompt-templates.test.ts --config ../../config/mocharc.node.js",
+    "test:integration:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha integration/**/*.test.ts --config ../../config/mocharc.node.js",
     "api-report": "api-extractor run --local --verbose",
     "typings:public": "node ../../scripts/build/use_typings.js ./dist/ai-public.d.ts",
     "type-check": "yarn tsc --noEmit",

packages/ai/src/constants.ts

@@ -32,7 +32,7 @@ export const PACKAGE_VERSION = version;
 
 export const LANGUAGE_TAG = 'gl-js';
 
-export const DEFAULT_FETCH_TIMEOUT_MS = 180 * 1000; // TODO: Extend default timeout to accommodate for longer generation requests with pro models.
+export const DEFAULT_FETCH_TIMEOUT_MS = 180 * 1000;
 
 /**
  * Defines the name of the default in-cloud model to use for hybrid inference.

packages/ai/src/methods/chat-session.ts

@@ -36,9 +36,6 @@ import { ChromeAdapter } from '../types/chrome-adapter';
 /**
  * Used to break the internal promise chain when an error is already handled
  * by the user, preventing duplicate console logs.
- *
- * TODO: Refactor to use `Promise.allSettled` to decouple the internal
- * sequencing chain from user error handling.
  */
 const SILENT_ERROR = 'SILENT_ERROR';