Use newer ai.languageModel property for Chrome built-in AI, continuing to support ai.assistant for backward compatibility.

felixarntz · felixarntz · commit 0f5222725419 · 2024-11-30T16:11:01.000-08:00
diff --git a/docs/Accessing-AI-Services-in-JavaScript.md b/docs/Accessing-AI-Services-in-JavaScript.md
@@ -272,7 +272,7 @@ try {
 
 In JavaScript the AI Services plugin allows using another service `browser`, additionally to using the third party API based AI services. This service relies on [Chrome's built-in AI APIs](https://developer.chrome.com/docs/ai/built-in-apis), which allow using AI in the browser, running on device, which can be a great option for certain use-cases as it does not require paying for API access and does not involve sending your prompts to an external third-party API.
 
-Note that these APIs are still in an experimental stage and are not yet rolled out completely. If you use Chrome and already have access to the APIs, you can use them through the AI Services plugin just like any other service's APIs. To see whether you have access, check if `window.ai.assistant` is available in your browser console. If not, you can [request to join the Early Preview Program](http://goo.gle/chrome-ai-dev-preview-join).
+Note that these APIs are still in an experimental stage and are not yet rolled out completely. If you use Chrome and already have access to the APIs, you can use them through the AI Services plugin just like any other service's APIs. To see whether you have access, check if `window.ai.languageModel` is available in your browser console. If not, you can [request to join the Early Preview Program](http://goo.gle/chrome-ai-dev-preview-join).
 
 ### Customizing the default model configuration
 
diff --git a/src/ai/browser.js b/src/ai/browser.js
@@ -38,15 +38,18 @@ export async function getBrowserServiceData() {
  * Gets the AI capabilities that the browser supports.
  *
  * @since 0.1.0
+ * @since n.e.x.t Checks for newer `ai.languageModel` property.
  *
  * @param {Object} ai The browser AI API object.
  * @return {Promise<string[]>} The list of AI capabilities.
  */
 async function getBrowserAiCapabilities( ai ) {
 	const capabilities = [];
 
-	if ( ai.assistant ) {
-		const supportsTextGeneration = await ai.assistant.capabilities();
+	const llm = ai.languageModel || ai.assistant;
+
+	if ( llm ) {
+		const supportsTextGeneration = await llm.capabilities();
 		if (
 			supportsTextGeneration &&
 			supportsTextGeneration.available === 'readily'
diff --git a/src/ai/classes/browser-generative-ai-model.js b/src/ai/classes/browser-generative-ai-model.js
@@ -55,6 +55,7 @@ function prepareContentForBrowser( content ) {
  * See https://github.com/explainers-by-googlers/prompt-api#examples for supported parameters.
  *
  * @since 0.3.0
+ * @since n.e.x.t Checks for newer `ai.languageModel` property.
  *
  * @param {Object} modelParams Model parameters.
  * @return {Promise<Object>} The browser session.
@@ -79,20 +80,22 @@ async function createSession( modelParams ) {
 		}
 	}
 
+	const llm = window.ai.languageModel || window.ai.assistant;
+
 	if ( Object.keys( browserParams ).length === 0 ) {
-		return window.ai.assistant.create();
+		return llm.create();
 	}
 
 	try {
-		const session = await window.ai.assistant.create( browserParams );
+		const session = await llm.create( browserParams );
 		return session;
 	} catch ( error ) {
 		// eslint-disable-next-line no-console
 		console.warn(
 			'Failed to create browser session with modelParams, therefore creating default session. Original error:',
 			error
 		);
-		return window.ai.assistant.create();
+		return llm.create();
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ function prepareContentForBrowser( content ) {`
`55`	`55`	`* See https://github.com/explainers-by-googlers/prompt-api#examples for supported parameters.`
`56`	`56`	`*`
`57`	`57`	`* @since 0.3.0`
	`58`	+ * @since n.e.x.t Checks for newer `ai.languageModel` property.
`58`	`59`	`*`
`59`	`60`	`* @param {Object} modelParams Model parameters.`
`60`	`61`	`* @return {Promise<Object>} The browser session.`
`@@ -79,20 +80,22 @@ async function createSession( modelParams ) {`
`79`	`80`	`}`
`80`	`81`	`}`
`81`	`82`
	`83`	`+ const llm = window.ai.languageModel \|\| window.ai.assistant;`
	`84`	`+`
`82`	`85`	`if ( Object.keys( browserParams ).length === 0 ) {`
`83`		`- return window.ai.assistant.create();`
	`86`	`+ return llm.create();`
`84`	`87`	`}`
`85`	`88`
`86`	`89`	`try {`
`87`		`- const session = await window.ai.assistant.create( browserParams );`
	`90`	`+ const session = await llm.create( browserParams );`
`88`	`91`	`return session;`
`89`	`92`	`} catch ( error ) {`
`90`	`93`	`// eslint-disable-next-line no-console`
`91`	`94`	`console.warn(`
`92`	`95`	`'Failed to create browser session with modelParams, therefore creating default session. Original error:',`
`93`	`96`	`error`
`94`	`97`	`);`
`95`		`- return window.ai.assistant.create();`
	`98`	`+ return llm.create();`
`96`	`99`	`}`
`97`	`100`	`}`
`98`	`101`