[Tables] Various small fixes (Azure#18964)

* match condition refactor

* Return TableItem on create

* Deserialization updates

* Support extra metadata

* Added some tests

* Added async recordings

* Updated changelog

* Updated changelog

* Docstring feedback

Author: annatisch

sdk/tables/azure-data-tables/CHANGELOG.md

@@ -3,11 +3,17 @@
 ## 12.0.0 (unreleased)
 **Breaking**
 * EdmType.Binary data in entities will now be deserialized as `bytes` in Python 3 and `str` in Python 2, rather than an `EdmProperty` instance. Likewise on serialization, `bytes` in Python 3 and `str` in Python 2 will be interpreted as binary (this is unchanged for Python 3, but breaking for Python 2, where `str` was previously serialized as EdmType.String)
+* `TableClient.create_table` now returns an instance of `TableItem`.
 
 **Fixes**
 * Fixed support for Cosmos emulator endpoint, via URL/credential or connection string.
 * Fixed table name from URL parsing in `TableClient.from_table_url` classmethod.
 * The `account_name` attribute on clients will now be pulled from an `AzureNamedKeyCredential` if used.
+* Any additional odata metadata is returned in entitys metadata.
+* The timestamp in entity metadata is now deserialized to a timestamp.
+* If the `prefer` header is added in the `create_entity` operation, the echo will be returned.
+* Errors raised on a 412 if-not-match error will now be a specific `azure.core.exceptions.ResourceModifiedError`.
+* `EdmType.DOUBLE` values are now explicitly typed in the request payload.
 
 ## 12.0.0b7 (2021-05-11)
 **Breaking**

sdk/tables/azure-data-tables/azure/data/tables/_deserialize.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-
+from typing import Dict, Optional, Any
 from uuid import UUID
 import logging
 import datetime
@@ -200,11 +200,14 @@ def _convert_to_entity(entry_element):
             entity[name] = new_property
 
     # extract etag from entry
-    etag = odata.get("etag")
-    if timestamp and not etag:
-        etag = "W/\"datetime'" + url_quote(timestamp) + "'\""
-
-    entity._metadata = {'etag': etag, 'timestamp': timestamp}  # pylint: disable=protected-access
+    etag = odata.pop("etag", None)
+    odata.pop("metadata", None)
+    if timestamp:
+        if not etag:
+            etag = "W/\"datetime'" + url_quote(timestamp) + "'\""
+        timestamp = _from_entity_datetime(timestamp)
+    odata.update({'etag': etag, 'timestamp': timestamp})
+    entity._metadata = odata  # pylint: disable=protected-access
     return entity
 
 
@@ -252,10 +255,15 @@ def _return_context_and_deserialized(
     return response.context['location_mode'], deserialized, response_headers
 
 
-def _trim_service_metadata(metadata):
-    # type: (dict[str,str]) -> None
-    return {
+def _trim_service_metadata(metadata, content=None):
+    # type: (Dict[str,str], Optional[Dict[str, Any]]) -> None
+    result = {
         "date": metadata.pop("date", None),
         "etag": metadata.pop("etag", None),
         "version": metadata.pop("version", None),
     }
+    preference = metadata.pop('preference_applied', None)
+    if preference:
+        result["preference_applied"] = preference
+        result["content"] = content
+    return result

sdk/tables/azure-data-tables/azure/data/tables/_error.py

@@ -95,7 +95,10 @@ def _decode_error(response, error_message=None, error_type=None, **kwargs):
     try:
         if not error_type:
             error_code = TableErrorCode(error_code)
-            if error_code in [TableErrorCode.condition_not_met]:
+            if error_code in [
+                TableErrorCode.condition_not_met,
+                TableErrorCode.update_condition_not_satisfied
+            ]:
                 error_type = ResourceModifiedError
             elif error_code in [
                 TableErrorCode.invalid_authentication_info,

sdk/tables/azure-data-tables/azure/data/tables/_serialize.py

@@ -20,36 +20,16 @@
 from ._error import _ERROR_VALUE_TOO_LARGE, _ERROR_TYPE_NOT_SUPPORTED
 
 
-def _get_match_headers(kwargs, match_param, etag_param):
-    if_match = None
-    if_none_match = None
-    match_condition = kwargs.pop(match_param, None)
+def _get_match_headers(etag, match_condition):
     if match_condition == MatchConditions.IfNotModified:
-        if_match = kwargs.pop(etag_param, None)
-        if not if_match:
-            raise ValueError(
-                "'{}' specified without '{}'.".format(match_param, etag_param)
-            )
-    elif match_condition == MatchConditions.IfPresent:
-        if_match = "*"
-    elif match_condition == MatchConditions.IfModified:
-        if_none_match = kwargs.pop(etag_param, None)
-        if not if_none_match:
-            raise ValueError(
-                "'{}' specified without '{}'.".format(match_param, etag_param)
-            )
-    elif match_condition == MatchConditions.IfMissing:
-        if_none_match = "*"
-    elif match_condition == MatchConditions.Unconditionally:
-        if_none_match = "*"
-    elif match_condition is None:
-        if kwargs.get(etag_param):
-            raise ValueError(
-                "'{}' specified without '{}'.".format(etag_param, match_param)
-            )
-    else:
-        raise TypeError("Invalid match condition: {}".format(match_condition))
-    return if_match, if_none_match
+        if not etag:
+            raise ValueError("IfNotModified must be specified with etag.")
+        return etag
+    if match_condition == MatchConditions.Unconditionally:
+        if etag:
+            raise ValueError("Etag is not supported for an Unconditional operation.")
+        return "*"
+    raise ValueError("Unsupported match condition: {}".format(match_condition))
 
 
 def _parameter_filter_substitution(parameters, query_filter):
@@ -116,7 +96,7 @@ def _to_entity_float(value):
         return EdmType.DOUBLE, "Infinity"
     if value == float("-inf"):
         return EdmType.DOUBLE, "-Infinity"
-    return None, value
+    return EdmType.DOUBLE, value
 
 
 def _to_entity_guid(value):
@@ -210,7 +190,6 @@ def _add_entity_properties(source):
     properties = {}
 
     to_send = dict(source)  # shallow copy
-    to_send.pop("_metadata", None)
 
     # set properties type for types we know if value has no type info.
     # if value has type info, then set the type to value.type

sdk/tables/azure-data-tables/azure/data/tables/_table_batch.py

@@ -12,6 +12,8 @@
     Optional
 )
 
+from azure.core import MatchConditions
+
 from ._common_conversion import _transform_patch_to_cosmos_post
 from ._models import UpdateMode
 from ._serialize import _get_match_headers, _add_entity_properties
@@ -247,15 +249,9 @@ def update(
                 etag = entity.metadata.get("etag", None)
             except (AttributeError, TypeError):
                 pass
-
-        if_match, _ = _get_match_headers(
-            kwargs=dict(
-                kwargs,
-                etag=etag,
-                match_condition=match_condition,
-            ),
-            etag_param="etag",
-            match_param="match_condition",
+        if_match = _get_match_headers(
+            etag=etag,
+            match_condition=match_condition or MatchConditions.Unconditionally,
         )
 
         partition_key = temp["PartitionKey"]
@@ -266,7 +262,7 @@ def update(
                 table=self.table_name,
                 partition_key=partition_key,
                 row_key=row_key,
-                if_match=if_match or "*",
+                if_match=if_match,
                 table_entity_properties=temp,
                 **kwargs
             )
@@ -275,7 +271,7 @@ def update(
                 table=self.table_name,
                 partition_key=partition_key,
                 row_key=row_key,
-                if_match=if_match or "*",
+                if_match=if_match,
                 table_entity_properties=temp,
                 **kwargs
             )
@@ -533,23 +529,16 @@ def delete(
                 etag = entity.metadata.get("etag", None)
             except (AttributeError, TypeError):
                 pass
-
-        if_match, _ = _get_match_headers(
-            kwargs=dict(
-                kwargs,
-                etag=etag,
-                match_condition=match_condition,
-            ),
-            etag_param="etag",
-            match_param="match_condition",
+        if_match = _get_match_headers(
+            etag=etag,
+            match_condition=match_condition or MatchConditions.Unconditionally,
         )
 
-
         self._batch_delete_entity(
             table=self.table_name,
             partition_key=partition_key,
             row_key=row_key,
-            if_match=if_match or "*",
+            if_match=if_match,
             **kwargs
         )