Flatten initial prompts type

Author: erikeldridge

common/api-review/ai.api.md

@@ -677,11 +677,9 @@ export interface LanguageModelCreateCoreOptions {
 // @public (undocumented)
 export interface LanguageModelCreateOptions extends LanguageModelCreateCoreOptions {
     // (undocumented)
-    initialPrompts?: LanguageModelInitialPrompts;
+    initialPrompts?: LanguageModelMessage[];
     // (undocumented)
     signal?: AbortSignal;
-    // (undocumented)
-    systemPrompt?: string;
 }
 
 // @public (undocumented)
@@ -692,9 +690,6 @@ export interface LanguageModelExpectedInput {
     type: LanguageModelMessageType;
 }
 
-// @public (undocumented)
-export type LanguageModelInitialPrompts = LanguageModelMessage[] | LanguageModelMessageShorthand[];
-
 // @public (undocumented)
 export interface LanguageModelMessage {
     // (undocumented)
@@ -717,14 +712,6 @@ export type LanguageModelMessageContentValue = ImageBitmapSource | AudioBuffer |
 // @public (undocumented)
 export type LanguageModelMessageRole = 'system' | 'user' | 'assistant';
 
-// @public (undocumented)
-export interface LanguageModelMessageShorthand {
-    // (undocumented)
-    content: string;
-    // (undocumented)
-    role: LanguageModelMessageRole;
-}
-
 // @public (undocumented)
 export type LanguageModelMessageType = 'text' | 'image' | 'audio';
 

packages/ai/src/types/index.ts

@@ -26,12 +26,10 @@ export * from './googleai';
 export {
   LanguageModelCreateOptions,
   LanguageModelCreateCoreOptions,
-  LanguageModelExpectedInput,
-  LanguageModelInitialPrompts,
+  LanguageModelExpected,
   LanguageModelMessage,
   LanguageModelMessageContent,
   LanguageModelMessageContentValue,
   LanguageModelMessageRole,
-  LanguageModelMessageShorthand,
   LanguageModelMessageType
 } from './language-model';

packages/ai/src/types/language-model.ts

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 /**
- * {@see https://github.com/webmachinelearning/prompt-api#full-api-surface-in-web-idl}
+ * The subset of the Prompt API
+ * ({@see https://github.com/webmachinelearning/prompt-api#full-api-surface-in-web-idl})
+ * required for hybrid functionality.
  */
 export interface LanguageModel extends EventTarget {
   create(options?: LanguageModelCreateOptions): Promise<LanguageModel>;
@@ -43,37 +45,26 @@ export enum Availability {
 export interface LanguageModelCreateCoreOptions {
   topK?: number;
   temperature?: number;
-  expectedInputs?: LanguageModelExpectedInput[];
+  expectedInputs?: LanguageModelExpected[];
 }
 export interface LanguageModelCreateOptions
   extends LanguageModelCreateCoreOptions {
   signal?: AbortSignal;
-  systemPrompt?: string;
-  initialPrompts?: LanguageModelInitialPrompts;
+  initialPrompts?: LanguageModelMessage[];
 }
 export interface LanguageModelPromptOptions {
   responseConstraint?: object;
   // TODO: Restore AbortSignal once the API is defined.
 }
-export interface LanguageModelExpectedInput {
+export interface LanguageModelExpected {
   type: LanguageModelMessageType;
   languages?: string[];
 }
-export type LanguageModelPrompt =
-  | LanguageModelMessage[]
-  | LanguageModelMessageShorthand[]
-  | string;
-export type LanguageModelInitialPrompts =
-  | LanguageModelMessage[]
-  | LanguageModelMessageShorthand[];
+export type LanguageModelPrompt = LanguageModelMessage[];
 export interface LanguageModelMessage {
   role: LanguageModelMessageRole;
   content: LanguageModelMessageContent[];
 }
-export interface LanguageModelMessageShorthand {
-  role: LanguageModelMessageRole;
-  content: string;
-}
 export interface LanguageModelMessageContent {
   type: LanguageModelMessageType;
   value: LanguageModelMessageContentValue;