Skip to content

Update MLKit GenAI to latest beta; add genai-schema and genai-speech-recognition #1508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mattleibow wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update MLKit GenAI to latest beta; add genai-schema and genai-speech-recognition #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7446,9 +7446,9 @@
"maven": {
"artifactId": "genai-common",
"groupId": "com.google.mlkit",
"version": "1.0.0-beta2",
"version": "1.0.0-beta4",
"nuGetId": "Xamarin.Google.MLKit.GenAI.Common",
"nuGetVersion": "1.0.0.3-beta2"
"nuGetVersion": "1.0.0.3-beta4"
}
},
"license": "ML Kit Terms of Service"
Expand All @@ -7459,8 +7459,34 @@
"maven": {
"artifactId": "genai-prompt",
"groupId": "com.google.mlkit",
"version": "1.0.0-alpha1",
"version": "1.0.0-beta4",
"nuGetId": "Xamarin.Google.MLKit.GenAI.Prompt",
"nuGetVersion": "1.0.0.3-beta4"
}
},
"license": "ML Kit Terms of Service"
},
{
"component": {
"type": "maven",
"maven": {
"artifactId": "genai-schema",
"groupId": "com.google.mlkit",
"version": "1.0.0-alpha1",
"nuGetId": "Xamarin.Google.MLKit.GenAI.Schema",
"nuGetVersion": "1.0.0.3-alpha1"
}
},
"license": "ML Kit Terms of Service"
},
{
"component": {
"type": "maven",
"maven": {
"artifactId": "genai-speech-recognition",
"groupId": "com.google.mlkit",
"version": "1.0.0-alpha1",
"nuGetId": "Xamarin.Google.MLKit.GenAI.SpeechRecognition",
"nuGetVersion": "1.0.0.3-alpha1"
}
},
Expand Down
22 changes: 19 additions & 3 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4370,17 +4370,33 @@
{
"groupId": "com.google.mlkit",
"artifactId": "genai-common",
"version": "1.0.0-beta2",
"nugetVersion": "1.0.0.3-beta2",
"version": "1.0.0-beta4",
"nugetVersion": "1.0.0.3-beta4",
"nugetId": "Xamarin.Google.MLKit.GenAI.Common",
"type": "xbd"
},
{
"groupId": "com.google.mlkit",
"artifactId": "genai-prompt",
"version": "1.0.0-beta4",
"nugetVersion": "1.0.0.3-beta4",
"nugetId": "Xamarin.Google.MLKit.GenAI.Prompt",
"type": "xbd"
},
{
"groupId": "com.google.mlkit",
"artifactId": "genai-schema",
"version": "1.0.0-alpha1",
"nugetVersion": "1.0.0.3-alpha1",
"nugetId": "Xamarin.Google.MLKit.GenAI.Prompt",
"nugetId": "Xamarin.Google.MLKit.GenAI.Schema",
"type": "xbd"
},
{
"groupId": "com.google.mlkit",
"artifactId": "genai-speech-recognition",
"version": "1.0.0-alpha1",
"nugetVersion": "1.0.0.3-alpha1",
"nugetId": "Xamarin.Google.MLKit.GenAI.SpeechRecognition",
"type": "xbd"
},
{
Expand Down
256 changes: 129 additions & 127 deletions docs/artifact-list-with-versions.md
View file
Open in desktop

Large diffs are not rendered by default.

252 changes: 127 additions & 125 deletions docs/artifact-list.md
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions published-namespaces.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,6 +1382,9 @@ Google.MLKit.GenAI.Common
Google.MLKit.GenAI.Common.Audio
Google.MLKit.GenAI.Prompt
Google.MLKit.GenAI.Prompt.Java
Google.MLKit.GenAI.Schema.Annotations
Google.MLKit.GenAI.Schema.Guided
Google.MLKit.GenAI.Speechrecognition
Google.MLKit.Vision.Digitalink.Common
Google.MLKit.Vision.Digitalink.Common.Downloading
Google.MLKit.Vision.Digitalink.Common.Internal
Expand Down
11 changes: 11 additions & 0 deletions source/com.google.mlkit/genai-common/PublicAPI/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#nullable enable
Google.MLKit.GenAI.Common.Audio.AudioSource
Google.MLKit.GenAI.Common.Audio.AudioSource.AudioSource(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void
Google.MLKit.GenAI.Common.Audio.AudioSourceMode
Google.MLKit.GenAI.Common.Audio.AudioSourceMode.OneShot = 1 -> Google.MLKit.GenAI.Common.Audio.AudioSourceMode
Google.MLKit.GenAI.Common.Audio.AudioSourceMode.Streaming = 0 -> Google.MLKit.GenAI.Common.Audio.AudioSourceMode
Google.MLKit.GenAI.Common.BaseOptions
Google.MLKit.GenAI.Common.BaseOptions.BaseOptions() -> void
Google.MLKit.GenAI.Common.BaseOptions.BaseOptions(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void
Expand Down Expand Up @@ -43,8 +46,10 @@ Google.MLKit.GenAI.Common.GenAIErrorCode.ResponseProcessingError = 11 -> Google.
Google.MLKit.GenAI.Common.GenAIErrorCode.Unknown = 0 -> Google.MLKit.GenAI.Common.GenAIErrorCode
Google.MLKit.GenAI.Common.GenAIException
Google.MLKit.GenAI.Common.GenAIException.GenAIException(Java.Lang.Throwable? cause, Google.MLKit.GenAI.Common.GenAIErrorCode errorCode) -> void
Google.MLKit.GenAI.Common.GenAIException.GenAIException(Java.Lang.Throwable? cause, Google.MLKit.GenAI.Common.GenAIErrorCode errorCode, Java.Time.Duration! retryDelay) -> void
Google.MLKit.GenAI.Common.GenAIException.GenAIException(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void
Google.MLKit.GenAI.Common.GenAIException.GenAIException(string! message, Java.Lang.Throwable? cause, Google.MLKit.GenAI.Common.GenAIErrorCode errorCode) -> void
Google.MLKit.GenAI.Common.GenAIException.GenAIException(string! message, Java.Lang.Throwable? cause, Google.MLKit.GenAI.Common.GenAIErrorCode errorCode, Java.Time.Duration! retryDelay) -> void
Google.MLKit.GenAI.Common.IDownloadCallback
Google.MLKit.GenAI.Common.IDownloadCallback.OnDownloadCompleted() -> void
Google.MLKit.GenAI.Common.IDownloadCallback.OnDownloadFailed(Google.MLKit.GenAI.Common.GenAIException! p0) -> void
Expand All @@ -53,6 +58,7 @@ Google.MLKit.GenAI.Common.IDownloadCallback.OnDownloadStarted(long p0) -> void
Google.MLKit.GenAI.Common.IFeatureStatus
Google.MLKit.GenAI.Common.IStreamingCallback
Google.MLKit.GenAI.Common.IStreamingCallback.OnNewText(string! p0) -> void
Google.MLKit.GenAI.Common.IStreamingCallback.OnNewThought(string! p0) -> void
abstract Google.MLKit.GenAI.Common.BaseOptions.TargetVersion.get -> Java.Lang.Integer?
abstract Google.MLKit.GenAI.Common.BaseRequest.OverrideRequestKind.get -> Java.Lang.Integer?
const Google.MLKit.GenAI.Common.FeatureStatus.Available = 3 -> int
Expand Down Expand Up @@ -80,8 +86,13 @@ override Google.MLKit.GenAI.Common.GenAIException.ThresholdClass.get -> nint
override Google.MLKit.GenAI.Common.GenAIException.ThresholdType.get -> System.Type!
static Google.MLKit.GenAI.Common.Audio.AudioSource.FromMic() -> Google.MLKit.GenAI.Common.Audio.AudioSource!
static Google.MLKit.GenAI.Common.Audio.AudioSource.FromPfd(Android.OS.ParcelFileDescriptor! pfd) -> Google.MLKit.GenAI.Common.Audio.AudioSource!
static Google.MLKit.GenAI.Common.Audio.AudioSource.FromPfd(Android.OS.ParcelFileDescriptor! pfd, Google.MLKit.GenAI.Common.Audio.AudioSourceMode mode) -> Google.MLKit.GenAI.Common.Audio.AudioSource!
static Google.MLKit.GenAI.Common.Audio.AudioSource.FromPfd(Android.OS.ParcelFileDescriptor! pfd, Google.MLKit.GenAI.Common.Audio.AudioSourceMode mode, Android.Media.AudioFormat! format) -> Google.MLKit.GenAI.Common.Audio.AudioSource!
static Google.MLKit.GenAI.Common.DownloadStatus.DownloadCompleted.Instance.get -> Google.MLKit.GenAI.Common.DownloadStatus.DownloadCompleted!
virtual Google.MLKit.GenAI.Common.Audio.AudioSource.AudioFormat.get -> Android.Media.AudioFormat!
virtual Google.MLKit.GenAI.Common.Audio.AudioSource.Mode.get -> Google.MLKit.GenAI.Common.Audio.AudioSourceMode
virtual Google.MLKit.GenAI.Common.Audio.AudioSource.Pfd.get -> Android.OS.ParcelFileDescriptor?
virtual Google.MLKit.GenAI.Common.BaseOptions.TargetVersionOrDefault.get -> int
virtual Google.MLKit.GenAI.Common.BaseRequest.OverrideRequestKindOrDefault.get -> int
virtual Google.MLKit.GenAI.Common.GenAIException.ErrorCode.get -> Google.MLKit.GenAI.Common.GenAIErrorCode
virtual Google.MLKit.GenAI.Common.GenAIException.RetryDelay.get -> Java.Time.Duration!
4 changes: 4 additions & 0 deletions source/com.google.mlkit/genai-common/Transforms/EnumFields.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@
<field clr-name="ResponseProcessingError" jni-name="RESPONSE_PROCESSING_ERROR" value="11" />
<field clr-name="Unknown" jni-name="UNKNOWN" value="0" />
</mapping>
<mapping clr-enum-type="Google.MLKit.GenAI.Common.Audio.AudioSourceMode" jni-interface="com/google/mlkit/genai/common/audio/AudioSource$Mode">
<field clr-name="Streaming" jni-name="STREAMING" value="0" />
<field clr-name="OneShot" jni-name="ONE_SHOT" value="1" />
</mapping>
</enum-field-mappings>
4 changes: 4 additions & 0 deletions source/com.google.mlkit/genai-common/Transforms/EnumMethods.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@
<method jni-name="getErrorCode" parameter="return" clr-enum-type="Google.MLKit.GenAI.Common.GenAIErrorCode" />
<method jni-name="constructor" parameter="errorCode" clr-enum-type="Google.MLKit.GenAI.Common.GenAIErrorCode" />
</mapping>
<mapping jni-class="com/google/mlkit/genai/common/audio/AudioSource">
<method jni-name="getMode" parameter="return" clr-enum-type="Google.MLKit.GenAI.Common.Audio.AudioSourceMode" />
<method jni-name="fromPfd" parameter="mode" clr-enum-type="Google.MLKit.GenAI.Common.Audio.AudioSourceMode" />
</mapping>
</enum-method-mappings>
3 changes: 3 additions & 0 deletions source/com.google.mlkit/genai-common/Transforms/Metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

<!-- Remove the nested ErrorCode interface to avoid conflict with the ErrorCode property -->
<remove-node path="/api/package[@name='com.google.mlkit.genai.common']/interface[@name='GenAiException.ErrorCode']" />

<!-- Remove the nested Mode interface to avoid conflict with the Mode property -->
<remove-node path="/api/package[@name='com.google.mlkit.genai.common.audio']/interface[@name='AudioSource.Mode']" />

<!-- Remove unused internal classes -->
<remove-node path="/api/package[@name='com.google.mlkit.genai.common.internal']" />
Expand Down
Loading