Update request sent to AIDA to use new fields current_message and historical_contexts

Bug: 379074152
Change-Id: I38147da812b2b3c5f6b92a9932c5f9c4ca018ca0
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6040796
Reviewed-by: Alex Rudenko <[email protected]>
Commit-Queue: Samiya Caur <[email protected]>

Author: Samiya Caur

front_end/core/host/AidaClient.test.ts

@@ -13,7 +13,7 @@ describeWithEnvironment('AidaClient', () => {
     const stub = getGetHostConfigStub({});
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
     assert.deepStrictEqual(request, {
-      input: 'foo',
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       client_feature: 1,
       functionality_type: 2,
@@ -30,7 +30,7 @@ describeWithEnvironment('AidaClient', () => {
     });
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
     assert.deepStrictEqual(request, {
-      input: 'foo',
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       options: {
         temperature: 0.5,
@@ -50,7 +50,7 @@ describeWithEnvironment('AidaClient', () => {
     });
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
     assert.deepStrictEqual(request, {
-      input: 'foo',
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       options: {
         temperature: 0,
@@ -70,7 +70,7 @@ describeWithEnvironment('AidaClient', () => {
     });
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
     assert.deepStrictEqual(request, {
-      input: 'foo',
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       client_feature: 1,
       functionality_type: 2,
@@ -88,7 +88,7 @@ describeWithEnvironment('AidaClient', () => {
     });
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
     assert.deepStrictEqual(request, {
-      input: 'foo',
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       options: {
         model_id: TEST_MODEL_ID,
@@ -112,7 +112,7 @@ describeWithEnvironment('AidaClient', () => {
     });
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
     assert.deepStrictEqual(request, {
-      input: 'foo',
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       metadata: {
         disable_user_content_logging: true,

front_end/core/host/AidaClient.ts

@@ -9,10 +9,13 @@ import {InspectorFrontendHostInstance} from './InspectorFrontendHost.js';
 import type {AidaClientResult, SyncInformation} from './InspectorFrontendHostAPI.js';
 import {bindOutputStream} from './ResourceLoader.js';
 
-export enum Entity {
-  UNKNOWN = 0,
+export enum Role {
+  // Unspecified role.
+  ROLE_UNSPECIFIED = 0,
+  // The user.
   USER = 1,
-  SYSTEM = 2,
+  // The model.
+  MODEL = 2,
 }
 
 export const enum Rating {
@@ -21,9 +24,27 @@ export const enum Rating {
   NEGATIVE = 'NEGATIVE',
 }
 
-export interface HistoryChunk {
-  text: string;
-  entity: Entity;
+// A `Content` represents a single turn message.
+export interface Content {
+  parts: Part[];
+  // The producer of the content.
+  role: Role;
+}
+
+export interface Part {
+  text?: string;
+  // Inline media bytes.
+  inlineData?: MediaBlob;
+}
+
+// Raw media bytes.
+export interface MediaBlob {
+  // The IANA standard MIME type of the source data.
+  // Currently supported types are: image/png, image/jpeg.
+  // Format: base64-encoded
+  // For reference: google3/google/x/pitchfork/aida/v1/content.proto
+  mimeType: string;
+  data: string;
 }
 
 export enum FunctionalityType {
@@ -62,10 +83,11 @@ export enum UserTier {
 }
 
 export interface AidaRequest {
-  input: string;
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  current_message?: Content;
   preamble?: string;
   // eslint-disable-next-line @typescript-eslint/naming-convention
-  chat_history?: HistoryChunk[];
+  historical_contexts?: Content[];
   client: string;
   options?: {
     temperature?: number,
@@ -152,7 +174,7 @@ export class AidaAbortError extends Error {}
 export class AidaClient {
   static buildConsoleInsightsRequest(input: string): AidaRequest {
     const request: AidaRequest = {
-      input,
+      current_message: {parts: [{text: input}], role: Role.USER},
       client: CLIENT_NAME,
       functionality_type: FunctionalityType.EXPLAIN_ERROR,
       client_feature: ClientFeature.CHROME_CONSOLE_INSIGHTS,

front_end/panels/freestyler/AiAgent.test.ts

@@ -74,7 +74,7 @@ describeWithEnvironment('AiAgent', () => {
         aidaClient: {} as Host.AidaClient.AidaClient,
       });
       assert.strictEqual(
-          agent.buildRequest({input: 'test input'}).options?.temperature,
+          agent.buildRequest({text: 'test input'}).options?.temperature,
           1,
       );
     });
@@ -85,7 +85,7 @@ describeWithEnvironment('AiAgent', () => {
       });
       agent.options.temperature = -1;
       assert.strictEqual(
-          agent.buildRequest({input: 'test input'}).options?.temperature,
+          agent.buildRequest({text: 'test input'}).options?.temperature,
           undefined,
       );
     });
@@ -95,7 +95,7 @@ describeWithEnvironment('AiAgent', () => {
         aidaClient: {} as Host.AidaClient.AidaClient,
       });
       assert.strictEqual(
-          agent.buildRequest({input: 'test input'}).options?.model_id,
+          agent.buildRequest({text: 'test input'}).options?.model_id,
           'test model',
       );
     });
@@ -106,7 +106,7 @@ describeWithEnvironment('AiAgent', () => {
         serverSideLoggingEnabled: true,
       });
       assert.strictEqual(
-          agent.buildRequest({input: 'test input'}).metadata?.disable_user_content_logging,
+          agent.buildRequest({text: 'test input'}).metadata?.disable_user_content_logging,
           false,
       );
     });
@@ -119,7 +119,7 @@ describeWithEnvironment('AiAgent', () => {
       assert.strictEqual(
           agent
               .buildRequest({
-                input: 'test input',
+                text: 'test input',
               })
               .metadata?.disable_user_content_logging,
           true,
@@ -131,27 +131,27 @@ describeWithEnvironment('AiAgent', () => {
         aidaClient: {} as Host.AidaClient.AidaClient,
         serverSideLoggingEnabled: false,
       });
-      const request = agent.buildRequest({input: 'test input'});
-      assert.strictEqual(request.input, 'test input');
-      assert.strictEqual(request.chat_history, undefined);
+      const request = agent.buildRequest({text: 'test input'});
+      assert.strictEqual(request.current_message?.parts[0].text, 'test input');
+      assert.strictEqual(request.historical_contexts, undefined);
     });
 
     it('builds a request with a sessionId', async () => {
       const agent = new AiAgentMock({
         aidaClient: {} as Host.AidaClient.AidaClient,
       });
-      const request = agent.buildRequest({input: 'test input'});
+      const request = agent.buildRequest({text: 'test input'});
       assert.strictEqual(request.metadata?.string_session_id, 'sessionId');
     });
 
     it('builds a request with preamble', async () => {
       const agent = new AiAgentMock({
         aidaClient: {} as Host.AidaClient.AidaClient,
       });
-      const request = agent.buildRequest({input: 'test input'});
-      assert.strictEqual(request.input, 'test input');
+      const request = agent.buildRequest({text: 'test input'});
+      assert.strictEqual(request.current_message?.parts[0].text, 'test input');
       assert.strictEqual(request.preamble, 'preamble');
-      assert.strictEqual(request.chat_history, undefined);
+      assert.strictEqual(request.historical_contexts, undefined);
     });
 
     it('builds a request with chat history', async () => {
@@ -190,26 +190,24 @@ describeWithEnvironment('AiAgent', () => {
           text: 'answer',
         },
       ];
-      const request = agent.buildRequest({
-        input: 'test input',
-      });
-      assert.strictEqual(request.input, 'test input');
-      assert.deepStrictEqual(request.chat_history, [
+      const request = agent.buildRequest({text: 'test input'});
+      assert.strictEqual(request.current_message?.parts[0].text, 'test input');
+      assert.deepStrictEqual(request.historical_contexts, [
         {
-          text: 'test',
-          entity: 1,
+          parts: [{text: 'test'}],
+          role: 1,
         },
         {
-          entity: 2,
-          text: 'THOUGHT: thought\nTITLE: title\nACTION\naction\nSTOP',
+          role: 2,
+          parts: [{text: 'THOUGHT: thought\nTITLE: title\nACTION\naction\nSTOP'}],
         },
         {
-          entity: 1,
-          text: 'OBSERVATION: result',
+          role: 1,
+          parts: [{text: 'OBSERVATION: result'}],
         },
         {
-          entity: 2,
-          text: 'answer',
+          role: 2,
+          parts: [{text: 'answer'}],
         },
       ]);
     });
@@ -240,11 +238,9 @@ describeWithEnvironment('AiAgent', () => {
           error: ErrorType.ABORT,
         },
       ];
-      const request = agent.buildRequest({
-        input: 'test input',
-      });
-      assert.strictEqual(request.input, 'test input');
-      assert.deepStrictEqual(request.chat_history, undefined);
+      const request = agent.buildRequest({text: 'test input'});
+      assert.strictEqual(request.current_message?.parts[0].text, 'test input');
+      assert.deepStrictEqual(request.historical_contexts, undefined);
     });
 
     it('builds a request with aborted query in history before a real request', async () => {
@@ -303,26 +299,24 @@ describeWithEnvironment('AiAgent', () => {
           text: 'answer2',
         },
       ];
-      const request = agent.buildRequest({
-        input: 'test input',
-      });
-      assert.strictEqual(request.input, 'test input');
-      assert.deepStrictEqual(request.chat_history, [
+      const request = agent.buildRequest({text: 'test input'});
+      assert.strictEqual(request.current_message?.parts[0].text, 'test input');
+      assert.deepStrictEqual(request.historical_contexts, [
         {
-          text: 'test2',
-          entity: 1,
+          parts: [{text: 'test2'}],
+          role: 1,
         },
         {
-          entity: 2,
-          text: 'THOUGHT: thought2\nTITLE: title2\nACTION\naction2\nSTOP',
+          role: 2,
+          parts: [{text: 'THOUGHT: thought2\nTITLE: title2\nACTION\naction2\nSTOP'}],
         },
         {
-          entity: 1,
-          text: 'OBSERVATION: result2',
+          role: 1,
+          parts: [{text: 'OBSERVATION: result2'}],
         },
         {
-          entity: 2,
-          text: 'answer2',
+          role: 2,
+          parts: [{text: 'answer2'}],
         },
       ]);
     });
@@ -395,12 +389,12 @@ describeWithEnvironment('AiAgent', () => {
 
         assert.deepStrictEqual(agent.chatHistoryForTesting, [
           {
-            entity: Host.AidaClient.Entity.USER,
-            text: 'query',
+            role: Host.AidaClient.Role.USER,
+            parts: [{text: 'query'}],
           },
           {
-            entity: Host.AidaClient.Entity.SYSTEM,
-            text: 'Partial answer is now completed',
+            role: Host.AidaClient.Role.MODEL,
+            parts: [{text: 'Partial answer is now completed'}],
           },
         ]);
       });