Skip to content
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

Add support for blockReasonMessage #6268

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Add support for blockReasonMessage #6268

merged 2 commits into from
Sep 18, 2024

Conversation

rlazo
Copy link
Collaborator

@rlazo rlazo commented Sep 17, 2024

b/367673161

Copy link
Contributor

github-actions bot commented Sep 17, 2024

Javadoc Changes:
--- /home/runner/diff/original/firebase-kotlindoc/android/com/google/firebase/vertexai/type/PromptFeedback.html	2024-09-17 21:33:32.344423588 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/android/com/google/firebase/vertexai/type/PromptFeedback.html	2024-09-17 21:31:27.501144661 +0000
@@ -33,6 +33,13 @@
             </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>
@@ -56,7 +63,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)">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>
+              <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>
             </td>
           </tr>
         </tbody>
@@ -69,6 +76,11 @@
         <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>
@@ -77,9 +89,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)"></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="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="devsite-table-wrapper">
           <table class="responsive">
             <colgroup>
@@ -104,6 +116,12 @@
                   <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-17 21:33:32.340423611 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/kotlin/com/google/firebase/vertexai/type/PromptFeedback.html	2024-09-17 21:31:27.493144707 +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)">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>
+              <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>
             </td>
           </tr>
         </tbody>
@@ -53,6 +53,13 @@
             </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>
@@ -64,9 +71,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)"></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="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="devsite-table-wrapper">
           <table class="responsive">
             <colgroup>
@@ -91,6 +98,12 @@
                   <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>
@@ -103,6 +116,11 @@
         <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>

@rlazo
Copy link
Collaborator Author

rlazo commented Sep 17, 2024

cc @andrewheard

@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
Contributor

Unit Test Results

  14 files   -   74    14 suites   - 74   15s ⏱️ - 2m 24s
106 tests  - 287  106 ✔️  - 287  0 💤 ±0  0 ±0 
212 runs   - 574  212 ✔️  - 574  0 💤 ±0  0 ±0 

Results for commit 7505ed4. ± Comparison against base commit e6b4ace.

This pull request removes 289 and adds 2 tests. Note that renamed tests count towards both.
com.google.firebase.appdistribution.impl.AabUpdaterTest ‑ updateAppTask_emptyLocationHeader_setsDownloadFailure
com.google.firebase.appdistribution.impl.AabUpdaterTest ‑ updateAppTask_isNotRedirectResponse_setsDownloadFailure
com.google.firebase.appdistribution.impl.AabUpdaterTest ‑ updateAppTask_missingLocationHeader_setsDownloadFailure
com.google.firebase.appdistribution.impl.AabUpdaterTest ‑ updateAppTask_onAppResume_setsUpdateCancelled
com.google.firebase.appdistribution.impl.AabUpdaterTest ‑ updateAppTask_whenAabReleaseAvailable_redirectsToPlay
com.google.firebase.appdistribution.impl.AabUpdaterTest ‑ updateAppTask_whenOpenConnectionFails_setsNetworkFailure
com.google.firebase.appdistribution.impl.AabUpdaterTest ‑ updateApp_whenCalledMultipleTimesWithAAB_onlyMakesOneRequest
com.google.firebase.appdistribution.impl.ApkInstallerTests ‑ installActivityDestroyed_setsInstallError
com.google.firebase.appdistribution.impl.ApkInstallerTests ‑ installApk_currentActivityNotNull_InstallIntentOnCurrentActivity
com.google.firebase.appdistribution.impl.ApkInstallerTests ‑ whenCalledMultipleTimes_onlyEmitsOneIntent
…
com.google.firebase.vertexai.StreamingSnapshotTests ‑ prompt blocked for safety with message
com.google.firebase.vertexai.UnarySnapshotTests ‑ prompt blocked for safety with message

@google-oss-bot
Copy link
Contributor

Size Report 1

Affected Products

  • firebase-vertexai

    TypeBase (e6b4ace)Merge (454f63e)Diff
    aar506 kB507 kB+443 B (+0.1%)
    apk (release)9.32 MB9.32 MB+652 B (+0.0%)

Test Logs

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

@rlazo rlazo merged commit d153670 into main Sep 18, 2024
32 of 33 checks passed
@rlazo rlazo deleted the rl.prompt.blocked.message branch September 18, 2024 15:28
@rlazo rlazo added this to the vertexai-ga milestone Sep 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants