[Voice to Content] Implement Jetpack-ai-query into workflow #20878

zwarm · 2024-05-24T19:36:30Z

Closes https://github.com/Automattic/wordpress-mobile/issues/67

Companion PR for wordpress-mobile/WordPress-FluxC-Android#3019

This PR incorporates the Jetpack-ai-query call into the VoiceToContentUseCase. There were no visible changes made in this PR. Note: The code is still using the hardcoded audio file.

Important

Merge Instructions

Ensure that the FluxC PR has been merged into trunk
Grab the fluxC hash from the Publish CI step, update build.gradle, and commit the change
Remove the Do Not Merge label
Merge as normal

To Test:

Prerequisites

Install and launch the app
Login into a site in which you have access to create posts
Navigate to Me > Debug Settings
Enable voice_to_content and restart the app
Navigate to My Site
Tap the FAB
Tap the microphone
✅ Verify the microphone disappears and the text "Testing Jetpack AI. Testing" is shown in the bottom sheet

Regression Notes

Potential unintended areas of impact
The feature shows when the flag is off
What I did to test those areas of impact (or what existing automated tests I relied on)
Manual testing
What automated tests I added (or what prevented me from doing so)
N/A

PR Submission Checklist:

I have completed the Regression Notes.
I have considered adding accessibility improvements for my changes.
I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

Testing Checklist (strike-out the not-applying and unnecessary ones): N/A

…and set as error

dangermattic · 2024-05-24T19:38:53Z

	1 Error
🚫	This PR is tagged with `Do Not Merge` label(s).

	2 Warnings
⚠️	Class `VoiceToContentResult` is missing tests, but `unit-tests-exemption` label was set to ignore this.
⚠️	PR is not assigned to a milestone.

Generated by 🚫 Danger

wpmobilebot · 2024-05-24T19:55:22Z

📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.

	App Name	Jetpack
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr20878-5eb2a46
	Commit	`5eb2a46`
	Direct Download	`jetpack-prototype-build-pr20878-5eb2a46.apk`

Note: Google Login is not supported on these builds.

wpmobilebot · 2024-05-24T19:56:24Z

📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.

	App Name	WordPress
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr20878-5eb2a46
	Commit	`5eb2a46`
	Direct Download	`wordpress-prototype-build-pr20878-5eb2a46.apk`

Note: Google Login is not supported on these builds.

pantstamp

LGTM!

# Conflicts: # build.gradle

wpmobilebot · 2024-05-28T10:30:23Z

Found 1 violations:

The PR caused some dependency changes (expand to see details)

-+--- org.wordpress:fluxc:{strictly 2.81.0} -> 2.81.0
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:2.81.0
-|    +--- org.greenrobot:eventbus:3.3.1
-|    |    \--- org.greenrobot:eventbus-java:3.3.1
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    +--- com.android.volley:volley:1.1.1 -> 1.2.1
-|    +--- androidx.paging:paging-runtime:2.1.2
-|    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
-|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
-|    +--- com.goterl:lazysodium-android:5.0.2
-|    +--- net.java.dev.jna:jna:5.5.0
-|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
-|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.22 (*)
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
-|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
-|    +--- androidx.security:security-crypto:1.0.0
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    \--- com.google.crypto.tink:tink-android:1.5.0
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0
-|    |    \--- org.apache.commons:commons-lang3:3.12.0
-|    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0
-|    |    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.1 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.1 -> 2.2.0 (*)
-|    |    +--- androidx.room:room-common:2.5.0
-|    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.9.10 (*)
-|    |    +--- androidx.sqlite:sqlite:2.3.0
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
-|    |    \--- androidx.sqlite:sqlite-framework:2.3.0
-|    |         +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|    |         +--- androidx.sqlite:sqlite:2.3.0 (*)
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
-|    +--- androidx.room:room-ktx:2.4.2 -> 2.5.0
-|    |    +--- androidx.room:room-common:2.5.0 (*)
-|    |    +--- androidx.room:room-runtime:2.5.0 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
-|    +--- com.google.dagger:dagger:2.42 -> 2.50
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
-|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
++--- org.wordpress:fluxc:{strictly trunk-a018ee9062d23f3a9280a2bf1e87c6b782616b55} -> trunk-a018ee9062d23f3a9280a2bf1e87c6b782616b55
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-a018ee9062d23f3a9280a2bf1e87c6b782616b55
+|    +--- org.greenrobot:eventbus:3.3.1
+|    |    \--- org.greenrobot:eventbus-java:3.3.1
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    +--- com.android.volley:volley:1.1.1 -> 1.2.1
+|    +--- androidx.paging:paging-runtime:2.1.2
+|    |    +--- androidx.paging:paging-common:2.1.2
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
+|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.22 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
+|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
+|    +--- androidx.security:security-crypto:1.0.0
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    \--- com.google.crypto.tink:tink-android:1.5.0
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- org.apache.commons:commons-text:1.10.0
+|    |    \--- org.apache.commons:commons-lang3:3.12.0
+|    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0
+|    |    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.1 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.1 -> 2.2.0 (*)
+|    |    +--- androidx.room:room-common:2.5.0
+|    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.9.10 (*)
+|    |    +--- androidx.sqlite:sqlite:2.3.0
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
+|    |    \--- androidx.sqlite:sqlite-framework:2.3.0
+|    |         +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+|    |         +--- androidx.sqlite:sqlite:2.3.0 (*)
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
+|    +--- androidx.room:room-ktx:2.4.2 -> 2.5.0
+|    |    +--- androidx.room:room-common:2.5.0 (*)
+|    |    +--- androidx.room:room-runtime:2.5.0 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
+|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
+|    +--- com.google.dagger:dagger:2.42 -> 2.50
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
 \--- org.wordpress:login:1.15.0
-     \--- org.wordpress:fluxc:trunk-ed60798b4d96ec19863c74b0f525e2e20f4525db -> 2.81.0 (*)
+     \--- org.wordpress:fluxc:trunk-ed60798b4d96ec19863c74b0f525e2e20f4525db -> trunk-a018ee9062d23f3a9280a2bf1e87c6b782616b55 (*)

Please review and act accordingly

sonarcloud · 2024-05-28T10:31:47Z

Quality Gate passed

Issues
3 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

zwarm added 3 commits May 24, 2024 15:18

Update FluxC hash

50800dd

Add the jetpack ai query call to the voice-to-content workflow

ad7a4aa

Capture the custom jetpack_ai_error from within the success response …

27b1e31

…and set as error

zwarm added the [Type] Task label May 24, 2024

zwarm requested a review from pantstamp May 24, 2024 19:36

zwarm self-assigned this May 24, 2024

zwarm added Voice to Content Do Not Merge In PRs with this label, our automation will fail a require check, preventing accidental merging labels May 24, 2024

zwarm mentioned this pull request May 24, 2024

[Voice to Content] Implement jetpack ai query endpoint wordpress-mobile/WordPress-FluxC-Android#3019

Merged

zwarm added 2 commits May 25, 2024 12:49

Address checkstyle blank line

12bdeb5

Refactor: Drop the AI suffix from the actionType

40d396f

zwarm added the unit-tests-exemption label May 25, 2024

zwarm added 3 commits May 26, 2024 15:58

Update import statement to reflect JetpackAIQuery location move

b91211f

Adjust import statements for response objects

12ac21b

Update FluxC hash

f98105b

zwarm mentioned this pull request May 26, 2024

[Voice to Content] Implement jetpack ai assistant feature into view model #20885

Merged

3 tasks

Update FluxC version

38c58bc

pantstamp removed the Do Not Merge In PRs with this label, our automation will fail a require check, preventing accidental merging label May 28, 2024

pantstamp approved these changes May 28, 2024

View reviewed changes

Merge branch 'trunk' into issue/v2c-support-jetpack-ai-query

5eb2a46

# Conflicts: # build.gradle

pantstamp enabled auto-merge May 28, 2024 10:27

pantstamp merged commit c4d1cf6 into trunk May 28, 2024
17 of 18 checks passed

pantstamp deleted the issue/v2c-support-jetpack-ai-query branch May 28, 2024 10:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Voice to Content] Implement Jetpack-ai-query into workflow #20878

[Voice to Content] Implement Jetpack-ai-query into workflow #20878

zwarm commented May 24, 2024

dangermattic commented May 24, 2024 •

edited

Loading

wpmobilebot commented May 24, 2024 •

edited

Loading

wpmobilebot commented May 24, 2024 •

edited

Loading

pantstamp left a comment

wpmobilebot commented May 28, 2024

sonarcloud bot commented May 28, 2024

[Voice to Content] Implement Jetpack-ai-query into workflow #20878

[Voice to Content] Implement Jetpack-ai-query into workflow #20878

Conversation

zwarm commented May 24, 2024

To Test:

Regression Notes

PR Submission Checklist:

Testing Checklist (strike-out the not-applying and unnecessary ones): N/A

dangermattic commented May 24, 2024 • edited Loading

wpmobilebot commented May 24, 2024 • edited Loading

wpmobilebot commented May 24, 2024 • edited Loading

pantstamp left a comment

Choose a reason for hiding this comment

wpmobilebot commented May 28, 2024

sonarcloud bot commented May 28, 2024

Quality Gate passed

dangermattic commented May 24, 2024 •

edited

Loading

wpmobilebot commented May 24, 2024 •

edited

Loading

wpmobilebot commented May 24, 2024 •

edited

Loading