Skip to content

fix(vertexai): export the firebase-common dependency #6272

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 1 commit into from
Sep 19, 2024

Conversation

thatfiredev
Copy link
Member

@thatfiredev thatfiredev commented Sep 18, 2024

This should address #6271

Copy link
Contributor

github-actions bot commented Sep 18, 2024

Javadoc Changes:
--- /home/runner/diff/original/firebase-kotlindoc/android/com/google/firebase/vertexai/type/PromptFeedback.html	2024-09-18 15:31:26.633007739 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/android/com/google/firebase/vertexai/type/PromptFeedback.html	2024-09-18 15:29:23.808713338 +0000
@@ -33,13 +33,6 @@
             </td>
           </tr>
           <tr>
-            <td><code>final <a href="https://developer.android.com/reference/kotlin/java/lang/String.html">String</a></code></td>
-            <td>
-              <div><code><a href="/docs/reference/android/com/google/firebase/vertexai/type/PromptFeedback.html#blockReasonMessage()">blockReasonMessage</a></code></div>
-              <p>A message describing the reason that content was blocked, if any.</p>
-            </td>
-          </tr>
-          <tr>
             <td><code>final @<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="https://developer.android.com/reference/kotlin/java/util/List.html">List</a>&lt;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;</code></td>
             <td>
               <div><code><a href="/docs/reference/android/com/google/firebase/vertexai/type/PromptFeedback.html#safetyRatings()">safetyRatings</a></code></div>
@@ -63,7 +56,7 @@
         <tbody class="list">
           <tr>
             <td>
-              <div><code><a href="/docs/reference/android/com/google/firebase/vertexai/type/PromptFeedback.html#PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List,kotlin.String)">PromptFeedback</a>(<br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/BlockReason.html">BlockReason</a>&nbsp;blockReason,<br>&nbsp;&nbsp;&nbsp;&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="https://developer.android.com/reference/kotlin/java/util/List.html">List</a>&lt;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;&nbsp;safetyRatings,<br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://developer.android.com/reference/kotlin/java/lang/String.html">String</a>&nbsp;blockReasonMessage<br>)</code></div>
+              <div><code><a href="/docs/reference/android/com/google/firebase/vertexai/type/PromptFeedback.html#PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List)">PromptFeedback</a>(<br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/BlockReason.html">BlockReason</a>&nbsp;blockReason,<br>&nbsp;&nbsp;&nbsp;&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="https://developer.android.com/reference/kotlin/java/util/List.html">List</a>&lt;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;&nbsp;safetyRatings<br>)</code></div>
             </td>
           </tr>
         </tbody>
@@ -76,11 +69,6 @@
         <pre class="api-signature no-pretty-print">public&nbsp;final&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/BlockReason.html">BlockReason</a>&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/PromptFeedback.html#blockReason()">blockReason</a></pre>
         <p>The reason that content was blocked, if at all.</p>
       </div>
-      <div class="api-item"><a name="getBlockReasonMessage()"></a><a name="setBlockReasonMessage()"></a><a name="getBlockReasonMessage--"></a><a name="setBlockReasonMessage--"></a>
-        <h3 class="api-name" id="blockReasonMessage()">blockReasonMessage</h3>
-        <pre class="api-signature no-pretty-print">public&nbsp;final&nbsp;<a href="https://developer.android.com/reference/kotlin/java/lang/String.html">String</a>&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/PromptFeedback.html#blockReasonMessage()">blockReasonMessage</a></pre>
-        <p>A message describing the reason that content was blocked, if any.</p>
-      </div>
       <div class="api-item"><a name="getSafetyRatings()"></a><a name="setSafetyRatings()"></a><a name="getSafetyRatings--"></a><a name="setSafetyRatings--"></a>
         <h3 class="api-name" id="safetyRatings()">safetyRatings</h3>
         <pre class="api-signature no-pretty-print">public&nbsp;final&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="https://developer.android.com/reference/kotlin/java/util/List.html">List</a>&lt;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/PromptFeedback.html#safetyRatings()">safetyRatings</a></pre>
@@ -89,9 +77,9 @@
     </div>
     <div class="list">
       <h2>Public constructors</h2>
-      <div class="api-item"><a name="PromptFeedback(com.google.firebase.vertexai.type.BlockReason, kotlin.collections.List, kotlin.String)"></a><a name="PromptFeedback-com.google.firebase.vertexai.type.BlockReason-kotlin.collections.List-kotlin.String-"></a><a name="promptfeedback"></a>
-        <h3 class="api-name" id="PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List,kotlin.String)">PromptFeedback</h3>
-        <pre class="api-signature no-pretty-print">public&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/PromptFeedback.html#PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List,kotlin.String)">PromptFeedback</a>(<br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/BlockReason.html">BlockReason</a>&nbsp;blockReason,<br>&nbsp;&nbsp;&nbsp;&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="https://developer.android.com/reference/kotlin/java/util/List.html">List</a>&lt;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;&nbsp;safetyRatings,<br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://developer.android.com/reference/kotlin/java/lang/String.html">String</a>&nbsp;blockReasonMessage<br>)</pre>
+      <div class="api-item"><a name="PromptFeedback(com.google.firebase.vertexai.type.BlockReason, kotlin.collections.List)"></a><a name="PromptFeedback-com.google.firebase.vertexai.type.BlockReason-kotlin.collections.List-"></a><a name="promptfeedback"></a>
+        <h3 class="api-name" id="PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List)">PromptFeedback</h3>
+        <pre class="api-signature no-pretty-print">public&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/PromptFeedback.html#PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List)">PromptFeedback</a>(<br>&nbsp;&nbsp;&nbsp;&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/BlockReason.html">BlockReason</a>&nbsp;blockReason,<br>&nbsp;&nbsp;&nbsp;&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="https://developer.android.com/reference/kotlin/java/util/List.html">List</a>&lt;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;&nbsp;safetyRatings<br>)</pre>
         <div class="devsite-table-wrapper">
           <table class="responsive">
             <colgroup>
@@ -116,12 +104,6 @@
                   <p>A list of relevant <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a></code>.</p>
                 </td>
               </tr>
-              <tr>
-                <td><code><a href="https://developer.android.com/reference/kotlin/java/lang/String.html">String</a>&nbsp;blockReasonMessage</code></td>
-                <td>
-                  <p>A message describing the reason that content was blocked, if any.</p>
-                </td>
-              </tr>
             </tbody>
           </table>
         </div>
--- /home/runner/diff/original/firebase-kotlindoc/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html	2024-09-18 15:31:26.625007722 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html	2024-09-18 15:29:23.800713321 +0000
@@ -27,7 +27,7 @@
         <tbody class="list">
           <tr>
             <td>
-              <div><code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html#PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List,kotlin.String)">PromptFeedback</a>(<br>&nbsp;&nbsp;&nbsp;&nbsp;blockReason:&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/BlockReason.html">BlockReason</a>?,<br>&nbsp;&nbsp;&nbsp;&nbsp;safetyRatings:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-list/index.html">List</a>&lt;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;,<br>&nbsp;&nbsp;&nbsp;&nbsp;blockReasonMessage:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html">String</a>?<br>)</code></div>
+              <div><code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html#PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List)">PromptFeedback</a>(<br>&nbsp;&nbsp;&nbsp;&nbsp;blockReason:&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/BlockReason.html">BlockReason</a>?,<br>&nbsp;&nbsp;&nbsp;&nbsp;safetyRatings:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-list/index.html">List</a>&lt;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;<br>)</code></div>
             </td>
           </tr>
         </tbody>
@@ -53,13 +53,6 @@
             </td>
           </tr>
           <tr>
-            <td><code><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html">String</a>?</code></td>
-            <td>
-              <div><code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html#blockReasonMessage()">blockReasonMessage</a></code></div>
-              <p>A message describing the reason that content was blocked, if any.</p>
-            </td>
-          </tr>
-          <tr>
             <td><code><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-list/index.html">List</a>&lt;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;</code></td>
             <td>
               <div><code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html#safetyRatings()">safetyRatings</a></code></div>
@@ -71,9 +64,9 @@
     </div>
     <div class="list">
       <h2>Public constructors</h2>
-      <div class="api-item"><a name="PromptFeedback(com.google.firebase.vertexai.type.BlockReason, kotlin.collections.List, kotlin.String)"></a><a name="PromptFeedback-com.google.firebase.vertexai.type.BlockReason-kotlin.collections.List-kotlin.String-"></a><a name="promptfeedback"></a>
-        <h3 class="api-name" id="PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List,kotlin.String)">PromptFeedback</h3>
-        <pre class="api-signature no-pretty-print"><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html#PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List,kotlin.String)">PromptFeedback</a>(<br>&nbsp;&nbsp;&nbsp;&nbsp;blockReason:&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/BlockReason.html">BlockReason</a>?,<br>&nbsp;&nbsp;&nbsp;&nbsp;safetyRatings:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-list/index.html">List</a>&lt;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;,<br>&nbsp;&nbsp;&nbsp;&nbsp;blockReasonMessage:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html">String</a>?<br>)</pre>
+      <div class="api-item"><a name="PromptFeedback(com.google.firebase.vertexai.type.BlockReason, kotlin.collections.List)"></a><a name="PromptFeedback-com.google.firebase.vertexai.type.BlockReason-kotlin.collections.List-"></a><a name="promptfeedback"></a>
+        <h3 class="api-name" id="PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List)">PromptFeedback</h3>
+        <pre class="api-signature no-pretty-print"><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html#PromptFeedback(com.google.firebase.vertexai.type.BlockReason,kotlin.collections.List)">PromptFeedback</a>(<br>&nbsp;&nbsp;&nbsp;&nbsp;blockReason:&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/BlockReason.html">BlockReason</a>?,<br>&nbsp;&nbsp;&nbsp;&nbsp;safetyRatings:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-list/index.html">List</a>&lt;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;<br>)</pre>
         <div class="devsite-table-wrapper">
           <table class="responsive">
             <colgroup>
@@ -98,12 +91,6 @@
                   <p>A list of relevant <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a></code>.</p>
                 </td>
               </tr>
-              <tr>
-                <td><code>blockReasonMessage:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html">String</a>?</code></td>
-                <td>
-                  <p>A message describing the reason that content was blocked, if any.</p>
-                </td>
-              </tr>
             </tbody>
           </table>
         </div>
@@ -116,11 +103,6 @@
         <pre class="api-signature no-pretty-print">val&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html#blockReason()">blockReason</a>:&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/BlockReason.html">BlockReason</a>?</pre>
         <p>The reason that content was blocked, if at all.</p>
       </div>
-      <div class="api-item"><a name="getBlockReasonMessage()"></a><a name="setBlockReasonMessage()"></a><a name="getBlockReasonMessage--"></a><a name="setBlockReasonMessage--"></a>
-        <h3 class="api-name" id="blockReasonMessage()">blockReasonMessage</h3>
-        <pre class="api-signature no-pretty-print">val&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html#blockReasonMessage()">blockReasonMessage</a>:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html">String</a>?</pre>
-        <p>A message describing the reason that content was blocked, if any.</p>
-      </div>
       <div class="api-item"><a name="getSafetyRatings()"></a><a name="setSafetyRatings()"></a><a name="getSafetyRatings--"></a><a name="setSafetyRatings--"></a>
         <h3 class="api-name" id="safetyRatings()">safetyRatings</h3>
         <pre class="api-signature no-pretty-print">val&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html#safetyRatings()">safetyRatings</a>:&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-list/index.html">List</a>&lt;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/SafetyRating.html">SafetyRating</a>&gt;</pre>

@google-oss-bot
Copy link
Contributor

1 Warning
⚠️ Did you forget to add a changelog entry? (Add the 'no-changelog' label to the PR to silence this warning.)

Generated by 🚫 Danger

@google-oss-bot
Copy link
Contributor

Copy link
Collaborator

@rlazo rlazo left a comment

Choose a reason for hiding this comment

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

That was a big oversight on our part. Thanks for fixing it @thatfiredev !

Copy link
Contributor

Unit Test Results

  14 files  +    6    14 suites  +6   14s ⏱️ -13s
104 tests +  82  104 ✔️ +  82  0 💤 ±0  0 ±0 
208 runs  +164  208 ✔️ +164  0 💤 ±0  0 ±0 

Results for commit 146181c. ± Comparison against base commit 48d460c.

This pull request removes 22 and adds 104 tests. Note that renamed tests count towards both.
com.google.firebase.crashlytics.internal.common.CrashlyticsControllerRobolectricTest ‑ testDoCloseSession_disabledAnrs_doesNotPersistsAppExitInfo
com.google.firebase.crashlytics.internal.common.CrashlyticsControllerRobolectricTest ‑ testDoCloseSession_enabledAnrs_doesNotPersistsAppExitInfoIfItDoesntExist
com.google.firebase.crashlytics.internal.common.CrashlyticsControllerRobolectricTest ‑ testDoCloseSession_enabledAnrs_persistsAppExitInfoIfItExists
com.google.firebase.crashlytics.internal.common.DataCollectionArbiterRobolectricTest ‑ testDefaultDataCollection_usedWhenNoOverrideOrManifestSetting
com.google.firebase.crashlytics.internal.common.DataCollectionArbiterRobolectricTest ‑ testManifestMetadata_respectedWhenNoOverride
com.google.firebase.crashlytics.internal.common.DataCollectionArbiterRobolectricTest ‑ testSetCrashlyticsDataCollectionEnabled_overridesOtherSettings
com.google.firebase.crashlytics.internal.common.SessionReportingCoordinatorRobolectricTest ‑ testAppExitInfoEvent_notPersistIfAnrBeforeSession
com.google.firebase.crashlytics.internal.common.SessionReportingCoordinatorRobolectricTest ‑ testAppExitInfoEvent_notPersistIfAppExitInfoNotAnrButWithinSession
com.google.firebase.crashlytics.internal.common.SessionReportingCoordinatorRobolectricTest ‑ testAppExitInfoEvent_persistIfAnrWithinSession
com.google.firebase.crashlytics.internal.common.SessionReportingCoordinatorRobolectricTest ‑ testAppExitInfoEvent_persistIfAnrWithinSession_multipleAppExitInfo
…
com.google.firebase.vertexai.StreamingSnapshotTests ‑ citation parsed correctly
com.google.firebase.vertexai.StreamingSnapshotTests ‑ empty content
com.google.firebase.vertexai.StreamingSnapshotTests ‑ http errors
com.google.firebase.vertexai.StreamingSnapshotTests ‑ image rejected
com.google.firebase.vertexai.StreamingSnapshotTests ‑ invalid api key
com.google.firebase.vertexai.StreamingSnapshotTests ‑ invalid json
com.google.firebase.vertexai.StreamingSnapshotTests ‑ long reply
com.google.firebase.vertexai.StreamingSnapshotTests ‑ malformed content
com.google.firebase.vertexai.StreamingSnapshotTests ‑ prompt blocked for safety
com.google.firebase.vertexai.StreamingSnapshotTests ‑ quotes escaped
…

@google-oss-bot
Copy link
Contributor

@thatfiredev thatfiredev merged commit d982626 into main Sep 19, 2024
31 of 32 checks passed
@thatfiredev thatfiredev deleted the rpf-export-common-from-vertexai branch September 19, 2024 12:11
rlazo pushed a commit that referenced this pull request Sep 27, 2024
@firebase firebase locked and limited conversation to collaborators Oct 20, 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.

3 participants