Skip to content

Merge GenAI Common into Vertex #6186

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.

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

Merged
merged 7 commits into from
Aug 21, 2024
Merged

Merge GenAI Common into Vertex #6186

merged 7 commits into from
Aug 21, 2024

Conversation

emilypgoogle
Copy link
Collaborator

No description provided.

Copy link
Contributor

github-actions bot commented Aug 15, 2024

Javadoc Changes:
--- /home/runner/diff/original/firebase-kotlindoc/android/client/firebase-vertexai/_toc.yaml	2024-08-21 20:40:30.408180266 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/android/client/firebase-vertexai/_toc.yaml	2024-08-21 20:38:01.263950648 +0000
@@ -15,6 +15,9 @@
     - title: "GenerativeModel"
       path: "/docs/reference/android/com/google/firebase/vertexai/GenerativeModel.html"
 
+- title: "com.google.firebase.vertexai.common.shared"
+  path: "/docs/reference/android/com/google/firebase/vertexai/common/shared/package-summary.html"
+
 - title: "com.google.firebase.vertexai.java"
   path: "/docs/reference/android/com/google/firebase/vertexai/java/package-summary.html"
 
--- /home/runner/diff/original/firebase-kotlindoc/android/com/google/firebase/vertexai/common/shared/package-summary.html	1970-01-01 00:00:00.000000000 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/android/com/google/firebase/vertexai/common/shared/package-summary.html	2024-08-21 20:38:01.255950635 +0000
@@ -0,0 +1,11 @@
+<html devsite="true">
+  <head>
+    <title>com.google.firebase.vertexai.common.shared</title>
+{% setvar book_path %}/_book.yaml{% endsetvar %}
+{% include "docs/reference/android/_reference-head-tags.html" %}
+  </head>
+  <body>
+    <h1>com.google.firebase.vertexai.common.shared</h1>
+  </body>
+</html>
+
--- /home/runner/diff/original/firebase-kotlindoc/kotlin/client/firebase-vertexai/_toc.yaml	2024-08-21 20:40:30.400180254 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/kotlin/client/firebase-vertexai/_toc.yaml	2024-08-21 20:38:01.255950635 +0000
@@ -13,6 +13,9 @@
     - title: "GenerativeModel"
       path: "/docs/reference/kotlin/com/google/firebase/vertexai/GenerativeModel.html"
 
+- title: "com.google.firebase.vertexai.common.shared"
+  path: "/docs/reference/kotlin/com/google/firebase/vertexai/common/shared/package-summary.html"
+
 - title: "com.google.firebase.vertexai.java"
   path: "/docs/reference/kotlin/com/google/firebase/vertexai/java/package-summary.html"
 
--- /home/runner/diff/original/firebase-kotlindoc/kotlin/com/google/firebase/vertexai/common/shared/package-summary.html	1970-01-01 00:00:00.000000000 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/kotlin/com/google/firebase/vertexai/common/shared/package-summary.html	2024-08-21 20:38:01.247950622 +0000
@@ -0,0 +1,26 @@
+<html devsite="true">
+  <head>
+    <title>com.google.firebase.vertexai.common.shared</title>
+{% setvar book_path %}/_book.yaml{% endsetvar %}
+{% include "docs/reference/kotlin/_reference-head-tags.html" %}
+  </head>
+  <body>
+    <h1>com.google.firebase.vertexai.common.shared</h1>
+    <h2>Type aliases</h2>
+    <div class="devsite-table-wrapper">
+      <table class="responsive">
+        <colgroup>
+          <col width="40%">
+          <col>
+        </colgroup>
+        <tbody class="list">
+          <tr>
+            <td><code>Base64</code></td>
+            <td></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </body>
+</html>
+

@google-oss-bot
Copy link
Contributor

The public api surface has changed for the subproject firebase-vertexai_api.txt:

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.

Copy link
Contributor

github-actions bot commented Aug 15, 2024

Unit Test Results

     968 files  +     964       968 suites  +964   35m 41s ⏱️ + 35m 38s
  5 323 tests +  5 273    5 292 ✔️ +  5 242  21 💤 +21  10 +10 
10 731 runs  +10 631  10 679 ✔️ +10 579  42 💤 +42  10 +10 

For more details on these failures, see this check.

Results for commit c16d020. ± Comparison against base commit 5fe51eb.

♻️ This comment has been updated with latest results.

@google-oss-bot
Copy link
Contributor

google-oss-bot commented Aug 15, 2024

Size Report 1

Affected Products

  • firebase-vertexai

    TypeBase (5fe51eb)Merge (d8469ab)Diff
    aar161 kB506 kB+345 kB (+213.7%)
    apk (aggressive)1.32 MB479 kB-844 kB (-63.8%)
    apk (release)9.32 MB9.32 MB-2.30 kB (-0.0%)

Test Logs

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

@google-oss-bot
Copy link
Contributor

google-oss-bot commented Aug 15, 2024

Coverage Report 1

Affected Products

  • firebase-inappmessaging

    Overall coverage changed from ? (5fe51eb) to 39.24% (d8469ab) by ?.

    148 individual files with coverage change

    FilenameBase (5fe51eb)Merge (d8469ab)Diff
    AbtIntegrationHelper.java?60.87%?
    AbtIntegrationHelper_Factory.java?0.00%?
    Action.java?76.47%?
    Analytics.java?0.00%?
    AnalyticsConstants.java?0.00%?
    AnalyticsEventsManager.java?85.19%?
    AnalyticsEventsModule.java?0.00%?
    AnalyticsEventsModule_ProvidesAnalyticsConnectorEventsFactory.java?0.00%?
    AnalyticsEventsModule_ProvidesAnalyticsEventsManagerFactory.java?0.00%?
    AnalyticsListener.java?0.00%?
    ApiClient.java?100.00%?
    ApiClientModule.java?0.00%?
    ApiClientModule_ProvidesApiClientFactory.java?0.00%?
    ApiClientModule_ProvidesDataCollectionHelperFactory.java?0.00%?
    ApiClientModule_ProvidesFirebaseAppFactory.java?0.00%?
    ApiClientModule_ProvidesFirebaseInstallationsFactory.java?0.00%?
    ApiClientModule_ProvidesSharedPreferencesUtilsFactory.java?0.00%?
    ApiClientModule_ProvidesTestDeviceHelperFactory.java?0.00%?
    AppComponent.java?0.00%?
    AppForeground.java?0.00%?
    ApplicationModule.java?0.00%?
    ApplicationModule_DeveloperListenerManagerFactory.java?0.00%?
    ApplicationModule_ProvidesApplicationFactory.java?0.00%?
    AppMeasurementModule.java?0.00%?
    AppMeasurementModule_ProvidesAnalyticsConnectorFactory.java?0.00%?
    AppMeasurementModule_ProvidesSubsriberFactory.java?0.00%?
    AutoValue_InstallationIdResult.java?33.33%?
    AutoValue_RateLimit.java?53.19%?
    BannerMessage.java?75.00%?
    Button.java?61.76%?
    CampaignAnalytics.java?33.22%?
    CampaignAnalyticsOrBuilder.java?0.00%?
    CampaignCache.java?0.00%?
    CampaignCacheClient.java?88.00%?
    CampaignCacheClient_Factory.java?0.00%?
    CampaignImpression.java?38.96%?
    CampaignImpressionList.java?39.25%?
    CampaignImpressionListOrBuilder.java?0.00%?
    CampaignImpressionOrBuilder.java?0.00%?
    CampaignMetadata.java?100.00%?
    CampaignProto.java?27.48%?
    CardMessage.java?78.48%?
    ClientAppInfo.java?35.79%?
    ClientAppInfoOrBuilder.java?0.00%?
    Clock.java?0.00%?
    CommonTypesProto.java?9.96%?
    DaggerAppComponent.java?0.00%?
    DaggerUniversalComponent.java?0.00%?
    DataCollectionHelper.java?87.50%?
    DataCollectionHelper_Factory.java?0.00%?
    DeveloperListenerManager.java?100.00%?
    DismissType.java?82.61%?
    DisplayCallbacksFactory.java?100.00%?
    DisplayCallbacksFactory_Factory.java?0.00%?
    DisplayCallbacksImpl.java?93.46%?
    EventType.java?76.19%?
    ExecutorsModule.java?0.00%?
    ExecutorsModule_ProvidesBackgroundExecutorFactory.java?0.00%?
    ExecutorsModule_ProvidesBlockingExecutorFactory.java?0.00%?
    ExecutorsModule_ProvidesLightWeightExecutorFactory.java?0.00%?
    ExperimentPayloadProto.java?6.05%?
    FetchEligibleCampaignsRequest.java?32.97%?
    FetchEligibleCampaignsRequestOrBuilder.java?0.00%?
    FetchEligibleCampaignsResponse.java?42.86%?
    FetchEligibleCampaignsResponseOrBuilder.java?0.00%?
    FetchErrorReason.java?52.17%?
    FiamAnalyticsConnectorListener.java?100.00%?
    FiamFetchService.java?0.00%?
    FirebaseAppScope.java?0.00%?
    FirebaseInAppMessaging.java?80.60%?
    FirebaseInAppMessagingCampaignAnalyticsProto.java?0.00%?
    FirebaseInAppMessagingClickListener.java?0.00%?
    FirebaseInAppMessagingContextualTrigger.java?0.00%?
    FirebaseInAppMessagingDismissListener.java?0.00%?
    FirebaseInAppMessagingDisplay.java?0.00%?
    FirebaseInAppMessagingDisplayCallbacks.java?100.00%?
    FirebaseInAppMessagingDisplayErrorListener.java?0.00%?
    FirebaseInAppMessagingImpressionListener.java?0.00%?
    FirebaseInAppMessagingRegistrar.java?0.00%?
    FirebaseInAppMessaging_Factory.java?0.00%?
    ForegroundFlowableModule.java?0.00%?
    ForegroundFlowableModule_ProvidesAppForegroundEventStreamFactory.java?0.00%?
    ForegroundNotifier.java?76.00%?
    GrpcChannelModule.java?0.00%?
    GrpcChannelModule_ProvidesGrpcChannelFactory.java?0.00%?
    GrpcChannelModule_ProvidesServiceHostFactory.java?0.00%?
    GrpcClient.java?100.00%?
    GrpcClientModule.java?0.00%?
    GrpcClientModule_ProvidesApiKeyHeadersFactory.java?0.00%?
    GrpcClientModule_ProvidesInAppMessagingSdkServingStubFactory.java?0.00%?
    GrpcClient_Factory.java?0.00%?
    ImageData.java?71.43%?
    ImageOnlyMessage.java?75.86%?
    ImpressionStorageClient.java?100.00%?
    ImpressionStorageClient_Factory.java?0.00%?
    ImpressionStore.java?0.00%?
    InAppMessage.java?24.24%?
    InAppMessageStreamManager.java?91.40%?
    InAppMessageStreamManager_Factory.java?0.00%?
    InAppMessaging.kt?0.00%?
    InAppMessagingSdkServingGrpc.java?45.95%?
    InstallationIdResult.java?100.00%?
    Logging.java?0.00%?
    MessagesProto.java?36.13%?
    MessageType.java?100.00%?
    MetricsLoggerClient.java?94.29%?
    ModalMessage.java?74.07%?
    ProgramaticContextualTriggers.java?0.00%?
    ProgrammaticContextualTriggerFlowableModule.java?0.00%?
    ProgrammaticContextualTriggerFlowableModule_ProvidesProgramaticContextualTriggersFactory.java?0.00%?
    ProgrammaticContextualTriggerFlowableModule_ProvidesProgramaticContextualTriggerStreamFactory.java?0.00%?
    ProgrammaticTrigger.java?0.00%?
    ProtoMarshallerClient.java?91.40%?
    ProtoMarshallerClient_Factory.java?0.00%?
    ProtoStorageClient.java?100.00%?
    ProtoStorageClientModule.java?0.00%?
    ProtoStorageClientModule_ProvidesProtoStorageClientForCampaignFactory.java?0.00%?
    ProtoStorageClientModule_ProvidesProtoStorageClientForImpressionStoreFactory.java?0.00%?
    ProtoStorageClientModule_ProvidesProtoStorageClientForLimiterStoreFactory.java?0.00%?
    ProviderInstaller.java?37.50%?
    ProviderInstaller_Factory.java?0.00%?
    ProxyAnalyticsConnector.java?67.95%?
    RateLimit.java?0.00%?
    RateLimiterClient.java?100.00%?
    RateLimiterClient_Factory.java?0.00%?
    RateLimitModule.java?0.00%?
    RateLimitModule_ProvidesAppForegroundRateLimitFactory.java?0.00%?
    RateLimitProto.java?52.69%?
    RenderErrorReason.java?82.61%?
    SchedulerModule.java?0.00%?
    SchedulerModule_ProvidesComputeSchedulerFactory.java?0.00%?
    SchedulerModule_ProvidesIOSchedulerFactory.java?0.00%?
    SchedulerModule_ProvidesMainThreadSchedulerFactory.java?0.00%?
    Schedulers.java?87.50%?
    Schedulers_Factory.java?0.00%?
    SharedPreferencesUtils.java?40.35%?
    SharedPreferencesUtils_Factory.java?0.00%?
    SystemClock.java?100.00%?
    SystemClockModule.java?0.00%?
    SystemClockModule_ProvidesSystemClockModuleFactory.java?0.00%?
    SystemClock_Factory.java?0.00%?
    TestDeviceHelper.java?100.00%?
    TestDeviceHelper_Factory.java?0.00%?
    Text.java?67.74%?
    TransportClientModule.java?0.00%?
    TransportClientModule_ProvidesMetricsLoggerClientFactory.java?0.00%?
    TriggeredInAppMessage.java?100.00%?
    UniversalComponent.java?0.00%?

  • firebase-messaging

    Overall coverage changed from 84.16% (5fe51eb) to 84.24% (d8469ab) by +0.07%.

    FilenameBase (5fe51eb)Merge (d8469ab)Diff
    RequestDeduplicator.java80.00%90.00%+10.00%
  • firebase-ml-modeldownloader

    Overall coverage changed from 83.38% (5fe51eb) to 83.32% (d8469ab) by -0.06%.

    FilenameBase (5fe51eb)Merge (d8469ab)Diff
    FirebaseModelDownloader.java84.66%84.05%-0.61%

Test Logs

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

@google-oss-bot
Copy link
Contributor

google-oss-bot commented Aug 15, 2024

Startup Time Report 1

The report is too large (122,587 chars) to be displayed on GitHub. Please check this report on GCS.

  1. https://storage.googleapis.com/firebase-sdk-metric-reports/IdkNvx3f6J/index.html

@google-oss-bot
Copy link
Contributor

The public api surface has changed for the subproject firebase-vertexai_api.txt:

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.

@emilypgoogle emilypgoogle requested review from rlazo and daymxn August 20, 2024 15:22
Copy link
Member

@daymxn daymxn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM from a source code perspective.

Assuming the tests and everything pass, we're good.

We'll probably do a follow up to clean things up, and remove old artifacts. Left some comments to get some clarification on that.

@google-oss-bot
Copy link
Contributor

The public api surface has changed for the subproject firebase-vertexai_api.txt:

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.

@emilypgoogle emilypgoogle enabled auto-merge (squash) August 21, 2024 18:26
@emilypgoogle emilypgoogle disabled auto-merge August 21, 2024 18:26
@davidmotson davidmotson enabled auto-merge (squash) August 21, 2024 18:31
@davidmotson davidmotson disabled auto-merge August 21, 2024 18:32
@emilypgoogle emilypgoogle merged commit 3afffc1 into main Aug 21, 2024
243 of 247 checks passed
@emilypgoogle emilypgoogle deleted the ep/vertex-common branch August 21, 2024 20:39
rlazo pushed a commit that referenced this pull request Sep 12, 2024
A previous change,
#6186, added the
Kotlin serialization plugin to every single Gradle module; however, only
one module actually used it. Moreover, it is becoming more conventional
to define dependency versions in `gradle/libs.versions.toml`. This PR
removes the global dependency on the Kotlin serialization plugin and,
instead, moves the version into `gradle/libs.versions.toml`, and also
modifies the dependency on the Kotlin JSON serialization library to use
`gradle/libs.versions.toml`. This will make sure that every module uses
the same version, which will become important once Data Connect, which
also uses these libraries, is merged into main.
@firebase firebase locked and limited conversation to collaborators Sep 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants