Merge branch 'main' into owl-bot-update-lock-58dd193e1be3f5f02276cdf222ed7f8dfc3be1f163488aea767bcf35a0e2b0cd

Author: daniel-sanche

README.rst

@@ -132,9 +132,8 @@ A logging scope is a period-separated namespace that begins with :code:`google`,
 
 **NOTE**: If the logging scope is invalid, the library does not set up any logging handlers.
 
-Examples
-^^^^^^^^
-
+Environment-Based Examples
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 - Enabling the default handler for all Google-based loggers
 
 .. code-block:: console
@@ -153,8 +152,8 @@ Advanced, code-based configuration
 
 You can also configure a valid logging scope using Python's standard `logging` mechanism.
 
-Examples
-^^^^^^^^
+Code-Based Examples
+^^^^^^^^^^^^^^^^^^^
 
 - Configuring a handler for all Google-based loggers
 

google/cloud/firestore_v1/field_path.py

@@ -31,7 +31,7 @@
 _ESCAPED_BACKTICK = _BACKSLASH + _BACKTICK
 
 _SIMPLE_FIELD_NAME = re.compile("^[_a-zA-Z][_a-zA-Z0-9]*$")
-_LEADING_ALPHA_INVALID = re.compile("^[_a-zA-Z][_a-zA-Z0-9]*[^_a-zA-Z0-9]")
+_LEADING_ALPHA_INVALID = re.compile(r"^[_a-zA-Z][_a-zA-Z0-9]*[~*/\[\]]")
 PATH_ELEMENT_TOKENS = [
     ("SIMPLE", r"[_a-zA-Z][_a-zA-Z0-9]*"),  # unquoted elements
     ("QUOTED", r"`(?:\\`|[^`])*?`"),  # quoted elements, unquoted
@@ -311,9 +311,7 @@ def from_string(cls, path_string: str):
                     raise ValueError("Empty element")
                 if _LEADING_ALPHA_INVALID.match(element):
                     raise ValueError(
-                        "Non-alphanum char in element with leading alpha: {}".format(
-                            element
-                        )
+                        "Invalid char in element with leading alpha: {}".format(element)
                     )
             return FieldPath(*elements)
 

google/cloud/firestore_v1/watch.py

@@ -440,6 +440,9 @@ def on_snapshot(self, proto):
             proto(`google.cloud.firestore_v1.types.ListenResponse`):
                 Callback method that receives a object to
         """
+        if self._closing.locked():
+            # don't process on_snapshot responses while spinning down, to prevent deadlock
+            return
         if proto is None:
             self.close()
             return

tests/system/test_system.py

@@ -3151,6 +3151,28 @@ def in_transaction(transaction):
         assert inner_fn_ran is True
 
 
+@pytest.mark.parametrize("database", [None, FIRESTORE_OTHER_DB], indirect=True)
+def test_transaction_w_uuid(client, cleanup, database):
+    """
+    https://github.com/googleapis/python-firestore/issues/1012
+    """
+    collection_id = "uuid_collection" + UNIQUE_RESOURCE_ID
+    doc_ref = client.document(collection_id, "doc")
+    cleanup(doc_ref.delete)
+    key = "b7992822-eacb-40be-8af6-559b9e2fb0b7"
+    doc_ref.create({key: "I'm a UUID!"})
+
+    @firestore.transactional
+    def update_doc(tx, doc_ref, key, value):
+        tx.update(doc_ref, {key: value})
+
+    expected = "UPDATED VALUE"
+    update_doc(client.transaction(), doc_ref, key, expected)
+    # read updated doc
+    snapshot = doc_ref.get()
+    assert snapshot.to_dict()[key] == expected
+
+
 @pytest.mark.skipif(
     FIRESTORE_EMULATOR, reason="Query profile not supported in emulator."
 )
@@ -3206,6 +3228,24 @@ def in_transaction(transaction):
         assert inner_fn_ran is True
 
 
+@pytest.mark.parametrize("database", [None, FIRESTORE_OTHER_DB], indirect=True)
+def test_update_w_uuid(client, cleanup, database):
+    """
+    https://github.com/googleapis/python-firestore/issues/1012
+    """
+    collection_id = "uuid_collection" + UNIQUE_RESOURCE_ID
+    doc_ref = client.document(collection_id, "doc")
+    cleanup(doc_ref.delete)
+    key = "b7992822-eacb-40be-8af6-559b9e2fb0b7"
+    doc_ref.create({key: "I'm a UUID!"})
+
+    expected = "UPDATED VALUE"
+    doc_ref.update({key: expected})
+    # read updated doc
+    snapshot = doc_ref.get()
+    assert snapshot.to_dict()[key] == expected
+
+
 @pytest.mark.parametrize("with_rollback,expected", [(True, 2), (False, 3)])
 @pytest.mark.parametrize("database", [None, FIRESTORE_OTHER_DB], indirect=True)
 def test_transaction_rollback(client, cleanup, database, with_rollback, expected):

tests/unit/v1/test_watch.py

@@ -400,6 +400,15 @@ def test_watch_on_snapshot_target_w_none():
     assert inst._rpc is None
 
 
+def test_watch_on_snapshot_while_closing():
+    inst = _make_watch()
+    inst.close = mock.Mock()
+    with inst._closing:
+        inst.on_snapshot(mock.Mock())
+        # close should not be called again when already closing
+        inst.close.assert_not_called()
+
+
 def test_watch_on_snapshot_target_no_change_no_target_ids_not_current():
     inst = _make_watch()
     proto = _make_listen_response()