fix: expose Count, FieldFilter, Or, and And to firestore module (#706)

Expose the `Count`, `FieldFilter`, `Or`, and `And` to the `firestore` module from the `firestore_v1`.

Author: Mariatta

google/cloud/firestore/__init__.py

@@ -19,6 +19,7 @@
 
 __version__ = package_version.__version__
 
+from google.cloud.firestore_v1 import And
 from google.cloud.firestore_v1 import ArrayRemove
 from google.cloud.firestore_v1 import ArrayUnion
 from google.cloud.firestore_v1 import AsyncClient
@@ -29,18 +30,21 @@
 from google.cloud.firestore_v1 import AsyncTransaction
 from google.cloud.firestore_v1 import AsyncWriteBatch
 from google.cloud.firestore_v1 import Client
+from google.cloud.firestore_v1 import CountAggregation
 from google.cloud.firestore_v1 import CollectionGroup
 from google.cloud.firestore_v1 import CollectionReference
 from google.cloud.firestore_v1 import DELETE_FIELD
 from google.cloud.firestore_v1 import DocumentReference
 from google.cloud.firestore_v1 import DocumentSnapshot
 from google.cloud.firestore_v1 import DocumentTransform
 from google.cloud.firestore_v1 import ExistsOption
+from google.cloud.firestore_v1 import FieldFilter
 from google.cloud.firestore_v1 import GeoPoint
 from google.cloud.firestore_v1 import Increment
 from google.cloud.firestore_v1 import LastUpdateOption
 from google.cloud.firestore_v1 import Maximum
 from google.cloud.firestore_v1 import Minimum
+from google.cloud.firestore_v1 import Or
 from google.cloud.firestore_v1 import Query
 from google.cloud.firestore_v1 import ReadAfterWriteError
 from google.cloud.firestore_v1 import SERVER_TIMESTAMP
@@ -55,6 +59,7 @@
 
 __all__: List[str] = [
     "__version__",
+    "And",
     "ArrayRemove",
     "ArrayUnion",
     "AsyncClient",
@@ -65,18 +70,21 @@
     "AsyncTransaction",
     "AsyncWriteBatch",
     "Client",
+    "CountAggregation",
     "CollectionGroup",
     "CollectionReference",
     "DELETE_FIELD",
     "DocumentReference",
     "DocumentSnapshot",
     "DocumentTransform",
     "ExistsOption",
+    "FieldFilter",
     "GeoPoint",
     "Increment",
     "LastUpdateOption",
     "Maximum",
     "Minimum",
+    "Or",
     "Query",
     "ReadAfterWriteError",
     "SERVER_TIMESTAMP",

google/cloud/firestore_v1/__init__.py

@@ -29,6 +29,10 @@
 from google.cloud.firestore_v1._helpers import LastUpdateOption
 from google.cloud.firestore_v1._helpers import ReadAfterWriteError
 from google.cloud.firestore_v1._helpers import WriteOption
+from google.cloud.firestore_v1.base_aggregation import CountAggregation
+from google.cloud.firestore_v1.base_query import And
+from google.cloud.firestore_v1.base_query import FieldFilter
+from google.cloud.firestore_v1.base_query import Or
 from google.cloud.firestore_v1.async_batch import AsyncWriteBatch
 from google.cloud.firestore_v1.async_client import AsyncClient
 from google.cloud.firestore_v1.async_collection import AsyncCollectionReference
@@ -107,6 +111,7 @@
 
 __all__: List[str] = [
     "__version__",
+    "And",
     "ArrayRemove",
     "ArrayUnion",
     "AsyncClient",
@@ -117,18 +122,21 @@
     "AsyncTransaction",
     "AsyncWriteBatch",
     "Client",
+    "CountAggregation",
     "CollectionGroup",
     "CollectionReference",
     "DELETE_FIELD",
     "DocumentReference",
     "DocumentSnapshot",
     "DocumentTransform",
     "ExistsOption",
+    "FieldFilter",
     "GeoPoint",
     "Increment",
     "LastUpdateOption",
     "Maximum",
     "Minimum",
+    "Or",
     "Query",
     "ReadAfterWriteError",
     "SERVER_TIMESTAMP",