chore: improve pipelines tests

google/cloud/firestore_v1/_pipeline_stages.py

@@ -112,11 +112,13 @@ class UnnestOptions:
             storing the original 0-based index of the element within the array.
     """
 
-    def __init__(self, index_field: str):
-        self.index_field = index_field
+    def __init__(self, index_field: Field | str):
+        self.index_field = (
+            index_field if isinstance(index_field, Field) else Field.of(index_field)
+        )
 
     def __repr__(self):
-        return f"{self.__class__.__name__}(index_field={self.index_field!r})"
+        return f"{self.__class__.__name__}(index_field={self.index_field.path!r})"
 
 
 class Stage(ABC):
@@ -258,13 +260,7 @@ def of(*documents: "BaseDocumentReference") -> "Documents":
         return Documents(*doc_paths)
 
     def _pb_args(self):
-        return [
-            Value(
-                array_value={
-                    "values": [Value(string_value=path) for path in self.paths]
-                }
-            )
-        ]
+        return [Value(reference_value=path) for path in self.paths]
 
 
 class FindNearest(Stage):
@@ -306,15 +302,23 @@ def _pb_options(self) -> dict[str, Value]:
 class GenericStage(Stage):
     """Represents a generic, named stage with parameters."""
 
-    def __init__(self, name: str, *params: Expr | Value):
+    def __init__(
+        self, name: str, *params: Expr | Value, options: dict[str, Expr | Value] = {}
+    ):
         super().__init__(name)
         self.params: list[Value] = [
             p._to_pb() if isinstance(p, Expr) else p for p in params
         ]
+        self.options: dict[str, Value] = {
+            k: v._to_pb() if isinstance(v, Expr) else v for k, v in options.items()
+        }
 
     def _pb_args(self):
         return self.params
 
+    def _pb_options(self):
+        return self.options
+
     def __repr__(self):
         return f"{self.__class__.__name__}(name='{self.name}')"
 
@@ -437,7 +441,7 @@ def _pb_args(self):
     def _pb_options(self):
         options = {}
         if self.options is not None:
-            options["index_field"] = Value(string_value=self.options.index_field)
+            options["index_field"] = self.options.index_field._to_pb()
         return options
 
 

google/cloud/firestore_v1/pipeline_expressions.py

@@ -112,8 +112,6 @@ def _to_pb(self) -> Value:
     @staticmethod
     def _cast_to_expr_or_convert_to_constant(o: Any, include_vector=False) -> "Expr":
         """Convert arbitrary object to an Expr."""
-        if isinstance(o, Constant) and isinstance(o.value, list):
-            o = o.value
         if isinstance(o, Expr):
             return o
         if isinstance(o, dict):
@@ -143,7 +141,7 @@ def __init__(self, instance_func):
         def static_func(self, first_arg, *other_args, **kwargs):
             if not isinstance(first_arg, (Expr, str)):
                 raise TypeError(
-                    f"`expressions must be called on an Expr or a string representing a field name. got {type(first_arg)}."
+                    f"'{self.instance_func.__name__}' must be called on an Expression or a string representing a field. got {type(first_arg)}."
                 )
             first_expr = (
                 Field.of(first_arg) if not isinstance(first_arg, Expr) else first_arg
@@ -152,7 +150,7 @@ def static_func(self, first_arg, *other_args, **kwargs):
 
         def __get__(self, instance, owner):
             if instance is None:
-                return self.static_func.__get__(instance, owner)
+                return self.static_func
             else:
                 return self.instance_func.__get__(instance, owner)
 
@@ -1280,7 +1278,7 @@ def map_get(self, key: str | Constant[str]) -> "Expr":
 
     @expose_as_static
     def map_remove(self, key: str | Constant[str]) -> "Expr":
-        """Remove a key from the map produced by evaluating this expression.
+        """Remove a key from a the map produced by evaluating this expression.
 
         Example:
             >>> Map({"city": "London"}).map_remove("city")

pytest.ini

@@ -22,4 +22,5 @@ filterwarnings =
     ignore:.*The \`credentials_file\` argument is deprecated.*:DeprecationWarning
     # Remove after updating test dependencies that use asyncio.iscoroutinefunction
     ignore:.*\'asyncio.iscoroutinefunction\' is deprecated.*:DeprecationWarning
-    ignore:.*\'asyncio.get_event_loop_policy\' is deprecated.*:DeprecationWarning
+    ignore:.*\'asyncio.get_event_loop_policy\' is deprecated.*:DeprecationWarning
+    ignore:.*Please upgrade to the latest Python version.*:FutureWarning