feat: regenerate google-cloud-firestore (googleapis#17577)

parthea · web-flow · commit 57ebaa3c244a · 2026-06-25T12:54:57.000-07:00
Fixes b/527895422
diff --git a/.librarian/generator-input/client-post-processing/firestore-integration.yaml b/.librarian/generator-input/client-post-processing/firestore-integration.yaml
@@ -621,45 +621,45 @@ replacements:
       packages/google-cloud-firestore/noxfile.py
     ]
     before: |
-      # Run py.test against the system tests\.
-      if system_test_exists:
-          session\.run\(
-              "py.test",
-              "--quiet",
-              f"--junitxml=system_\{session\.python\}_sponge_log\.xml",
-              system_test_path,
-              \*session\.posargs,
-          \)
-      if system_test_folder_exists:
-          session\.run\(
-              "py.test",
-              "--quiet",
-              f"--junitxml=system_\{session\.python\}_sponge_log\.xml",
-              system_test_folder_path,
-              \*session\.posargs,
-          \)
+      # Run py.test against the system tests.
+      \    if system_test_exists:
+      \        session.run\(
+      \            "py.test",
+      \            "--quiet",
+      \            f"--junitxml=system_\{session.python\}_sponge_log.xml",
+      \            system_test_path,
+      \            \*session.posargs,
+      \        \)
+      \    if system_test_folder_exists:
+      \        session.run\(
+      \            "py.test",
+      \            "--quiet",
+      \            f"--junitxml=system_\{session.python\}_sponge_log.xml",
+      \            system_test_folder_path,
+      \            \*session.posargs,
+      \        \)
     after: |
       # Run py.test against the system tests.
-      if system_test_exists:
-          session.run(
-              "py.test",
-              "-n",
-              "10",
-              "--quiet",
-              f"--junitxml=system_{session.python}_sponge_log.xml",
-              system_test_path,
-              *session.posargs,
-          )
-      if system_test_folder_exists:
-          session.run(
-              "py.test",
-              "-n",
-              "10",
-              "--quiet",
-              f"--junitxml=system_{session.python}_sponge_log.xml",
-              system_test_folder_path,
-              *session.posargs,
-          )
+          if system_test_exists:
+              session.run(
+                  "py.test",
+                  "-n",
+                  "10",
+                  "--quiet",
+                  f"--junitxml=system_{session.python}_sponge_log.xml",
+                  system_test_path,
+                  *session.posargs,
+              )
+          if system_test_folder_exists:
+              session.run(
+                  "py.test",
+                  "-n",
+                  "10",
+                  "--quiet",
+                  f"--junitxml=system_{session.python}_sponge_log.xml",
+                  system_test_folder_path,
+                  *session.posargs,
+              )
     count: 1
   - paths: [
       "packages/google-cloud-firestore/docs/conf.py",
diff --git a/.release-please-bulk-manifest.json b/.release-please-bulk-manifest.json
@@ -122,6 +122,7 @@
   "packages/google-cloud-eventarc-publishing": "0.10.1",
   "packages/google-cloud-filestore": "1.17.0",
   "packages/google-cloud-financialservices": "0.4.1",
+  "packages/google-cloud-firestore": "2.27.0",
   "packages/google-cloud-functions": "1.24.0",
   "packages/google-cloud-gdchardwaremanagement": "0.5.1",
   "packages/google-cloud-geminidataanalytics": "0.13.1",
diff --git a/.release-please-individual-manifest.json b/.release-please-individual-manifest.json
@@ -1,7 +1,6 @@
 {
   "packages/bigframes": "2.43.0",
   "packages/google-cloud-bigtable": "2.39.0",
-  "packages/google-cloud-firestore": "2.27.0",
   "packages/google-crc32c": "1.8.0",
   "packages/pandas-gbq": "0.35.0",
   "packages/sqlalchemy-bigquery": "1.17.0"
diff --git a/librarian.yaml b/librarian.yaml
@@ -1151,8 +1151,6 @@ libraries:
       - docs/firestore_v1/transaction.rst
       - docs/firestore_v1/transforms.rst
       - docs/firestore_v1/types.rst
-    skip_generate: true
-    skip_release: true
     python:
       library_type: GAPIC_COMBO
       opt_args_by_api:
diff --git a/packages/google-cloud-firestore/google/cloud/firestore_bundle/__init__.py b/packages/google-cloud-firestore/google/cloud/firestore_bundle/__init__.py
@@ -57,7 +57,7 @@
 
         def parse_version_to_tuple(version_string: str):
             """Safely converts a semantic version string to a comparable tuple of integers.
-            Example: "4.25.8" -> (4, 25, 8)
+            Example: "6.33.5" -> (6, 33, 5)
             Ignores non-numeric parts and handles common version formats.
             Args:
                 version_string: Version string in the format "x.y.z" or "x.y.z<suffix>"
@@ -86,9 +86,9 @@ def _get_version(dependency_name):
                 return (None, "--")
 
         _dependency_package = "google.protobuf"
-        _next_supported_version = "4.25.8"
-        _next_supported_version_tuple = (4, 25, 8)
-        _recommendation = " (we recommend 6.x)"
+        _next_supported_version = "6.33.5"
+        _next_supported_version_tuple = (6, 33, 5)
+        _recommendation = " (we recommend 7.x)"
         (_version_used, _version_used_string) = _get_version(_dependency_package)
         if _version_used and _version_used < _next_supported_version_tuple:
             warnings.warn(
diff --git a/packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/async_client.py b/packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/async_client.py
@@ -1811,6 +1811,10 @@ async def sample_list_collection_ids():
                 For example:
                 ``projects/my-project/databases/my-database/documents/chatrooms/my-chatroom``
 
+                Use
+                ``projects/{project_id}/databases/{database_id}/documents``
+                to list top-level collections.
+
                 This corresponds to the ``parent`` field
                 on the ``request`` instance; if ``request`` is provided, this
                 should not be set.
diff --git a/packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/client.py b/packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/client.py
@@ -2202,6 +2202,10 @@ def sample_list_collection_ids():
                 For example:
                 ``projects/my-project/databases/my-database/documents/chatrooms/my-chatroom``
 
+                Use
+                ``projects/{project_id}/databases/{database_id}/documents``
+                to list top-level collections.
+
                 This corresponds to the ``parent`` field
                 on the ``request`` instance; if ``request`` is provided, this
                 should not be set.
diff --git a/packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/transports/base.py b/packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/transports/base.py
@@ -303,7 +303,6 @@ def _prep_wrapped_messages(self, client_info):
                     maximum=60.0,
                     multiplier=1.3,
                     predicate=retries.if_exception_type(
-                        core_exceptions.DeadlineExceeded,
                         core_exceptions.InternalServerError,
                         core_exceptions.ServiceUnavailable,
                     ),
diff --git a/packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/transports/grpc_asyncio.py b/packages/google-cloud-firestore/google/cloud/firestore_v1/services/firestore/transports/grpc_asyncio.py
@@ -999,7 +999,6 @@ def _prep_wrapped_messages(self, client_info):
                     maximum=60.0,
                     multiplier=1.3,
                     predicate=retries.if_exception_type(
-                        core_exceptions.DeadlineExceeded,
                         core_exceptions.InternalServerError,
                         core_exceptions.ServiceUnavailable,
                     ),
diff --git a/packages/google-cloud-firestore/google/cloud/firestore_v1/types/common.py b/packages/google-cloud-firestore/google/cloud/firestore_v1/types/common.py
@@ -111,21 +111,54 @@ class TransactionOptions(proto.Message):
             This field is a member of `oneof`_ ``mode``.
     """
 
+    class ConcurrencyMode(proto.Enum):
+        r"""The type of concurrency control mode for transactions.
+
+        Values:
+            CONCURRENCY_MODE_UNSPECIFIED (0):
+                Start the transaction with the database-level
+                default concurrency mode.
+            OPTIMISTIC (1):
+                Use optimistic concurrency control for the
+                new transaction.
+            PESSIMISTIC (2):
+                Use pessimistic concurrency control for the
+                new transaction.
+        """
+
+        CONCURRENCY_MODE_UNSPECIFIED = 0
+        OPTIMISTIC = 1
+        PESSIMISTIC = 2
+
     class ReadWrite(proto.Message):
         r"""Options for a transaction that can be used to read and write
         documents.
-        Firestore does not allow 3rd party auth requests to create
-        read-write. transactions.
 
         Attributes:
             retry_transaction (bytes):
                 An optional transaction to retry.
+            concurrency_mode (google.cloud.firestore_v1.types.TransactionOptions.ConcurrencyMode):
+                Optional. The concurrency control mode to use
+                for this transaction.
+                A database is able to use different concurrency
+                modes for different transactions simultaneously.
+
+                3rd party auth requests are only allowed to
+                create optimistic read-write transactions and
+                must specify that here even if the
+                database-level setting is already configured to
+                optimistic.
         """
 
         retry_transaction: bytes = proto.Field(
             proto.BYTES,
             number=1,
         )
+        concurrency_mode: "TransactionOptions.ConcurrencyMode" = proto.Field(
+            proto.ENUM,
+            number=2,
+            enum="TransactionOptions.ConcurrencyMode",
+        )
 
     class ReadOnly(proto.Message):
         r"""Options for a transaction that can only be used to read
diff --git a/packages/google-cloud-firestore/google/cloud/firestore_v1/types/firestore.py b/packages/google-cloud-firestore/google/cloud/firestore_v1/types/firestore.py
@@ -884,6 +884,10 @@ class ExecutePipelineRequest(proto.Message):
             minute timestamp within the past 7 days.
 
             This field is a member of `oneof`_ ``consistency_selector``.
+        auto_commit_transaction (bool):
+            Optional. Automatically commits the transaction after the
+            pipeline has been executed. Only permitted in combination
+            with ``transaction`` or ``new_transaction``.
     """
 
     database: str = proto.Field(
@@ -913,6 +917,10 @@ class ExecutePipelineRequest(proto.Message):
         oneof="consistency_selector",
         message=timestamp_pb2.Timestamp,
     )
+    auto_commit_transaction: bool = proto.Field(
+        proto.BOOL,
+        number=9,
+    )
 
 
 class ExecutePipelineResponse(proto.Message):
@@ -1781,6 +1789,10 @@ class ListCollectionIdsRequest(proto.Message):
             ``projects/{project_id}/databases/{database_id}/documents/{document_path}``.
             For example:
             ``projects/my-project/databases/my-database/documents/chatrooms/my-chatroom``
+
+            Use
+            ``projects/{project_id}/databases/{database_id}/documents``
+            to list top-level collections.
         page_size (int):
             The maximum number of results to return.
         page_token (str):
diff --git a/packages/google-cloud-firestore/google/cloud/firestore_v1/types/query.py b/packages/google-cloud-firestore/google/cloud/firestore_v1/types/query.py
@@ -60,10 +60,13 @@ class StructuredQuery(proto.Message):
         order_by (MutableSequence[google.cloud.firestore_v1.types.StructuredQuery.Order]):
             The order to apply to the query results.
 
-            Firestore allows callers to provide a full ordering, a
-            partial ordering, or no ordering at all. In all cases,
-            Firestore guarantees a stable ordering through the following
-            rules:
+            Callers can provide a full ordering, a partial ordering, or
+            no ordering at all. While Firestore will always respect the
+            provided order, the behavior for queries without a full
+            ordering is different per database edition:
+
+            In Standard edition, Firestore guarantees a stable ordering
+            through the following rules:
 
             - The ``order_by`` is required to reference all fields used
               with an inequality filter.
@@ -84,6 +87,14 @@ class StructuredQuery(proto.Message):
               ``WHERE a > 1 ORDER BY a ASC, __name__ ASC``
             - ``WHERE __name__ > ... AND a > 1`` becomes
               ``WHERE __name__ > ... AND a > 1 ORDER BY a ASC, __name__ ASC``
+
+            In Enterprise edition, Firestore does not guarantee a stable
+            ordering. Instead it will pick the most efficient ordering
+            based on the indexes available at the time of query
+            execution. This will result in a different ordering for
+            queries that are otherwise identical. To ensure a stable
+            ordering, always include a unique field in the ``order_by``
+            clause, such as ``__name__``.
         start_at (google.cloud.firestore_v1.types.Cursor):
             A potential prefix of a position in the result set to start
             the query at.
diff --git a/packages/google-cloud-firestore/setup.py b/packages/google-cloud-firestore/setup.py
@@ -29,7 +29,10 @@
 version = None
 
 with open(os.path.join(package_root, "google/cloud/firestore/gapic_version.py")) as fp:
-    version_candidates = re.findall(r"(?<=\")\d+.\d+.\d+(?=\")", fp.read())
+    version_candidates = re.findall(
+        r"(?<=\")\d+\.\d+\.\d+[^\"\s]*(?=\")",
+        fp.read(),
+    )
     assert len(version_candidates) == 1
     version = version_candidates[0]
 
@@ -39,16 +42,15 @@
     release_status = "Development Status :: 5 - Production/Stable"
 
 dependencies = [
-    "google-api-core[grpc] >= 2.17.1, <3.0.0",
+    "google-api-core[grpc] >= 2.24.2, <3.0.0",
     # Exclude incompatible versions of `google-auth`
     # See https://github.com/googleapis/google-cloud-python/issues/12364
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
     "google-cloud-core >= 2.0.0, <3.0.0",
     "grpcio >= 1.59.0, < 2.0.0",
     "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
-    "proto-plus >= 1.22.3, <2.0.0",
-    "proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
-    "protobuf >= 4.25.8, < 8.0.0",
+    "proto-plus >= 1.26.1, <2.0.0",
+    "protobuf >= 6.33.5, < 8.0.0",
 ]
 extras = {}
 url = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-firestore"
diff --git a/packages/google-cloud-firestore/testing/constraints-3.10.txt b/packages/google-cloud-firestore/testing/constraints-3.10.txt
@@ -4,9 +4,9 @@
 # pinning their versions to their lower bounds.
 # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
 # then this file should have google-cloud-foo==1.14.0
-google-api-core==2.17.1
+google-api-core==2.24.2
 google-auth==2.14.1
 google-cloud-core==2.0.0
 grpcio==1.59.0
-proto-plus==1.22.3
-protobuf==4.25.8
+proto-plus==1.26.1
+protobuf==6.33.5
diff --git a/packages/google-cloud-firestore/testing/constraints-3.13.txt b/packages/google-cloud-firestore/testing/constraints-3.13.txt
@@ -10,4 +10,4 @@ google-auth>=2
 google-cloud-core>=2
 grpcio>=1
 proto-plus>=1
-protobuf>=6
+protobuf>=7
diff --git a/packages/google-cloud-firestore/testing/constraints-3.14.txt b/packages/google-cloud-firestore/testing/constraints-3.14.txt
@@ -10,4 +10,4 @@ google-auth>=2
 google-cloud-core>=2
 grpcio>=1
 proto-plus>=1
-protobuf>=6
+protobuf>=7
diff --git a/release-please-bulk-config.json b/release-please-bulk-config.json
@@ -1585,6 +1585,26 @@
         }
       ]
     },
+    "packages/google-cloud-firestore": {
+      "component": "google-cloud-firestore",
+      "extra-files": [
+        "google/cloud/firestore/gapic_version.py",
+        "google/cloud/firestore_admin/gapic_version.py",
+        "google/cloud/firestore_admin_v1/gapic_version.py",
+        "google/cloud/firestore_bundle/gapic_version.py",
+        "google/cloud/firestore_v1/gapic_version.py",
+        {
+          "jsonpath": "$.clientLibrary.version",
+          "path": "samples/generated_samples/snippet_metadata_google.firestore.admin.v1.json",
+          "type": "json"
+        },
+        {
+          "jsonpath": "$.clientLibrary.version",
+          "path": "samples/generated_samples/snippet_metadata_google.firestore.v1.json",
+          "type": "json"
+        }
+      ]
+    },
     "packages/google-cloud-functions": {
       "component": "google-cloud-functions",
       "extra-files": [
diff --git a/release-please-individual-config.json b/release-please-individual-config.json

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"packages/bigframes": "2.43.0",`
`3`	`3`	`"packages/google-cloud-bigtable": "2.39.0",`
`4`		`- "packages/google-cloud-firestore": "2.27.0",`
`5`	`4`	`"packages/google-crc32c": "1.8.0",`
`6`	`5`	`"packages/pandas-gbq": "0.35.0",`
`7`	`6`	`"packages/sqlalchemy-bigquery": "1.17.0"`