Skip to content

Conversation

@daymxn
Copy link
Member

@daymxn daymxn commented Apr 7, 2025

Per b/409040155,

This adds support for HarmBlockThreshold.OFF, and also adds javadocs that clearly articulate the difference it holds from NONE.

@daymxn daymxn requested a review from rlazo April 7, 2025 16:22
@daymxn daymxn self-assigned this Apr 7, 2025
@daymxn daymxn enabled auto-merge (squash) April 7, 2025 16:22
@github-actions
Copy link
Contributor

github-actions bot commented Apr 7, 2025

Javadoc Changes:
--- /home/runner/diff/original/firebase-kotlindoc/android/com/google/firebase/vertexai/type/HarmBlockThreshold.html	2025-04-07 17:02:42.342582816 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/android/com/google/firebase/vertexai/type/HarmBlockThreshold.html	2025-04-07 17:00:31.465713991 +0000
@@ -69,6 +69,13 @@
           <tr>
             <td><code>static&nbsp;final @<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmBlockThreshold.html">HarmBlockThreshold</a></code></td>
             <td>
+              <div><code><a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#OFF()">OFF</a></code></div>
+              <p>All content is allowed regardless of harm.</p>
+            </td>
+          </tr>
+          <tr>
+            <td><code>static&nbsp;final @<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmBlockThreshold.html">HarmBlockThreshold</a></code></td>
+            <td>
               <div><code><a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#ONLY_HIGH()">ONLY_HIGH</a></code></div>
               <p>Content with negligible to medium harm is allowed.</p>
             </td>
@@ -99,6 +106,12 @@
         <pre class="api-signature no-pretty-print">public&nbsp;static&nbsp;final&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmBlockThreshold.html">HarmBlockThreshold</a>&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#NONE()">NONE</a></pre>
         <p>All content is allowed regardless of harm.</p>
       </div>
+      <div class="api-item"><a name="getOFF()"></a><a name="setOFF()"></a><a name="getOFF--"></a><a name="setOFF--"></a>
+        <h3 class="api-name" id="OFF()">OFF</h3>
+        <pre class="api-signature no-pretty-print">public&nbsp;static&nbsp;final&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmBlockThreshold.html">HarmBlockThreshold</a>&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#OFF()">OFF</a></pre>
+        <p>All content is allowed regardless of harm.</p>
+        <p>The same as <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#NONE()">NONE</a></code>, but metadata when the corresponding <code><a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmCategory.html">HarmCategory</a></code> occurs will <b>NOT</b> be present in the response.</p>
+      </div>
       <div class="api-item"><a name="getONLY_HIGH()"></a><a name="setONLY_HIGH()"></a><a name="getONLY_HIGH--"></a><a name="setONLY_HIGH--"></a>
         <h3 class="api-name" id="ONLY_HIGH()">ONLY_HIGH</h3>
         <pre class="api-signature no-pretty-print">public&nbsp;static&nbsp;final&nbsp;@<a href="https://developer.android.com/reference/kotlin/androidx/annotation/NonNull.html">NonNull</a> <a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmBlockThreshold.html">HarmBlockThreshold</a>&nbsp;<a href="/docs/reference/android/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#ONLY_HIGH()">ONLY_HIGH</a></pre>
--- /home/runner/diff/original/firebase-kotlindoc/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.html	2025-04-07 17:02:42.333582756 +0000
+++ /home/runner/diff/modified/firebase-kotlindoc/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.html	2025-04-07 17:00:31.455713925 +0000
@@ -49,6 +49,13 @@
           <tr>
             <td><code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.html">HarmBlockThreshold</a></code></td>
             <td>
+              <div><code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#OFF()">OFF</a></code></div>
+              <p>All content is allowed regardless of harm.</p>
+            </td>
+          </tr>
+          <tr>
+            <td><code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.html">HarmBlockThreshold</a></code></td>
+            <td>
               <div><code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#ONLY_HIGH()">ONLY_HIGH</a></code></div>
               <p>Content with negligible to medium harm is allowed.</p>
             </td>
@@ -94,6 +101,12 @@
         <pre class="api-signature no-pretty-print">val&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#NONE()">NONE</a>:&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.html">HarmBlockThreshold</a></pre>
         <p>All content is allowed regardless of harm.</p>
       </div>
+      <div class="api-item"><a name="getOFF()"></a><a name="setOFF()"></a><a name="getOFF--"></a><a name="setOFF--"></a>
+        <h3 class="api-name" id="OFF()">OFF</h3>
+        <pre class="api-signature no-pretty-print">val&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#OFF()">OFF</a>:&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.html">HarmBlockThreshold</a></pre>
+        <p>All content is allowed regardless of harm.</p>
+        <p>The same as <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#NONE()">NONE</a></code>, but metadata when the corresponding <code><a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmCategory.html">HarmCategory</a></code> occurs will <b>NOT</b> be present in the response.</p>
+      </div>
       <div class="api-item"><a name="getONLY_HIGH()"></a><a name="setONLY_HIGH()"></a><a name="getONLY_HIGH--"></a><a name="setONLY_HIGH--"></a>
         <h3 class="api-name" id="ONLY_HIGH()">ONLY_HIGH</h3>
         <pre class="api-signature no-pretty-print">val&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.Companion.html#ONLY_HIGH()">ONLY_HIGH</a>:&nbsp;<a href="/docs/reference/kotlin/com/google/firebase/vertexai/type/HarmBlockThreshold.html">HarmBlockThreshold</a></pre>

@google-oss-bot
Copy link
Contributor

google-oss-bot commented Apr 7, 2025

@github-actions
Copy link
Contributor

github-actions bot commented Apr 7, 2025

Test Results

 18 files   -  1 016   18 suites   - 1 016   14s ⏱️ - 34m 22s
 86 tests  -  5 786   86 ✅  -  5 764  0 💤  - 22  0 ❌ ±0 
172 runs   - 11 635  172 ✅  - 11 591  0 💤  - 44  0 ❌ ±0 

Results for commit 5d5e2eb. ± Comparison against base commit 9a07498.

This pull request removes 5786 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.

@daymxn daymxn disabled auto-merge April 7, 2025 16:29
@daymxn daymxn requested a review from rachelsaunders April 7, 2025 16:30
@google-oss-bot
Copy link
Contributor

The public api surface has changed for the subproject firebase-vertexai:
error: Added field com.google.firebase.vertexai.type.HarmBlockThreshold.OFF [AddedField]

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.

Should make it easier to find in the future
@google-oss-bot
Copy link
Contributor

The public api surface has changed for the subproject firebase-vertexai:
error: Added field com.google.firebase.vertexai.type.HarmBlockThreshold.OFF [AddedField]

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.

1 similar comment
@google-oss-bot
Copy link
Contributor

The public api surface has changed for the subproject firebase-vertexai:
error: Added field com.google.firebase.vertexai.type.HarmBlockThreshold.OFF [AddedField]

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
Copy link
Contributor

google-oss-bot commented Apr 7, 2025

Size Report 1

Affected Products

  • firebase-vertexai

    TypeBase (9a07498)Merge (f5d90c0)Diff
    aar768 kB768 kB+68 B (+0.0%)
    apk (aggressive)1.53 MB1.53 MB+108 B (+0.0%)
    apk (release)9.49 MB9.49 MB+124 B (+0.0%)

Test Logs

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

@rlazo
Copy link
Collaborator

rlazo commented Apr 7, 2025

Don't forget to update the api.txt file

@daymxn daymxn requested a review from rlazo April 7, 2025 16:54
@google-oss-bot
Copy link
Contributor

The public api surface has changed for the subproject firebase-vertexai:
error: Added field com.google.firebase.vertexai.type.HarmBlockThreshold.OFF [AddedField]

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.

@daymxn daymxn merged commit 9e89b28 into main Apr 9, 2025
29 checks passed
@daymxn daymxn deleted the daymon-vai-add-off branch April 9, 2025 17:17
@firebase firebase locked and limited conversation to collaborators May 10, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants