Imagen Editing #7075

davidmotson · 2025-06-24T17:26:44Z

Adds Imagen Editing controls which allows for inpainting, outpainting, style transfer, subject references, and controlnet features.

github-actions · 2025-06-24T17:26:58Z

📝 PRs merging into main branch

Our main branch should always be in a releasable state. If you are working on a larger change, or if you don't want this change to see the light of the day just yet, consider using a feature branch first, and only merge into the main branch when the code complete and ready to be released.

gemini-code-assist

Summary of Changes

Hello @davidmotson, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request introduces image editing capabilities to the Firebase AI Imagen model, allowing developers to perform inpainting and outpainting operations. It includes new configuration options and request construction logic to support these features, as well as a utility function for converting Bitmap objects to ImagenInlineImage.

Highlights

Imagen Editing Functionality: Introduces the ability to edit images using inpainting and outpainting techniques via the editImage function in ImagenModel.kt.
New Configuration Options: Adds ImagenEditingConfig to configure image editing parameters such as edit mode, mask, and mask dilation.
Request Construction: Modifies the request construction logic to handle both image generation and editing requests, including the use of reference images and masks.
Bitmap Conversion: Adds a utility function to convert Bitmap objects to ImagenInlineImage for easier integration with existing Android code.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in issue comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

The code changes introduce new image editing options, including inpainting and outpainting, by adding new classes and modifying existing ones to support these features. The changes include new data classes for edit modes and configurations, as well as modifications to the request construction logic to handle image editing requests.

firebase-ai/src/main/kotlin/com/google/firebase/ai/ImagenModel.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/common/Request.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenEditingConfig.kt

google-oss-bot · 2025-06-24T17:30:25Z

Coverage Report ¹

Affected Products

No changes between base commit (ae14842) and merge commit (e75c9e5).

Test Logs

Merge (e75c9e5): https://github.com/firebase/firebase-android-sdk/actions/runs/16477237383

https://storage.googleapis.com/firebase-sdk-metric-reports/4kwmm5Dxgm.html

github-actions · 2025-06-24T17:32:33Z

Test Results

24 files - 1 034 24 suites - 1 034 44s ⏱️ - 35m 15s
102 tests - 5 883 102 ✅ - 5 861 0 💤 - 22 0 ❌ ±0
204 runs - 11 829 204 ✅ - 11 785 0 💤 - 44 0 ❌ ±0

Results for commit e710498. ± Comparison against base commit e4955d9.

This pull request removes 5883 tests.

com.google.android.datatransport.cct.CctBackendFactoryTest ‑ create_returnCCTBackend_WhenBackendNameIsCCT
com.google.android.datatransport.cct.CctDestinationTest ‑ cctDestination_shouldOnlySupportProtoAndJson
com.google.android.datatransport.cct.CctDestinationTest ‑ cctDestination_shouldSupportProtoAndJson
com.google.android.datatransport.cct.CctTransportBackendTest ‑ decorate_whenOffline_shouldProperlyPopulateNetworkInfo
com.google.android.datatransport.cct.CctTransportBackendTest ‑ decorate_whenOnline_shouldProperlyPopulateNetworkInfo
com.google.android.datatransport.cct.CctTransportBackendTest ‑ schedule_shouldAddCookieOnPseudonymousIds
com.google.android.datatransport.cct.CctTransportBackendTest ‑ schedule_shouldDropCookieOnMixedPseudonymousIds
com.google.android.datatransport.cct.CctTransportBackendTest ‑ send_CompressedResponseIsUncompressed
com.google.android.datatransport.cct.CctTransportBackendTest ‑ send_whenBackendRedirectsMoreThan5Times_shouldOnlyRedirect4Times
com.google.android.datatransport.cct.CctTransportBackendTest ‑ send_whenBackendRedirects_shouldCorrectlyFollowTheRedirectViaPost
…

♻️ This comment has been updated with latest results.

google-oss-bot · 2025-06-24T17:34:36Z

The public api surface has changed for the subproject firebase-ai:
error: Added method com.google.firebase.ai.ImagenModel.editImage(String,com.google.firebase.ai.type.ImagenEditingConfig,kotlin.coroutines.Continuation<? super com.google.firebase.ai.type.ImagenGenerationResponse<com.google.firebase.ai.type.ImagenInlineImage>>) [AddedMethod]
error: Added class com.google.firebase.ai.type.ImagenEditMode [AddedClass]
error: Added class com.google.firebase.ai.type.ImagenEditingConfig [AddedClass]
error: Added class com.google.firebase.ai.type.ImagenEditingConfigKt [AddedClass]
error: Added class com.google.firebase.ai.type.ImagenInlineImageKt [AddedClass]

Please update the api.txt files for the subprojects being affected by this change by running ./gradlew ${subproject}:generateApiTxtFile. Also perform a major/minor bump accordingly.

google-oss-bot · 2025-06-24T17:41:35Z

Size Report ¹

Affected Products

firebase-ai
Type Base (ae14842) Merge (e75c9e5) Diff
aar 830 kB 914 kB +83.6 kB (+10.1%)
apk (aggressive) 1.58 MB 1.61 MB +35.2 kB (+2.2%)
apk (release) 10.7 MB 10.7 MB +68.2 kB (+0.6%)

Test Logs

https://storage.googleapis.com/firebase-sdk-metric-reports/IBUI90ygkp.html

firebase-ai/src/main/kotlin/com/google/firebase/ai/ImagenModel.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/common/Request.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenEditingConfig.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenInlineImage.kt

google-oss-bot · 2025-06-25T18:40:51Z

The public api surface has changed for the subproject firebase-ai:
error: Added method com.google.firebase.ai.ImagenModel.editImage(String,com.google.firebase.ai.type.ImagenEditingConfig,kotlin.coroutines.Continuation<? super com.google.firebase.ai.type.ImagenGenerationResponse<com.google.firebase.ai.type.ImagenInlineImage>>) [AddedMethod]
error: Added class com.google.firebase.ai.type.ImagenEditMode [AddedClass]
error: Added class com.google.firebase.ai.type.ImagenEditingConfig [AddedClass]
error: Added class com.google.firebase.ai.type.ImagenEditingConfigKt [AddedClass]
error: Added class com.google.firebase.ai.type.ImagenInlineImageKt [AddedClass]

Please update the api.txt files for the subprojects being affected by this change by running ./gradlew ${subproject}:generateApiTxtFile. Also perform a major/minor bump accordingly.

…and more complex editing settings

firebase-ai/gradle.properties

firebase-ai/src/main/kotlin/com/google/firebase/ai/ImagenModel.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/common/Request.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenReferenceImage.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/Dimensions.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenImagePlacement.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenMaskReference.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenReferenceImage.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/ImagenModel.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenEditMode.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenControlType.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenImagePlacement.kt

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenReferenceImage.kt

…utpainting

google-oss-bot · 2025-07-22T18:05:27Z

The public api surface has changed for the subproject firebase-ai:
error: Added field com.google.firebase.ai.type.ImagenControlType.CANNY [AddedField]
error: Added field com.google.firebase.ai.type.ImagenControlType.COLOR_SUPERPIXEL [AddedField]
error: Added field com.google.firebase.ai.type.ImagenControlType.FACE_MESH [AddedField]
error: Added field com.google.firebase.ai.type.ImagenControlType.SCRIBBLE [AddedField]
error: Removed method com.google.firebase.ai.type.ImagenControlType.Companion.getCANNY() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenControlType.Companion.getCOLOR_SUPERPIXEL() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenControlType.Companion.getFACE_MESH() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenControlType.Companion.getSCRIBBLE() [RemovedMethod]
error: Added field com.google.firebase.ai.type.ImagenEditMode.INPAINT_INSERTION [AddedField]
error: Added field com.google.firebase.ai.type.ImagenEditMode.INPAINT_REMOVAL [AddedField]
error: Added field com.google.firebase.ai.type.ImagenEditMode.OUTPAINT [AddedField]
error: Removed method com.google.firebase.ai.type.ImagenEditMode.Companion.getINPAINT_INSERTION() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenEditMode.Companion.getINPAINT_REMOVAL() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenEditMode.Companion.getOUTPAINT() [RemovedMethod]
error: Added method com.google.firebase.ai.type.ImagenImagePlacement.fromCoordinate(int,int) [AddedMethod]
error: Added field com.google.firebase.ai.type.ImagenImagePlacement.BOTTOM_CENTER [AddedField]
error: Added field com.google.firebase.ai.type.ImagenImagePlacement.BOTTOM_LEFT [AddedField]
error: Added field com.google.firebase.ai.type.ImagenImagePlacement.BOTTOM_RIGHT [AddedField]
error: Added field com.google.firebase.ai.type.ImagenImagePlacement.CENTER [AddedField]
error: Added field com.google.firebase.ai.type.ImagenImagePlacement.LEFT_CENTER [AddedField]
error: Added field com.google.firebase.ai.type.ImagenImagePlacement.RIGHT_CENTER [AddedField]
error: Added field com.google.firebase.ai.type.ImagenImagePlacement.TOP_CENTER [AddedField]
error: Added field com.google.firebase.ai.type.ImagenImagePlacement.TOP_LEFT [AddedField]
error: Added field com.google.firebase.ai.type.ImagenImagePlacement.TOP_RIGHT [AddedField]
error: Removed method com.google.firebase.ai.type.ImagenImagePlacement.Companion.getBOTTOM_CENTER() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenImagePlacement.Companion.getBOTTOM_LEFT() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenImagePlacement.Companion.getBOTTOM_RIGHT() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenImagePlacement.Companion.getCENTER() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenImagePlacement.Companion.getLEFT_CENTER() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenImagePlacement.Companion.getRIGHT_CENTER() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenImagePlacement.Companion.getTOP_CENTER() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenImagePlacement.Companion.getTOP_LEFT() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenImagePlacement.Companion.getTOP_RIGHT() [RemovedMethod]
error: Added method com.google.firebase.ai.type.ImagenMaskReference.generateMaskAndPadForOutpainting(com.google.firebase.ai.type.ImagenInlineImage,com.google.firebase.ai.type.Dimensions) [AddedMethod]
error: Added method com.google.firebase.ai.type.ImagenMaskReference.generateMaskAndPadForOutpainting(com.google.firebase.ai.type.ImagenInlineImage,com.google.firebase.ai.type.Dimensions,com.google.firebase.ai.type.ImagenImagePlacement) [AddedMethod]
error: Added method com.google.firebase.ai.type.ImagenMaskReference.Companion.generateMaskAndPadForOutpainting(com.google.firebase.ai.type.ImagenInlineImage,com.google.firebase.ai.type.Dimensions) [AddedMethod]
error: Added field com.google.firebase.ai.type.ImagenSubjectReferenceType.ANIMAL [AddedField]
error: Added field com.google.firebase.ai.type.ImagenSubjectReferenceType.PERSON [AddedField]
error: Added field com.google.firebase.ai.type.ImagenSubjectReferenceType.PRODUCT [AddedField]
error: Removed method com.google.firebase.ai.type.ImagenSubjectReferenceType.Companion.getANIMAL() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenSubjectReferenceType.Companion.getPERSON() [RemovedMethod]
error: Removed method com.google.firebase.ai.type.ImagenSubjectReferenceType.Companion.getPRODUCT() [RemovedMethod]

Please update the api.txt files for the subprojects being affected by this change by running ./gradlew ${subproject}:generateApiTxtFile. Also perform a major/minor bump accordingly.

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenReferenceImage.kt

Add imagen editing options like inpainting and outpainting

dec0990

davidmotson assigned rlazo Jun 24, 2025

gemini-code-assist bot reviewed Jun 24, 2025

View reviewed changes

rlazo reviewed Jun 25, 2025

View reviewed changes

David Motsonashvili added 2 commits June 25, 2025 11:33

add java implementation and minor naming adjustments

9795fc3

update api.txt and format

60baab6

David Motsonashvili added 7 commits June 25, 2025 11:49

remove nullability from includeRaiReason

806d4fb

remove unneeded and gcsUri

66cff7b

rename constructGenerateImageRequest

e710498

rewrite to fit the referenceType style transfer, subject references, …

f632e94

…and more complex editing settings

added support for outpainting properly

0327b0a

add copyright headers

c0f6161

javadocs1

778f176

rlazo reviewed Jul 11, 2025

View reviewed changes

David Motsonashvili added 3 commits July 15, 2025 22:49

Add refdocs, and address a few review comments

1131d22

bump version

eb3ac0a

fixes for comments

7ed0bd7

rlazo reviewed Jul 16, 2025

View reviewed changes

rlazo reviewed Jul 17, 2025

View reviewed changes

davidmotson changed the title ~~Add imagen editing options like inpainting and outpainting~~ Imagen Editing Jul 17, 2025

David Motsonashvili added 3 commits July 17, 2025 15:55

fixing refdocs for comments, and adding error for incorrect call to o…

a48f7ac

…utpainting

add tests, and JvmStatic and JvmField annotations

21262c3

Merge branch 'main' into davidmotson.imagen_editing

2f85544

David Motsonashvili added 4 commits July 22, 2025 11:13

add copyright and update api.txt

adf4957

format

c4a626d

removed references to ControlNet and added an integration test

41427fa

format

b172b22

rlazo reviewed Jul 23, 2025

View reviewed changes

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/ImagenReferenceImage.kt Outdated Show resolved Hide resolved

rlazo approved these changes Jul 23, 2025

View reviewed changes

David Motsonashvili and others added 4 commits July 23, 2025 10:03

remove extra square brackets

c4d4034

add changelog

9647fd7

make config optional for editing images

0980505

Merge branch 'main' into davidmotson.imagen_editing

83df056

davidmotson merged commit bcc00a5 into main Jul 23, 2025
31 of 32 checks passed

davidmotson deleted the davidmotson.imagen_editing branch July 23, 2025 17:25

Imagen Editing #7075

Imagen Editing #7075

Uh oh!

Conversation

davidmotson commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📝 PRs merging into main branch

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

google-oss-bot commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Coverage Report 1

Affected Products

Test Logs

Uh oh!

github-actions bot commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

google-oss-bot commented Jun 24, 2025

Uh oh!

google-oss-bot commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Size Report 1

Affected Products

firebase-ai

Test Logs

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

google-oss-bot commented Jun 25, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

davidmotson commented Jun 24, 2025 •

edited

Loading

github-actions bot commented Jun 24, 2025 •

edited

Loading

google-oss-bot commented Jun 24, 2025 •

edited

Loading

Coverage Report ¹

github-actions bot commented Jun 24, 2025 •

edited

Loading

google-oss-bot commented Jun 24, 2025 •

edited

Loading

Size Report ¹

`firebase-ai`