Merge branch 'main' into dl/string-expressions

Author: dlarocque

ci/fireci/pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
   "pandas==2.3.3",
   "PyGithub==1.58.2",
   "pystache==0.6.0",
-  "requests==2.32.4",
+  "requests==2.33.0",
   "seaborn==0.12.2",
   "PyYAML==6.0.1",
   "termcolor==2.4.0",

firebase-firestore/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 
+- [feature] Pipeline operations are GA now.
 - [feature] Added support for Pipeline expressions `nor` and `switchOn`.
   [#7903](https://github.com/firebase/firebase-android-sdk/pull/7903)
 - [feature] Added support for `first`, `last`, `arrayAgg`, and `arrayAggDistinct` Pipeline expressions.

firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestore.java

@@ -27,7 +27,6 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
-import com.google.common.annotations.Beta;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.annotations.PreviewApi;
 import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
@@ -914,7 +913,6 @@ static void setClientLanguage(@NonNull String languageToken) {
    *
    * @return A {@code PipelineSource} to begin defining the pipeline's stages.
    */
-  @Beta
   @NonNull
   public PipelineSource pipeline() {
     clientProvider.ensureConfigured();

firebase-firestore/src/main/java/com/google/firebase/firestore/Pipeline.kt

@@ -16,7 +16,6 @@ package com.google.firebase.firestore
 
 import com.google.android.gms.tasks.Task
 import com.google.android.gms.tasks.TaskCompletionSource
-import com.google.common.annotations.Beta
 import com.google.firebase.Timestamp
 import com.google.firebase.firestore.model.Document
 import com.google.firebase.firestore.model.DocumentKey
@@ -81,7 +80,6 @@ import com.google.firestore.v1.Value
  * only</b>. <li>They do <b>not</b> utilize or update the local SDK cache. <li>They do <b>not</b>
  * support realtime snapshot listeners. </ul>
  */
-@Beta
 class Pipeline
 internal constructor(
   private val firestore: FirebaseFirestore,
@@ -900,7 +898,6 @@ internal constructor(
 }
 
 /** Start of a Firestore Pipeline */
-@Beta
 class PipelineSource internal constructor(private val firestore: FirebaseFirestore) {
 
   /**
@@ -1051,7 +1048,6 @@ class PipelineSource internal constructor(private val firestore: FirebaseFiresto
  * Represents the results of a Pipeline query, including the data and metadata. It is usually
  * accessed via [Pipeline.Snapshot].
  */
-@Beta
 class PipelineResult
 internal constructor(
   private val userDataWriter: UserDataWriter,

firebase-firestore/src/main/java/com/google/firebase/firestore/pipeline/expressions.kt

@@ -14,7 +14,6 @@
 
 package com.google.firebase.firestore.pipeline
 
-import com.google.common.annotations.Beta
 import com.google.firebase.Timestamp
 import com.google.firebase.firestore.Blob
 import com.google.firebase.firestore.DocumentReference
@@ -57,7 +56,6 @@ import java.util.Date
  * The [Expression] class provides a fluent API for building expressions. You can chain together
  * method calls to create complex expressions.
  */
-@Beta
 abstract class Expression internal constructor() {
 
   internal abstract fun canonicalId(): String
@@ -8925,7 +8923,6 @@ abstract class Expression internal constructor() {
 }
 
 /** Expressions that have an alias are [Selectable] */
-@Beta
 abstract class Selectable : Expression() {
   internal abstract val alias: String
   internal abstract val expr: Expression
@@ -8943,7 +8940,6 @@ abstract class Selectable : Expression() {
 }
 
 /** Represents an expression that will be given the alias in the output document. */
-@Beta
 class AliasedExpression
 internal constructor(override val alias: String, override val expr: Expression) : Selectable() {
   override fun toProto(userDataReader: UserDataReader): Value = expr.toProto(userDataReader)
@@ -8973,7 +8969,6 @@ internal constructor(override val alias: String, override val expr: Expression)
  *
  * You can create a [Field] instance using the static [Expression.field] method:
  */
-@Beta
 class Field internal constructor(internal val fieldPath: ModelFieldPath) : Selectable() {
   companion object {
 
@@ -9054,7 +9049,6 @@ class Field internal constructor(internal val fieldPath: ModelFieldPath) : Selec
  * [and], [equal], or the methods on [Expression] ([Expression.equal]), [Expression.lessThan], etc)
  * to construct new [FunctionExpression] instances.
  */
-@Beta
 open class FunctionExpression
 internal constructor(
   internal val name: String,
@@ -9143,7 +9137,6 @@ internal constructor(
 }
 
 /** A class that represents a filter condition. */
-@Beta
 abstract class BooleanExpression : Expression() {
 
   /**
@@ -9329,7 +9322,6 @@ internal class BooleanField(val field: Field) : BooleanExpression() {
  *
  * You create [Ordering] instances using the [ascending] and [descending] helper methods.
  */
-@Beta
 class Ordering internal constructor(val expr: Expression, val dir: Direction) {
   internal fun canonicalId(): String {
     val direction = if (dir == Direction.ASCENDING) "asc" else "desc"

firebase-firestore/src/main/java/com/google/firebase/firestore/pipeline/stage.kt

@@ -14,7 +14,6 @@
 
 package com.google.firebase.firestore.pipeline
 
-import com.google.common.annotations.Beta
 import com.google.firebase.firestore.UserDataReader
 import com.google.firebase.firestore.VectorValue
 import com.google.firebase.firestore.model.Document
@@ -31,7 +30,6 @@ import com.google.firestore.v1.Pipeline
 import com.google.firestore.v1.Value
 import javax.annotation.Nonnull
 
-@Beta
 sealed class Stage<T : Stage<T>>(internal val name: String, internal val options: InternalOptions) {
   internal fun toProtoStage(userDataReader: UserDataReader): Pipeline.Stage {
     val builder = Pipeline.Stage.newBuilder()
@@ -110,7 +108,6 @@ sealed class Stage<T : Stage<T>>(internal val name: String, internal val options
  * This class provides a way to call stages that are supported by the Firestore backend but that are
  * not implemented in the SDK version being used.
  */
-@Beta
 class RawStage
 private constructor(
   name: String,
@@ -205,7 +202,6 @@ internal constructor(options: InternalOptions = InternalOptions.EMPTY) :
   }
 }
 
-@Beta
 class CollectionSource
 internal constructor(
   internal val path: ResourcePath,
@@ -253,7 +249,6 @@ internal constructor(
   }
 }
 
-@Beta
 class CollectionSourceOptions internal constructor(options: InternalOptions) :
   AbstractOptions<CollectionSourceOptions>(options) {
   /** Creates a new, empty `CollectionSourceOptions` object. */
@@ -272,7 +267,6 @@ class CollectionSourceOptions internal constructor(options: InternalOptions) :
   }
 }
 
-@Beta
 class CollectionHints internal constructor(options: InternalOptions) :
   AbstractOptions<CollectionHints>(options) {
   /** Creates a new, empty `CollectionHints` object. */
@@ -303,7 +297,6 @@ class CollectionHints internal constructor(options: InternalOptions) :
   }
 }
 
-@Beta
 class CollectionGroupSource
 internal constructor(val collectionId: String, options: InternalOptions) :
   Stage<CollectionGroupSource>("collection_group", options) {
@@ -344,7 +337,6 @@ internal constructor(val collectionId: String, options: InternalOptions) :
   }
 }
 
-@Beta
 class CollectionGroupOptions internal constructor(options: InternalOptions) :
   AbstractOptions<CollectionGroupOptions>(options) {
   /** Creates a new, empty `CollectionGroupOptions` object. */
@@ -473,7 +465,6 @@ internal constructor(
  * [AggregateFunction.alias] on [AggregateFunction] instances. Each aggregation calculates a value
  * (e.g., sum, average, count) based on the documents within its group.
  */
-@Beta
 class AggregateStage
 private constructor(
   private val accumulators: Map<String, AggregateFunction>,
@@ -574,7 +565,6 @@ private constructor(
   }
 }
 
-@Beta
 class AggregateHints internal constructor(options: InternalOptions) :
   AbstractOptions<AggregateHints>(options) {
   /** Creates a new, empty `AggregateHints` object. */
@@ -589,7 +579,6 @@ class AggregateHints internal constructor(options: InternalOptions) :
   }
 }
 
-@Beta
 class AggregateOptions internal constructor(options: InternalOptions) :
   AbstractOptions<AggregateOptions>(options) {
   /** Creates a new, empty `AggregateOptions` object. */
@@ -648,7 +637,6 @@ internal constructor(
  * Performs a vector similarity search, ordering the result set by most similar to least similar,
  * and returning the first N documents in the result set.
  */
-@Beta
 class FindNearestStage
 internal constructor(
   private val property: Expression,
@@ -795,7 +783,6 @@ internal constructor(
   }
 }
 
-@Beta
 class FindNearestOptions private constructor(options: InternalOptions) :
   AbstractOptions<FindNearestOptions>(options) {
   /** Creates a new, empty `FindNearestOptions` object. */
@@ -1128,7 +1115,6 @@ internal constructor(
  * dictate how the sample is calculated either by specifying a target output size, or by specifying
  * a target percentage of the input size.
  */
-@Beta
 class SampleStage
 private constructor(
   private val size: Number,
@@ -1228,7 +1214,6 @@ internal constructor(
  * Takes a specified array from the input documents and outputs a document for each element with the
  * element stored in a field with name specified by the alias.
  */
-@Beta
 class UnnestStage
 internal constructor(
   private val selectable: Selectable,
@@ -1302,7 +1287,6 @@ internal constructor(
   fun withIndexField(indexField: String): UnnestStage = withOption("index_field", indexField)
 }
 
-@Beta
 class UnnestOptions private constructor(options: InternalOptions) :
   AbstractOptions<UnnestOptions>(options) {
   /** Creates a new, empty `UnnestOptions` object. */