[Product AI v2] generation prompt + option selector #11993

hichamboushaba · 2024-07-12T14:16:40Z

Closes: #11972 Closes: #11973

Please don't merge until the FluxC hash is updated.

Description

This PR adds the following changes:

Logic for the new prompt that generates a product with three variants for the name/description.
UI and logic for the variant selector.
Refactorings to simplify the code of building the product properties rows.

⚠️ ~~The generation fails sometimes, this is because we still need to implement this part #11929, if you find issues with testing the PR, please let me know and I can suggest a temporary solution.~~
This was updated, the PR includes the changes of the PR wordpress-mobile/WordPress-FluxC-Android#3049 which implements the required change

Testing information

Open the app and sign in using a Jeptack website.
Start product creation using AI.
Type something on the product features field.
Tap "Generate Product Details"
Confirm a product is generated according to the given details.
Notice the selector for the product variants.
Use the selector to change the product variant, and confirm it works as expected.

Images/gif

Note: the buttons look bigger than what we have in Figma, that's because Compose enforces 48dp as the minimum size for touch targets, I believe we can override the minimum, but I don't think we should do it, the accessibility is more important than having it match Figma perfectly, WDYT?

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

dangermattic · 2024-07-12T14:18:25Z

	2 Warnings
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	Class `GenerateProductWithAI` is missing tests, but `unit-tests-exemption` label was set to ignore this.

Generated by 🚫 Danger

wpmobilebot · 2024-07-12T14:23:02Z

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

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`3241a72`
	Direct Download	`woocommerce-wear-prototype-build-pr11993-3241a72.apk`

wpmobilebot · 2024-07-12T14:38:36Z

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

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`3241a72`
	Direct Download	`woocommerce-prototype-build-pr11993-3241a72.apk`

hichamboushaba · 2024-07-12T15:21:34Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ai/AIPrompts.kt

@@ -75,6 +75,67 @@ object AIPrompts {

    @Suppress("LongParameterList")
    fun generateProductCreationPrompt(


Instead of putting lots of ifs to check the FeatureFlag inside the prompt, I decided to create different functions and make the changes there, and I added the suffix Legacy for the previous versions to make it easier to spot them for cleanup.

hichamboushaba · 2024-07-12T15:22:53Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/ai/AIProductModel.kt

+            existingCategories: List<ProductCategory>,
+            existingTags: List<ProductTag>
+        ): AIProductModel {
+            val jsonModel = JSONObject(json)


Instead of using Gson for the parsing, I decided to do it manually, I found this easier for allowing me to match against the existing categories/tags and assign them directly.

hichamboushaba · 2024-07-12T15:24:30Z

...erce/src/main/kotlin/com/woocommerce/android/ui/products/ai/preview/GenerateProductWithAI.kt

+    private var isProductCategoriesFetched = false
+    private var isProductTagsFetched = false


These properties will allow us to skip fetching categories and tags when the user uses the button Re-generate

...rce/src/main/kotlin/com/woocommerce/android/ui/products/ai/preview/AiProductPreviewScreen.kt

JorgeMucientes · 2024-07-15T09:48:01Z

...erce/src/main/kotlin/com/woocommerce/android/ui/products/ai/preview/GenerateProductWithAI.kt

+            return Result.failure(it)
+        }
+
+        if (!::languageISOCode.isInitialized) {


Nice TIL about this way of checking if lateinit property is initialized

JorgeMucientes · 2024-07-15T09:49:50Z

Excellent job @hichamboushaba. Just left a minor nitpick. But the PR is ready for shipping once fluxC changeset is updated

Co-authored-by: Jorge Mucientes <jorge.mucientes@automattic.com>

# Conflicts: # build.gradle

wpmobilebot · 2024-07-15T14:35:19Z

Found 1 violations:

The PR caused the following dependency changes:

expand

-+--- org.wordpress:fluxc:trunk-56cd6652d0d83fccfbb7ecc19cf2c6496d812dab
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-56cd6652d0d83fccfbb7ecc19cf2c6496d812dab
-|    +--- org.greenrobot:eventbus:3.3.1 (*)
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
-|    +--- androidx.paging:paging-runtime:2.1.2
-|    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.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.2 (*)
-|    +--- 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
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 (*)
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
-|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
-|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
-|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.0 (*)
-|    |    +--- com.google.crypto.tink:tink-android:1.5.0
-|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
-|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0 (*)
-|    +--- androidx.room:room-runtime:2.4.2 -> 2.5.2 (*)
-|    +--- androidx.room:room-ktx:2.4.2 -> 2.5.2
-|    |    +--- androidx.room:room-common:2.5.2 (*)
-|    |    +--- androidx.room:room-runtime:2.5.2 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*)
-|    +--- com.google.dagger:dagger:2.42 -> 2.50
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.8.1 (*)
-|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.8.1 (*)
++--- org.wordpress:fluxc:trunk-025008c28331ecf1b4f69009348b01bad42bac99 FAILED
-+--- org.wordpress.fluxc.plugins:woocommerce:trunk-56cd6652d0d83fccfbb7ecc19cf2c6496d812dab
-|    +--- org.wordpress:wellsql:2.0.0 (*)
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-56cd6652d0d83fccfbb7ecc19cf2c6496d812dab
-|    +--- androidx.room:room-ktx:2.4.2 -> 2.5.2 (*)
-|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
-|    +--- org.wordpress:fluxc:trunk-56cd6652d0d83fccfbb7ecc19cf2c6496d812dab (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- com.google.dagger:dagger:2.42 -> 2.50 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.8.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.8.1 (*)
-|    \--- androidx.room:room-runtime:2.4.2 -> 2.5.2 (*)
++--- org.wordpress.fluxc.plugins:woocommerce:trunk-025008c28331ecf1b4f69009348b01bad42bac99 FAILED
 +--- org.wordpress:login:1.17.0
 |    +--- com.github.bumptech.glide:glide:4.12.0 -> 4.16.0
-|    |    \--- androidx.exifinterface:exifinterface:1.3.6 (*)
+|    |    \--- androidx.exifinterface:exifinterface:1.3.6
+|    |         \--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
-|    \--- com.google.dagger:dagger:2.47 -> 2.50 (*)
+|    \--- com.google.dagger:dagger:2.47 -> 2.50
+|         \--- javax.inject:javax.inject:1
 \--- project :libs:cardreader
      +--- com.stripe:stripeterminal-localmobile:3.1.1
      |    \--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.8.22 -> 1.9.22
-     |         \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22 (*)
+     |         \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22
+     |              \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 (*)
      \--- com.stripe:stripeterminal-core:3.1.1
-          +--- androidx.security:security-crypto:1.1.0-alpha03 (*)
+          +--- androidx.security:security-crypto:1.1.0-alpha03
+          |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.0 (*)
+          |    +--- com.google.crypto.tink:tink-android:1.5.0
+          |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
-          \--- androidx.room:room-ktx:2.5.2 (*)
+          \--- androidx.room:room-ktx:2.5.2
+               +--- androidx.room:room-common:2.5.2 (*)
+               +--- androidx.room:room-runtime:2.5.2 (*)
+               +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
+               \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*)

Please review and act accordingly

hichamboushaba added 8 commits July 10, 2024 20:01

Rename legacy usecase for generation the product with AI

c3d8c9e

Add stubbed implementation for generating product

bdfc859

Add logic to handle fetching product categories and tags

b88828c

Add new prompt to generate product with three options

4b7e3ea

Add product variant selector

b6e1026

Unify logic of building product cards between legacy and new screens

0cef054

Update AIProductModel to include reference to actual tags and categories

45f3ab7

Fix detekt issues

2f2efc1

hichamboushaba added type: enhancement A request for an enhancement. feature: product details Related to adding or editing products, includes product settings. labels Jul 12, 2024

hichamboushaba added the unit-tests-exemption label Jul 12, 2024

Disable the save buttons when generating the product

1c6416e

hichamboushaba commented Jul 12, 2024

View reviewed changes

hichamboushaba requested a review from JorgeMucientes July 12, 2024 15:24

hichamboushaba added this to the 19.6 milestone Jul 12, 2024

hichamboushaba marked this pull request as ready for review July 12, 2024 15:24

hichamboushaba mentioned this pull request Jul 12, 2024

[Jetpack AI query] Add an optional parameter to set the max_tokens option wordpress-mobile/WordPress-FluxC-Android#3049

Merged

hichamboushaba added 2 commits July 12, 2024 18:01

Bump fluxc

0ef4fab

Pass 4000 as the max_tokens parameter

70f1660

hichamboushaba added the status: do not merge Dependent on another PR, ready for review but not ready for merge. label Jul 12, 2024

JorgeMucientes self-assigned this Jul 14, 2024

JorgeMucientes approved these changes Jul 15, 2024

View reviewed changes

Remove leftover code

344beb1

Co-authored-by: Jorge Mucientes <jorge.mucientes@automattic.com>

hichamboushaba enabled auto-merge July 15, 2024 09:58

hichamboushaba added 2 commits July 15, 2024 15:28

Merge branch 'refs/heads/trunk' into issue/11972-product-ai-3-variants

a60abfd

# Conflicts: # build.gradle

Bump fluxc

3241a72

hichamboushaba force-pushed the issue/11972-product-ai-3-variants branch from fc3604e to 3241a72 Compare July 15, 2024 14:29

hichamboushaba removed the status: do not merge Dependent on another PR, ready for review but not ready for merge. label Jul 15, 2024

hichamboushaba merged commit 4f7c5c2 into trunk Jul 15, 2024
16 of 17 checks passed

hichamboushaba deleted the issue/11972-product-ai-3-variants branch July 15, 2024 15:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Product AI v2] generation prompt + option selector #11993

[Product AI v2] generation prompt + option selector #11993

hichamboushaba commented Jul 12, 2024 •

edited

Loading

dangermattic commented Jul 12, 2024 •

edited

Loading

wpmobilebot commented Jul 12, 2024 •

edited

Loading

wpmobilebot commented Jul 12, 2024 •

edited

Loading

hichamboushaba Jul 12, 2024

hichamboushaba Jul 12, 2024

hichamboushaba Jul 12, 2024

JorgeMucientes Jul 15, 2024

JorgeMucientes commented Jul 15, 2024

wpmobilebot commented Jul 15, 2024

		@@ -75,6 +75,67 @@ object AIPrompts {

		@Suppress("LongParameterList")
		fun generateProductCreationPrompt(

		private var isProductCategoriesFetched = false
		private var isProductTagsFetched = false

[Product AI v2] generation prompt + option selector #11993

[Product AI v2] generation prompt + option selector #11993

Conversation

hichamboushaba commented Jul 12, 2024 • edited Loading

Description

Testing information

Images/gif

dangermattic commented Jul 12, 2024 • edited Loading

wpmobilebot commented Jul 12, 2024 • edited Loading

wpmobilebot commented Jul 12, 2024 • edited Loading

hichamboushaba Jul 12, 2024

Choose a reason for hiding this comment

hichamboushaba Jul 12, 2024

Choose a reason for hiding this comment

hichamboushaba Jul 12, 2024

Choose a reason for hiding this comment

JorgeMucientes Jul 15, 2024

Choose a reason for hiding this comment

JorgeMucientes commented Jul 15, 2024

wpmobilebot commented Jul 15, 2024

The PR caused the following dependency changes:

hichamboushaba commented Jul 12, 2024 •

edited

Loading

dangermattic commented Jul 12, 2024 •

edited

Loading

wpmobilebot commented Jul 12, 2024 •

edited

Loading

wpmobilebot commented Jul 12, 2024 •

edited

Loading