address comments

google/cloud/firestore_v1/aggregation.py

@@ -136,7 +136,7 @@ def _make_stream(
         ] = gapic_v1.method.DEFAULT,
         timeout: Optional[float] = None,
         explain_options: Optional[ExplainOptions] = None,
-    ) -> Generator[Optional[List[AggregationResult]], Any, Optional[ExplainMetrics]]:
+    ) -> Generator[List[AggregationResult], Any, Optional[ExplainMetrics]]:
         """Internal method for stream(). Runs the aggregation query.
 
         This sends a ``RunAggregationQuery`` RPC and then returns a generator
@@ -161,7 +161,7 @@ def _make_stream(
                 explain_metrics will be available on the returned generator.
 
         Yields:
-            Optional[List[AggregationResult]]:
+            List[AggregationResult]:
             The result of aggregations of this query.
 
         Returns:
@@ -198,10 +198,12 @@ def _make_stream(
                 metrics = response.explain_metrics
 
             result = _query_response_to_result(response)
-            if len(result) > 0 or metrics is None:
+            if len(result) > 0 or explain_options.analyze is True:
                 # When explain_options.analyze == False, the query isn't run
                 # but query profiling results are returned. In this case we
-                # do not yield an empty result.
+                # do not yield an empty result. But when
+                # explain_options.analyze == True, we yield even if result is
+                # empty.
                 yield result
 
         return metrics

google/cloud/firestore_v1/base_aggregation.py

@@ -27,7 +27,7 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    Coroutine,
+    Awaitable,
     List,
     Optional,
     Tuple,
@@ -66,7 +66,7 @@ class AggregationResult(object):
     :param value: The resulting read_time
     """
 
-    def __init__(self, alias: str, value: int | float, read_time=None):
+    def __init__(self, alias: str, value: float, read_time=None):
         self.alias = alias
         self.value = value
         self.read_time = read_time
@@ -241,7 +241,7 @@ def get(
         explain_options: Optional[ExplainOptions] = None,
     ) -> (
         QueryResultsList[AggregationResult]
-        | Coroutine[Any, Any, List[AggregationResult]]
+        | Awaitable[Any, Any, List[AggregationResult]]
     ):
         """Runs the aggregation query.
 
@@ -264,7 +264,7 @@ def get(
                 explain_metrics will be available on the returned generator.
 
         Returns:
-            QueryResultsList[AggregationResult] | Coroutine[Any, Any, List[AggregationResult]]:
+            QueryResultsList[AggregationResult] | Awaitable[Any, Any, List[AggregationResult]]:
                 The aggregation query results.
 
         """
@@ -281,7 +281,7 @@ def stream(
         explain_options: Optional[ExplainOptions] = None,
     ) -> (
         StreamGenerator[Optional[List[AggregationResult]]]
-        | AsyncStreamGenerator[List[AggregationResult], Any, None]
+        | AsyncStreamGenerator[List[AggregationResult], Any]
     ):
         """Runs the aggregation query.
 

google/cloud/firestore_v1/base_document.py

@@ -24,7 +24,6 @@
     NoReturn,
     Optional,
     Tuple,
-    TypeVar,
     Union,
 )
 
@@ -39,9 +38,6 @@
     from google.cloud.firestore_v1.types import Document, firestore, write
 
 
-T = TypeVar("T")
-
-
 class BaseDocumentReference(object):
     """A reference to a document in a Firestore database.
 

google/cloud/firestore_v1/base_vector_query.py

@@ -150,5 +150,5 @@ def stream(
         timeout: float = None,
         *,
         explain_options: Optional[ExplainOptions] = None,
-    ) -> Generator[Optional[DocumentSnapshot], Any, Optional[ExplainMetrics]]:
+    ) -> Generator[DocumentSnapshot, Any, Optional[ExplainMetrics]]:
         """Reads the documents in the collection that match this query."""

google/cloud/firestore_v1/query.py

@@ -223,7 +223,7 @@ def _chunkify(
             snapshots = _q.get()
 
             if snapshots:
-                last_document = snapshots[-1]  # type: ignore
+                last_document = snapshots[-1]
 
             num_returned += len(snapshots)
 
@@ -353,7 +353,7 @@ def _make_stream(
         retry: Optional[retries.Retry] = gapic_v1.method.DEFAULT,
         timeout: Optional[float] = None,
         explain_options: Optional[ExplainOptions] = None,
-    ) -> Generator[Optional[DocumentSnapshot], Any, Optional[ExplainMetrics]]:
+    ) -> Generator[DocumentSnapshot, Any, Optional[ExplainMetrics]]:
         """Internal method for stream(). Read the documents in the collection
         that match this query.
 
@@ -388,7 +388,7 @@ def _make_stream(
                 explain_metrics will be available on the returned generator.
 
         Yields:
-            Optional[DocumentSnapshot]:
+            DocumentSnapshot:
             The next document that fulfills the query.
 
         Returns:

google/cloud/firestore_v1/query_results.py

@@ -19,10 +19,7 @@
 )
 
 
-from typing import List, Optional, TypeVar
-
-
-T = TypeVar("T")
+from typing import List, Optional
 
 
 class QueryResultsList(list):
@@ -32,7 +29,7 @@ class QueryResultsList(list):
     is added to return the query profile results.
 
     Args:
-        docs (list[T]):
+        docs (list):
             The list of query results.
         explain_options
             (Optional[:class:`~google.cloud.firestore_v1.query_profile.ExplainOptions`]):

google/cloud/firestore_v1/stream_generator.py

@@ -16,7 +16,7 @@
 """
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Generator, Optional
+from typing import TYPE_CHECKING, Any, Generator, Optional, TypeVar
 
 from google.cloud.firestore_v1.query_profile import (
     ExplainMetrics,
@@ -27,11 +27,14 @@
     from google.cloud.firestore_v1.query_profile import ExplainOptions
 
 
-class StreamGenerator(Generator[Any, Any, Optional[ExplainMetrics]]):
+T = TypeVar("T")
+
+
+class StreamGenerator(Generator[T, Any, None]):
     """Generator for the streamed results.
 
     Args:
-        response_generator (Generator):
+        response_generator (Generator[T, Any, Optional[ExplainMetrics]]):
             The inner generator that yields the returned document in the stream.
         explain_options
             (Optional[:class:`~google.cloud.firestore_v1.query_profile.ExplainOptions`]):
@@ -40,7 +43,7 @@ class StreamGenerator(Generator[Any, Any, Optional[ExplainMetrics]]):
 
     def __init__(
         self,
-        response_generator: Generator[Any, Any, Optional[ExplainMetrics]],
+        response_generator: Generator[T, Any, Optional[ExplainMetrics]],
         explain_options: Optional[ExplainOptions] = None,
     ):
         self._generator = response_generator

google/cloud/firestore_v1/transforms.py

@@ -102,7 +102,7 @@ class _NumericValue(object):
     """Hold a single integer / float value.
 
     Args:
-        value (int | float): value held in the helper.
+        value (float): value held in the helper.
     """
 
     def __init__(self, value) -> None:
@@ -133,7 +133,7 @@ class Increment(_NumericValue):
     https://cloud.google.com/firestore/docs/reference/rpc/google.firestore.v1#google.firestore.v1.DocumentTransform.FieldTransform.FIELDS.google.firestore.v1.ArrayValue.google.firestore.v1.DocumentTransform.FieldTransform.increment
 
     Args:
-        value (int | float): value used to increment the field.
+        value (float): value used to increment the field.
     """
 
 
@@ -144,7 +144,7 @@ class Maximum(_NumericValue):
     https://cloud.google.com/firestore/docs/reference/rpc/google.firestore.v1#google.firestore.v1.DocumentTransform.FieldTransform.FIELDS.google.firestore.v1.ArrayValue.google.firestore.v1.DocumentTransform.FieldTransform.maximum
 
     Args:
-        value (int | float): value used to bound the field.
+        value (float): value used to bound the field.
     """
 
 
@@ -155,5 +155,5 @@ class Minimum(_NumericValue):
     https://cloud.google.com/firestore/docs/reference/rpc/google.firestore.v1#google.firestore.v1.DocumentTransform.FieldTransform.FIELDS.google.firestore.v1.ArrayValue.google.firestore.v1.DocumentTransform.FieldTransform.minimum
 
     Args:
-        value (int | float): value used to bound the field.
+        value (float): value used to bound the field.
     """

google/cloud/firestore_v1/vector_query.py

@@ -125,7 +125,7 @@ def _make_stream(
         retry: Optional[retries.Retry] = gapic_v1.method.DEFAULT,
         timeout: Optional[float] = None,
         explain_options: Optional[ExplainOptions] = None,
-    ) -> Generator[Optional[DocumentSnapshot], Any, Optional[ExplainMetrics]]:
+    ) -> Generator[DocumentSnapshot, Any, Optional[ExplainMetrics]]:
         """Reads the documents in the collection that match this query.
 
         This sends a ``RunQuery`` RPC and then returns a generator which
@@ -151,7 +151,7 @@ def _make_stream(
                 explain_metrics will be available on the returned generator.
 
         Yields:
-            Optional[DocumentSnapshot]:
+            DocumentSnapshot:
             The next document that fulfills the query.
 
         Returns: