diff --git a/sdk/tables/azure-data-tables/MANIFEST.in b/sdk/tables/azure-data-tables/MANIFEST.in
index 8c54d4fc0df5..676035437468 100644
--- a/sdk/tables/azure-data-tables/MANIFEST.in
+++ b/sdk/tables/azure-data-tables/MANIFEST.in
@@ -1,8 +1,7 @@
-recursive-include tests *.py *.yaml
include *.md
-include azure/__init__.py
-include azure/data/__init__.py
include LICENSE
+include azure/data/tables/_generated/py.typed
recursive-include tests *.py
recursive-include samples *.py *.md
-include azure/data/tables/py.typed
+include azure/__init__.py
+include azure/data/__init__.py
diff --git a/sdk/tables/azure-data-tables/_metadata.json b/sdk/tables/azure-data-tables/_metadata.json
new file mode 100644
index 000000000000..924ee4ed0e1a
--- /dev/null
+++ b/sdk/tables/azure-data-tables/_metadata.json
@@ -0,0 +1,3 @@
+{
+ "apiVersion": "2019-02-02"
+}
\ No newline at end of file
diff --git a/sdk/tables/azure-data-tables/apiview-properties.json b/sdk/tables/azure-data-tables/apiview-properties.json
new file mode 100644
index 000000000000..2cd10094e31b
--- /dev/null
+++ b/sdk/tables/azure-data-tables/apiview-properties.json
@@ -0,0 +1,50 @@
+{
+ "CrossLanguagePackageId": "Data.Tables",
+ "CrossLanguageDefinitionId": {
+ "azure.data.tables._generated.models.AccessPolicy": "Data.Tables.AccessPolicy",
+ "azure.data.tables._generated.models.CorsRule": "Data.Tables.CorsRule",
+ "azure.data.tables._generated.models.GeoReplication": "Data.Tables.GeoReplication",
+ "azure.data.tables._generated.models.Logging": "Data.Tables.Logging",
+ "azure.data.tables._generated.models.Metrics": "Data.Tables.Metrics",
+ "azure.data.tables._generated.models.RetentionPolicy": "Data.Tables.RetentionPolicy",
+ "azure.data.tables._generated.models.SignedIdentifier": "Data.Tables.SignedIdentifier",
+ "azure.data.tables._generated.models.TableEntityQueryResponse": "Data.Tables.TableEntityQueryResponse",
+ "azure.data.tables._generated.models.TableProperties": "Data.Tables.TableProperties",
+ "azure.data.tables._generated.models.TableResponse": "Data.Tables.TableResponse",
+ "azure.data.tables._generated.models.TablesError": "Data.Tables.TablesError",
+ "azure.data.tables._generated.models.TableServiceProperties": "Data.Tables.TableServiceProperties",
+ "azure.data.tables._generated.models.TableServiceStats": "Data.Tables.TableServiceStats",
+ "azure.data.tables._generated.models.TablesServiceError": "Data.Tables.TablesServiceError",
+ "azure.data.tables._generated.models.OdataMetadataFormat": "Data.Tables.OdataMetadataFormat",
+ "azure.data.tables._generated.models.ResponseFormat": "Data.Tables.ResponseFormat",
+ "azure.data.tables._generated.models.GeoReplicationStatusType": "Data.Tables.GeoReplicationStatusType",
+ "azure.data.tables._generated.operations.TableOperations.query": "Data.Tables.Table.query",
+ "azure.data.tables._generated.aio.operations.TableOperations.query": "Data.Tables.Table.query",
+ "azure.data.tables._generated.operations.TableOperations.create": "Data.Tables.Table.create",
+ "azure.data.tables._generated.aio.operations.TableOperations.create": "Data.Tables.Table.create",
+ "azure.data.tables._generated.operations.TableOperations.delete": "Data.Tables.Table.delete",
+ "azure.data.tables._generated.aio.operations.TableOperations.delete": "Data.Tables.Table.delete",
+ "azure.data.tables._generated.operations.TableOperations.query_entities": "Data.Tables.Table.queryEntities",
+ "azure.data.tables._generated.aio.operations.TableOperations.query_entities": "Data.Tables.Table.queryEntities",
+ "azure.data.tables._generated.operations.TableOperations.query_entity_with_partition_and_row_key": "Data.Tables.Table.queryEntityWithPartitionAndRowKey",
+ "azure.data.tables._generated.aio.operations.TableOperations.query_entity_with_partition_and_row_key": "Data.Tables.Table.queryEntityWithPartitionAndRowKey",
+ "azure.data.tables._generated.operations.TableOperations.update_entity": "Data.Tables.Table.updateEntity",
+ "azure.data.tables._generated.aio.operations.TableOperations.update_entity": "Data.Tables.Table.updateEntity",
+ "azure.data.tables._generated.operations.TableOperations.merge_entity": "Data.Tables.Table.mergeEntity",
+ "azure.data.tables._generated.aio.operations.TableOperations.merge_entity": "Data.Tables.Table.mergeEntity",
+ "azure.data.tables._generated.operations.TableOperations.delete_entity": "Data.Tables.Table.deleteEntity",
+ "azure.data.tables._generated.aio.operations.TableOperations.delete_entity": "Data.Tables.Table.deleteEntity",
+ "azure.data.tables._generated.operations.TableOperations.insert_entity": "Data.Tables.Table.insertEntity",
+ "azure.data.tables._generated.aio.operations.TableOperations.insert_entity": "Data.Tables.Table.insertEntity",
+ "azure.data.tables._generated.operations.TableOperations.get_access_policy": "Data.Tables.Table.getAccessPolicy",
+ "azure.data.tables._generated.aio.operations.TableOperations.get_access_policy": "Data.Tables.Table.getAccessPolicy",
+ "azure.data.tables._generated.operations.TableOperations.set_access_policy": "Data.Tables.Table.setAccessPolicy",
+ "azure.data.tables._generated.aio.operations.TableOperations.set_access_policy": "Data.Tables.Table.setAccessPolicy",
+ "azure.data.tables._generated.operations.ServiceOperations.set_properties": "Data.Tables.Service.setProperties",
+ "azure.data.tables._generated.aio.operations.ServiceOperations.set_properties": "Data.Tables.Service.setProperties",
+ "azure.data.tables._generated.operations.ServiceOperations.get_properties": "Data.Tables.Service.getProperties",
+ "azure.data.tables._generated.aio.operations.ServiceOperations.get_properties": "Data.Tables.Service.getProperties",
+ "azure.data.tables._generated.operations.ServiceOperations.get_statistics": "Data.Tables.Service.getStatistics",
+ "azure.data.tables._generated.aio.operations.ServiceOperations.get_statistics": "Data.Tables.Service.getStatistics"
+ }
+}
\ No newline at end of file
diff --git a/sdk/tables/azure-data-tables/azure/__init__.py b/sdk/tables/azure-data-tables/azure/__init__.py
index 8db66d3d0f0f..d55ccad1f573 100644
--- a/sdk/tables/azure-data-tables/azure/__init__.py
+++ b/sdk/tables/azure-data-tables/azure/__init__.py
@@ -1 +1 @@
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore
diff --git a/sdk/tables/azure-data-tables/azure/data/__init__.py b/sdk/tables/azure-data-tables/azure/data/__init__.py
index 8db66d3d0f0f..d55ccad1f573 100644
--- a/sdk/tables/azure-data-tables/azure/data/__init__.py
+++ b/sdk/tables/azure-data-tables/azure/data/__init__.py
@@ -1 +1 @@
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/__init__.py b/sdk/tables/azure-data-tables/azure/data/tables/__init__.py
index 034368195c02..f5c1dc787260 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/__init__.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/__init__.py
@@ -50,4 +50,4 @@
"TransactionOperation",
"RequestTooLargeError",
"EntityMetadata",
-]
+]
\ No newline at end of file
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_base_client.py b/sdk/tables/azure-data-tables/azure/data/tables/_base_client.py
index a9c0053636e4..2b24eebeb1f3 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_base_client.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_base_client.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
@@ -26,7 +27,7 @@
RequestIdPolicy,
)
-from ._generated import AzureTable
+from ._generated import TablesClient as AzureTable
from ._common_conversion import _is_cosmos_endpoint, _get_account
from ._shared_access_signature import QueryStringConstants
from ._constants import (
@@ -145,14 +146,20 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential
}
self._hosts = _hosts
- self._policies = self._configure_policies(audience=audience, hosts=self._hosts, **kwargs)
+ auth_policy, self._policies = self._configure_policies(audience=audience, hosts=self._hosts, **kwargs)
if self._cosmos_endpoint:
self._policies.insert(0, CosmosPatchTransformPolicy())
- self._client = AzureTable(self.url, policies=kwargs.pop("policies", self._policies), **kwargs)
+ self._client = AzureTable(
+ self.url,
+ credential=credential,
+ authentication_policy=auth_policy,
+ policies=kwargs.pop("policies", self._policies),
+ **kwargs,
+ )
# Incompatible assignment when assigning a str value to a Literal type variable
- self._client._config.version = get_api_version(
- api_version, self._client._config.version
+ self._client._config.api_version = get_api_version(
+ api_version, self._client._config.api_version
) # type: ignore[assignment]
@property
@@ -219,7 +226,7 @@ def api_version(self) -> str:
:return: The Storage API version.
:type: str
"""
- return self._client._config.version # pylint: disable=protected-access
+ return self._client._config.api_version # pylint: disable=protected-access
def __enter__(self) -> Self:
self._client.__enter__()
@@ -238,11 +245,11 @@ def _format_url(self, hostname):
"""
return f"{self.scheme}://{hostname}{self._query_str}"
- def _configure_policies(self, *, audience: Optional[str] = None, **kwargs: Any) -> List[Any]:
+ def _configure_policies(self, *, audience: Optional[str] = None, **kwargs: Any) -> tuple[Any, List[Any]]:
credential_policy = _configure_credential(
self.credential, cosmos_endpoint=self._cosmos_endpoint, audience=audience
)
- return [
+ return credential_policy, [
RequestIdPolicy(**kwargs),
StorageHeadersPolicy(**kwargs),
UserAgentPolicy(sdk_moniker=SDK_MONIKER, **kwargs),
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/__init__.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/__init__.py
index d00af573949a..2c248d5a08e8 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/__init__.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/__init__.py
@@ -2,25 +2,31 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
-from ._client import AzureTable
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._client import TablesClient # type: ignore
from ._version import VERSION
__version__ = VERSION
try:
from ._patch import __all__ as _patch_all
- from ._patch import * # pylint: disable=unused-wildcard-import
+ from ._patch import *
except ImportError:
_patch_all = []
from ._patch import patch_sdk as _patch_sdk
__all__ = [
- "AzureTable",
+ "TablesClient",
]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
_patch_sdk()
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_client.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_client.py
index 2230d9fcc4bf..5f35039f1c07 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_client.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_client.py
@@ -2,52 +2,73 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
from copy import deepcopy
-from typing import Any
+from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
from azure.core import PipelineClient
+from azure.core.pipeline import policies
from azure.core.rest import HttpRequest, HttpResponse
-from . import models as _models
-from ._configuration import AzureTableConfiguration
-from ._serialization import Deserializer, Serializer
+from ._configuration import TablesClientConfiguration
+from ._utils.serialization import Deserializer, Serializer
from .operations import ServiceOperations, TableOperations
+if TYPE_CHECKING:
+ from azure.core.credentials import TokenCredential
-class AzureTable: # pylint: disable=client-accepts-api-version-keyword
- """AzureTable.
+
+class TablesClient:
+ """TablesClient.
:ivar table: TableOperations operations
- :vartype table: azure.table.operations.TableOperations
+ :vartype table: azure.data.tables._generated.operations.TableOperations
:ivar service: ServiceOperations operations
- :vartype service: azure.table.operations.ServiceOperations
- :param url: The URL of the service account or table that is the target of the desired
- operation. Required.
+ :vartype service: azure.data.tables._generated.operations.ServiceOperations
+ :param url: The host name of the tables account, e.g. accountName.table.core.windows.net.
+ Required.
:type url: str
- :keyword version: Specifies the version of the operation to use for this request. Default value
- is "2019-02-02". Note that overriding this default value may result in unsupported behavior.
- :paramtype version: str
+ :param credential: Credential used to authenticate requests to the service. Required.
+ :type credential: ~azure.core.credentials.TokenCredential
+ :keyword api_version: The API version. Default value is "2019-02-02". Note that overriding this
+ default value may result in unsupported behavior.
+ :paramtype api_version: str
"""
- def __init__( # pylint: disable=missing-client-constructor-parameter-credential
- self, url: str, **kwargs: Any
- ) -> None:
+ def __init__(self, url: str, credential: "TokenCredential", **kwargs: Any) -> None:
_endpoint = "{url}"
- self._config = AzureTableConfiguration(url=url, **kwargs)
- self._client: PipelineClient = PipelineClient(base_url=_endpoint, config=self._config, **kwargs)
-
- client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
- self._serialize = Serializer(client_models)
- self._deserialize = Deserializer(client_models)
+ self._config = TablesClientConfiguration(url=url, credential=credential, **kwargs)
+
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs)
+
+ self._serialize = Serializer()
+ self._deserialize = Deserializer()
self._serialize.client_side_validation = False
self.table = TableOperations(self._client, self._config, self._serialize, self._deserialize)
self.service = ServiceOperations(self._client, self._config, self._serialize, self._deserialize)
- def send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
+ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
"""Runs the network request through the client's chained policies.
>>> from azure.core.rest import HttpRequest
@@ -71,12 +92,12 @@ def send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
}
request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
- return self._client.send_request(request_copy, **kwargs)
+ return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
def close(self) -> None:
self._client.close()
- def __enter__(self) -> "AzureTable":
+ def __enter__(self) -> Self:
self._client.__enter__()
return self
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_configuration.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_configuration.py
index 5891c6cc373c..43323f676433 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_configuration.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_configuration.py
@@ -2,48 +2,50 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-import sys
-from typing import Any
+from typing import Any, TYPE_CHECKING
-from azure.core.configuration import Configuration
from azure.core.pipeline import policies
from ._version import VERSION
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
-else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+if TYPE_CHECKING:
+ from azure.core.credentials import TokenCredential
-class AzureTableConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
- """Configuration for AzureTable.
+class TablesClientConfiguration: # pylint: disable=too-many-instance-attributes
+ """Configuration for TablesClient.
Note that all parameters used to create this instance are saved as instance
attributes.
- :param url: The URL of the service account or table that is the target of the desired
- operation. Required.
+ :param url: The host name of the tables account, e.g. accountName.table.core.windows.net.
+ Required.
:type url: str
- :keyword version: Specifies the version of the operation to use for this request. Default value
- is "2019-02-02". Note that overriding this default value may result in unsupported behavior.
- :paramtype version: str
+ :param credential: Credential used to authenticate requests to the service. Required.
+ :type credential: ~azure.core.credentials.TokenCredential
+ :keyword api_version: The API version. Default value is "2019-02-02". Note that overriding this
+ default value may result in unsupported behavior.
+ :paramtype api_version: str
"""
- def __init__(self, url: str, **kwargs: Any) -> None:
- super(AzureTableConfiguration, self).__init__(**kwargs)
- version: Literal["2019-02-02"] = kwargs.pop("version", "2019-02-02")
+ def __init__(self, url: str, credential: "TokenCredential", **kwargs: Any) -> None:
+ api_version: str = kwargs.pop("api_version", "2019-02-02")
if url is None:
raise ValueError("Parameter 'url' must not be None.")
+ if credential is None:
+ raise ValueError("Parameter 'credential' must not be None.")
self.url = url
- self.version = version
- kwargs.setdefault("sdk_moniker", "table/{}".format(VERSION))
+ self.credential = credential
+ self.api_version = api_version
+ self.credential_scopes = kwargs.pop("credential_scopes", ["https://storage.azure.com/.default"])
+ kwargs.setdefault("sdk_moniker", "data-tables/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -52,7 +54,11 @@ def _configure(self, **kwargs: Any) -> None:
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs)
- self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
+ self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
self.authentication_policy = kwargs.get("authentication_policy")
+ if self.credential and not self.authentication_policy:
+ self.authentication_policy = policies.BearerTokenCredentialPolicy(
+ self.credential, *self.credential_scopes, **kwargs
+ )
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_serialization.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_serialization.py
index 9f3e29b11388..8f4fdfe2c039 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_serialization.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_serialization.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# --------------------------------------------------------------------------
#
# Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/__init__.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/__init__.py
new file mode 100644
index 000000000000..8026245c2abc
--- /dev/null
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/__init__.py
@@ -0,0 +1,6 @@
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) Python Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/model_base.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/model_base.py
new file mode 100644
index 000000000000..2e7977d8ab17
--- /dev/null
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/model_base.py
@@ -0,0 +1,1337 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) Python Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+# pylint: disable=protected-access, broad-except
+
+import copy
+import calendar
+import decimal
+import functools
+import sys
+import logging
+import base64
+import re
+import typing
+import enum
+import email.utils
+from datetime import datetime, date, time, timedelta, timezone
+from json import JSONEncoder
+import xml.etree.ElementTree as ET
+from collections.abc import MutableMapping
+from typing_extensions import Self
+import isodate
+from azure.core.exceptions import DeserializationError
+from azure.core import CaseInsensitiveEnumMeta
+from azure.core.pipeline import PipelineResponse
+from azure.core.serialization import _Null
+from azure.core.rest import HttpResponse
+
+_LOGGER = logging.getLogger(__name__)
+
+__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"]
+
+TZ_UTC = timezone.utc
+_T = typing.TypeVar("_T")
+_NONE_TYPE = type(None)
+
+
+def _timedelta_as_isostr(td: timedelta) -> str:
+ """Converts a datetime.timedelta object into an ISO 8601 formatted string, e.g. 'P4DT12H30M05S'
+
+ Function adapted from the Tin Can Python project: https://github.com/RusticiSoftware/TinCanPython
+
+ :param timedelta td: The timedelta to convert
+ :rtype: str
+ :return: ISO8601 version of this timedelta
+ """
+
+ # Split seconds to larger units
+ seconds = td.total_seconds()
+ minutes, seconds = divmod(seconds, 60)
+ hours, minutes = divmod(minutes, 60)
+ days, hours = divmod(hours, 24)
+
+ days, hours, minutes = list(map(int, (days, hours, minutes)))
+ seconds = round(seconds, 6)
+
+ # Build date
+ date_str = ""
+ if days:
+ date_str = "%sD" % days
+
+ if hours or minutes or seconds:
+ # Build time
+ time_str = "T"
+
+ # Hours
+ bigger_exists = date_str or hours
+ if bigger_exists:
+ time_str += "{:02}H".format(hours)
+
+ # Minutes
+ bigger_exists = bigger_exists or minutes
+ if bigger_exists:
+ time_str += "{:02}M".format(minutes)
+
+ # Seconds
+ try:
+ if seconds.is_integer():
+ seconds_string = "{:02}".format(int(seconds))
+ else:
+ # 9 chars long w/ leading 0, 6 digits after decimal
+ seconds_string = "%09.6f" % seconds
+ # Remove trailing zeros
+ seconds_string = seconds_string.rstrip("0")
+ except AttributeError: # int.is_integer() raises
+ seconds_string = "{:02}".format(seconds)
+
+ time_str += "{}S".format(seconds_string)
+ else:
+ time_str = ""
+
+ return "P" + date_str + time_str
+
+
+def _serialize_bytes(o, format: typing.Optional[str] = None) -> str:
+ encoded = base64.b64encode(o).decode()
+ if format == "base64url":
+ return encoded.strip("=").replace("+", "-").replace("/", "_")
+ return encoded
+
+
+def _serialize_datetime(o, format: typing.Optional[str] = None):
+ if hasattr(o, "year") and hasattr(o, "hour"):
+ if format == "rfc7231":
+ return email.utils.format_datetime(o, usegmt=True)
+ if format == "unix-timestamp":
+ return int(calendar.timegm(o.utctimetuple()))
+
+ # astimezone() fails for naive times in Python 2.7, so make make sure o is aware (tzinfo is set)
+ if not o.tzinfo:
+ iso_formatted = o.replace(tzinfo=TZ_UTC).isoformat()
+ else:
+ iso_formatted = o.astimezone(TZ_UTC).isoformat()
+ # Replace the trailing "+00:00" UTC offset with "Z" (RFC 3339: https://www.ietf.org/rfc/rfc3339.txt)
+ return iso_formatted.replace("+00:00", "Z")
+ # Next try datetime.date or datetime.time
+ return o.isoformat()
+
+
+def _is_readonly(p):
+ try:
+ return p._visibility == ["read"]
+ except AttributeError:
+ return False
+
+
+class SdkJSONEncoder(JSONEncoder):
+ """A JSON encoder that's capable of serializing datetime objects and bytes."""
+
+ def __init__(self, *args, exclude_readonly: bool = False, format: typing.Optional[str] = None, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.exclude_readonly = exclude_readonly
+ self.format = format
+
+ def default(self, o): # pylint: disable=too-many-return-statements
+ if _is_model(o):
+ if self.exclude_readonly:
+ readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)]
+ return {k: v for k, v in o.items() if k not in readonly_props}
+ return dict(o.items())
+ try:
+ return super(SdkJSONEncoder, self).default(o)
+ except TypeError:
+ if isinstance(o, _Null):
+ return None
+ if isinstance(o, decimal.Decimal):
+ return float(o)
+ if isinstance(o, (bytes, bytearray)):
+ return _serialize_bytes(o, self.format)
+ try:
+ # First try datetime.datetime
+ return _serialize_datetime(o, self.format)
+ except AttributeError:
+ pass
+ # Last, try datetime.timedelta
+ try:
+ return _timedelta_as_isostr(o)
+ except AttributeError:
+ # This will be raised when it hits value.total_seconds in the method above
+ pass
+ return super(SdkJSONEncoder, self).default(o)
+
+
+_VALID_DATE = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" + r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?")
+_VALID_RFC7231 = re.compile(
+ r"(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s\d{2}\s"
+ r"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\s\d{2}:\d{2}:\d{2}\sGMT"
+)
+
+_ARRAY_ENCODE_MAPPING = {
+ "pipeDelimited": "|",
+ "spaceDelimited": " ",
+ "commaDelimited": ",",
+ "newlineDelimited": "\n",
+}
+
+
+def _deserialize_array_encoded(delimit: str, attr):
+ if isinstance(attr, str):
+ if attr == "":
+ return []
+ return attr.split(delimit)
+ return attr
+
+
+def _deserialize_datetime(attr: typing.Union[str, datetime]) -> datetime:
+ """Deserialize ISO-8601 formatted string into Datetime object.
+
+ :param str attr: response string to be deserialized.
+ :rtype: ~datetime.datetime
+ :returns: The datetime object from that input
+ """
+ if isinstance(attr, datetime):
+ # i'm already deserialized
+ return attr
+ attr = attr.upper()
+ match = _VALID_DATE.match(attr)
+ if not match:
+ raise ValueError("Invalid datetime string: " + attr)
+
+ check_decimal = attr.split(".")
+ if len(check_decimal) > 1:
+ decimal_str = ""
+ for digit in check_decimal[1]:
+ if digit.isdigit():
+ decimal_str += digit
+ else:
+ break
+ if len(decimal_str) > 6:
+ attr = attr.replace(decimal_str, decimal_str[0:6])
+
+ date_obj = isodate.parse_datetime(attr)
+ test_utc = date_obj.utctimetuple()
+ if test_utc.tm_year > 9999 or test_utc.tm_year < 1:
+ raise OverflowError("Hit max or min date")
+ return date_obj # type: ignore[no-any-return]
+
+
+def _deserialize_datetime_rfc7231(attr: typing.Union[str, datetime]) -> datetime:
+ """Deserialize RFC7231 formatted string into Datetime object.
+
+ :param str attr: response string to be deserialized.
+ :rtype: ~datetime.datetime
+ :returns: The datetime object from that input
+ """
+ if isinstance(attr, datetime):
+ # i'm already deserialized
+ return attr
+ match = _VALID_RFC7231.match(attr)
+ if not match:
+ raise ValueError("Invalid datetime string: " + attr)
+
+ return email.utils.parsedate_to_datetime(attr)
+
+
+def _deserialize_datetime_unix_timestamp(attr: typing.Union[float, datetime]) -> datetime:
+ """Deserialize unix timestamp into Datetime object.
+
+ :param str attr: response string to be deserialized.
+ :rtype: ~datetime.datetime
+ :returns: The datetime object from that input
+ """
+ if isinstance(attr, datetime):
+ # i'm already deserialized
+ return attr
+ return datetime.fromtimestamp(attr, TZ_UTC)
+
+
+def _deserialize_date(attr: typing.Union[str, date]) -> date:
+ """Deserialize ISO-8601 formatted string into Date object.
+ :param str attr: response string to be deserialized.
+ :rtype: date
+ :returns: The date object from that input
+ """
+ # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception.
+ if isinstance(attr, date):
+ return attr
+ return isodate.parse_date(attr, defaultmonth=None, defaultday=None) # type: ignore
+
+
+def _deserialize_time(attr: typing.Union[str, time]) -> time:
+ """Deserialize ISO-8601 formatted string into time object.
+
+ :param str attr: response string to be deserialized.
+ :rtype: datetime.time
+ :returns: The time object from that input
+ """
+ if isinstance(attr, time):
+ return attr
+ return isodate.parse_time(attr) # type: ignore[no-any-return]
+
+
+def _deserialize_bytes(attr):
+ if isinstance(attr, (bytes, bytearray)):
+ return attr
+ return bytes(base64.b64decode(attr))
+
+
+def _deserialize_bytes_base64(attr):
+ if isinstance(attr, (bytes, bytearray)):
+ return attr
+ padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore
+ attr = attr + padding # type: ignore
+ encoded = attr.replace("-", "+").replace("_", "/")
+ return bytes(base64.b64decode(encoded))
+
+
+def _deserialize_duration(attr):
+ if isinstance(attr, timedelta):
+ return attr
+ return isodate.parse_duration(attr)
+
+
+def _deserialize_decimal(attr):
+ if isinstance(attr, decimal.Decimal):
+ return attr
+ return decimal.Decimal(str(attr))
+
+
+def _deserialize_int_as_str(attr):
+ if isinstance(attr, int):
+ return attr
+ return int(attr)
+
+
+_DESERIALIZE_MAPPING = {
+ datetime: _deserialize_datetime,
+ date: _deserialize_date,
+ time: _deserialize_time,
+ bytes: _deserialize_bytes,
+ bytearray: _deserialize_bytes,
+ timedelta: _deserialize_duration,
+ typing.Any: lambda x: x,
+ decimal.Decimal: _deserialize_decimal,
+}
+
+_DESERIALIZE_MAPPING_WITHFORMAT = {
+ "rfc3339": _deserialize_datetime,
+ "rfc7231": _deserialize_datetime_rfc7231,
+ "unix-timestamp": _deserialize_datetime_unix_timestamp,
+ "base64": _deserialize_bytes,
+ "base64url": _deserialize_bytes_base64,
+}
+
+
+def get_deserializer(annotation: typing.Any, rf: typing.Optional["_RestField"] = None):
+ if annotation is int and rf and rf._format == "str":
+ return _deserialize_int_as_str
+ if annotation is str and rf and rf._format in _ARRAY_ENCODE_MAPPING:
+ return functools.partial(_deserialize_array_encoded, _ARRAY_ENCODE_MAPPING[rf._format])
+ if rf and rf._format:
+ return _DESERIALIZE_MAPPING_WITHFORMAT.get(rf._format)
+ return _DESERIALIZE_MAPPING.get(annotation) # pyright: ignore
+
+
+def _get_type_alias_type(module_name: str, alias_name: str):
+ types = {
+ k: v
+ for k, v in sys.modules[module_name].__dict__.items()
+ if isinstance(v, typing._GenericAlias) # type: ignore
+ }
+ if alias_name not in types:
+ return alias_name
+ return types[alias_name]
+
+
+def _get_model(module_name: str, model_name: str):
+ models = {k: v for k, v in sys.modules[module_name].__dict__.items() if isinstance(v, type)}
+ module_end = module_name.rsplit(".", 1)[0]
+ models.update({k: v for k, v in sys.modules[module_end].__dict__.items() if isinstance(v, type)})
+ if isinstance(model_name, str):
+ model_name = model_name.split(".")[-1]
+ if model_name not in models:
+ return model_name
+ return models[model_name]
+
+
+_UNSET = object()
+
+
+class _MyMutableMapping(MutableMapping[str, typing.Any]):
+ def __init__(self, data: dict[str, typing.Any]) -> None:
+ self._data = data
+
+ def __contains__(self, key: typing.Any) -> bool:
+ return key in self._data
+
+ def __getitem__(self, key: str) -> typing.Any:
+ # If this key has been deserialized (for mutable types), we need to handle serialization
+ if hasattr(self, "_attr_to_rest_field"):
+ cache_attr = f"_deserialized_{key}"
+ if hasattr(self, cache_attr):
+ rf = _get_rest_field(getattr(self, "_attr_to_rest_field"), key)
+ if rf:
+ value = self._data.get(key)
+ if isinstance(value, (dict, list, set)):
+ # For mutable types, serialize and return
+ # But also update _data with serialized form and clear flag
+ # so mutations via this returned value affect _data
+ serialized = _serialize(value, rf._format)
+ # If serialized form is same type (no transformation needed),
+ # return _data directly so mutations work
+ if isinstance(serialized, type(value)) and serialized == value:
+ return self._data.get(key)
+ # Otherwise return serialized copy and clear flag
+ try:
+ object.__delattr__(self, cache_attr)
+ except AttributeError:
+ pass
+ # Store serialized form back
+ self._data[key] = serialized
+ return serialized
+ return self._data.__getitem__(key)
+
+ def __setitem__(self, key: str, value: typing.Any) -> None:
+ # Clear any cached deserialized value when setting through dictionary access
+ cache_attr = f"_deserialized_{key}"
+ try:
+ object.__delattr__(self, cache_attr)
+ except AttributeError:
+ pass
+ self._data.__setitem__(key, value)
+
+ def __delitem__(self, key: str) -> None:
+ self._data.__delitem__(key)
+
+ def __iter__(self) -> typing.Iterator[typing.Any]:
+ return self._data.__iter__()
+
+ def __len__(self) -> int:
+ return self._data.__len__()
+
+ def __ne__(self, other: typing.Any) -> bool:
+ return not self.__eq__(other)
+
+ def keys(self) -> typing.KeysView[str]:
+ """
+ :returns: a set-like object providing a view on D's keys
+ :rtype: ~typing.KeysView
+ """
+ return self._data.keys()
+
+ def values(self) -> typing.ValuesView[typing.Any]:
+ """
+ :returns: an object providing a view on D's values
+ :rtype: ~typing.ValuesView
+ """
+ return self._data.values()
+
+ def items(self) -> typing.ItemsView[str, typing.Any]:
+ """
+ :returns: set-like object providing a view on D's items
+ :rtype: ~typing.ItemsView
+ """
+ return self._data.items()
+
+ def get(self, key: str, default: typing.Any = None) -> typing.Any:
+ """
+ Get the value for key if key is in the dictionary, else default.
+ :param str key: The key to look up.
+ :param any default: The value to return if key is not in the dictionary. Defaults to None
+ :returns: D[k] if k in D, else d.
+ :rtype: any
+ """
+ try:
+ return self[key]
+ except KeyError:
+ return default
+
+ @typing.overload
+ def pop(self, key: str) -> typing.Any: ... # pylint: disable=arguments-differ
+
+ @typing.overload
+ def pop(self, key: str, default: _T) -> _T: ... # pylint: disable=signature-differs
+
+ @typing.overload
+ def pop(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs
+
+ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any:
+ """
+ Removes specified key and return the corresponding value.
+ :param str key: The key to pop.
+ :param any default: The value to return if key is not in the dictionary
+ :returns: The value corresponding to the key.
+ :rtype: any
+ :raises KeyError: If key is not found and default is not given.
+ """
+ if default is _UNSET:
+ return self._data.pop(key)
+ return self._data.pop(key, default)
+
+ def popitem(self) -> tuple[str, typing.Any]:
+ """
+ Removes and returns some (key, value) pair
+ :returns: The (key, value) pair.
+ :rtype: tuple
+ :raises KeyError: if D is empty.
+ """
+ return self._data.popitem()
+
+ def clear(self) -> None:
+ """
+ Remove all items from D.
+ """
+ self._data.clear()
+
+ def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: # pylint: disable=arguments-differ
+ """
+ Updates D from mapping/iterable E and F.
+ :param any args: Either a mapping object or an iterable of key-value pairs.
+ """
+ self._data.update(*args, **kwargs)
+
+ @typing.overload
+ def setdefault(self, key: str, default: None = None) -> None: ...
+
+ @typing.overload
+ def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs
+
+ def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.Any:
+ """
+ Same as calling D.get(k, d), and setting D[k]=d if k not found
+ :param str key: The key to look up.
+ :param any default: The value to set if key is not in the dictionary
+ :returns: D[k] if k in D, else d.
+ :rtype: any
+ """
+ if default is _UNSET:
+ return self._data.setdefault(key)
+ return self._data.setdefault(key, default)
+
+ def __eq__(self, other: typing.Any) -> bool:
+ try:
+ other_model = self.__class__(other)
+ except Exception:
+ return False
+ return self._data == other_model._data
+
+ def __repr__(self) -> str:
+ return str(self._data)
+
+
+def _is_model(obj: typing.Any) -> bool:
+ return getattr(obj, "_is_model", False)
+
+
+def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-many-return-statements
+ if isinstance(o, list):
+ if format in _ARRAY_ENCODE_MAPPING and all(isinstance(x, str) for x in o):
+ return _ARRAY_ENCODE_MAPPING[format].join(o)
+ return [_serialize(x, format) for x in o]
+ if isinstance(o, dict):
+ return {k: _serialize(v, format) for k, v in o.items()}
+ if isinstance(o, set):
+ return {_serialize(x, format) for x in o}
+ if isinstance(o, tuple):
+ return tuple(_serialize(x, format) for x in o)
+ if isinstance(o, (bytes, bytearray)):
+ return _serialize_bytes(o, format)
+ if isinstance(o, decimal.Decimal):
+ return float(o)
+ if isinstance(o, enum.Enum):
+ return o.value
+ if isinstance(o, int):
+ if format == "str":
+ return str(o)
+ return o
+ try:
+ # First try datetime.datetime
+ return _serialize_datetime(o, format)
+ except AttributeError:
+ pass
+ # Last, try datetime.timedelta
+ try:
+ return _timedelta_as_isostr(o)
+ except AttributeError:
+ # This will be raised when it hits value.total_seconds in the method above
+ pass
+ return o
+
+
+def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]:
+ try:
+ return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name)
+ except StopIteration:
+ return None
+
+
+def _create_value(rf: typing.Optional["_RestField"], value: typing.Any) -> typing.Any:
+ if not rf:
+ return _serialize(value, None)
+ if rf._is_multipart_file_input:
+ return value
+ if rf._is_model:
+ return _deserialize(rf._type, value)
+ if isinstance(value, ET.Element):
+ value = _deserialize(rf._type, value)
+ return _serialize(value, rf._format)
+
+
+class Model(_MyMutableMapping):
+ _is_model = True
+ # label whether current class's _attr_to_rest_field has been calculated
+ # could not see _attr_to_rest_field directly because subclass inherits it from parent class
+ _calculated: set[str] = set()
+
+ def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None:
+ class_name = self.__class__.__name__
+ if len(args) > 1:
+ raise TypeError(f"{class_name}.__init__() takes 2 positional arguments but {len(args) + 1} were given")
+ dict_to_pass = {
+ rest_field._rest_name: rest_field._default
+ for rest_field in self._attr_to_rest_field.values()
+ if rest_field._default is not _UNSET
+ }
+ if args: # pylint: disable=too-many-nested-blocks
+ if isinstance(args[0], ET.Element):
+ existed_attr_keys = []
+ model_meta = getattr(self, "_xml", {})
+
+ for rf in self._attr_to_rest_field.values():
+ prop_meta = getattr(rf, "_xml", {})
+ xml_name = prop_meta.get("name", rf._rest_name)
+ xml_ns = prop_meta.get("ns", model_meta.get("ns", None))
+ if xml_ns:
+ xml_name = "{" + xml_ns + "}" + xml_name
+
+ # attribute
+ if prop_meta.get("attribute", False) and args[0].get(xml_name) is not None:
+ existed_attr_keys.append(xml_name)
+ dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].get(xml_name))
+ continue
+
+ # unwrapped element is array
+ if prop_meta.get("unwrapped", False):
+ # unwrapped array could either use prop items meta/prop meta
+ if prop_meta.get("itemsName"):
+ xml_name = prop_meta.get("itemsName")
+ xml_ns = prop_meta.get("itemNs")
+ if xml_ns:
+ xml_name = "{" + xml_ns + "}" + xml_name
+ items = args[0].findall(xml_name) # pyright: ignore
+ if len(items) > 0:
+ existed_attr_keys.append(xml_name)
+ dict_to_pass[rf._rest_name] = _deserialize(rf._type, items)
+ continue
+
+ # text element is primitive type
+ if prop_meta.get("text", False):
+ if args[0].text is not None:
+ dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].text)
+ continue
+
+ # wrapped element could be normal property or array, it should only have one element
+ item = args[0].find(xml_name)
+ if item is not None:
+ existed_attr_keys.append(xml_name)
+ dict_to_pass[rf._rest_name] = _deserialize(rf._type, item)
+
+ # rest thing is additional properties
+ for e in args[0]:
+ if e.tag not in existed_attr_keys:
+ dict_to_pass[e.tag] = _convert_element(e)
+ else:
+ dict_to_pass.update(
+ {k: _create_value(_get_rest_field(self._attr_to_rest_field, k), v) for k, v in args[0].items()}
+ )
+ else:
+ non_attr_kwargs = [k for k in kwargs if k not in self._attr_to_rest_field]
+ if non_attr_kwargs:
+ # actual type errors only throw the first wrong keyword arg they see, so following that.
+ raise TypeError(f"{class_name}.__init__() got an unexpected keyword argument '{non_attr_kwargs[0]}'")
+ dict_to_pass.update(
+ {
+ self._attr_to_rest_field[k]._rest_name: _create_value(self._attr_to_rest_field[k], v)
+ for k, v in kwargs.items()
+ if v is not None
+ }
+ )
+ super().__init__(dict_to_pass)
+
+ def copy(self) -> "Model":
+ return Model(self.__dict__)
+
+ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self:
+ if f"{cls.__module__}.{cls.__qualname__}" not in cls._calculated:
+ # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping',
+ # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object'
+ mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order
+ attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property
+ k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type")
+ }
+ annotations = {
+ k: v
+ for mro_class in mros
+ if hasattr(mro_class, "__annotations__")
+ for k, v in mro_class.__annotations__.items()
+ }
+ for attr, rf in attr_to_rest_field.items():
+ rf._module = cls.__module__
+ if not rf._type:
+ rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None))
+ if not rf._rest_name_input:
+ rf._rest_name_input = attr
+ cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items())
+ cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}")
+
+ return super().__new__(cls)
+
+ def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None:
+ for base in cls.__bases__:
+ if hasattr(base, "__mapping__"):
+ base.__mapping__[discriminator or cls.__name__] = cls # type: ignore
+
+ @classmethod
+ def _get_discriminator(cls, exist_discriminators) -> typing.Optional["_RestField"]:
+ for v in cls.__dict__.values():
+ if isinstance(v, _RestField) and v._is_discriminator and v._rest_name not in exist_discriminators:
+ return v
+ return None
+
+ @classmethod
+ def _deserialize(cls, data, exist_discriminators):
+ if not hasattr(cls, "__mapping__"):
+ return cls(data)
+ discriminator = cls._get_discriminator(exist_discriminators)
+ if discriminator is None:
+ return cls(data)
+ exist_discriminators.append(discriminator._rest_name)
+ if isinstance(data, ET.Element):
+ model_meta = getattr(cls, "_xml", {})
+ prop_meta = getattr(discriminator, "_xml", {})
+ xml_name = prop_meta.get("name", discriminator._rest_name)
+ xml_ns = prop_meta.get("ns", model_meta.get("ns", None))
+ if xml_ns:
+ xml_name = "{" + xml_ns + "}" + xml_name
+
+ if data.get(xml_name) is not None:
+ discriminator_value = data.get(xml_name)
+ else:
+ discriminator_value = data.find(xml_name).text # pyright: ignore
+ else:
+ discriminator_value = data.get(discriminator._rest_name)
+ mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member
+ return mapped_cls._deserialize(data, exist_discriminators)
+
+ def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]:
+ """Return a dict that can be turned into json using json.dump.
+
+ :keyword bool exclude_readonly: Whether to remove the readonly properties.
+ :returns: A dict JSON compatible object
+ :rtype: dict
+ """
+
+ result = {}
+ readonly_props = []
+ if exclude_readonly:
+ readonly_props = [p._rest_name for p in self._attr_to_rest_field.values() if _is_readonly(p)]
+ for k, v in self.items():
+ if exclude_readonly and k in readonly_props: # pyright: ignore
+ continue
+ is_multipart_file_input = False
+ try:
+ is_multipart_file_input = next(
+ rf for rf in self._attr_to_rest_field.values() if rf._rest_name == k
+ )._is_multipart_file_input
+ except StopIteration:
+ pass
+ result[k] = v if is_multipart_file_input else Model._as_dict_value(v, exclude_readonly=exclude_readonly)
+ return result
+
+ @staticmethod
+ def _as_dict_value(v: typing.Any, exclude_readonly: bool = False) -> typing.Any:
+ if v is None or isinstance(v, _Null):
+ return None
+ if isinstance(v, (list, tuple, set)):
+ return type(v)(Model._as_dict_value(x, exclude_readonly=exclude_readonly) for x in v)
+ if isinstance(v, dict):
+ return {dk: Model._as_dict_value(dv, exclude_readonly=exclude_readonly) for dk, dv in v.items()}
+ return v.as_dict(exclude_readonly=exclude_readonly) if hasattr(v, "as_dict") else v
+
+
+def _deserialize_model(model_deserializer: typing.Optional[typing.Callable], obj):
+ if _is_model(obj):
+ return obj
+ return _deserialize(model_deserializer, obj)
+
+
+def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj):
+ if obj is None:
+ return obj
+ return _deserialize_with_callable(if_obj_deserializer, obj)
+
+
+def _deserialize_with_union(deserializers, obj):
+ for deserializer in deserializers:
+ try:
+ return _deserialize(deserializer, obj)
+ except DeserializationError:
+ pass
+ raise DeserializationError()
+
+
+def _deserialize_dict(
+ value_deserializer: typing.Optional[typing.Callable],
+ module: typing.Optional[str],
+ obj: dict[typing.Any, typing.Any],
+):
+ if obj is None:
+ return obj
+ if isinstance(obj, ET.Element):
+ obj = {child.tag: child for child in obj}
+ return {k: _deserialize(value_deserializer, v, module) for k, v in obj.items()}
+
+
+def _deserialize_multiple_sequence(
+ entry_deserializers: list[typing.Optional[typing.Callable]],
+ module: typing.Optional[str],
+ obj,
+):
+ if obj is None:
+ return obj
+ return type(obj)(_deserialize(deserializer, entry, module) for entry, deserializer in zip(obj, entry_deserializers))
+
+
+def _is_array_encoded_deserializer(deserializer: functools.partial) -> bool:
+ return (
+ isinstance(deserializer, functools.partial)
+ and isinstance(deserializer.args[0], functools.partial)
+ and deserializer.args[0].func == _deserialize_array_encoded # pylint: disable=comparison-with-callable
+ )
+
+
+def _deserialize_sequence(
+ deserializer: typing.Optional[typing.Callable],
+ module: typing.Optional[str],
+ obj,
+):
+ if obj is None:
+ return obj
+ if isinstance(obj, ET.Element):
+ obj = list(obj)
+
+ # encoded string may be deserialized to sequence
+ if isinstance(obj, str) and isinstance(deserializer, functools.partial):
+ # for list[str]
+ if _is_array_encoded_deserializer(deserializer):
+ return deserializer(obj)
+
+ # for list[Union[...]]
+ if isinstance(deserializer.args[0], list):
+ for sub_deserializer in deserializer.args[0]:
+ if _is_array_encoded_deserializer(sub_deserializer):
+ return sub_deserializer(obj)
+
+ return type(obj)(_deserialize(deserializer, entry, module) for entry in obj)
+
+
+def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]:
+ return sorted(
+ types,
+ key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"),
+ )
+
+
+def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-return-statements, too-many-statements, too-many-branches
+ annotation: typing.Any,
+ module: typing.Optional[str],
+ rf: typing.Optional["_RestField"] = None,
+) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]:
+ if not annotation:
+ return None
+
+ # is it a type alias?
+ if isinstance(annotation, str):
+ if module is not None:
+ annotation = _get_type_alias_type(module, annotation)
+
+ # is it a forward ref / in quotes?
+ if isinstance(annotation, (str, typing.ForwardRef)):
+ try:
+ model_name = annotation.__forward_arg__ # type: ignore
+ except AttributeError:
+ model_name = annotation
+ if module is not None:
+ annotation = _get_model(module, model_name) # type: ignore
+
+ try:
+ if module and _is_model(annotation):
+ if rf:
+ rf._is_model = True
+
+ return functools.partial(_deserialize_model, annotation) # pyright: ignore
+ except Exception:
+ pass
+
+ # is it a literal?
+ try:
+ if annotation.__origin__ is typing.Literal: # pyright: ignore
+ return None
+ except AttributeError:
+ pass
+
+ # is it optional?
+ try:
+ if any(a is _NONE_TYPE for a in annotation.__args__): # pyright: ignore
+ if len(annotation.__args__) <= 2: # pyright: ignore
+ if_obj_deserializer = _get_deserialize_callable_from_annotation(
+ next(a for a in annotation.__args__ if a is not _NONE_TYPE), module, rf # pyright: ignore
+ )
+
+ return functools.partial(_deserialize_with_optional, if_obj_deserializer)
+ # the type is Optional[Union[...]], we need to remove the None type from the Union
+ annotation_copy = copy.copy(annotation)
+ annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a is not _NONE_TYPE] # pyright: ignore
+ return _get_deserialize_callable_from_annotation(annotation_copy, module, rf)
+ except AttributeError:
+ pass
+
+ # is it union?
+ if getattr(annotation, "__origin__", None) is typing.Union:
+ # initial ordering is we make `string` the last deserialization option, because it is often them most generic
+ deserializers = [
+ _get_deserialize_callable_from_annotation(arg, module, rf)
+ for arg in _sorted_annotations(annotation.__args__) # pyright: ignore
+ ]
+
+ return functools.partial(_deserialize_with_union, deserializers)
+
+ try:
+ annotation_name = (
+ annotation.__name__ if hasattr(annotation, "__name__") else annotation._name # pyright: ignore
+ )
+ if annotation_name.lower() == "dict":
+ value_deserializer = _get_deserialize_callable_from_annotation(
+ annotation.__args__[1], module, rf # pyright: ignore
+ )
+
+ return functools.partial(
+ _deserialize_dict,
+ value_deserializer,
+ module,
+ )
+ except (AttributeError, IndexError):
+ pass
+ try:
+ annotation_name = (
+ annotation.__name__ if hasattr(annotation, "__name__") else annotation._name # pyright: ignore
+ )
+ if annotation_name.lower() in ["list", "set", "tuple", "sequence"]:
+ if len(annotation.__args__) > 1: # pyright: ignore
+ entry_deserializers = [
+ _get_deserialize_callable_from_annotation(dt, module, rf)
+ for dt in annotation.__args__ # pyright: ignore
+ ]
+ return functools.partial(_deserialize_multiple_sequence, entry_deserializers, module)
+ deserializer = _get_deserialize_callable_from_annotation(
+ annotation.__args__[0], module, rf # pyright: ignore
+ )
+
+ return functools.partial(_deserialize_sequence, deserializer, module)
+ except (TypeError, IndexError, AttributeError, SyntaxError):
+ pass
+
+ def _deserialize_default(
+ deserializer,
+ obj,
+ ):
+ if obj is None:
+ return obj
+ try:
+ return _deserialize_with_callable(deserializer, obj)
+ except Exception:
+ pass
+ return obj
+
+ if get_deserializer(annotation, rf):
+ return functools.partial(_deserialize_default, get_deserializer(annotation, rf))
+
+ return functools.partial(_deserialize_default, annotation)
+
+
+def _deserialize_with_callable(
+ deserializer: typing.Optional[typing.Callable[[typing.Any], typing.Any]],
+ value: typing.Any,
+): # pylint: disable=too-many-return-statements
+ try:
+ if value is None or isinstance(value, _Null):
+ return None
+ if isinstance(value, ET.Element):
+ if deserializer is str:
+ return value.text or ""
+ if deserializer is int:
+ return int(value.text) if value.text else None
+ if deserializer is float:
+ return float(value.text) if value.text else None
+ if deserializer is bool:
+ return value.text == "true" if value.text else None
+ if deserializer is None:
+ return value
+ if deserializer in [int, float, bool]:
+ return deserializer(value)
+ if isinstance(deserializer, CaseInsensitiveEnumMeta):
+ try:
+ return deserializer(value)
+ except ValueError:
+ # for unknown value, return raw value
+ return value
+ if isinstance(deserializer, type) and issubclass(deserializer, Model):
+ return deserializer._deserialize(value, [])
+ return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value)
+ except Exception as e:
+ raise DeserializationError() from e
+
+
+def _deserialize(
+ deserializer: typing.Any,
+ value: typing.Any,
+ module: typing.Optional[str] = None,
+ rf: typing.Optional["_RestField"] = None,
+ format: typing.Optional[str] = None,
+) -> typing.Any:
+ if isinstance(value, PipelineResponse):
+ value = value.http_response.json()
+ if rf is None and format:
+ rf = _RestField(format=format)
+ if not isinstance(deserializer, functools.partial):
+ deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf)
+ return _deserialize_with_callable(deserializer, value)
+
+
+def _failsafe_deserialize(
+ deserializer: typing.Any,
+ response: HttpResponse,
+ module: typing.Optional[str] = None,
+ rf: typing.Optional["_RestField"] = None,
+ format: typing.Optional[str] = None,
+) -> typing.Any:
+ try:
+ return _deserialize(deserializer, response.json(), module, rf, format)
+ except DeserializationError:
+ _LOGGER.warning(
+ "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
+ )
+ return None
+
+
+def _failsafe_deserialize_xml(
+ deserializer: typing.Any,
+ response: HttpResponse,
+) -> typing.Any:
+ try:
+ return _deserialize_xml(deserializer, response.text())
+ except DeserializationError:
+ _LOGGER.warning(
+ "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
+ )
+ return None
+
+
+class _RestField:
+ def __init__(
+ self,
+ *,
+ name: typing.Optional[str] = None,
+ type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin
+ is_discriminator: bool = False,
+ visibility: typing.Optional[list[str]] = None,
+ default: typing.Any = _UNSET,
+ format: typing.Optional[str] = None,
+ is_multipart_file_input: bool = False,
+ xml: typing.Optional[dict[str, typing.Any]] = None,
+ ):
+ self._type = type
+ self._rest_name_input = name
+ self._module: typing.Optional[str] = None
+ self._is_discriminator = is_discriminator
+ self._visibility = visibility
+ self._is_model = False
+ self._default = default
+ self._format = format
+ self._is_multipart_file_input = is_multipart_file_input
+ self._xml = xml if xml is not None else {}
+
+ @property
+ def _class_type(self) -> typing.Any:
+ result = getattr(self._type, "args", [None])[0]
+ # type may be wrapped by nested functools.partial so we need to check for that
+ if isinstance(result, functools.partial):
+ return getattr(result, "args", [None])[0]
+ return result
+
+ @property
+ def _rest_name(self) -> str:
+ if self._rest_name_input is None:
+ raise ValueError("Rest name was never set")
+ return self._rest_name_input
+
+ def __get__(self, obj: Model, type=None): # pylint: disable=redefined-builtin
+ # by this point, type and rest_name will have a value bc we default
+ # them in __new__ of the Model class
+ # Use _data.get() directly to avoid triggering __getitem__ which clears the cache
+ item = obj._data.get(self._rest_name)
+ if item is None:
+ return item
+ if self._is_model:
+ return item
+
+ # For mutable types, we want mutations to directly affect _data
+ # Check if we've already deserialized this value
+ cache_attr = f"_deserialized_{self._rest_name}"
+ if hasattr(obj, cache_attr):
+ # Return the value from _data directly (it's been deserialized in place)
+ return obj._data.get(self._rest_name)
+
+ deserialized = _deserialize(self._type, _serialize(item, self._format), rf=self)
+
+ # For mutable types, store the deserialized value back in _data
+ # so mutations directly affect _data
+ if isinstance(deserialized, (dict, list, set)):
+ obj._data[self._rest_name] = deserialized
+ object.__setattr__(obj, cache_attr, True) # Mark as deserialized
+ return deserialized
+
+ return deserialized
+
+ def __set__(self, obj: Model, value) -> None:
+ # Clear the cached deserialized object when setting a new value
+ cache_attr = f"_deserialized_{self._rest_name}"
+ if hasattr(obj, cache_attr):
+ object.__delattr__(obj, cache_attr)
+
+ if value is None:
+ # we want to wipe out entries if users set attr to None
+ try:
+ obj.__delitem__(self._rest_name)
+ except KeyError:
+ pass
+ return
+ if self._is_model:
+ if not _is_model(value):
+ value = _deserialize(self._type, value)
+ obj.__setitem__(self._rest_name, value)
+ return
+ obj.__setitem__(self._rest_name, _serialize(value, self._format))
+
+ def _get_deserialize_callable_from_annotation(
+ self, annotation: typing.Any
+ ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]:
+ return _get_deserialize_callable_from_annotation(annotation, self._module, self)
+
+
+def rest_field(
+ *,
+ name: typing.Optional[str] = None,
+ type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin
+ visibility: typing.Optional[list[str]] = None,
+ default: typing.Any = _UNSET,
+ format: typing.Optional[str] = None,
+ is_multipart_file_input: bool = False,
+ xml: typing.Optional[dict[str, typing.Any]] = None,
+) -> typing.Any:
+ return _RestField(
+ name=name,
+ type=type,
+ visibility=visibility,
+ default=default,
+ format=format,
+ is_multipart_file_input=is_multipart_file_input,
+ xml=xml,
+ )
+
+
+def rest_discriminator(
+ *,
+ name: typing.Optional[str] = None,
+ type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin
+ visibility: typing.Optional[list[str]] = None,
+ xml: typing.Optional[dict[str, typing.Any]] = None,
+) -> typing.Any:
+ return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml)
+
+
+def serialize_xml(model: Model, exclude_readonly: bool = False) -> str:
+ """Serialize a model to XML.
+
+ :param Model model: The model to serialize.
+ :param bool exclude_readonly: Whether to exclude readonly properties.
+ :returns: The XML representation of the model.
+ :rtype: str
+ """
+ return ET.tostring(_get_element(model, exclude_readonly), encoding="unicode") # type: ignore
+
+
+def _get_element(
+ o: typing.Any,
+ exclude_readonly: bool = False,
+ parent_meta: typing.Optional[dict[str, typing.Any]] = None,
+ wrapped_element: typing.Optional[ET.Element] = None,
+) -> typing.Union[ET.Element, list[ET.Element]]:
+ if _is_model(o):
+ model_meta = getattr(o, "_xml", {})
+
+ # if prop is a model, then use the prop element directly, else generate a wrapper of model
+ if wrapped_element is None:
+ wrapped_element = _create_xml_element(
+ model_meta.get("name", o.__class__.__name__),
+ model_meta.get("prefix"),
+ model_meta.get("ns"),
+ )
+
+ readonly_props = []
+ if exclude_readonly:
+ readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)]
+
+ for k, v in o.items():
+ # do not serialize readonly properties
+ if exclude_readonly and k in readonly_props:
+ continue
+
+ prop_rest_field = _get_rest_field(o._attr_to_rest_field, k)
+ if prop_rest_field:
+ prop_meta = getattr(prop_rest_field, "_xml").copy()
+ # use the wire name as xml name if no specific name is set
+ if prop_meta.get("name") is None:
+ prop_meta["name"] = k
+ else:
+ # additional properties will not have rest field, use the wire name as xml name
+ prop_meta = {"name": k}
+
+ # if no ns for prop, use model's
+ if prop_meta.get("ns") is None and model_meta.get("ns"):
+ prop_meta["ns"] = model_meta.get("ns")
+ prop_meta["prefix"] = model_meta.get("prefix")
+
+ if prop_meta.get("unwrapped", False):
+ # unwrapped could only set on array
+ wrapped_element.extend(_get_element(v, exclude_readonly, prop_meta))
+ elif prop_meta.get("text", False):
+ # text could only set on primitive type
+ wrapped_element.text = _get_primitive_type_value(v)
+ elif prop_meta.get("attribute", False):
+ xml_name = prop_meta.get("name", k)
+ if prop_meta.get("ns"):
+ ET.register_namespace(prop_meta.get("prefix"), prop_meta.get("ns")) # pyright: ignore
+ xml_name = "{" + prop_meta.get("ns") + "}" + xml_name # pyright: ignore
+ # attribute should be primitive type
+ wrapped_element.set(xml_name, _get_primitive_type_value(v))
+ else:
+ # other wrapped prop element
+ wrapped_element.append(_get_wrapped_element(v, exclude_readonly, prop_meta))
+ return wrapped_element
+ if isinstance(o, list):
+ return [_get_element(x, exclude_readonly, parent_meta) for x in o] # type: ignore
+ if isinstance(o, dict):
+ result = []
+ for k, v in o.items():
+ result.append(
+ _get_wrapped_element(
+ v,
+ exclude_readonly,
+ {
+ "name": k,
+ "ns": parent_meta.get("ns") if parent_meta else None,
+ "prefix": parent_meta.get("prefix") if parent_meta else None,
+ },
+ )
+ )
+ return result
+
+ # primitive case need to create element based on parent_meta
+ if parent_meta:
+ return _get_wrapped_element(
+ o,
+ exclude_readonly,
+ {
+ "name": parent_meta.get("itemsName", parent_meta.get("name")),
+ "prefix": parent_meta.get("itemsPrefix", parent_meta.get("prefix")),
+ "ns": parent_meta.get("itemsNs", parent_meta.get("ns")),
+ },
+ )
+
+ raise ValueError("Could not serialize value into xml: " + o)
+
+
+def _get_wrapped_element(
+ v: typing.Any,
+ exclude_readonly: bool,
+ meta: typing.Optional[dict[str, typing.Any]],
+) -> ET.Element:
+ wrapped_element = _create_xml_element(
+ meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None
+ )
+ if isinstance(v, (dict, list)):
+ wrapped_element.extend(_get_element(v, exclude_readonly, meta))
+ elif _is_model(v):
+ _get_element(v, exclude_readonly, meta, wrapped_element)
+ else:
+ wrapped_element.text = _get_primitive_type_value(v)
+ return wrapped_element # type: ignore[no-any-return]
+
+
+def _get_primitive_type_value(v) -> str:
+ if v is True:
+ return "true"
+ if v is False:
+ return "false"
+ if isinstance(v, _Null):
+ return ""
+ return str(v)
+
+
+def _create_xml_element(
+ tag: typing.Any, prefix: typing.Optional[str] = None, ns: typing.Optional[str] = None
+) -> ET.Element:
+ if prefix and ns:
+ ET.register_namespace(prefix, ns)
+ if ns:
+ return ET.Element("{" + ns + "}" + tag)
+ return ET.Element(tag)
+
+
+def _deserialize_xml(
+ deserializer: typing.Any,
+ value: str,
+) -> typing.Any:
+ element = ET.fromstring(value) # nosec
+ return _deserialize(deserializer, element)
+
+
+def _convert_element(e: ET.Element):
+ # dict case
+ if len(e.attrib) > 0 or len({child.tag for child in e}) > 1:
+ dict_result: dict[str, typing.Any] = {}
+ for child in e:
+ if dict_result.get(child.tag) is not None:
+ if isinstance(dict_result[child.tag], list):
+ dict_result[child.tag].append(_convert_element(child))
+ else:
+ dict_result[child.tag] = [dict_result[child.tag], _convert_element(child)]
+ else:
+ dict_result[child.tag] = _convert_element(child)
+ dict_result.update(e.attrib)
+ return dict_result
+ # array case
+ if len(e) > 0:
+ array_result: list[typing.Any] = []
+ for child in e:
+ array_result.append(_convert_element(child))
+ return array_result
+ # primitive case
+ return e.text
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/serialization.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/serialization.py
new file mode 100644
index 000000000000..81ec1de5922b
--- /dev/null
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/serialization.py
@@ -0,0 +1,2041 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) Python Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+# pyright: reportUnnecessaryTypeIgnoreComment=false
+
+from base64 import b64decode, b64encode
+import calendar
+import datetime
+import decimal
+import email
+from enum import Enum
+import json
+import logging
+import re
+import sys
+import codecs
+from typing import (
+ Any,
+ cast,
+ Optional,
+ Union,
+ AnyStr,
+ IO,
+ Mapping,
+ Callable,
+ MutableMapping,
+)
+
+try:
+ from urllib import quote # type: ignore
+except ImportError:
+ from urllib.parse import quote
+import xml.etree.ElementTree as ET
+
+import isodate # type: ignore
+from typing_extensions import Self
+
+from azure.core.exceptions import DeserializationError, SerializationError
+from azure.core.serialization import NULL as CoreNull
+
+_BOM = codecs.BOM_UTF8.decode(encoding="utf-8")
+
+JSON = MutableMapping[str, Any]
+
+
+class RawDeserializer:
+
+ # Accept "text" because we're open minded people...
+ JSON_REGEXP = re.compile(r"^(application|text)/([a-z+.]+\+)?json$")
+
+ # Name used in context
+ CONTEXT_NAME = "deserialized_data"
+
+ @classmethod
+ def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: Optional[str] = None) -> Any:
+ """Decode data according to content-type.
+
+ Accept a stream of data as well, but will be load at once in memory for now.
+
+ If no content-type, will return the string version (not bytes, not stream)
+
+ :param data: Input, could be bytes or stream (will be decoded with UTF8) or text
+ :type data: str or bytes or IO
+ :param str content_type: The content type.
+ :return: The deserialized data.
+ :rtype: object
+ """
+ if hasattr(data, "read"):
+ # Assume a stream
+ data = cast(IO, data).read()
+
+ if isinstance(data, bytes):
+ data_as_str = data.decode(encoding="utf-8-sig")
+ else:
+ # Explain to mypy the correct type.
+ data_as_str = cast(str, data)
+
+ # Remove Byte Order Mark if present in string
+ data_as_str = data_as_str.lstrip(_BOM)
+
+ if content_type is None:
+ return data
+
+ if cls.JSON_REGEXP.match(content_type):
+ try:
+ return json.loads(data_as_str)
+ except ValueError as err:
+ raise DeserializationError("JSON is invalid: {}".format(err), err) from err
+ elif "xml" in (content_type or []):
+ try:
+
+ try:
+ if isinstance(data, unicode): # type: ignore
+ # If I'm Python 2.7 and unicode XML will scream if I try a "fromstring" on unicode string
+ data_as_str = data_as_str.encode(encoding="utf-8") # type: ignore
+ except NameError:
+ pass
+
+ return ET.fromstring(data_as_str) # nosec
+ except ET.ParseError as err:
+ # It might be because the server has an issue, and returned JSON with
+ # content-type XML....
+ # So let's try a JSON load, and if it's still broken
+ # let's flow the initial exception
+ def _json_attemp(data):
+ try:
+ return True, json.loads(data)
+ except ValueError:
+ return False, None # Don't care about this one
+
+ success, json_result = _json_attemp(data)
+ if success:
+ return json_result
+ # If i'm here, it's not JSON, it's not XML, let's scream
+ # and raise the last context in this block (the XML exception)
+ # The function hack is because Py2.7 messes up with exception
+ # context otherwise.
+ _LOGGER.critical("Wasn't XML not JSON, failing")
+ raise DeserializationError("XML is invalid") from err
+ elif content_type.startswith("text/"):
+ return data_as_str
+ raise DeserializationError("Cannot deserialize content-type: {}".format(content_type))
+
+ @classmethod
+ def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], headers: Mapping) -> Any:
+ """Deserialize from HTTP response.
+
+ Use bytes and headers to NOT use any requests/aiohttp or whatever
+ specific implementation.
+ Headers will tested for "content-type"
+
+ :param bytes body_bytes: The body of the response.
+ :param dict headers: The headers of the response.
+ :returns: The deserialized data.
+ :rtype: object
+ """
+ # Try to use content-type from headers if available
+ content_type = None
+ if "content-type" in headers:
+ content_type = headers["content-type"].split(";")[0].strip().lower()
+ # Ouch, this server did not declare what it sent...
+ # Let's guess it's JSON...
+ # Also, since Autorest was considering that an empty body was a valid JSON,
+ # need that test as well....
+ else:
+ content_type = "application/json"
+
+ if body_bytes:
+ return cls.deserialize_from_text(body_bytes, content_type)
+ return None
+
+
+_LOGGER = logging.getLogger(__name__)
+
+try:
+ _long_type = long # type: ignore
+except NameError:
+ _long_type = int
+
+TZ_UTC = datetime.timezone.utc
+
+_FLATTEN = re.compile(r"(? None:
+ self.additional_properties: Optional[dict[str, Any]] = {}
+ for k in kwargs: # pylint: disable=consider-using-dict-items
+ if k not in self._attribute_map:
+ _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__)
+ elif k in self._validation and self._validation[k].get("readonly", False):
+ _LOGGER.warning("Readonly attribute %s will be ignored in class %s", k, self.__class__)
+ else:
+ setattr(self, k, kwargs[k])
+
+ def __eq__(self, other: Any) -> bool:
+ """Compare objects by comparing all attributes.
+
+ :param object other: The object to compare
+ :returns: True if objects are equal
+ :rtype: bool
+ """
+ if isinstance(other, self.__class__):
+ return self.__dict__ == other.__dict__
+ return False
+
+ def __ne__(self, other: Any) -> bool:
+ """Compare objects by comparing all attributes.
+
+ :param object other: The object to compare
+ :returns: True if objects are not equal
+ :rtype: bool
+ """
+ return not self.__eq__(other)
+
+ def __str__(self) -> str:
+ return str(self.__dict__)
+
+ @classmethod
+ def enable_additional_properties_sending(cls) -> None:
+ cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"}
+
+ @classmethod
+ def is_xml_model(cls) -> bool:
+ try:
+ cls._xml_map # type: ignore
+ except AttributeError:
+ return False
+ return True
+
+ @classmethod
+ def _create_xml_node(cls):
+ """Create XML node.
+
+ :returns: The XML node
+ :rtype: xml.etree.ElementTree.Element
+ """
+ try:
+ xml_map = cls._xml_map # type: ignore
+ except AttributeError:
+ xml_map = {}
+
+ return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None))
+
+ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON:
+ """Return the JSON that would be sent to server from this model.
+
+ This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`.
+
+ If you want XML serialization, you can pass the kwargs is_xml=True.
+
+ :param bool keep_readonly: If you want to serialize the readonly attributes
+ :returns: A dict JSON compatible object
+ :rtype: dict
+ """
+ serializer = Serializer(self._infer_class_models())
+ return serializer._serialize( # type: ignore # pylint: disable=protected-access
+ self, keep_readonly=keep_readonly, **kwargs
+ )
+
+ def as_dict(
+ self,
+ keep_readonly: bool = True,
+ key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer,
+ **kwargs: Any
+ ) -> JSON:
+ """Return a dict that can be serialized using json.dump.
+
+ Advanced usage might optionally use a callback as parameter:
+
+ .. code::python
+
+ def my_key_transformer(key, attr_desc, value):
+ return key
+
+ Key is the attribute name used in Python. Attr_desc
+ is a dict of metadata. Currently contains 'type' with the
+ msrest type and 'key' with the RestAPI encoded key.
+ Value is the current value in this object.
+
+ The string returned will be used to serialize the key.
+ If the return type is a list, this is considered hierarchical
+ result dict.
+
+ See the three examples in this file:
+
+ - attribute_transformer
+ - full_restapi_key_transformer
+ - last_restapi_key_transformer
+
+ If you want XML serialization, you can pass the kwargs is_xml=True.
+
+ :param bool keep_readonly: If you want to serialize the readonly attributes
+ :param function key_transformer: A key transformer function.
+ :returns: A dict JSON compatible object
+ :rtype: dict
+ """
+ serializer = Serializer(self._infer_class_models())
+ return serializer._serialize( # type: ignore # pylint: disable=protected-access
+ self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs
+ )
+
+ @classmethod
+ def _infer_class_models(cls):
+ try:
+ str_models = cls.__module__.rsplit(".", 1)[0]
+ models = sys.modules[str_models]
+ client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
+ if cls.__name__ not in client_models:
+ raise ValueError("Not Autorest generated code")
+ except Exception: # pylint: disable=broad-exception-caught
+ # Assume it's not Autorest generated (tests?). Add ourselves as dependencies.
+ client_models = {cls.__name__: cls}
+ return client_models
+
+ @classmethod
+ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self:
+ """Parse a str using the RestAPI syntax and return a model.
+
+ :param str data: A str using RestAPI structure. JSON by default.
+ :param str content_type: JSON by default, set application/xml if XML.
+ :returns: An instance of this model
+ :raises DeserializationError: if something went wrong
+ :rtype: Self
+ """
+ deserializer = Deserializer(cls._infer_class_models())
+ return deserializer(cls.__name__, data, content_type=content_type) # type: ignore
+
+ @classmethod
+ def from_dict(
+ cls,
+ data: Any,
+ key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None,
+ content_type: Optional[str] = None,
+ ) -> Self:
+ """Parse a dict using given key extractor return a model.
+
+ By default consider key
+ extractors (rest_key_case_insensitive_extractor, attribute_key_case_insensitive_extractor
+ and last_rest_key_case_insensitive_extractor)
+
+ :param dict data: A dict using RestAPI structure
+ :param function key_extractors: A key extractor function.
+ :param str content_type: JSON by default, set application/xml if XML.
+ :returns: An instance of this model
+ :raises DeserializationError: if something went wrong
+ :rtype: Self
+ """
+ deserializer = Deserializer(cls._infer_class_models())
+ deserializer.key_extractors = ( # type: ignore
+ [ # type: ignore
+ attribute_key_case_insensitive_extractor,
+ rest_key_case_insensitive_extractor,
+ last_rest_key_case_insensitive_extractor,
+ ]
+ if key_extractors is None
+ else key_extractors
+ )
+ return deserializer(cls.__name__, data, content_type=content_type) # type: ignore
+
+ @classmethod
+ def _flatten_subtype(cls, key, objects):
+ if "_subtype_map" not in cls.__dict__:
+ return {}
+ result = dict(cls._subtype_map[key])
+ for valuetype in cls._subtype_map[key].values():
+ result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access
+ return result
+
+ @classmethod
+ def _classify(cls, response, objects):
+ """Check the class _subtype_map for any child classes.
+ We want to ignore any inherited _subtype_maps.
+
+ :param dict response: The initial data
+ :param dict objects: The class objects
+ :returns: The class to be used
+ :rtype: class
+ """
+ for subtype_key in cls.__dict__.get("_subtype_map", {}).keys():
+ subtype_value = None
+
+ if not isinstance(response, ET.Element):
+ rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1]
+ subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None)
+ else:
+ subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response)
+ if subtype_value:
+ # Try to match base class. Can be class name only
+ # (bug to fix in Autorest to support x-ms-discriminator-name)
+ if cls.__name__ == subtype_value:
+ return cls
+ flatten_mapping_type = cls._flatten_subtype(subtype_key, objects)
+ try:
+ return objects[flatten_mapping_type[subtype_value]] # type: ignore
+ except KeyError:
+ _LOGGER.warning(
+ "Subtype value %s has no mapping, use base class %s.",
+ subtype_value,
+ cls.__name__,
+ )
+ break
+ else:
+ _LOGGER.warning("Discriminator %s is absent or null, use base class %s.", subtype_key, cls.__name__)
+ break
+ return cls
+
+ @classmethod
+ def _get_rest_key_parts(cls, attr_key):
+ """Get the RestAPI key of this attr, split it and decode part
+ :param str attr_key: Attribute key must be in attribute_map.
+ :returns: A list of RestAPI part
+ :rtype: list
+ """
+ rest_split_key = _FLATTEN.split(cls._attribute_map[attr_key]["key"])
+ return [_decode_attribute_map_key(key_part) for key_part in rest_split_key]
+
+
+def _decode_attribute_map_key(key):
+ """This decode a key in an _attribute_map to the actual key we want to look at
+ inside the received data.
+
+ :param str key: A key string from the generated code
+ :returns: The decoded key
+ :rtype: str
+ """
+ return key.replace("\\.", ".")
+
+
+class Serializer: # pylint: disable=too-many-public-methods
+ """Request object model serializer."""
+
+ basic_types = {str: "str", int: "int", bool: "bool", float: "float"}
+
+ _xml_basic_types_serializers = {"bool": lambda x: str(x).lower()}
+ days = {0: "Mon", 1: "Tue", 2: "Wed", 3: "Thu", 4: "Fri", 5: "Sat", 6: "Sun"}
+ months = {
+ 1: "Jan",
+ 2: "Feb",
+ 3: "Mar",
+ 4: "Apr",
+ 5: "May",
+ 6: "Jun",
+ 7: "Jul",
+ 8: "Aug",
+ 9: "Sep",
+ 10: "Oct",
+ 11: "Nov",
+ 12: "Dec",
+ }
+ validation = {
+ "min_length": lambda x, y: len(x) < y,
+ "max_length": lambda x, y: len(x) > y,
+ "minimum": lambda x, y: x < y,
+ "maximum": lambda x, y: x > y,
+ "minimum_ex": lambda x, y: x <= y,
+ "maximum_ex": lambda x, y: x >= y,
+ "min_items": lambda x, y: len(x) < y,
+ "max_items": lambda x, y: len(x) > y,
+ "pattern": lambda x, y: not re.match(y, x, re.UNICODE),
+ "unique": lambda x, y: len(x) != len(set(x)),
+ "multiple": lambda x, y: x % y != 0,
+ }
+
+ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None:
+ self.serialize_type = {
+ "iso-8601": Serializer.serialize_iso,
+ "rfc-1123": Serializer.serialize_rfc,
+ "unix-time": Serializer.serialize_unix,
+ "duration": Serializer.serialize_duration,
+ "date": Serializer.serialize_date,
+ "time": Serializer.serialize_time,
+ "decimal": Serializer.serialize_decimal,
+ "long": Serializer.serialize_long,
+ "bytearray": Serializer.serialize_bytearray,
+ "base64": Serializer.serialize_base64,
+ "object": self.serialize_object,
+ "[]": self.serialize_iter,
+ "{}": self.serialize_dict,
+ }
+ self.dependencies: dict[str, type] = dict(classes) if classes else {}
+ self.key_transformer = full_restapi_key_transformer
+ self.client_side_validation = True
+
+ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals
+ self, target_obj, data_type=None, **kwargs
+ ):
+ """Serialize data into a string according to type.
+
+ :param object target_obj: The data to be serialized.
+ :param str data_type: The type to be serialized from.
+ :rtype: str, dict
+ :raises SerializationError: if serialization fails.
+ :returns: The serialized data.
+ """
+ key_transformer = kwargs.get("key_transformer", self.key_transformer)
+ keep_readonly = kwargs.get("keep_readonly", False)
+ if target_obj is None:
+ return None
+
+ attr_name = None
+ class_name = target_obj.__class__.__name__
+
+ if data_type:
+ return self.serialize_data(target_obj, data_type, **kwargs)
+
+ if not hasattr(target_obj, "_attribute_map"):
+ data_type = type(target_obj).__name__
+ if data_type in self.basic_types.values():
+ return self.serialize_data(target_obj, data_type, **kwargs)
+
+ # Force "is_xml" kwargs if we detect a XML model
+ try:
+ is_xml_model_serialization = kwargs["is_xml"]
+ except KeyError:
+ is_xml_model_serialization = kwargs.setdefault("is_xml", target_obj.is_xml_model())
+
+ serialized = {}
+ if is_xml_model_serialization:
+ serialized = target_obj._create_xml_node() # pylint: disable=protected-access
+ try:
+ attributes = target_obj._attribute_map # pylint: disable=protected-access
+ for attr, attr_desc in attributes.items():
+ attr_name = attr
+ if not keep_readonly and target_obj._validation.get( # pylint: disable=protected-access
+ attr_name, {}
+ ).get("readonly", False):
+ continue
+
+ if attr_name == "additional_properties" and attr_desc["key"] == "":
+ if target_obj.additional_properties is not None:
+ serialized |= target_obj.additional_properties
+ continue
+ try:
+
+ orig_attr = getattr(target_obj, attr)
+ if is_xml_model_serialization:
+ pass # Don't provide "transformer" for XML for now. Keep "orig_attr"
+ else: # JSON
+ keys, orig_attr = key_transformer(attr, attr_desc.copy(), orig_attr)
+ keys = keys if isinstance(keys, list) else [keys]
+
+ kwargs["serialization_ctxt"] = attr_desc
+ new_attr = self.serialize_data(orig_attr, attr_desc["type"], **kwargs)
+
+ if is_xml_model_serialization:
+ xml_desc = attr_desc.get("xml", {})
+ xml_name = xml_desc.get("name", attr_desc["key"])
+ xml_prefix = xml_desc.get("prefix", None)
+ xml_ns = xml_desc.get("ns", None)
+ if xml_desc.get("attr", False):
+ if xml_ns:
+ ET.register_namespace(xml_prefix, xml_ns)
+ xml_name = "{{{}}}{}".format(xml_ns, xml_name)
+ serialized.set(xml_name, new_attr) # type: ignore
+ continue
+ if xml_desc.get("text", False):
+ serialized.text = new_attr # type: ignore
+ continue
+ if isinstance(new_attr, list):
+ serialized.extend(new_attr) # type: ignore
+ elif isinstance(new_attr, ET.Element):
+ # If the down XML has no XML/Name,
+ # we MUST replace the tag with the local tag. But keeping the namespaces.
+ if "name" not in getattr(orig_attr, "_xml_map", {}):
+ splitted_tag = new_attr.tag.split("}")
+ if len(splitted_tag) == 2: # Namespace
+ new_attr.tag = "}".join([splitted_tag[0], xml_name])
+ else:
+ new_attr.tag = xml_name
+ serialized.append(new_attr) # type: ignore
+ else: # That's a basic type
+ # Integrate namespace if necessary
+ local_node = _create_xml_node(xml_name, xml_prefix, xml_ns)
+ local_node.text = str(new_attr)
+ serialized.append(local_node) # type: ignore
+ else: # JSON
+ for k in reversed(keys): # type: ignore
+ new_attr = {k: new_attr}
+
+ _new_attr = new_attr
+ _serialized = serialized
+ for k in keys: # type: ignore
+ if k not in _serialized:
+ _serialized.update(_new_attr) # type: ignore
+ _new_attr = _new_attr[k] # type: ignore
+ _serialized = _serialized[k]
+ except ValueError as err:
+ if isinstance(err, SerializationError):
+ raise
+
+ except (AttributeError, KeyError, TypeError) as err:
+ msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
+ raise SerializationError(msg) from err
+ return serialized
+
+ def body(self, data, data_type, **kwargs):
+ """Serialize data intended for a request body.
+
+ :param object data: The data to be serialized.
+ :param str data_type: The type to be serialized from.
+ :rtype: dict
+ :raises SerializationError: if serialization fails.
+ :raises ValueError: if data is None
+ :returns: The serialized request body
+ """
+
+ # Just in case this is a dict
+ internal_data_type_str = data_type.strip("[]{}")
+ internal_data_type = self.dependencies.get(internal_data_type_str, None)
+ try:
+ is_xml_model_serialization = kwargs["is_xml"]
+ except KeyError:
+ if internal_data_type and issubclass(internal_data_type, Model):
+ is_xml_model_serialization = kwargs.setdefault("is_xml", internal_data_type.is_xml_model())
+ else:
+ is_xml_model_serialization = False
+ if internal_data_type and not isinstance(internal_data_type, Enum):
+ try:
+ deserializer = Deserializer(self.dependencies)
+ # Since it's on serialization, it's almost sure that format is not JSON REST
+ # We're not able to deal with additional properties for now.
+ deserializer.additional_properties_detection = False
+ if is_xml_model_serialization:
+ deserializer.key_extractors = [ # type: ignore
+ attribute_key_case_insensitive_extractor,
+ ]
+ else:
+ deserializer.key_extractors = [
+ rest_key_case_insensitive_extractor,
+ attribute_key_case_insensitive_extractor,
+ last_rest_key_case_insensitive_extractor,
+ ]
+ data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access
+ except DeserializationError as err:
+ raise SerializationError("Unable to build a model: " + str(err)) from err
+
+ return self._serialize(data, data_type, **kwargs)
+
+ def url(self, name, data, data_type, **kwargs):
+ """Serialize data intended for a URL path.
+
+ :param str name: The name of the URL path parameter.
+ :param object data: The data to be serialized.
+ :param str data_type: The type to be serialized from.
+ :rtype: str
+ :returns: The serialized URL path
+ :raises TypeError: if serialization fails.
+ :raises ValueError: if data is None
+ """
+ try:
+ output = self.serialize_data(data, data_type, **kwargs)
+ if data_type == "bool":
+ output = json.dumps(output)
+
+ if kwargs.get("skip_quote") is True:
+ output = str(output)
+ output = output.replace("{", quote("{")).replace("}", quote("}"))
+ else:
+ output = quote(str(output), safe="")
+ except SerializationError as exc:
+ raise TypeError("{} must be type {}.".format(name, data_type)) from exc
+ return output
+
+ def query(self, name, data, data_type, **kwargs):
+ """Serialize data intended for a URL query.
+
+ :param str name: The name of the query parameter.
+ :param object data: The data to be serialized.
+ :param str data_type: The type to be serialized from.
+ :rtype: str, list
+ :raises TypeError: if serialization fails.
+ :raises ValueError: if data is None
+ :returns: The serialized query parameter
+ """
+ try:
+ # Treat the list aside, since we don't want to encode the div separator
+ if data_type.startswith("["):
+ internal_data_type = data_type[1:-1]
+ do_quote = not kwargs.get("skip_quote", False)
+ return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs)
+
+ # Not a list, regular serialization
+ output = self.serialize_data(data, data_type, **kwargs)
+ if data_type == "bool":
+ output = json.dumps(output)
+ if kwargs.get("skip_quote") is True:
+ output = str(output)
+ else:
+ output = quote(str(output), safe="")
+ except SerializationError as exc:
+ raise TypeError("{} must be type {}.".format(name, data_type)) from exc
+ return str(output)
+
+ def header(self, name, data, data_type, **kwargs):
+ """Serialize data intended for a request header.
+
+ :param str name: The name of the header.
+ :param object data: The data to be serialized.
+ :param str data_type: The type to be serialized from.
+ :rtype: str
+ :raises TypeError: if serialization fails.
+ :raises ValueError: if data is None
+ :returns: The serialized header
+ """
+ try:
+ if data_type in ["[str]"]:
+ data = ["" if d is None else d for d in data]
+
+ output = self.serialize_data(data, data_type, **kwargs)
+ if data_type == "bool":
+ output = json.dumps(output)
+ except SerializationError as exc:
+ raise TypeError("{} must be type {}.".format(name, data_type)) from exc
+ return str(output)
+
+ def serialize_data(self, data, data_type, **kwargs):
+ """Serialize generic data according to supplied data type.
+
+ :param object data: The data to be serialized.
+ :param str data_type: The type to be serialized from.
+ :raises AttributeError: if required data is None.
+ :raises ValueError: if data is None
+ :raises SerializationError: if serialization fails.
+ :returns: The serialized data.
+ :rtype: str, int, float, bool, dict, list
+ """
+ if data is None:
+ raise ValueError("No value for given attribute")
+
+ try:
+ if data is CoreNull:
+ return None
+ if data_type in self.basic_types.values():
+ return self.serialize_basic(data, data_type, **kwargs)
+
+ if data_type in self.serialize_type:
+ return self.serialize_type[data_type](data, **kwargs)
+
+ # If dependencies is empty, try with current data class
+ # It has to be a subclass of Enum anyway
+ enum_type = self.dependencies.get(data_type, cast(type, data.__class__))
+ if issubclass(enum_type, Enum):
+ return Serializer.serialize_enum(data, enum_obj=enum_type)
+
+ iter_type = data_type[0] + data_type[-1]
+ if iter_type in self.serialize_type:
+ return self.serialize_type[iter_type](data, data_type[1:-1], **kwargs)
+
+ except (ValueError, TypeError) as err:
+ msg = "Unable to serialize value: {!r} as type: {!r}."
+ raise SerializationError(msg.format(data, data_type)) from err
+ return self._serialize(data, **kwargs)
+
+ @classmethod
+ def _get_custom_serializers(cls, data_type, **kwargs): # pylint: disable=inconsistent-return-statements
+ custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type)
+ if custom_serializer:
+ return custom_serializer
+ if kwargs.get("is_xml", False):
+ return cls._xml_basic_types_serializers.get(data_type)
+
+ @classmethod
+ def serialize_basic(cls, data, data_type, **kwargs):
+ """Serialize basic builting data type.
+ Serializes objects to str, int, float or bool.
+
+ Possible kwargs:
+ - basic_types_serializers dict[str, callable] : If set, use the callable as serializer
+ - is_xml bool : If set, use xml_basic_types_serializers
+
+ :param obj data: Object to be serialized.
+ :param str data_type: Type of object in the iterable.
+ :rtype: str, int, float, bool
+ :return: serialized object
+ :raises TypeError: raise if data_type is not one of str, int, float, bool.
+ """
+ custom_serializer = cls._get_custom_serializers(data_type, **kwargs)
+ if custom_serializer:
+ return custom_serializer(data)
+ if data_type == "str":
+ return cls.serialize_unicode(data)
+ if data_type == "int":
+ return int(data)
+ if data_type == "float":
+ return float(data)
+ if data_type == "bool":
+ return bool(data)
+ raise TypeError("Unknown basic data type: {}".format(data_type))
+
+ @classmethod
+ def serialize_unicode(cls, data):
+ """Special handling for serializing unicode strings in Py2.
+ Encode to UTF-8 if unicode, otherwise handle as a str.
+
+ :param str data: Object to be serialized.
+ :rtype: str
+ :return: serialized object
+ """
+ try: # If I received an enum, return its value
+ return data.value
+ except AttributeError:
+ pass
+
+ try:
+ if isinstance(data, unicode): # type: ignore
+ # Don't change it, JSON and XML ElementTree are totally able
+ # to serialize correctly u'' strings
+ return data
+ except NameError:
+ return str(data)
+ return str(data)
+
+ def serialize_iter(self, data, iter_type, div=None, **kwargs):
+ """Serialize iterable.
+
+ Supported kwargs:
+ - serialization_ctxt dict : The current entry of _attribute_map, or same format.
+ serialization_ctxt['type'] should be same as data_type.
+ - is_xml bool : If set, serialize as XML
+
+ :param list data: Object to be serialized.
+ :param str iter_type: Type of object in the iterable.
+ :param str div: If set, this str will be used to combine the elements
+ in the iterable into a combined string. Default is 'None'.
+ Defaults to False.
+ :rtype: list, str
+ :return: serialized iterable
+ """
+ if isinstance(data, str):
+ raise SerializationError("Refuse str type as a valid iter type.")
+
+ serialization_ctxt = kwargs.get("serialization_ctxt", {})
+ is_xml = kwargs.get("is_xml", False)
+
+ serialized = []
+ for d in data:
+ try:
+ serialized.append(self.serialize_data(d, iter_type, **kwargs))
+ except ValueError as err:
+ if isinstance(err, SerializationError):
+ raise
+ serialized.append(None)
+
+ if kwargs.get("do_quote", False):
+ serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]
+
+ if div:
+ serialized = ["" if s is None else str(s) for s in serialized]
+ serialized = div.join(serialized)
+
+ if "xml" in serialization_ctxt or is_xml:
+ # XML serialization is more complicated
+ xml_desc = serialization_ctxt.get("xml", {})
+ xml_name = xml_desc.get("name")
+ if not xml_name:
+ xml_name = serialization_ctxt["key"]
+
+ # Create a wrap node if necessary (use the fact that Element and list have "append")
+ is_wrapped = xml_desc.get("wrapped", False)
+ node_name = xml_desc.get("itemsName", xml_name)
+ if is_wrapped:
+ final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None))
+ else:
+ final_result = []
+ # All list elements to "local_node"
+ for el in serialized:
+ if isinstance(el, ET.Element):
+ el_node = el
+ else:
+ el_node = _create_xml_node(node_name, xml_desc.get("prefix", None), xml_desc.get("ns", None))
+ if el is not None: # Otherwise it writes "None" :-p
+ el_node.text = str(el)
+ final_result.append(el_node)
+ return final_result
+ return serialized
+
+ def serialize_dict(self, attr, dict_type, **kwargs):
+ """Serialize a dictionary of objects.
+
+ :param dict attr: Object to be serialized.
+ :param str dict_type: Type of object in the dictionary.
+ :rtype: dict
+ :return: serialized dictionary
+ """
+ serialization_ctxt = kwargs.get("serialization_ctxt", {})
+ serialized = {}
+ for key, value in attr.items():
+ try:
+ serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
+ except ValueError as err:
+ if isinstance(err, SerializationError):
+ raise
+ serialized[self.serialize_unicode(key)] = None
+
+ if "xml" in serialization_ctxt:
+ # XML serialization is more complicated
+ xml_desc = serialization_ctxt["xml"]
+ xml_name = xml_desc["name"]
+
+ final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None))
+ for key, value in serialized.items():
+ ET.SubElement(final_result, key).text = value
+ return final_result
+
+ return serialized
+
+ def serialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements
+ """Serialize a generic object.
+ This will be handled as a dictionary. If object passed in is not
+ a basic type (str, int, float, dict, list) it will simply be
+ cast to str.
+
+ :param dict attr: Object to be serialized.
+ :rtype: dict or str
+ :return: serialized object
+ """
+ if attr is None:
+ return None
+ if isinstance(attr, ET.Element):
+ return attr
+ obj_type = type(attr)
+ if obj_type in self.basic_types:
+ return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs)
+ if obj_type is _long_type:
+ return self.serialize_long(attr)
+ if obj_type is str:
+ return self.serialize_unicode(attr)
+ if obj_type is datetime.datetime:
+ return self.serialize_iso(attr)
+ if obj_type is datetime.date:
+ return self.serialize_date(attr)
+ if obj_type is datetime.time:
+ return self.serialize_time(attr)
+ if obj_type is datetime.timedelta:
+ return self.serialize_duration(attr)
+ if obj_type is decimal.Decimal:
+ return self.serialize_decimal(attr)
+
+ # If it's a model or I know this dependency, serialize as a Model
+ if obj_type in self.dependencies.values() or isinstance(attr, Model):
+ return self._serialize(attr)
+
+ if obj_type == dict:
+ serialized = {}
+ for key, value in attr.items():
+ try:
+ serialized[self.serialize_unicode(key)] = self.serialize_object(value, **kwargs)
+ except ValueError:
+ serialized[self.serialize_unicode(key)] = None
+ return serialized
+
+ if obj_type == list:
+ serialized = []
+ for obj in attr:
+ try:
+ serialized.append(self.serialize_object(obj, **kwargs))
+ except ValueError:
+ pass
+ return serialized
+ return str(attr)
+
+ @staticmethod
+ def serialize_enum(attr, enum_obj=None):
+ try:
+ result = attr.value
+ except AttributeError:
+ result = attr
+ try:
+ enum_obj(result) # type: ignore
+ return result
+ except ValueError as exc:
+ for enum_value in enum_obj: # type: ignore
+ if enum_value.value.lower() == str(attr).lower():
+ return enum_value.value
+ error = "{!r} is not valid value for enum {!r}"
+ raise SerializationError(error.format(attr, enum_obj)) from exc
+
+ @staticmethod
+ def serialize_bytearray(attr, **kwargs): # pylint: disable=unused-argument
+ """Serialize bytearray into base-64 string.
+
+ :param str attr: Object to be serialized.
+ :rtype: str
+ :return: serialized base64
+ """
+ return b64encode(attr).decode()
+
+ @staticmethod
+ def serialize_base64(attr, **kwargs): # pylint: disable=unused-argument
+ """Serialize str into base-64 string.
+
+ :param str attr: Object to be serialized.
+ :rtype: str
+ :return: serialized base64
+ """
+ encoded = b64encode(attr).decode("ascii")
+ return encoded.strip("=").replace("+", "-").replace("/", "_")
+
+ @staticmethod
+ def serialize_decimal(attr, **kwargs): # pylint: disable=unused-argument
+ """Serialize Decimal object to float.
+
+ :param decimal attr: Object to be serialized.
+ :rtype: float
+ :return: serialized decimal
+ """
+ return float(attr)
+
+ @staticmethod
+ def serialize_long(attr, **kwargs): # pylint: disable=unused-argument
+ """Serialize long (Py2) or int (Py3).
+
+ :param int attr: Object to be serialized.
+ :rtype: int/long
+ :return: serialized long
+ """
+ return _long_type(attr)
+
+ @staticmethod
+ def serialize_date(attr, **kwargs): # pylint: disable=unused-argument
+ """Serialize Date object into ISO-8601 formatted string.
+
+ :param Date attr: Object to be serialized.
+ :rtype: str
+ :return: serialized date
+ """
+ if isinstance(attr, str):
+ attr = isodate.parse_date(attr)
+ t = "{:04}-{:02}-{:02}".format(attr.year, attr.month, attr.day)
+ return t
+
+ @staticmethod
+ def serialize_time(attr, **kwargs): # pylint: disable=unused-argument
+ """Serialize Time object into ISO-8601 formatted string.
+
+ :param datetime.time attr: Object to be serialized.
+ :rtype: str
+ :return: serialized time
+ """
+ if isinstance(attr, str):
+ attr = isodate.parse_time(attr)
+ t = "{:02}:{:02}:{:02}".format(attr.hour, attr.minute, attr.second)
+ if attr.microsecond:
+ t += ".{:02}".format(attr.microsecond)
+ return t
+
+ @staticmethod
+ def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument
+ """Serialize TimeDelta object into ISO-8601 formatted string.
+
+ :param TimeDelta attr: Object to be serialized.
+ :rtype: str
+ :return: serialized duration
+ """
+ if isinstance(attr, str):
+ attr = isodate.parse_duration(attr)
+ return isodate.duration_isoformat(attr)
+
+ @staticmethod
+ def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument
+ """Serialize Datetime object into RFC-1123 formatted string.
+
+ :param Datetime attr: Object to be serialized.
+ :rtype: str
+ :raises TypeError: if format invalid.
+ :return: serialized rfc
+ """
+ try:
+ if not attr.tzinfo:
+ _LOGGER.warning("Datetime with no tzinfo will be considered UTC.")
+ utc = attr.utctimetuple()
+ except AttributeError as exc:
+ raise TypeError("RFC1123 object must be valid Datetime object.") from exc
+
+ return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format(
+ Serializer.days[utc.tm_wday],
+ utc.tm_mday,
+ Serializer.months[utc.tm_mon],
+ utc.tm_year,
+ utc.tm_hour,
+ utc.tm_min,
+ utc.tm_sec,
+ )
+
+ @staticmethod
+ def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument
+ """Serialize Datetime object into ISO-8601 formatted string.
+
+ :param Datetime attr: Object to be serialized.
+ :rtype: str
+ :raises SerializationError: if format invalid.
+ :return: serialized iso
+ """
+ if isinstance(attr, str):
+ attr = isodate.parse_datetime(attr)
+ try:
+ if not attr.tzinfo:
+ _LOGGER.warning("Datetime with no tzinfo will be considered UTC.")
+ utc = attr.utctimetuple()
+ if utc.tm_year > 9999 or utc.tm_year < 1:
+ raise OverflowError("Hit max or min date")
+
+ microseconds = str(attr.microsecond).rjust(6, "0").rstrip("0").ljust(3, "0")
+ if microseconds:
+ microseconds = "." + microseconds
+ date = "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}".format(
+ utc.tm_year, utc.tm_mon, utc.tm_mday, utc.tm_hour, utc.tm_min, utc.tm_sec
+ )
+ return date + microseconds + "Z"
+ except (ValueError, OverflowError) as err:
+ msg = "Unable to serialize datetime object."
+ raise SerializationError(msg) from err
+ except AttributeError as err:
+ msg = "ISO-8601 object must be valid Datetime object."
+ raise TypeError(msg) from err
+
+ @staticmethod
+ def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument
+ """Serialize Datetime object into IntTime format.
+ This is represented as seconds.
+
+ :param Datetime attr: Object to be serialized.
+ :rtype: int
+ :raises SerializationError: if format invalid
+ :return: serialied unix
+ """
+ if isinstance(attr, int):
+ return attr
+ try:
+ if not attr.tzinfo:
+ _LOGGER.warning("Datetime with no tzinfo will be considered UTC.")
+ return int(calendar.timegm(attr.utctimetuple()))
+ except AttributeError as exc:
+ raise TypeError("Unix time object must be valid Datetime object.") from exc
+
+
+def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument
+ key = attr_desc["key"]
+ working_data = data
+
+ while "." in key:
+ # Need the cast, as for some reasons "split" is typed as list[str | Any]
+ dict_keys = cast(list[str], _FLATTEN.split(key))
+ if len(dict_keys) == 1:
+ key = _decode_attribute_map_key(dict_keys[0])
+ break
+ working_key = _decode_attribute_map_key(dict_keys[0])
+ working_data = working_data.get(working_key, data)
+ if working_data is None:
+ # If at any point while following flatten JSON path see None, it means
+ # that all properties under are None as well
+ return None
+ key = ".".join(dict_keys[1:])
+
+ return working_data.get(key)
+
+
+def rest_key_case_insensitive_extractor( # pylint: disable=unused-argument, inconsistent-return-statements
+ attr, attr_desc, data
+):
+ key = attr_desc["key"]
+ working_data = data
+
+ while "." in key:
+ dict_keys = _FLATTEN.split(key)
+ if len(dict_keys) == 1:
+ key = _decode_attribute_map_key(dict_keys[0])
+ break
+ working_key = _decode_attribute_map_key(dict_keys[0])
+ working_data = attribute_key_case_insensitive_extractor(working_key, None, working_data)
+ if working_data is None:
+ # If at any point while following flatten JSON path see None, it means
+ # that all properties under are None as well
+ return None
+ key = ".".join(dict_keys[1:])
+
+ if working_data:
+ return attribute_key_case_insensitive_extractor(key, None, working_data)
+
+
+def last_rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument
+ """Extract the attribute in "data" based on the last part of the JSON path key.
+
+ :param str attr: The attribute to extract
+ :param dict attr_desc: The attribute description
+ :param dict data: The data to extract from
+ :rtype: object
+ :returns: The extracted attribute
+ """
+ key = attr_desc["key"]
+ dict_keys = _FLATTEN.split(key)
+ return attribute_key_extractor(dict_keys[-1], None, data)
+
+
+def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): # pylint: disable=unused-argument
+ """Extract the attribute in "data" based on the last part of the JSON path key.
+
+ This is the case insensitive version of "last_rest_key_extractor"
+ :param str attr: The attribute to extract
+ :param dict attr_desc: The attribute description
+ :param dict data: The data to extract from
+ :rtype: object
+ :returns: The extracted attribute
+ """
+ key = attr_desc["key"]
+ dict_keys = _FLATTEN.split(key)
+ return attribute_key_case_insensitive_extractor(dict_keys[-1], None, data)
+
+
+def attribute_key_extractor(attr, _, data):
+ return data.get(attr)
+
+
+def attribute_key_case_insensitive_extractor(attr, _, data):
+ found_key = None
+ lower_attr = attr.lower()
+ for key in data:
+ if lower_attr == key.lower():
+ found_key = key
+ break
+
+ return data.get(found_key)
+
+
+def _extract_name_from_internal_type(internal_type):
+ """Given an internal type XML description, extract correct XML name with namespace.
+
+ :param dict internal_type: An model type
+ :rtype: tuple
+ :returns: A tuple XML name + namespace dict
+ """
+ internal_type_xml_map = getattr(internal_type, "_xml_map", {})
+ xml_name = internal_type_xml_map.get("name", internal_type.__name__)
+ xml_ns = internal_type_xml_map.get("ns", None)
+ if xml_ns:
+ xml_name = "{{{}}}{}".format(xml_ns, xml_name)
+ return xml_name
+
+
+def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument,too-many-return-statements
+ if isinstance(data, dict):
+ return None
+
+ # Test if this model is XML ready first
+ if not isinstance(data, ET.Element):
+ return None
+
+ xml_desc = attr_desc.get("xml", {})
+ xml_name = xml_desc.get("name", attr_desc["key"])
+
+ # Look for a children
+ is_iter_type = attr_desc["type"].startswith("[")
+ is_wrapped = xml_desc.get("wrapped", False)
+ internal_type = attr_desc.get("internalType", None)
+ internal_type_xml_map = getattr(internal_type, "_xml_map", {})
+
+ # Integrate namespace if necessary
+ xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
+ if xml_ns:
+ xml_name = "{{{}}}{}".format(xml_ns, xml_name)
+
+ # If it's an attribute, that's simple
+ if xml_desc.get("attr", False):
+ return data.get(xml_name)
+
+ # If it's x-ms-text, that's simple too
+ if xml_desc.get("text", False):
+ return data.text
+
+ # Scenario where I take the local name:
+ # - Wrapped node
+ # - Internal type is an enum (considered basic types)
+ # - Internal type has no XML/Name node
+ if is_wrapped or (internal_type and (issubclass(internal_type, Enum) or "name" not in internal_type_xml_map)):
+ children = data.findall(xml_name)
+ # If internal type has a local name and it's not a list, I use that name
+ elif not is_iter_type and internal_type and "name" in internal_type_xml_map:
+ xml_name = _extract_name_from_internal_type(internal_type)
+ children = data.findall(xml_name)
+ # That's an array
+ else:
+ if internal_type: # Complex type, ignore itemsName and use the complex type name
+ items_name = _extract_name_from_internal_type(internal_type)
+ else:
+ items_name = xml_desc.get("itemsName", xml_name)
+ children = data.findall(items_name)
+
+ if len(children) == 0:
+ if is_iter_type:
+ if is_wrapped:
+ return None # is_wrapped no node, we want None
+ return [] # not wrapped, assume empty list
+ return None # Assume it's not there, maybe an optional node.
+
+ # If is_iter_type and not wrapped, return all found children
+ if is_iter_type:
+ if not is_wrapped:
+ return children
+ # Iter and wrapped, should have found one node only (the wrap one)
+ if len(children) != 1:
+ raise DeserializationError(
+ "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format(
+ xml_name
+ )
+ )
+ return list(children[0]) # Might be empty list and that's ok.
+
+ # Here it's not a itertype, we should have found one element only or empty
+ if len(children) > 1:
+ raise DeserializationError("Find several XML '{}' where it was not expected".format(xml_name))
+ return children[0]
+
+
+class Deserializer:
+ """Response object model deserializer.
+
+ :param dict classes: Class type dictionary for deserializing complex types.
+ :ivar list key_extractors: Ordered list of extractors to be used by this deserializer.
+ """
+
+ basic_types = {str: "str", int: "int", bool: "bool", float: "float"}
+
+ valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?")
+
+ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None:
+ self.deserialize_type = {
+ "iso-8601": Deserializer.deserialize_iso,
+ "rfc-1123": Deserializer.deserialize_rfc,
+ "unix-time": Deserializer.deserialize_unix,
+ "duration": Deserializer.deserialize_duration,
+ "date": Deserializer.deserialize_date,
+ "time": Deserializer.deserialize_time,
+ "decimal": Deserializer.deserialize_decimal,
+ "long": Deserializer.deserialize_long,
+ "bytearray": Deserializer.deserialize_bytearray,
+ "base64": Deserializer.deserialize_base64,
+ "object": self.deserialize_object,
+ "[]": self.deserialize_iter,
+ "{}": self.deserialize_dict,
+ }
+ self.deserialize_expected_types = {
+ "duration": (isodate.Duration, datetime.timedelta),
+ "iso-8601": (datetime.datetime),
+ }
+ self.dependencies: dict[str, type] = dict(classes) if classes else {}
+ self.key_extractors = [rest_key_extractor, xml_key_extractor]
+ # Additional properties only works if the "rest_key_extractor" is used to
+ # extract the keys. Making it to work whatever the key extractor is too much
+ # complicated, with no real scenario for now.
+ # So adding a flag to disable additional properties detection. This flag should be
+ # used if your expect the deserialization to NOT come from a JSON REST syntax.
+ # Otherwise, result are unexpected
+ self.additional_properties_detection = True
+
+ def __call__(self, target_obj, response_data, content_type=None):
+ """Call the deserializer to process a REST response.
+
+ :param str target_obj: Target data type to deserialize to.
+ :param requests.Response response_data: REST response object.
+ :param str content_type: Swagger "produces" if available.
+ :raises DeserializationError: if deserialization fails.
+ :return: Deserialized object.
+ :rtype: object
+ """
+ data = self._unpack_content(response_data, content_type)
+ return self._deserialize(target_obj, data)
+
+ def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements
+ """Call the deserializer on a model.
+
+ Data needs to be already deserialized as JSON or XML ElementTree
+
+ :param str target_obj: Target data type to deserialize to.
+ :param object data: Object to deserialize.
+ :raises DeserializationError: if deserialization fails.
+ :return: Deserialized object.
+ :rtype: object
+ """
+ # This is already a model, go recursive just in case
+ if hasattr(data, "_attribute_map"):
+ constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")]
+ try:
+ for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access
+ if attr in constants:
+ continue
+ value = getattr(data, attr)
+ if value is None:
+ continue
+ local_type = mapconfig["type"]
+ internal_data_type = local_type.strip("[]{}")
+ if internal_data_type not in self.dependencies or isinstance(internal_data_type, Enum):
+ continue
+ setattr(data, attr, self._deserialize(local_type, value))
+ return data
+ except AttributeError:
+ return
+
+ response, class_name = self._classify_target(target_obj, data)
+
+ if isinstance(response, str):
+ return self.deserialize_data(data, response)
+ if isinstance(response, type) and issubclass(response, Enum):
+ return self.deserialize_enum(data, response)
+
+ if data is None or data is CoreNull:
+ return data
+ try:
+ attributes = response._attribute_map # type: ignore # pylint: disable=protected-access
+ d_attrs = {}
+ for attr, attr_desc in attributes.items():
+ # Check empty string. If it's not empty, someone has a real "additionalProperties"...
+ if attr == "additional_properties" and attr_desc["key"] == "":
+ continue
+ raw_value = None
+ # Enhance attr_desc with some dynamic data
+ attr_desc = attr_desc.copy() # Do a copy, do not change the real one
+ internal_data_type = attr_desc["type"].strip("[]{}")
+ if internal_data_type in self.dependencies:
+ attr_desc["internalType"] = self.dependencies[internal_data_type]
+
+ for key_extractor in self.key_extractors:
+ found_value = key_extractor(attr, attr_desc, data)
+ if found_value is not None:
+ if raw_value is not None and raw_value != found_value:
+ msg = (
+ "Ignoring extracted value '%s' from %s for key '%s'"
+ " (duplicate extraction, follow extractors order)"
+ )
+ _LOGGER.warning(msg, found_value, key_extractor, attr)
+ continue
+ raw_value = found_value
+
+ value = self.deserialize_data(raw_value, attr_desc["type"])
+ d_attrs[attr] = value
+ except (AttributeError, TypeError, KeyError) as err:
+ msg = "Unable to deserialize to object: " + class_name # type: ignore
+ raise DeserializationError(msg) from err
+ additional_properties = self._build_additional_properties(attributes, data)
+ return self._instantiate_model(response, d_attrs, additional_properties)
+
+ def _build_additional_properties(self, attribute_map, data):
+ if not self.additional_properties_detection:
+ return None
+ if "additional_properties" in attribute_map and attribute_map.get("additional_properties", {}).get("key") != "":
+ # Check empty string. If it's not empty, someone has a real "additionalProperties"
+ return None
+ if isinstance(data, ET.Element):
+ data = {el.tag: el.text for el in data}
+
+ known_keys = {
+ _decode_attribute_map_key(_FLATTEN.split(desc["key"])[0])
+ for desc in attribute_map.values()
+ if desc["key"] != ""
+ }
+ present_keys = set(data.keys())
+ missing_keys = present_keys - known_keys
+ return {key: data[key] for key in missing_keys}
+
+ def _classify_target(self, target, data):
+ """Check to see whether the deserialization target object can
+ be classified into a subclass.
+ Once classification has been determined, initialize object.
+
+ :param str target: The target object type to deserialize to.
+ :param str/dict data: The response data to deserialize.
+ :return: The classified target object and its class name.
+ :rtype: tuple
+ """
+ if target is None:
+ return None, None
+
+ if isinstance(target, str):
+ try:
+ target = self.dependencies[target]
+ except KeyError:
+ return target, target
+
+ try:
+ target = target._classify(data, self.dependencies) # type: ignore # pylint: disable=protected-access
+ except AttributeError:
+ pass # Target is not a Model, no classify
+ return target, target.__class__.__name__ # type: ignore
+
+ def failsafe_deserialize(self, target_obj, data, content_type=None):
+ """Ignores any errors encountered in deserialization,
+ and falls back to not deserializing the object. Recommended
+ for use in error deserialization, as we want to return the
+ HttpResponseError to users, and not have them deal with
+ a deserialization error.
+
+ :param str target_obj: The target object type to deserialize to.
+ :param str/dict data: The response data to deserialize.
+ :param str content_type: Swagger "produces" if available.
+ :return: Deserialized object.
+ :rtype: object
+ """
+ try:
+ return self(target_obj, data, content_type=content_type)
+ except: # pylint: disable=bare-except
+ _LOGGER.debug(
+ "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True
+ )
+ return None
+
+ @staticmethod
+ def _unpack_content(raw_data, content_type=None):
+ """Extract the correct structure for deserialization.
+
+ If raw_data is a PipelineResponse, try to extract the result of RawDeserializer.
+ if we can't, raise. Your Pipeline should have a RawDeserializer.
+
+ If not a pipeline response and raw_data is bytes or string, use content-type
+ to decode it. If no content-type, try JSON.
+
+ If raw_data is something else, bypass all logic and return it directly.
+
+ :param obj raw_data: Data to be processed.
+ :param str content_type: How to parse if raw_data is a string/bytes.
+ :raises JSONDecodeError: If JSON is requested and parsing is impossible.
+ :raises UnicodeDecodeError: If bytes is not UTF8
+ :rtype: object
+ :return: Unpacked content.
+ """
+ # Assume this is enough to detect a Pipeline Response without importing it
+ context = getattr(raw_data, "context", {})
+ if context:
+ if RawDeserializer.CONTEXT_NAME in context:
+ return context[RawDeserializer.CONTEXT_NAME]
+ raise ValueError("This pipeline didn't have the RawDeserializer policy; can't deserialize")
+
+ # Assume this is enough to recognize universal_http.ClientResponse without importing it
+ if hasattr(raw_data, "body"):
+ return RawDeserializer.deserialize_from_http_generics(raw_data.text(), raw_data.headers)
+
+ # Assume this enough to recognize requests.Response without importing it.
+ if hasattr(raw_data, "_content_consumed"):
+ return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers)
+
+ if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"):
+ return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore
+ return raw_data
+
+ def _instantiate_model(self, response, attrs, additional_properties=None):
+ """Instantiate a response model passing in deserialized args.
+
+ :param Response response: The response model class.
+ :param dict attrs: The deserialized response attributes.
+ :param dict additional_properties: Additional properties to be set.
+ :rtype: Response
+ :return: The instantiated response model.
+ """
+ if callable(response):
+ subtype = getattr(response, "_subtype_map", {})
+ try:
+ readonly = [
+ k
+ for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore
+ if v.get("readonly")
+ ]
+ const = [
+ k
+ for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore
+ if v.get("constant")
+ ]
+ kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const}
+ response_obj = response(**kwargs)
+ for attr in readonly:
+ setattr(response_obj, attr, attrs.get(attr))
+ if additional_properties:
+ response_obj.additional_properties = additional_properties # type: ignore
+ return response_obj
+ except TypeError as err:
+ msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore
+ raise DeserializationError(msg + str(err)) from err
+ else:
+ try:
+ for attr, value in attrs.items():
+ setattr(response, attr, value)
+ return response
+ except Exception as exp:
+ msg = "Unable to populate response model. "
+ msg += "Type: {}, Error: {}".format(type(response), exp)
+ raise DeserializationError(msg) from exp
+
+ def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements
+ """Process data for deserialization according to data type.
+
+ :param str data: The response string to be deserialized.
+ :param str data_type: The type to deserialize to.
+ :raises DeserializationError: if deserialization fails.
+ :return: Deserialized object.
+ :rtype: object
+ """
+ if data is None:
+ return data
+
+ try:
+ if not data_type:
+ return data
+ if data_type in self.basic_types.values():
+ return self.deserialize_basic(data, data_type)
+ if data_type in self.deserialize_type:
+ if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())):
+ return data
+
+ is_a_text_parsing_type = lambda x: x not in [ # pylint: disable=unnecessary-lambda-assignment
+ "object",
+ "[]",
+ r"{}",
+ ]
+ if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text:
+ return None
+ data_val = self.deserialize_type[data_type](data)
+ return data_val
+
+ iter_type = data_type[0] + data_type[-1]
+ if iter_type in self.deserialize_type:
+ return self.deserialize_type[iter_type](data, data_type[1:-1])
+
+ obj_type = self.dependencies[data_type]
+ if issubclass(obj_type, Enum):
+ if isinstance(data, ET.Element):
+ data = data.text
+ return self.deserialize_enum(data, obj_type)
+
+ except (ValueError, TypeError, AttributeError) as err:
+ msg = "Unable to deserialize response data."
+ msg += " Data: {}, {}".format(data, data_type)
+ raise DeserializationError(msg) from err
+ return self._deserialize(obj_type, data)
+
+ def deserialize_iter(self, attr, iter_type):
+ """Deserialize an iterable.
+
+ :param list attr: Iterable to be deserialized.
+ :param str iter_type: The type of object in the iterable.
+ :return: Deserialized iterable.
+ :rtype: list
+ """
+ if attr is None:
+ return None
+ if isinstance(attr, ET.Element): # If I receive an element here, get the children
+ attr = list(attr)
+ if not isinstance(attr, (list, set)):
+ raise DeserializationError("Cannot deserialize as [{}] an object of type {}".format(iter_type, type(attr)))
+ return [self.deserialize_data(a, iter_type) for a in attr]
+
+ def deserialize_dict(self, attr, dict_type):
+ """Deserialize a dictionary.
+
+ :param dict/list attr: Dictionary to be deserialized. Also accepts
+ a list of key, value pairs.
+ :param str dict_type: The object type of the items in the dictionary.
+ :return: Deserialized dictionary.
+ :rtype: dict
+ """
+ if isinstance(attr, list):
+ return {x["key"]: self.deserialize_data(x["value"], dict_type) for x in attr}
+
+ if isinstance(attr, ET.Element):
+ # Transform value into {"Key": "value"}
+ attr = {el.tag: el.text for el in attr}
+ return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()}
+
+ def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements
+ """Deserialize a generic object.
+ This will be handled as a dictionary.
+
+ :param dict attr: Dictionary to be deserialized.
+ :return: Deserialized object.
+ :rtype: dict
+ :raises TypeError: if non-builtin datatype encountered.
+ """
+ if attr is None:
+ return None
+ if isinstance(attr, ET.Element):
+ # Do no recurse on XML, just return the tree as-is
+ return attr
+ if isinstance(attr, str):
+ return self.deserialize_basic(attr, "str")
+ obj_type = type(attr)
+ if obj_type in self.basic_types:
+ return self.deserialize_basic(attr, self.basic_types[obj_type])
+ if obj_type is _long_type:
+ return self.deserialize_long(attr)
+
+ if obj_type == dict:
+ deserialized = {}
+ for key, value in attr.items():
+ try:
+ deserialized[key] = self.deserialize_object(value, **kwargs)
+ except ValueError:
+ deserialized[key] = None
+ return deserialized
+
+ if obj_type == list:
+ deserialized = []
+ for obj in attr:
+ try:
+ deserialized.append(self.deserialize_object(obj, **kwargs))
+ except ValueError:
+ pass
+ return deserialized
+
+ error = "Cannot deserialize generic object with type: "
+ raise TypeError(error + str(obj_type))
+
+ def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return-statements
+ """Deserialize basic builtin data type from string.
+ Will attempt to convert to str, int, float and bool.
+ This function will also accept '1', '0', 'true' and 'false' as
+ valid bool values.
+
+ :param str attr: response string to be deserialized.
+ :param str data_type: deserialization data type.
+ :return: Deserialized basic type.
+ :rtype: str, int, float or bool
+ :raises TypeError: if string format is not valid or data_type is not one of str, int, float, bool.
+ """
+ # If we're here, data is supposed to be a basic type.
+ # If it's still an XML node, take the text
+ if isinstance(attr, ET.Element):
+ attr = attr.text
+ if not attr:
+ if data_type == "str":
+ # None or '', node is empty string.
+ return ""
+ # None or '', node with a strong type is None.
+ # Don't try to model "empty bool" or "empty int"
+ return None
+
+ if data_type == "bool":
+ if attr in [True, False, 1, 0]:
+ return bool(attr)
+ if isinstance(attr, str):
+ if attr.lower() in ["true", "1"]:
+ return True
+ if attr.lower() in ["false", "0"]:
+ return False
+ raise TypeError("Invalid boolean value: {}".format(attr))
+
+ if data_type == "str":
+ return self.deserialize_unicode(attr)
+ if data_type == "int":
+ return int(attr)
+ if data_type == "float":
+ return float(attr)
+ raise TypeError("Unknown basic data type: {}".format(data_type))
+
+ @staticmethod
+ def deserialize_unicode(data):
+ """Preserve unicode objects in Python 2, otherwise return data
+ as a string.
+
+ :param str data: response string to be deserialized.
+ :return: Deserialized string.
+ :rtype: str or unicode
+ """
+ # We might be here because we have an enum modeled as string,
+ # and we try to deserialize a partial dict with enum inside
+ if isinstance(data, Enum):
+ return data
+
+ # Consider this is real string
+ try:
+ if isinstance(data, unicode): # type: ignore
+ return data
+ except NameError:
+ return str(data)
+ return str(data)
+
+ @staticmethod
+ def deserialize_enum(data, enum_obj):
+ """Deserialize string into enum object.
+
+ If the string is not a valid enum value it will be returned as-is
+ and a warning will be logged.
+
+ :param str data: Response string to be deserialized. If this value is
+ None or invalid it will be returned as-is.
+ :param Enum enum_obj: Enum object to deserialize to.
+ :return: Deserialized enum object.
+ :rtype: Enum
+ """
+ if isinstance(data, enum_obj) or data is None:
+ return data
+ if isinstance(data, Enum):
+ data = data.value
+ if isinstance(data, int):
+ # Workaround. We might consider remove it in the future.
+ try:
+ return list(enum_obj.__members__.values())[data]
+ except IndexError as exc:
+ error = "{!r} is not a valid index for enum {!r}"
+ raise DeserializationError(error.format(data, enum_obj)) from exc
+ try:
+ return enum_obj(str(data))
+ except ValueError:
+ for enum_value in enum_obj:
+ if enum_value.value.lower() == str(data).lower():
+ return enum_value
+ # We don't fail anymore for unknown value, we deserialize as a string
+ _LOGGER.warning("Deserializer is not able to find %s as valid enum in %s", data, enum_obj)
+ return Deserializer.deserialize_unicode(data)
+
+ @staticmethod
+ def deserialize_bytearray(attr):
+ """Deserialize string into bytearray.
+
+ :param str attr: response string to be deserialized.
+ :return: Deserialized bytearray
+ :rtype: bytearray
+ :raises TypeError: if string format invalid.
+ """
+ if isinstance(attr, ET.Element):
+ attr = attr.text
+ return bytearray(b64decode(attr)) # type: ignore
+
+ @staticmethod
+ def deserialize_base64(attr):
+ """Deserialize base64 encoded string into string.
+
+ :param str attr: response string to be deserialized.
+ :return: Deserialized base64 string
+ :rtype: bytearray
+ :raises TypeError: if string format invalid.
+ """
+ if isinstance(attr, ET.Element):
+ attr = attr.text
+ padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore
+ attr = attr + padding # type: ignore
+ encoded = attr.replace("-", "+").replace("_", "/")
+ return b64decode(encoded)
+
+ @staticmethod
+ def deserialize_decimal(attr):
+ """Deserialize string into Decimal object.
+
+ :param str attr: response string to be deserialized.
+ :return: Deserialized decimal
+ :raises DeserializationError: if string format invalid.
+ :rtype: decimal
+ """
+ if isinstance(attr, ET.Element):
+ attr = attr.text
+ try:
+ return decimal.Decimal(str(attr)) # type: ignore
+ except decimal.DecimalException as err:
+ msg = "Invalid decimal {}".format(attr)
+ raise DeserializationError(msg) from err
+
+ @staticmethod
+ def deserialize_long(attr):
+ """Deserialize string into long (Py2) or int (Py3).
+
+ :param str attr: response string to be deserialized.
+ :return: Deserialized int
+ :rtype: long or int
+ :raises ValueError: if string format invalid.
+ """
+ if isinstance(attr, ET.Element):
+ attr = attr.text
+ return _long_type(attr) # type: ignore
+
+ @staticmethod
+ def deserialize_duration(attr):
+ """Deserialize ISO-8601 formatted string into TimeDelta object.
+
+ :param str attr: response string to be deserialized.
+ :return: Deserialized duration
+ :rtype: TimeDelta
+ :raises DeserializationError: if string format invalid.
+ """
+ if isinstance(attr, ET.Element):
+ attr = attr.text
+ try:
+ duration = isodate.parse_duration(attr)
+ except (ValueError, OverflowError, AttributeError) as err:
+ msg = "Cannot deserialize duration object."
+ raise DeserializationError(msg) from err
+ return duration
+
+ @staticmethod
+ def deserialize_date(attr):
+ """Deserialize ISO-8601 formatted string into Date object.
+
+ :param str attr: response string to be deserialized.
+ :return: Deserialized date
+ :rtype: Date
+ :raises DeserializationError: if string format invalid.
+ """
+ if isinstance(attr, ET.Element):
+ attr = attr.text
+ if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore
+ raise DeserializationError("Date must have only digits and -. Received: %s" % attr)
+ # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception.
+ return isodate.parse_date(attr, defaultmonth=0, defaultday=0)
+
+ @staticmethod
+ def deserialize_time(attr):
+ """Deserialize ISO-8601 formatted string into time object.
+
+ :param str attr: response string to be deserialized.
+ :return: Deserialized time
+ :rtype: datetime.time
+ :raises DeserializationError: if string format invalid.
+ """
+ if isinstance(attr, ET.Element):
+ attr = attr.text
+ if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore
+ raise DeserializationError("Date must have only digits and -. Received: %s" % attr)
+ return isodate.parse_time(attr)
+
+ @staticmethod
+ def deserialize_rfc(attr):
+ """Deserialize RFC-1123 formatted string into Datetime object.
+
+ :param str attr: response string to be deserialized.
+ :return: Deserialized RFC datetime
+ :rtype: Datetime
+ :raises DeserializationError: if string format invalid.
+ """
+ if isinstance(attr, ET.Element):
+ attr = attr.text
+ try:
+ parsed_date = email.utils.parsedate_tz(attr) # type: ignore
+ date_obj = datetime.datetime(
+ *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60))
+ )
+ if not date_obj.tzinfo:
+ date_obj = date_obj.astimezone(tz=TZ_UTC)
+ except ValueError as err:
+ msg = "Cannot deserialize to rfc datetime object."
+ raise DeserializationError(msg) from err
+ return date_obj
+
+ @staticmethod
+ def deserialize_iso(attr):
+ """Deserialize ISO-8601 formatted string into Datetime object.
+
+ :param str attr: response string to be deserialized.
+ :return: Deserialized ISO datetime
+ :rtype: Datetime
+ :raises DeserializationError: if string format invalid.
+ """
+ if isinstance(attr, ET.Element):
+ attr = attr.text
+ try:
+ attr = attr.upper() # type: ignore
+ match = Deserializer.valid_date.match(attr)
+ if not match:
+ raise ValueError("Invalid datetime string: " + attr)
+
+ check_decimal = attr.split(".")
+ if len(check_decimal) > 1:
+ decimal_str = ""
+ for digit in check_decimal[1]:
+ if digit.isdigit():
+ decimal_str += digit
+ else:
+ break
+ if len(decimal_str) > 6:
+ attr = attr.replace(decimal_str, decimal_str[0:6])
+
+ date_obj = isodate.parse_datetime(attr)
+ test_utc = date_obj.utctimetuple()
+ if test_utc.tm_year > 9999 or test_utc.tm_year < 1:
+ raise OverflowError("Hit max or min date")
+ except (ValueError, OverflowError, AttributeError) as err:
+ msg = "Cannot deserialize datetime object."
+ raise DeserializationError(msg) from err
+ return date_obj
+
+ @staticmethod
+ def deserialize_unix(attr):
+ """Serialize Datetime object into IntTime format.
+ This is represented as seconds.
+
+ :param int attr: Object to be serialized.
+ :return: Deserialized datetime
+ :rtype: Datetime
+ :raises DeserializationError: if format invalid
+ """
+ if isinstance(attr, ET.Element):
+ attr = int(attr.text) # type: ignore
+ try:
+ attr = int(attr)
+ date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC)
+ except ValueError as err:
+ msg = "Cannot deserialize to unix datetime object."
+ raise DeserializationError(msg) from err
+ return date_obj
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/utils.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/utils.py
new file mode 100644
index 000000000000..cbaa624660e4
--- /dev/null
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_utils/utils.py
@@ -0,0 +1,40 @@
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) Python Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from typing import Optional
+
+from azure.core import MatchConditions
+
+
+def quote_etag(etag: Optional[str]) -> Optional[str]:
+ if not etag or etag == "*":
+ return etag
+ if etag.startswith("W/"):
+ return etag
+ if etag.startswith('"') and etag.endswith('"'):
+ return etag
+ if etag.startswith("'") and etag.endswith("'"):
+ return etag
+ return '"' + etag + '"'
+
+
+def prep_if_match(etag: Optional[str], match_condition: Optional[MatchConditions]) -> Optional[str]:
+ if match_condition == MatchConditions.IfNotModified:
+ if_match = quote_etag(etag) if etag else None
+ return if_match
+ if match_condition == MatchConditions.IfPresent:
+ return "*"
+ return None
+
+
+def prep_if_none_match(etag: Optional[str], match_condition: Optional[MatchConditions]) -> Optional[str]:
+ if match_condition == MatchConditions.IfModified:
+ if_none_match = quote_etag(etag) if etag else None
+ return if_none_match
+ if match_condition == MatchConditions.IfMissing:
+ return "*"
+ return None
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_version.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_version.py
index 0a99d31fccc0..be71c81bd282 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/_version.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/_version.py
@@ -2,8 +2,8 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-VERSION = "2019-02-02"
+VERSION = "1.0.0b1"
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/__init__.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/__init__.py
index ae03cc3ab39b..48d4d1bb1dea 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/__init__.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/__init__.py
@@ -2,22 +2,28 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
-from ._client import AzureTable
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._client import TablesClient # type: ignore
try:
from ._patch import __all__ as _patch_all
- from ._patch import * # pylint: disable=unused-wildcard-import
+ from ._patch import *
except ImportError:
_patch_all = []
from ._patch import patch_sdk as _patch_sdk
__all__ = [
- "AzureTable",
+ "TablesClient",
]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
_patch_sdk()
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/_client.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/_client.py
index 585004a33b2d..0fe91a37f71d 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/_client.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/_client.py
@@ -2,52 +2,75 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
from copy import deepcopy
-from typing import Any, Awaitable
+from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
from azure.core import AsyncPipelineClient
+from azure.core.pipeline import policies
from azure.core.rest import AsyncHttpResponse, HttpRequest
-from .. import models as _models
-from .._serialization import Deserializer, Serializer
-from ._configuration import AzureTableConfiguration
+from .._utils.serialization import Deserializer, Serializer
+from ._configuration import TablesClientConfiguration
from .operations import ServiceOperations, TableOperations
+if TYPE_CHECKING:
+ from azure.core.credentials_async import AsyncTokenCredential
-class AzureTable: # pylint: disable=client-accepts-api-version-keyword
- """AzureTable.
+
+class TablesClient:
+ """TablesClient.
:ivar table: TableOperations operations
- :vartype table: azure.table.aio.operations.TableOperations
+ :vartype table: azure.data.tables._generated.aio.operations.TableOperations
:ivar service: ServiceOperations operations
- :vartype service: azure.table.aio.operations.ServiceOperations
- :param url: The URL of the service account or table that is the target of the desired
- operation. Required.
+ :vartype service: azure.data.tables._generated.aio.operations.ServiceOperations
+ :param url: The host name of the tables account, e.g. accountName.table.core.windows.net.
+ Required.
:type url: str
- :keyword version: Specifies the version of the operation to use for this request. Default value
- is "2019-02-02". Note that overriding this default value may result in unsupported behavior.
- :paramtype version: str
+ :param credential: Credential used to authenticate requests to the service. Required.
+ :type credential: ~azure.core.credentials_async.AsyncTokenCredential
+ :keyword api_version: The API version. Default value is "2019-02-02". Note that overriding this
+ default value may result in unsupported behavior.
+ :paramtype api_version: str
"""
- def __init__( # pylint: disable=missing-client-constructor-parameter-credential
- self, url: str, **kwargs: Any
- ) -> None:
+ def __init__(self, url: str, credential: "AsyncTokenCredential", **kwargs: Any) -> None:
_endpoint = "{url}"
- self._config = AzureTableConfiguration(url=url, **kwargs)
- self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, config=self._config, **kwargs)
-
- client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
- self._serialize = Serializer(client_models)
- self._deserialize = Deserializer(client_models)
+ self._config = TablesClientConfiguration(url=url, credential=credential, **kwargs)
+
+ _policies = kwargs.pop("policies", None)
+ if _policies is None:
+ _policies = [
+ policies.RequestIdPolicy(**kwargs),
+ self._config.headers_policy,
+ self._config.user_agent_policy,
+ self._config.proxy_policy,
+ policies.ContentDecodePolicy(**kwargs),
+ self._config.redirect_policy,
+ self._config.retry_policy,
+ self._config.authentication_policy,
+ self._config.custom_hook_policy,
+ self._config.logging_policy,
+ policies.DistributedTracingPolicy(**kwargs),
+ policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+ self._config.http_logging_policy,
+ ]
+ self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs)
+
+ self._serialize = Serializer()
+ self._deserialize = Deserializer()
self._serialize.client_side_validation = False
self.table = TableOperations(self._client, self._config, self._serialize, self._deserialize)
self.service = ServiceOperations(self._client, self._config, self._serialize, self._deserialize)
- def send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]:
+ def send_request(
+ self, request: HttpRequest, *, stream: bool = False, **kwargs: Any
+ ) -> Awaitable[AsyncHttpResponse]:
"""Runs the network request through the client's chained policies.
>>> from azure.core.rest import HttpRequest
@@ -71,12 +94,12 @@ def send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHt
}
request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
- return self._client.send_request(request_copy, **kwargs)
+ return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
async def close(self) -> None:
await self._client.close()
- async def __aenter__(self) -> "AzureTable":
+ async def __aenter__(self) -> Self:
await self._client.__aenter__()
return self
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/_configuration.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/_configuration.py
index 65d6a3c7afcd..7871ca9ef285 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/_configuration.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/_configuration.py
@@ -2,48 +2,50 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-import sys
-from typing import Any
+from typing import Any, TYPE_CHECKING
-from azure.core.configuration import Configuration
from azure.core.pipeline import policies
from .._version import VERSION
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
-else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+if TYPE_CHECKING:
+ from azure.core.credentials_async import AsyncTokenCredential
-class AzureTableConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
- """Configuration for AzureTable.
+class TablesClientConfiguration: # pylint: disable=too-many-instance-attributes
+ """Configuration for TablesClient.
Note that all parameters used to create this instance are saved as instance
attributes.
- :param url: The URL of the service account or table that is the target of the desired
- operation. Required.
+ :param url: The host name of the tables account, e.g. accountName.table.core.windows.net.
+ Required.
:type url: str
- :keyword version: Specifies the version of the operation to use for this request. Default value
- is "2019-02-02". Note that overriding this default value may result in unsupported behavior.
- :paramtype version: str
+ :param credential: Credential used to authenticate requests to the service. Required.
+ :type credential: ~azure.core.credentials_async.AsyncTokenCredential
+ :keyword api_version: The API version. Default value is "2019-02-02". Note that overriding this
+ default value may result in unsupported behavior.
+ :paramtype api_version: str
"""
- def __init__(self, url: str, **kwargs: Any) -> None:
- super(AzureTableConfiguration, self).__init__(**kwargs)
- version: Literal["2019-02-02"] = kwargs.pop("version", "2019-02-02")
+ def __init__(self, url: str, credential: "AsyncTokenCredential", **kwargs: Any) -> None:
+ api_version: str = kwargs.pop("api_version", "2019-02-02")
if url is None:
raise ValueError("Parameter 'url' must not be None.")
+ if credential is None:
+ raise ValueError("Parameter 'credential' must not be None.")
self.url = url
- self.version = version
- kwargs.setdefault("sdk_moniker", "table/{}".format(VERSION))
+ self.credential = credential
+ self.api_version = api_version
+ self.credential_scopes = kwargs.pop("credential_scopes", ["https://storage.azure.com/.default"])
+ kwargs.setdefault("sdk_moniker", "data-tables/{}".format(VERSION))
+ self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)
def _configure(self, **kwargs: Any) -> None:
@@ -52,7 +54,11 @@ def _configure(self, **kwargs: Any) -> None:
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs)
- self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs)
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs)
+ self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs)
self.authentication_policy = kwargs.get("authentication_policy")
+ if self.credential and not self.authentication_policy:
+ self.authentication_policy = policies.AsyncBearerTokenCredentialPolicy(
+ self.credential, *self.credential_scopes, **kwargs
+ )
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/__init__.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/__init__.py
index 8467e05a2502..7b004d4708fa 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/__init__.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/__init__.py
@@ -2,20 +2,26 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
-from ._operations import TableOperations
-from ._operations import ServiceOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._operations import TableOperations # type: ignore
+from ._operations import ServiceOperations # type: ignore
from ._patch import __all__ as _patch_all
-from ._patch import * # pylint: disable=unused-wildcard-import
+from ._patch import *
from ._patch import patch_sdk as _patch_sdk
__all__ = [
"TableOperations",
"ServiceOperations",
]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
_patch_sdk()
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/_operations.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/_operations.py
index 769fa6a4fb2f..90df4bf65d2a 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/_operations.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/_operations.py
@@ -1,16 +1,19 @@
-# pylint: disable=too-many-lines
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from collections.abc import MutableMapping
from io import IOBase
-import sys
-from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload
+import json
+from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, overload
+import urllib.parse
-from azure.core import MatchConditions
+from azure.core import AsyncPipelineClient, MatchConditions
+from azure.core.async_paging import AsyncItemPaged, AsyncList
from azure.core.exceptions import (
ClientAuthenticationError,
HttpResponseError,
@@ -18,14 +21,26 @@
ResourceModifiedError,
ResourceNotFoundError,
ResourceNotModifiedError,
+ StreamClosedError,
+ StreamConsumedError,
map_error,
)
from azure.core.pipeline import PipelineResponse
from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
from azure.core.tracing.decorator_async import distributed_trace_async
from azure.core.utils import case_insensitive_dict
from ... import models as _models
+from ..._utils.model_base import (
+ SdkJSONEncoder,
+ _deserialize,
+ _deserialize_xml,
+ _failsafe_deserialize,
+ _failsafe_deserialize_xml,
+ _get_element,
+)
+from ..._utils.serialization import Deserializer, Serializer
from ...operations._operations import (
build_service_get_properties_request,
build_service_get_statistics_request,
@@ -42,13 +57,11 @@
build_table_set_access_policy_request,
build_table_update_entity_request,
)
+from .._configuration import TablesClientConfiguration
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
-else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+JSON = MutableMapping[str, Any]
T = TypeVar("T")
-ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]]
class TableOperations:
@@ -57,54 +70,54 @@ class TableOperations:
**DO NOT** instantiate this class directly.
Instead, you should access the following operations through
- :class:`~azure.table.aio.AzureTable`'s
+ :class:`~azure.data.tables._generated.aio.TablesClient`'s
:attr:`table` attribute.
"""
- models = _models
-
def __init__(self, *args, **kwargs) -> None:
input_args = list(args)
- self._client = input_args.pop(0) if input_args else kwargs.pop("client")
- self._config = input_args.pop(0) if input_args else kwargs.pop("config")
- self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
- self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+ self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
+ self._config: TablesClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
+ self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer")
+ self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
- @distributed_trace_async
- async def query(
+ @distributed_trace
+ def query(
self,
*,
format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
top: Optional[int] = None,
select: Optional[str] = None,
filter: Optional[str] = None,
- next_table_name: Optional[str] = None,
**kwargs: Any
- ) -> _models.TableQueryResponse:
+ ) -> AsyncItemPaged["_models.TableProperties"]:
"""Queries tables under the given account.
- :keyword format: Specifies the media type for the response. Known values are:
+ :keyword format: Specifies the metadata format for the response. Known values are:
"application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
"application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
- :keyword top: Maximum number of records to return. Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword top: Specifies the maximum number of records to return. Default value is None.
:paramtype top: int
:keyword select: Select expression using OData notation. Limits the columns on each record to
- just those requested, e.g. "$select=PolicyAssignmentId, ResourceId". Default value is None.
+ just those requested. Default value is None.
:paramtype select: str
:keyword filter: OData filter expression. Default value is None.
:paramtype filter: str
- :keyword next_table_name: A table query continuation token from a previous call. Default value
- is None.
- :paramtype next_table_name: str
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
- :return: TableQueryResponse
- :rtype: ~azure.table.models.TableQueryResponse
+ :return: An iterator like instance of TableProperties
+ :rtype:
+ ~azure.core.async_paging.AsyncItemPaged[~azure.data.tables._generated.models.TableProperties]
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ _headers = kwargs.pop("headers", {}) or {}
+ _params = kwargs.pop("params", {}) or {}
+
+ data_service_version: Literal["3.0"] = kwargs.pop(
+ "data_service_version", _headers.pop("DataServiceVersion", "3.0")
+ )
+ cls: ClsType[list[_models.TableProperties]] = kwargs.pop("cls", None)
+
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -112,90 +125,173 @@ async def query(
}
error_map.update(kwargs.pop("error_map", {}) or {})
- _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
- _params = kwargs.pop("params", {}) or {}
+ def prepare_request(_continuation_token=None):
+
+ _request = build_table_query_request(
+ format=format,
+ top=top,
+ select=select,
+ filter=filter,
+ next_table_name=_continuation_token,
+ data_service_version=data_service_version,
+ api_version=self._config.api_version,
+ headers=_headers,
+ params=_params,
+ )
+ path_format_arguments = {
+ "url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
+ }
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
+ return _request
+
+ async def extract_data(pipeline_response):
+ deserialized = pipeline_response.http_response.json()
+ list_of_elem = _deserialize(list[_models.TableProperties], deserialized.get("value", []))
+ if cls:
+ list_of_elem = cls(list_of_elem) # type: ignore
+ return pipeline_response.http_response.headers.get("x-ms-continuation-NextTableName") or None, AsyncList(
+ list_of_elem
+ )
- data_service_version: Literal["3.0"] = kwargs.pop(
- "data_service_version", _headers.pop("DataServiceVersion", "3.0")
- )
- cls: ClsType[_models.TableQueryResponse] = kwargs.pop("cls", None)
+ async def get_next(_continuation_token=None):
+ _request = prepare_request(_continuation_token)
- request = build_table_query_request(
- format=format,
- top=top,
- select=select,
- filter=filter,
- next_table_name=next_table_name,
- data_service_version=data_service_version,
- version=self._config.version,
- headers=_headers,
- params=_params,
- )
- path_format_arguments = {
- "url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
- }
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _stream = False
+ pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
+ _request, stream=_stream, **kwargs
+ )
+ response = pipeline_response.http_response
- _stream = False
- pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
- )
+ if response.status_code not in [200]:
+ map_error(status_code=response.status_code, response=response, error_map=error_map)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
+ raise HttpResponseError(response=response, model=error)
- response = pipeline_response.http_response
+ return pipeline_response
- if response.status_code not in [200]:
- if _stream:
- await response.read() # Load the body in memory and close the socket
- map_error(status_code=response.status_code, response=response, error_map=error_map)
- raise HttpResponseError(response=response)
+ return AsyncItemPaged(get_next, extract_data)
- response_headers = {}
- response_headers["x-ms-client-request-id"] = self._deserialize(
- "str", response.headers.get("x-ms-client-request-id")
- )
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
- response_headers["x-ms-continuation-NextTableName"] = self._deserialize(
- "str", response.headers.get("x-ms-continuation-NextTableName")
- )
+ @overload
+ async def create(
+ self,
+ table_properties: _models.TableProperties,
+ *,
+ content_type: str = "application/json",
+ format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
+ **kwargs: Any
+ ) -> Optional[_models.TableResponse]:
+ """Creates a new table under the given account.
- deserialized = self._deserialize("TableQueryResponse", pipeline_response)
+ :param table_properties: The table properties to create. Required.
+ :type table_properties: ~azure.data.tables._generated.models.TableProperties
+ :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :keyword format: Specifies the metadata format for the response. Known values are:
+ "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
+ "application/json;odata=fullmetadata". Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the created table in the
+ payload. Possible values are return-no-content and return-content. Known values are:
+ "return-no-content" and "return-content". Default value is None.
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: TableResponse or None. The TableResponse is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableResponse or None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
- if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ @overload
+ async def create(
+ self,
+ table_properties: JSON,
+ *,
+ content_type: str = "application/json",
+ format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
+ **kwargs: Any
+ ) -> Optional[_models.TableResponse]:
+ """Creates a new table under the given account.
- return deserialized
+ :param table_properties: The table properties to create. Required.
+ :type table_properties: JSON
+ :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :keyword format: Specifies the metadata format for the response. Known values are:
+ "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
+ "application/json;odata=fullmetadata". Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the created table in the
+ payload. Possible values are return-no-content and return-content. Known values are:
+ "return-no-content" and "return-content". Default value is None.
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: TableResponse or None. The TableResponse is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableResponse or None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+
+ @overload
+ async def create(
+ self,
+ table_properties: IO[bytes],
+ *,
+ content_type: str = "application/json",
+ format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
+ **kwargs: Any
+ ) -> Optional[_models.TableResponse]:
+ """Creates a new table under the given account.
+
+ :param table_properties: The table properties to create. Required.
+ :type table_properties: IO[bytes]
+ :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :keyword format: Specifies the metadata format for the response. Known values are:
+ "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
+ "application/json;odata=fullmetadata". Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the created table in the
+ payload. Possible values are return-no-content and return-content. Known values are:
+ "return-no-content" and "return-content". Default value is None.
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: TableResponse or None. The TableResponse is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableResponse or None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
@distributed_trace_async
async def create(
self,
- table_properties: _models.TableProperties,
+ table_properties: Union[_models.TableProperties, JSON, IO[bytes]],
*,
format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
- response_preference: Optional[Union[str, _models.ResponseFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
**kwargs: Any
) -> Optional[_models.TableResponse]:
"""Creates a new table under the given account.
- :param table_properties: The Table properties. Required.
- :type table_properties: ~azure.table.models.TableProperties
- :keyword format: Specifies the media type for the response. Known values are:
+ :param table_properties: The table properties to create. Is one of the following types:
+ TableProperties, JSON, IO[bytes] Required.
+ :type table_properties: ~azure.data.tables._generated.models.TableProperties or JSON or
+ IO[bytes]
+ :keyword format: Specifies the metadata format for the response. Known values are:
"application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
"application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
- :keyword response_preference: Specifies whether the response should include the inserted entity
- in the payload. Possible values are return-no-content and return-content. Known values are:
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the created table in the
+ payload. Possible values are return-no-content and return-content. Known values are:
"return-no-content" and "return-content". Default value is None.
- :paramtype response_preference: str or ~azure.table.models.ResponseFormat
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
- :return: TableResponse or None
- :rtype: ~azure.table.models.TableResponse or None
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: TableResponse or None. The TableResponse is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableResponse or None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -209,76 +305,89 @@ async def create(
data_service_version: Literal["3.0"] = kwargs.pop(
"data_service_version", _headers.pop("DataServiceVersion", "3.0")
)
- content_type: str = kwargs.pop(
- "content_type", _headers.pop("Content-Type", "application/json;odata=nometadata")
- )
+ content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[Optional[_models.TableResponse]] = kwargs.pop("cls", None)
- _json = self._serialize.body(table_properties, "TableProperties")
+ content_type = content_type or "application/json"
+ _content = None
+ if isinstance(table_properties, (IOBase, bytes)):
+ _content = table_properties
+ else:
+ _content = json.dumps(table_properties, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
- request = build_table_create_request(
+ _request = build_table_create_request(
format=format,
- response_preference=response_preference,
+ prefer=prefer,
data_service_version=data_service_version,
content_type=content_type,
- version=self._config.version,
- json=_json,
+ api_version=self._config.api_version,
+ content=_content,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [201, 204]:
if _stream:
- await response.read() # Load the body in memory and close the socket
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
deserialized = None
response_headers = {}
if response.status_code == 201:
+ response_headers["Preference-Applied"] = self._deserialize(
+ "str", response.headers.get("Preference-Applied")
+ )
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
- response_headers["Preference-Applied"] = self._deserialize(
- "str", response.headers.get("Preference-Applied")
- )
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("TableResponse", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize(_models.TableResponse, response.json())
if response.status_code == 204:
+ response_headers["Preference-Applied"] = self._deserialize(
+ "str", response.headers.get("Preference-Applied")
+ )
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
- response_headers["Preference-Applied"] = self._deserialize(
- "str", response.headers.get("Preference-Applied")
- )
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@distributed_trace_async
- async def delete(self, table: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements
- """Operation permanently deletes the specified table.
+ async def delete(self, table: str, **kwargs: Any) -> None:
+ """Deletes an existing table.
:param table: The name of the table. Required.
:type table: str
@@ -286,7 +395,7 @@ async def delete(self, table: str, **kwargs: Any) -> None: # pylint: disable=in
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -299,87 +408,86 @@ async def delete(self, table: str, **kwargs: Any) -> None: # pylint: disable=in
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_table_delete_request(
+ _request = build_table_delete_request(
table=table,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [204]:
- if _stream:
- await response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
@distributed_trace_async
async def query_entities(
self,
table: str,
*,
- timeout: Optional[int] = None,
format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
top: Optional[int] = None,
select: Optional[str] = None,
filter: Optional[str] = None,
+ timeout: Optional[int] = None,
next_partition_key: Optional[str] = None,
next_row_key: Optional[str] = None,
**kwargs: Any
) -> _models.TableEntityQueryResponse:
- """Queries entities in a table.
+ """Queries entities under the given table.
:param table: The name of the table. Required.
:type table: str
- :keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
- :paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
+ :keyword format: Specifies the metadata format for the response. Known values are:
"application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
"application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
- :keyword top: Maximum number of records to return. Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword top: Specifies the maximum number of records to return. Default value is None.
:paramtype top: int
:keyword select: Select expression using OData notation. Limits the columns on each record to
- just those requested, e.g. "$select=PolicyAssignmentId, ResourceId". Default value is None.
+ just those requested. Default value is None.
:paramtype select: str
:keyword filter: OData filter expression. Default value is None.
:paramtype filter: str
- :keyword next_partition_key: An entity query continuation token from a previous call. Default
- value is None.
+ :keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
+ :paramtype timeout: int
+ :keyword next_partition_key: An entity partition key query continuation token from a previous
+ call. Default value is None.
:paramtype next_partition_key: str
- :keyword next_row_key: An entity query continuation token from a previous call. Default value
- is None.
+ :keyword next_row_key: An entity row key query continuation token from a previous call. Default
+ value is None.
:paramtype next_row_key: str
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
- :return: TableEntityQueryResponse
- :rtype: ~azure.table.models.TableEntityQueryResponse
+ :return: TableEntityQueryResponse. The TableEntityQueryResponse is compatible with
+ MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableEntityQueryResponse
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -387,7 +495,7 @@ async def query_entities(
}
error_map.update(kwargs.pop("error_map", {}) or {})
- _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _headers = kwargs.pop("headers", {}) or {}
_params = kwargs.pop("params", {}) or {}
data_service_version: Literal["3.0"] = kwargs.pop(
@@ -395,59 +503,69 @@ async def query_entities(
)
cls: ClsType[_models.TableEntityQueryResponse] = kwargs.pop("cls", None)
- request = build_table_query_entities_request(
+ _request = build_table_query_entities_request(
table=table,
- timeout=timeout,
format=format,
top=top,
select=select,
filter=filter,
+ timeout=timeout,
next_partition_key=next_partition_key,
next_row_key=next_row_key,
data_service_version=data_service_version,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
if _stream:
- await response.read() # Load the body in memory and close the socket
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
- response_headers["x-ms-client-request-id"] = self._deserialize(
- "str", response.headers.get("x-ms-client-request-id")
- )
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
response_headers["x-ms-continuation-NextPartitionKey"] = self._deserialize(
"str", response.headers.get("x-ms-continuation-NextPartitionKey")
)
response_headers["x-ms-continuation-NextRowKey"] = self._deserialize(
"str", response.headers.get("x-ms-continuation-NextRowKey")
)
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
+ response_headers["x-ms-client-request-id"] = self._deserialize(
+ "str", response.headers.get("x-ms-client-request-id")
+ )
+ response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("TableEntityQueryResponse", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize(_models.TableEntityQueryResponse, response.json())
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@distributed_trace_async
async def query_entity_with_partition_and_row_key(
@@ -461,8 +579,8 @@ async def query_entity_with_partition_and_row_key(
select: Optional[str] = None,
filter: Optional[str] = None,
**kwargs: Any
- ) -> Dict[str, Any]:
- """Queries a single entity in a table.
+ ) -> dict[str, Any]:
+ """Retrieve a single entity.
:param table: The name of the table. Required.
:type table: str
@@ -472,23 +590,20 @@ async def query_entity_with_partition_and_row_key(
:type row_key: str
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
+ :keyword format: Specifies the metadata format for the response. Known values are:
"application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
"application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
:keyword select: Select expression using OData notation. Limits the columns on each record to
- just those requested, e.g. "$select=PolicyAssignmentId, ResourceId". Default value is None.
+ just those requested. Default value is None.
:paramtype select: str
:keyword filter: OData filter expression. Default value is None.
:paramtype filter: str
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: dict mapping str to any
:rtype: dict[str, any]
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -496,15 +611,15 @@ async def query_entity_with_partition_and_row_key(
}
error_map.update(kwargs.pop("error_map", {}) or {})
- _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _headers = kwargs.pop("headers", {}) or {}
_params = kwargs.pop("params", {}) or {}
data_service_version: Literal["3.0"] = kwargs.pop(
"data_service_version", _headers.pop("DataServiceVersion", "3.0")
)
- cls: ClsType[Dict[str, Any]] = kwargs.pop("cls", None)
+ cls: ClsType[dict[str, Any]] = kwargs.pop("cls", None)
- request = build_table_query_entity_with_partition_and_row_key_request(
+ _request = build_table_query_entity_with_partition_and_row_key_request(
table=table,
partition_key=partition_key,
row_key=row_key,
@@ -513,36 +628,36 @@ async def query_entity_with_partition_and_row_key(
select=select,
filter=filter,
data_service_version=data_service_version,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
if _stream:
- await response.read() # Load the body in memory and close the socket
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
- response_headers["x-ms-client-request-id"] = self._deserialize(
- "str", response.headers.get("x-ms-client-request-id")
- )
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
response_headers["x-ms-continuation-NextPartitionKey"] = self._deserialize(
"str", response.headers.get("x-ms-continuation-NextPartitionKey")
@@ -550,24 +665,33 @@ async def query_entity_with_partition_and_row_key(
response_headers["x-ms-continuation-NextRowKey"] = self._deserialize(
"str", response.headers.get("x-ms-continuation-NextRowKey")
)
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
+ response_headers["x-ms-client-request-id"] = self._deserialize(
+ "str", response.headers.get("x-ms-client-request-id")
+ )
+ response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("{object}", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize(dict[str, Any], response.json())
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@overload
- async def update_entity( # pylint: disable=inconsistent-return-statements
+ async def update_entity(
self,
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[Dict[str, Any]] = None,
+ table_entity_properties: Optional[dict[str, Any]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
content_type: str = "application/json",
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
@@ -585,10 +709,6 @@ async def update_entity( # pylint: disable=inconsistent-return-statements
:type table_entity_properties: dict[str, any]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
@@ -597,24 +717,20 @@ async def update_entity( # pylint: disable=inconsistent-return-statements
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
@overload
- async def update_entity( # pylint: disable=inconsistent-return-statements
+ async def update_entity(
self,
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[IO] = None,
+ table_entity_properties: Optional[IO[bytes]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
content_type: str = "application/json",
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
@@ -629,13 +745,9 @@ async def update_entity( # pylint: disable=inconsistent-return-statements
:param row_key: The row key of the entity. Required.
:type row_key: str
:param table_entity_properties: The properties for the table entity. Default value is None.
- :type table_entity_properties: IO
+ :type table_entity_properties: IO[bytes]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
@@ -644,24 +756,20 @@ async def update_entity( # pylint: disable=inconsistent-return-statements
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
@distributed_trace_async
- async def update_entity( # pylint: disable=inconsistent-return-statements
+ async def update_entity(
self,
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[Union[Dict[str, Any], IO]] = None,
+ table_entity_properties: Optional[Union[dict[str, Any], IO[bytes]]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
**kwargs: Any
@@ -675,30 +783,20 @@ async def update_entity( # pylint: disable=inconsistent-return-statements
:param row_key: The row key of the entity. Required.
:type row_key: str
:param table_entity_properties: The properties for the table entity. Is either a {str: Any}
- type or a IO type. Default value is None.
- :type table_entity_properties: dict[str, any] or IO
+ type or a IO[bytes] type. Default value is None.
+ :type table_entity_properties: dict[str, any] or IO[bytes]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword etag: check if resource is changed. Set None to skip checking etag. Default value is
None.
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -719,31 +817,29 @@ async def update_entity( # pylint: disable=inconsistent-return-statements
"data_service_version", _headers.pop("DataServiceVersion", "3.0")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+ content_type = content_type if table_entity_properties else None
cls: ClsType[None] = kwargs.pop("cls", None)
- content_type = content_type or "application/json"
- _json = None
+ content_type = content_type or "application/json" if table_entity_properties else None
_content = None
if isinstance(table_entity_properties, (IOBase, bytes)):
_content = table_entity_properties
else:
if table_entity_properties is not None:
- _json = self._serialize.body(table_entity_properties, "{object}")
+ _content = json.dumps(table_entity_properties, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
else:
- _json = None
+ _content = None
- request = build_table_update_entity_request(
+ _request = build_table_update_entity_request(
table=table,
partition_key=partition_key,
row_key=row_key,
timeout=timeout,
- format=format,
etag=etag,
match_condition=match_condition,
data_service_version=data_service_version,
content_type=content_type,
- version=self._config.version,
- json=_json,
+ api_version=self._config.api_version,
content=_content,
headers=_headers,
params=_params,
@@ -751,44 +847,44 @@ async def update_entity( # pylint: disable=inconsistent-return-statements
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [204]:
- if _stream:
- await response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
- response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
@overload
- async def merge_entity( # pylint: disable=inconsistent-return-statements
+ async def merge_entity(
self,
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[Dict[str, Any]] = None,
+ table_entity_properties: Optional[dict[str, Any]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
content_type: str = "application/json",
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
@@ -806,10 +902,6 @@ async def merge_entity( # pylint: disable=inconsistent-return-statements
:type table_entity_properties: dict[str, any]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
@@ -818,24 +910,20 @@ async def merge_entity( # pylint: disable=inconsistent-return-statements
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
@overload
- async def merge_entity( # pylint: disable=inconsistent-return-statements
+ async def merge_entity(
self,
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[IO] = None,
+ table_entity_properties: Optional[IO[bytes]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
content_type: str = "application/json",
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
@@ -850,13 +938,9 @@ async def merge_entity( # pylint: disable=inconsistent-return-statements
:param row_key: The row key of the entity. Required.
:type row_key: str
:param table_entity_properties: The properties for the table entity. Default value is None.
- :type table_entity_properties: IO
+ :type table_entity_properties: IO[bytes]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
@@ -865,24 +949,20 @@ async def merge_entity( # pylint: disable=inconsistent-return-statements
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
@distributed_trace_async
- async def merge_entity( # pylint: disable=inconsistent-return-statements
+ async def merge_entity(
self,
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[Union[Dict[str, Any], IO]] = None,
+ table_entity_properties: Optional[Union[dict[str, Any], IO[bytes]]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
**kwargs: Any
@@ -896,30 +976,20 @@ async def merge_entity( # pylint: disable=inconsistent-return-statements
:param row_key: The row key of the entity. Required.
:type row_key: str
:param table_entity_properties: The properties for the table entity. Is either a {str: Any}
- type or a IO type. Default value is None.
- :type table_entity_properties: dict[str, any] or IO
+ type or a IO[bytes] type. Default value is None.
+ :type table_entity_properties: dict[str, any] or IO[bytes]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword etag: check if resource is changed. Set None to skip checking etag. Default value is
None.
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -940,31 +1010,29 @@ async def merge_entity( # pylint: disable=inconsistent-return-statements
"data_service_version", _headers.pop("DataServiceVersion", "3.0")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+ content_type = content_type if table_entity_properties else None
cls: ClsType[None] = kwargs.pop("cls", None)
- content_type = content_type or "application/json"
- _json = None
+ content_type = content_type or "application/json" if table_entity_properties else None
_content = None
if isinstance(table_entity_properties, (IOBase, bytes)):
_content = table_entity_properties
else:
if table_entity_properties is not None:
- _json = self._serialize.body(table_entity_properties, "{object}")
+ _content = json.dumps(table_entity_properties, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
else:
- _json = None
+ _content = None
- request = build_table_merge_entity_request(
+ _request = build_table_merge_entity_request(
table=table,
partition_key=partition_key,
row_key=row_key,
timeout=timeout,
- format=format,
etag=etag,
match_condition=match_condition,
data_service_version=data_service_version,
content_type=content_type,
- version=self._config.version,
- json=_json,
+ api_version=self._config.api_version,
content=_content,
headers=_headers,
params=_params,
@@ -972,36 +1040,37 @@ async def merge_entity( # pylint: disable=inconsistent-return-statements
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [204]:
- if _stream:
- await response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
- response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
@distributed_trace_async
- async def delete_entity( # pylint: disable=inconsistent-return-statements
+ async def delete_entity(
self,
table: str,
partition_key: str,
@@ -1010,7 +1079,6 @@ async def delete_entity( # pylint: disable=inconsistent-return-statements
etag: str,
match_condition: MatchConditions,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
**kwargs: Any
) -> None:
"""Deletes the specified entity in a table.
@@ -1027,18 +1095,11 @@ async def delete_entity( # pylint: disable=inconsistent-return-statements
:paramtype match_condition: ~azure.core.MatchConditions
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1052,7 +1113,7 @@ async def delete_entity( # pylint: disable=inconsistent-return-statements
error_map[412] = ResourceExistsError
error_map.update(kwargs.pop("error_map", {}) or {})
- _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _headers = kwargs.pop("headers", {}) or {}
_params = kwargs.pop("params", {}) or {}
data_service_version: Literal["3.0"] = kwargs.pop(
@@ -1060,84 +1121,154 @@ async def delete_entity( # pylint: disable=inconsistent-return-statements
)
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_table_delete_entity_request(
+ _request = build_table_delete_entity_request(
table=table,
partition_key=partition_key,
row_key=row_key,
etag=etag,
match_condition=match_condition,
timeout=timeout,
- format=format,
data_service_version=data_service_version,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [204]:
- if _stream:
- await response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
- @distributed_trace_async
+ @overload
async def insert_entity(
self,
table: str,
- table_entity_properties: Optional[Dict[str, Any]] = None,
+ table_entity_properties: Optional[dict[str, Any]] = None,
*,
+ content_type: str = "application/json",
timeout: Optional[int] = None,
format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
- response_preference: Optional[Union[str, _models.ResponseFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
**kwargs: Any
- ) -> Optional[Dict[str, Any]]:
+ ) -> Optional[dict[str, Any]]:
"""Insert entity in a table.
:param table: The name of the table. Required.
:type table: str
- :param table_entity_properties: The properties for the table entity. Default value is None.
+ :param table_entity_properties: The entity properties to insert. Default value is None.
:type table_entity_properties: dict[str, any]
+ :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
+ :paramtype timeout: int
+ :keyword format: Specifies the metadata format for the response. Known values are:
+ "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
+ "application/json;odata=fullmetadata". Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the inserted entity in the
+ payload. Possible values are return-no-content and return-content. Known values are:
+ "return-no-content" and "return-content". Default value is None.
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: dict mapping str to any or None
+ :rtype: dict[str, any] or None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+
+ @overload
+ async def insert_entity(
+ self,
+ table: str,
+ table_entity_properties: Optional[IO[bytes]] = None,
+ *,
+ content_type: str = "application/json",
+ timeout: Optional[int] = None,
+ format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
+ **kwargs: Any
+ ) -> Optional[dict[str, Any]]:
+ """Insert entity in a table.
+
+ :param table: The name of the table. Required.
+ :type table: str
+ :param table_entity_properties: The entity properties to insert. Default value is None.
+ :type table_entity_properties: IO[bytes]
+ :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
+ :paramtype timeout: int
+ :keyword format: Specifies the metadata format for the response. Known values are:
+ "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
+ "application/json;odata=fullmetadata". Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the inserted entity in the
+ payload. Possible values are return-no-content and return-content. Known values are:
+ "return-no-content" and "return-content". Default value is None.
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: dict mapping str to any or None
+ :rtype: dict[str, any] or None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+
+ @distributed_trace_async
+ async def insert_entity(
+ self,
+ table: str,
+ table_entity_properties: Optional[Union[dict[str, Any], IO[bytes]]] = None,
+ *,
+ timeout: Optional[int] = None,
+ format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
+ **kwargs: Any
+ ) -> Optional[dict[str, Any]]:
+ """Insert entity in a table.
+
+ :param table: The name of the table. Required.
+ :type table: str
+ :param table_entity_properties: The entity properties to insert. Is either a {str: Any} type or
+ a IO[bytes] type. Default value is None.
+ :type table_entity_properties: dict[str, any] or IO[bytes]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
+ :keyword format: Specifies the metadata format for the response. Known values are:
"application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
"application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
- :keyword response_preference: Specifies whether the response should include the inserted entity
- in the payload. Possible values are return-no-content and return-content. Known values are:
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the inserted entity in the
+ payload. Possible values are return-no-content and return-content. Known values are:
"return-no-content" and "return-content". Default value is None.
- :paramtype response_preference: str or ~azure.table.models.ResponseFormat
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
:return: dict mapping str to any or None
:rtype: dict[str, any] or None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1151,86 +1282,98 @@ async def insert_entity(
data_service_version: Literal["3.0"] = kwargs.pop(
"data_service_version", _headers.pop("DataServiceVersion", "3.0")
)
- content_type: str = kwargs.pop(
- "content_type", _headers.pop("Content-Type", "application/json;odata=nometadata")
- )
- cls: ClsType[Optional[Dict[str, Any]]] = kwargs.pop("cls", None)
+ content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+ content_type = content_type if table_entity_properties else None
+ cls: ClsType[Optional[dict[str, Any]]] = kwargs.pop("cls", None)
- if table_entity_properties is not None:
- _json = self._serialize.body(table_entity_properties, "{object}")
+ content_type = content_type or "application/json" if table_entity_properties else None
+ _content = None
+ if isinstance(table_entity_properties, (IOBase, bytes)):
+ _content = table_entity_properties
else:
- _json = None
+ if table_entity_properties is not None:
+ _content = json.dumps(table_entity_properties, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
+ else:
+ _content = None
- request = build_table_insert_entity_request(
+ _request = build_table_insert_entity_request(
table=table,
timeout=timeout,
format=format,
- response_preference=response_preference,
+ prefer=prefer,
data_service_version=data_service_version,
content_type=content_type,
- version=self._config.version,
- json=_json,
+ api_version=self._config.api_version,
+ content=_content,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [201, 204]:
if _stream:
- await response.read() # Load the body in memory and close the socket
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
deserialized = None
response_headers = {}
if response.status_code == 201:
+ response_headers["Preference-Applied"] = self._deserialize(
+ "str", response.headers.get("Preference-Applied")
+ )
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
- response_headers["Preference-Applied"] = self._deserialize(
- "str", response.headers.get("Preference-Applied")
- )
response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("{object}", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize(dict[str, Any], response.json())
if response.status_code == 204:
+ response_headers["Preference-Applied"] = self._deserialize(
+ "str", response.headers.get("Preference-Applied")
+ )
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
- response_headers["Preference-Applied"] = self._deserialize(
- "str", response.headers.get("Preference-Applied")
- )
- response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@distributed_trace_async
async def get_access_policy(
self, table: str, *, timeout: Optional[int] = None, **kwargs: Any
- ) -> List[_models.SignedIdentifier]:
+ ) -> list[_models.SignedIdentifier]:
"""Retrieves details about any stored access policies specified on the table that may be used with
Shared Access Signatures.
@@ -1238,15 +1381,11 @@ async def get_access_policy(
:type table: str
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword comp: Required query string to handle stored access policies for the table that may be
- used with Shared Access Signatures. Default value is "acl". Note that overriding this default
- value may result in unsupported behavior.
- :paramtype comp: str
:return: SignedIdentifier
- :rtype: ~azure.table.models.SignedIdentifier
+ :rtype: ~azure.data.tables._generated.models.SignedIdentifier
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1255,79 +1394,78 @@ async def get_access_policy(
error_map.update(kwargs.pop("error_map", {}) or {})
_headers = kwargs.pop("headers", {}) or {}
- _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+ _params = kwargs.pop("params", {}) or {}
- comp: Literal["acl"] = kwargs.pop("comp", _params.pop("comp", "acl"))
- cls: ClsType[List[_models.SignedIdentifier]] = kwargs.pop("cls", None)
+ cls: ClsType[list[_models.SignedIdentifier]] = kwargs.pop("cls", None)
- request = build_table_get_access_policy_request(
+ _request = build_table_get_access_policy_request(
table=table,
timeout=timeout,
- comp=comp,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
if _stream:
- await response.read() # Load the body in memory and close the socket
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize_xml(
+ _models.TablesServiceError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("[SignedIdentifier]", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize_xml(list[_models.SignedIdentifier], response.text())
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@distributed_trace_async
- async def set_access_policy( # pylint: disable=inconsistent-return-statements
- self,
- table: str,
- table_acl: Optional[List[_models.SignedIdentifier]] = None,
- *,
- timeout: Optional[int] = None,
- **kwargs: Any
+ async def set_access_policy(
+ self, table: str, table_acl: _models.SignedIdentifiersRequest, *, timeout: Optional[int] = None, **kwargs: Any
) -> None:
"""Sets stored access policies for the table that may be used with Shared Access Signatures.
:param table: The name of the table. Required.
:type table: str
- :param table_acl: The acls for the table. Default value is None.
- :type table_acl: ~azure.table.models.SignedIdentifier
+ :param table_acl: The access control list for the table. Required.
+ :type table_acl: ~azure.data.tables._generated.models.SignedIdentifiersRequest
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword comp: Required query string to handle stored access policies for the table that may be
- used with Shared Access Signatures. Default value is "acl". Note that overriding this default
- value may result in unsupported behavior.
- :paramtype comp: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1336,26 +1474,18 @@ async def set_access_policy( # pylint: disable=inconsistent-return-statements
error_map.update(kwargs.pop("error_map", {}) or {})
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
- _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+ _params = kwargs.pop("params", {}) or {}
- comp: Literal["acl"] = kwargs.pop("comp", _params.pop("comp", "acl"))
content_type: str = kwargs.pop("content_type", _headers.pop("Content-Type", "application/xml"))
cls: ClsType[None] = kwargs.pop("cls", None)
- serialization_ctxt = {"xml": {"name": "SignedIdentifiers", "wrapped": True, "itemsName": "SignedIdentifier"}}
- if table_acl is not None:
- _content = self._serialize.body(
- table_acl, "[SignedIdentifier]", is_xml=True, serialization_ctxt=serialization_ctxt
- )
- else:
- _content = None
+ _content = _get_element(table_acl)
- request = build_table_set_access_policy_request(
+ _request = build_table_set_access_policy_request(
table=table,
timeout=timeout,
- comp=comp,
content_type=content_type,
- version=self._config.version,
+ api_version=self._config.api_version,
content=_content,
headers=_headers,
params=_params,
@@ -1363,32 +1493,33 @@ async def set_access_policy( # pylint: disable=inconsistent-return-statements
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [204]:
- if _stream:
- await response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize_xml(
+ _models.TablesServiceError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
class ServiceOperations:
@@ -1397,41 +1528,33 @@ class ServiceOperations:
**DO NOT** instantiate this class directly.
Instead, you should access the following operations through
- :class:`~azure.table.aio.AzureTable`'s
+ :class:`~azure.data.tables._generated.aio.TablesClient`'s
:attr:`service` attribute.
"""
- models = _models
-
def __init__(self, *args, **kwargs) -> None:
input_args = list(args)
- self._client = input_args.pop(0) if input_args else kwargs.pop("client")
- self._config = input_args.pop(0) if input_args else kwargs.pop("config")
- self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
- self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+ self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
+ self._config: TablesClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
+ self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer")
+ self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
@distributed_trace_async
- async def set_properties( # pylint: disable=inconsistent-return-statements
+ async def set_properties(
self, table_service_properties: _models.TableServiceProperties, *, timeout: Optional[int] = None, **kwargs: Any
) -> None:
"""Sets properties for an account's Table service endpoint, including properties for Analytics and
CORS (Cross-Origin Resource Sharing) rules.
- :param table_service_properties: The Table Service properties. Required.
- :type table_service_properties: ~azure.table.models.TableServiceProperties
+ :param table_service_properties: The table service properties to set. Required.
+ :type table_service_properties: ~azure.data.tables._generated.models.TableServiceProperties
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword restype: Required query string to set the service properties. Default value is
- "service". Note that overriding this default value may result in unsupported behavior.
- :paramtype restype: str
- :keyword comp: Required query string to set the service properties. Default value is
- "properties". Note that overriding this default value may result in unsupported behavior.
- :paramtype comp: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1440,21 +1563,17 @@ async def set_properties( # pylint: disable=inconsistent-return-statements
error_map.update(kwargs.pop("error_map", {}) or {})
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
- _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+ _params = kwargs.pop("params", {}) or {}
- restype: Literal["service"] = kwargs.pop("restype", _params.pop("restype", "service"))
- comp: Literal["properties"] = kwargs.pop("comp", _params.pop("comp", "properties"))
content_type: str = kwargs.pop("content_type", _headers.pop("Content-Type", "application/xml"))
cls: ClsType[None] = kwargs.pop("cls", None)
- _content = self._serialize.body(table_service_properties, "TableServiceProperties", is_xml=True)
+ _content = _get_element(table_service_properties)
- request = build_service_set_properties_request(
+ _request = build_service_set_properties_request(
timeout=timeout,
- restype=restype,
- comp=comp,
content_type=content_type,
- version=self._config.version,
+ api_version=self._config.api_version,
content=_content,
headers=_headers,
params=_params,
@@ -1462,31 +1581,32 @@ async def set_properties( # pylint: disable=inconsistent-return-statements
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [202]:
- if _stream:
- await response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize_xml(
+ _models.TablesServiceError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
@distributed_trace_async
async def get_properties(self, *, timeout: Optional[int] = None, **kwargs: Any) -> _models.TableServiceProperties:
@@ -1495,17 +1615,11 @@ async def get_properties(self, *, timeout: Optional[int] = None, **kwargs: Any)
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword restype: Required query string to set the service properties. Default value is
- "service". Note that overriding this default value may result in unsupported behavior.
- :paramtype restype: str
- :keyword comp: Required query string to set the service properties. Default value is
- "properties". Note that overriding this default value may result in unsupported behavior.
- :paramtype comp: str
- :return: TableServiceProperties
- :rtype: ~azure.table.models.TableServiceProperties
+ :return: TableServiceProperties. The TableServiceProperties is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableServiceProperties
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1514,52 +1628,58 @@ async def get_properties(self, *, timeout: Optional[int] = None, **kwargs: Any)
error_map.update(kwargs.pop("error_map", {}) or {})
_headers = kwargs.pop("headers", {}) or {}
- _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+ _params = kwargs.pop("params", {}) or {}
- restype: Literal["service"] = kwargs.pop("restype", _params.pop("restype", "service"))
- comp: Literal["properties"] = kwargs.pop("comp", _params.pop("comp", "properties"))
cls: ClsType[_models.TableServiceProperties] = kwargs.pop("cls", None)
- request = build_service_get_properties_request(
+ _request = build_service_get_properties_request(
timeout=timeout,
- restype=restype,
- comp=comp,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
if _stream:
- await response.read() # Load the body in memory and close the socket
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize_xml(
+ _models.TablesServiceError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize_xml(_models.TableServiceProperties, response.text())
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@distributed_trace_async
async def get_statistics(self, *, timeout: Optional[int] = None, **kwargs: Any) -> _models.TableServiceStats:
@@ -1569,17 +1689,11 @@ async def get_statistics(self, *, timeout: Optional[int] = None, **kwargs: Any)
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword restype: Required query string to get service stats. Default value is "service". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype restype: str
- :keyword comp: Required query string to get service stats. Default value is "stats". Note that
- overriding this default value may result in unsupported behavior.
- :paramtype comp: str
- :return: TableServiceStats
- :rtype: ~azure.table.models.TableServiceStats
+ :return: TableServiceStats. The TableServiceStats is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableServiceStats
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1588,50 +1702,56 @@ async def get_statistics(self, *, timeout: Optional[int] = None, **kwargs: Any)
error_map.update(kwargs.pop("error_map", {}) or {})
_headers = kwargs.pop("headers", {}) or {}
- _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+ _params = kwargs.pop("params", {}) or {}
- restype: Literal["service"] = kwargs.pop("restype", _params.pop("restype", "service"))
- comp: Literal["stats"] = kwargs.pop("comp", _params.pop("comp", "stats"))
cls: ClsType[_models.TableServiceStats] = kwargs.pop("cls", None)
- request = build_service_get_statistics_request(
+ _request = build_service_get_statistics_request(
timeout=timeout,
- restype=restype,
- comp=comp,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
if _stream:
- await response.read() # Load the body in memory and close the socket
+ try:
+ await response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize_xml(
+ _models.TablesServiceError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("TableServiceStats", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize_xml(_models.TableServiceStats, response.text())
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/_patch.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/_patch.py
index f7dd32510333..87676c65a8f0 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/_patch.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/aio/operations/_patch.py
@@ -1,14 +1,15 @@
-# ------------------------------------
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-# ------------------------------------
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------
"""Customize generated code here.
Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
"""
-from typing import List
-__all__: List[str] = [] # Add all objects you want publicly available to users at this package level
+
+__all__: list[str] = [] # Add all objects you want publicly available to users at this package level
def patch_sdk():
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/__init__.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/__init__.py
index 6037cf52c41c..263a99a187e2 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/__init__.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/__init__.py
@@ -2,31 +2,42 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
-from ._models import AccessPolicy
-from ._models import CorsRule
-from ._models import GeoReplication
-from ._models import Logging
-from ._models import Metrics
-from ._models import RetentionPolicy
-from ._models import SignedIdentifier
-from ._models import TableEntityQueryResponse
-from ._models import TableProperties
-from ._models import TableQueryResponse
-from ._models import TableResponse
-from ._models import TableResponseProperties
-from ._models import TableServiceError
-from ._models import TableServiceProperties
-from ._models import TableServiceStats
+from typing import TYPE_CHECKING
-from ._enums import GeoReplicationStatusType
-from ._enums import OdataMetadataFormat
-from ._enums import ResponseFormat
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+
+from ._models import ( # type: ignore
+ AccessPolicy,
+ CorsRule,
+ GeoReplication,
+ Logging,
+ Metrics,
+ RetentionPolicy,
+ SignedIdentifier,
+ SignedIdentifiersRequest,
+ TableEntityQueryResponse,
+ TableProperties,
+ TableResponse,
+ TableServiceProperties,
+ TableServiceStats,
+ TablesError,
+ TablesServiceError,
+)
+
+from ._enums import ( # type: ignore
+ GeoReplicationStatusType,
+ OdataMetadataFormat,
+ ResponseFormat,
+)
from ._patch import __all__ as _patch_all
-from ._patch import * # pylint: disable=unused-wildcard-import
+from ._patch import *
from ._patch import patch_sdk as _patch_sdk
__all__ = [
@@ -37,17 +48,17 @@
"Metrics",
"RetentionPolicy",
"SignedIdentifier",
+ "SignedIdentifiersRequest",
"TableEntityQueryResponse",
"TableProperties",
- "TableQueryResponse",
"TableResponse",
- "TableResponseProperties",
- "TableServiceError",
"TableServiceProperties",
"TableServiceStats",
+ "TablesError",
+ "TablesServiceError",
"GeoReplicationStatusType",
"OdataMetadataFormat",
"ResponseFormat",
]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
_patch_sdk()
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/_enums.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/_enums.py
index 42d527e35998..a285a0ce1e86 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/_enums.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/_enums.py
@@ -2,7 +2,7 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
@@ -14,20 +14,28 @@ class GeoReplicationStatusType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
"""The status of the secondary location."""
LIVE = "live"
+ """The geo replication is live."""
BOOTSTRAP = "bootstrap"
+ """The geo replication is bootstrap."""
UNAVAILABLE = "unavailable"
+ """The geo replication is unavailable."""
class OdataMetadataFormat(str, Enum, metaclass=CaseInsensitiveEnumMeta):
- """OdataMetadataFormat."""
+ """Specifies the level of metadata to be returned with the response."""
- APPLICATION_JSON_ODATA_NOMETADATA = "application/json;odata=nometadata"
- APPLICATION_JSON_ODATA_MINIMALMETADATA = "application/json;odata=minimalmetadata"
- APPLICATION_JSON_ODATA_FULLMETADATA = "application/json;odata=fullmetadata"
+ NO_METADATA = "application/json;odata=nometadata"
+ """No metadata."""
+ MINIMAL_METADATA = "application/json;odata=minimalmetadata"
+ """Minimal metadata. This is the default and the minimum required for full deserialization."""
+ FULL_METADATA = "application/json;odata=fullmetadata"
+ """Full metadata."""
class ResponseFormat(str, Enum, metaclass=CaseInsensitiveEnumMeta):
- """ResponseFormat."""
+ """Specifies whether the response should echo the created content."""
RETURN_NO_CONTENT = "return-no-content"
+ """Do not echo the created content."""
RETURN_CONTENT = "return-content"
+ """Echo the created content."""
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/_models.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/_models.py
index 391f356e06cf..51d4b5d95c80 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/_models.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/models/_models.py
@@ -1,71 +1,76 @@
# coding=utf-8
-# pylint: disable=too-many-lines
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=useless-super-delegation
import datetime
-from typing import Any, Dict, List, Optional, TYPE_CHECKING, Union
+from typing import Any, Mapping, Optional, TYPE_CHECKING, Union, overload
-from .. import _serialization
+from .._utils.model_base import Model as _Model, rest_field
if TYPE_CHECKING:
- # pylint: disable=unused-import,ungrouped-imports
from .. import models as _models
-class AccessPolicy(_serialization.Model):
- """An Access policy.
+class AccessPolicy(_Model):
+ """An access policy.
- All required parameters must be populated in order to send to Azure.
-
- :ivar start: The start datetime from which the policy is active. Required.
+ :ivar start: The date-time the policy is active. Required.
:vartype start: str
- :ivar expiry: The datetime that the policy expires. Required.
+ :ivar expiry: The date-time the policy expires. Required.
:vartype expiry: str
- :ivar permission: The permissions for the acl policy. Required.
+ :ivar permission: The permissions for acl the policy. Required.
:vartype permission: str
"""
- _validation = {
- "start": {"required": True},
- "expiry": {"required": True},
- "permission": {"required": True},
- }
-
- _attribute_map = {
- "start": {"key": "Start", "type": "str", "xml": {"name": "Start"}},
- "expiry": {"key": "Expiry", "type": "str", "xml": {"name": "Expiry"}},
- "permission": {"key": "Permission", "type": "str", "xml": {"name": "Permission"}},
- }
- _xml_map = {"name": "AccessPolicy"}
+ start: str = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Start", "text": False, "unwrapped": False},
+ )
+ """The date-time the policy is active. Required."""
+ expiry: str = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Expiry", "text": False, "unwrapped": False},
+ )
+ """The date-time the policy expires. Required."""
+ permission: str = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Permission", "text": False, "unwrapped": False},
+ )
+ """The permissions for acl the policy. Required."""
+
+ _xml = {"attribute": False, "name": "AccessPolicy", "text": False, "unwrapped": False}
+
+ @overload
+ def __init__(
+ self,
+ *,
+ start: str,
+ expiry: str,
+ permission: str,
+ ) -> None: ...
- def __init__(self, *, start: str, expiry: str, permission: str, **kwargs: Any) -> None:
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword start: The start datetime from which the policy is active. Required.
- :paramtype start: str
- :keyword expiry: The datetime that the policy expires. Required.
- :paramtype expiry: str
- :keyword permission: The permissions for the acl policy. Required.
- :paramtype permission: str
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.start = start
- self.expiry = expiry
- self.permission = permission
+
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class CorsRule(_serialization.Model):
+class CorsRule(_Model):
"""CORS is an HTTP feature that enables a web application running under one domain to access
resources in another domain. Web browsers implement a security restriction known as same-origin
policy that prevents a web page from calling APIs in a different domain; CORS provides a secure
way to allow one domain (the origin domain) to call APIs in another domain.
- All required parameters must be populated in order to send to Azure.
-
:ivar allowed_origins: The origin domains that are permitted to make a request against the
service via CORS. The origin domain is the domain from which the request originates. Note that
the origin must be an exact case-sensitive match with the origin that the user age sends to the
@@ -73,7 +78,7 @@ class CorsRule(_serialization.Model):
requests via CORS. Required.
:vartype allowed_origins: str
:ivar allowed_methods: The methods (HTTP request verbs) that the origin domain may use for a
- CORS request. (comma separated). Required.
+ CORS request. Required.
:vartype allowed_methods: str
:ivar allowed_headers: The request headers that the origin domain may specify on the CORS
request. Required.
@@ -86,23 +91,44 @@ class CorsRule(_serialization.Model):
:vartype max_age_in_seconds: int
"""
- _validation = {
- "allowed_origins": {"required": True},
- "allowed_methods": {"required": True},
- "allowed_headers": {"required": True},
- "exposed_headers": {"required": True},
- "max_age_in_seconds": {"required": True, "minimum": 0},
- }
-
- _attribute_map = {
- "allowed_origins": {"key": "AllowedOrigins", "type": "str", "xml": {"name": "AllowedOrigins"}},
- "allowed_methods": {"key": "AllowedMethods", "type": "str", "xml": {"name": "AllowedMethods"}},
- "allowed_headers": {"key": "AllowedHeaders", "type": "str", "xml": {"name": "AllowedHeaders"}},
- "exposed_headers": {"key": "ExposedHeaders", "type": "str", "xml": {"name": "ExposedHeaders"}},
- "max_age_in_seconds": {"key": "MaxAgeInSeconds", "type": "int", "xml": {"name": "MaxAgeInSeconds"}},
- }
- _xml_map = {"name": "CorsRule"}
-
+ allowed_origins: str = rest_field(
+ name="allowedOrigins",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "AllowedOrigins", "text": False, "unwrapped": False},
+ )
+ """The origin domains that are permitted to make a request against the service via CORS. The
+ origin domain is the domain from which the request originates. Note that the origin must be an
+ exact case-sensitive match with the origin that the user age sends to the service. You can also
+ use the wildcard character '*' to allow all origin domains to make requests via CORS. Required."""
+ allowed_methods: str = rest_field(
+ name="allowedMethods",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "AllowedMethods", "text": False, "unwrapped": False},
+ )
+ """The methods (HTTP request verbs) that the origin domain may use for a CORS request. Required."""
+ allowed_headers: str = rest_field(
+ name="allowedHeaders",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "AllowedHeaders", "text": False, "unwrapped": False},
+ )
+ """The request headers that the origin domain may specify on the CORS request. Required."""
+ exposed_headers: str = rest_field(
+ name="exposedHeaders",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "ExposedHeaders", "text": False, "unwrapped": False},
+ )
+ """The response headers that may be sent in the response to the CORS request and exposed by the
+ browser to the request issuer. Required."""
+ max_age_in_seconds: int = rest_field(
+ name="maxAgeInSeconds",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "MaxAgeInSeconds", "text": False, "unwrapped": False},
+ )
+ """The maximum amount time that a browser should cache the preflight OPTIONS request. Required."""
+
+ _xml = {"attribute": False, "name": "CorsRule", "text": False, "unwrapped": False}
+
+ @overload
def __init__(
self,
*,
@@ -111,116 +137,113 @@ def __init__(
allowed_headers: str,
exposed_headers: str,
max_age_in_seconds: int,
- **kwargs: Any
- ) -> None:
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword allowed_origins: The origin domains that are permitted to make a request against the
- service via CORS. The origin domain is the domain from which the request originates. Note that
- the origin must be an exact case-sensitive match with the origin that the user age sends to the
- service. You can also use the wildcard character '*' to allow all origin domains to make
- requests via CORS. Required.
- :paramtype allowed_origins: str
- :keyword allowed_methods: The methods (HTTP request verbs) that the origin domain may use for a
- CORS request. (comma separated). Required.
- :paramtype allowed_methods: str
- :keyword allowed_headers: The request headers that the origin domain may specify on the CORS
- request. Required.
- :paramtype allowed_headers: str
- :keyword exposed_headers: The response headers that may be sent in the response to the CORS
- request and exposed by the browser to the request issuer. Required.
- :paramtype exposed_headers: str
- :keyword max_age_in_seconds: The maximum amount time that a browser should cache the preflight
- OPTIONS request. Required.
- :paramtype max_age_in_seconds: int
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.allowed_origins = allowed_origins
- self.allowed_methods = allowed_methods
- self.allowed_headers = allowed_headers
- self.exposed_headers = exposed_headers
- self.max_age_in_seconds = max_age_in_seconds
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class GeoReplication(_serialization.Model):
- """GeoReplication.
- All required parameters must be populated in order to send to Azure.
+class GeoReplication(_Model):
+ """Geo-Replication information for the Secondary Storage Service.
:ivar status: The status of the secondary location. Required. Known values are: "live",
"bootstrap", and "unavailable".
- :vartype status: str or ~azure.table.models.GeoReplicationStatusType
+ :vartype status: str or ~azure.data.tables._generated.models.GeoReplicationStatusType
:ivar last_sync_time: A GMT date/time value, to the second. All primary writes preceding this
value are guaranteed to be available for read operations at the secondary. Primary writes after
this point in time may or may not be available for reads. Required.
:vartype last_sync_time: ~datetime.datetime
"""
- _validation = {
- "status": {"required": True},
- "last_sync_time": {"required": True},
- }
-
- _attribute_map = {
- "status": {"key": "Status", "type": "str", "xml": {"name": "Status"}},
- "last_sync_time": {"key": "LastSyncTime", "type": "rfc-1123", "xml": {"name": "LastSyncTime"}},
- }
- _xml_map = {"name": "GeoReplication"}
-
+ status: Union[str, "_models.GeoReplicationStatusType"] = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Status", "text": False, "unwrapped": False},
+ )
+ """The status of the secondary location. Required. Known values are: \"live\", \"bootstrap\", and
+ \"unavailable\"."""
+ last_sync_time: datetime.datetime = rest_field(
+ name="lastSyncTime",
+ visibility=["read", "create", "update", "delete", "query"],
+ format="rfc7231",
+ xml={"attribute": False, "name": "LastSyncTime", "text": False, "unwrapped": False},
+ )
+ """A GMT date/time value, to the second. All primary writes preceding this value are guaranteed to
+ be available for read operations at the secondary. Primary writes after this point in time may
+ or may not be available for reads. Required."""
+
+ _xml = {"attribute": False, "name": "GeoReplication", "text": False, "unwrapped": False}
+
+ @overload
def __init__(
self,
*,
status: Union[str, "_models.GeoReplicationStatusType"],
last_sync_time: datetime.datetime,
- **kwargs: Any
- ) -> None:
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword status: The status of the secondary location. Required. Known values are: "live",
- "bootstrap", and "unavailable".
- :paramtype status: str or ~azure.table.models.GeoReplicationStatusType
- :keyword last_sync_time: A GMT date/time value, to the second. All primary writes preceding
- this value are guaranteed to be available for read operations at the secondary. Primary writes
- after this point in time may or may not be available for reads. Required.
- :paramtype last_sync_time: ~datetime.datetime
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.status = status
- self.last_sync_time = last_sync_time
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class Logging(_serialization.Model):
- """Azure Analytics Logging settings.
- All required parameters must be populated in order to send to Azure.
+class Logging(_Model):
+ """Azure Analytics Logging settings.
- :ivar version: The version of Analytics to configure. Required.
+ :ivar version: The version of the logging properties. Required.
:vartype version: str
- :ivar delete: Indicates whether all delete requests should be logged. Required.
+ :ivar delete: Whether delete operation is logged. Required.
:vartype delete: bool
- :ivar read: Indicates whether all read requests should be logged. Required.
+ :ivar read: Whether read operation is logged. Required.
:vartype read: bool
- :ivar write: Indicates whether all write requests should be logged. Required.
+ :ivar write: Whether write operation is logged. Required.
:vartype write: bool
- :ivar retention_policy: The retention policy. Required.
- :vartype retention_policy: ~azure.table.models.RetentionPolicy
+ :ivar retention_policy: The retention policy of the logs. Required.
+ :vartype retention_policy: ~azure.data.tables._generated.models.RetentionPolicy
"""
- _validation = {
- "version": {"required": True},
- "delete": {"required": True},
- "read": {"required": True},
- "write": {"required": True},
- "retention_policy": {"required": True},
- }
-
- _attribute_map = {
- "version": {"key": "Version", "type": "str", "xml": {"name": "Version"}},
- "delete": {"key": "Delete", "type": "bool", "xml": {"name": "Delete"}},
- "read": {"key": "Read", "type": "bool", "xml": {"name": "Read"}},
- "write": {"key": "Write", "type": "bool", "xml": {"name": "Write"}},
- "retention_policy": {"key": "RetentionPolicy", "type": "RetentionPolicy"},
- }
- _xml_map = {"name": "Logging"}
-
+ version: str = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Version", "text": False, "unwrapped": False},
+ )
+ """The version of the logging properties. Required."""
+ delete: bool = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Delete", "text": False, "unwrapped": False},
+ )
+ """Whether delete operation is logged. Required."""
+ read: bool = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Read", "text": False, "unwrapped": False},
+ )
+ """Whether read operation is logged. Required."""
+ write: bool = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Write", "text": False, "unwrapped": False},
+ )
+ """Whether write operation is logged. Required."""
+ retention_policy: "_models.RetentionPolicy" = rest_field(
+ name="retentionPolicy",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "RetentionPolicy", "text": False, "unwrapped": False},
+ )
+ """The retention policy of the logs. Required."""
+
+ _xml = {"attribute": False, "name": "Logging", "text": False, "unwrapped": False}
+
+ @overload
def __init__(
self,
*,
@@ -229,55 +252,59 @@ def __init__(
read: bool,
write: bool,
retention_policy: "_models.RetentionPolicy",
- **kwargs: Any
- ) -> None:
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword version: The version of Analytics to configure. Required.
- :paramtype version: str
- :keyword delete: Indicates whether all delete requests should be logged. Required.
- :paramtype delete: bool
- :keyword read: Indicates whether all read requests should be logged. Required.
- :paramtype read: bool
- :keyword write: Indicates whether all write requests should be logged. Required.
- :paramtype write: bool
- :keyword retention_policy: The retention policy. Required.
- :paramtype retention_policy: ~azure.table.models.RetentionPolicy
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.version = version
- self.delete = delete
- self.read = read
- self.write = write
- self.retention_policy = retention_policy
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class Metrics(_serialization.Model):
- """Metrics.
- All required parameters must be populated in order to send to Azure.
+class Metrics(_Model):
+ """The metrics properties.
- :ivar version: The version of Analytics to configure.
+ :ivar version: The version of the metrics properties.
:vartype version: str
:ivar enabled: Indicates whether metrics are enabled for the Table service. Required.
:vartype enabled: bool
:ivar include_apis: Indicates whether metrics should generate summary statistics for called API
operations.
:vartype include_apis: bool
- :ivar retention_policy: The retention policy.
- :vartype retention_policy: ~azure.table.models.RetentionPolicy
+ :ivar retention_policy: The retention policy of the metrics.
+ :vartype retention_policy: ~azure.data.tables._generated.models.RetentionPolicy
"""
- _validation = {
- "enabled": {"required": True},
- }
-
- _attribute_map = {
- "version": {"key": "Version", "type": "str", "xml": {"name": "Version"}},
- "enabled": {"key": "Enabled", "type": "bool", "xml": {"name": "Enabled"}},
- "include_apis": {"key": "IncludeAPIs", "type": "bool", "xml": {"name": "IncludeAPIs"}},
- "retention_policy": {"key": "RetentionPolicy", "type": "RetentionPolicy"},
- }
-
+ version: Optional[str] = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Version", "text": False, "unwrapped": False},
+ )
+ """The version of the metrics properties."""
+ enabled: bool = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Enabled", "text": False, "unwrapped": False},
+ )
+ """Indicates whether metrics are enabled for the Table service. Required."""
+ include_apis: Optional[bool] = rest_field(
+ name="includeApis",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "IncludeAPIs", "text": False, "unwrapped": False},
+ )
+ """Indicates whether metrics should generate summary statistics for called API operations."""
+ retention_policy: Optional["_models.RetentionPolicy"] = rest_field(
+ name="retentionPolicy",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "RetentionPolicy", "text": False, "unwrapped": False},
+ )
+ """The retention policy of the metrics."""
+
+ _xml = {"attribute": False, "name": "Metrics", "text": False, "unwrapped": False}
+
+ @overload
def __init__(
self,
*,
@@ -285,182 +312,171 @@ def __init__(
version: Optional[str] = None,
include_apis: Optional[bool] = None,
retention_policy: Optional["_models.RetentionPolicy"] = None,
- **kwargs: Any
- ) -> None:
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword version: The version of Analytics to configure.
- :paramtype version: str
- :keyword enabled: Indicates whether metrics are enabled for the Table service. Required.
- :paramtype enabled: bool
- :keyword include_apis: Indicates whether metrics should generate summary statistics for called
- API operations.
- :paramtype include_apis: bool
- :keyword retention_policy: The retention policy.
- :paramtype retention_policy: ~azure.table.models.RetentionPolicy
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.version = version
- self.enabled = enabled
- self.include_apis = include_apis
- self.retention_policy = retention_policy
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class RetentionPolicy(_serialization.Model):
- """The retention policy.
- All required parameters must be populated in order to send to Azure.
+class RetentionPolicy(_Model):
+ """The retention policy.
- :ivar enabled: Indicates whether a retention policy is enabled for the service. Required.
+ :ivar enabled: Whether to enable the retention policy. Required.
:vartype enabled: bool
:ivar days: Indicates the number of days that metrics or logging or soft-deleted data should be
retained. All data older than this value will be deleted.
:vartype days: int
"""
- _validation = {
- "enabled": {"required": True},
- "days": {"minimum": 1},
- }
-
- _attribute_map = {
- "enabled": {"key": "Enabled", "type": "bool", "xml": {"name": "Enabled"}},
- "days": {"key": "Days", "type": "int", "xml": {"name": "Days"}},
- }
- _xml_map = {"name": "RetentionPolicy"}
+ enabled: bool = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Enabled", "text": False, "unwrapped": False},
+ )
+ """Whether to enable the retention policy. Required."""
+ days: Optional[int] = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Days", "text": False, "unwrapped": False},
+ )
+ """Indicates the number of days that metrics or logging or soft-deleted data should be retained.
+ All data older than this value will be deleted."""
+
+ _xml = {"attribute": False, "name": "RetentionPolicy", "text": False, "unwrapped": False}
+
+ @overload
+ def __init__(
+ self,
+ *,
+ enabled: bool,
+ days: Optional[int] = None,
+ ) -> None: ...
- def __init__(self, *, enabled: bool, days: Optional[int] = None, **kwargs: Any) -> None:
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword enabled: Indicates whether a retention policy is enabled for the service. Required.
- :paramtype enabled: bool
- :keyword days: Indicates the number of days that metrics or logging or soft-deleted data should
- be retained. All data older than this value will be deleted.
- :paramtype days: int
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.enabled = enabled
- self.days = days
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class SignedIdentifier(_serialization.Model):
- """A signed identifier.
- All required parameters must be populated in order to send to Azure.
+class SignedIdentifier(_Model):
+ """The signed identifier.
- :ivar id: A unique id. Required.
+ :ivar id: The unique ID for the signed identifier. Required.
:vartype id: str
- :ivar access_policy: The access policy.
- :vartype access_policy: ~azure.table.models.AccessPolicy
+ :ivar access_policy: The access policy for the signed identifier.
+ :vartype access_policy: ~azure.data.tables._generated.models.AccessPolicy
"""
- _validation = {
- "id": {"required": True},
- }
-
- _attribute_map = {
- "id": {"key": "Id", "type": "str", "xml": {"name": "Id"}},
- "access_policy": {"key": "AccessPolicy", "type": "AccessPolicy"},
- }
- _xml_map = {"name": "SignedIdentifier"}
-
+ id: str = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Id", "text": False, "unwrapped": False},
+ )
+ """The unique ID for the signed identifier. Required."""
+ access_policy: Optional["_models.AccessPolicy"] = rest_field(
+ name="accessPolicy",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "AccessPolicy", "text": False, "unwrapped": False},
+ )
+ """The access policy for the signed identifier."""
+
+ _xml = {"attribute": False, "name": "SignedIdentifier", "text": False, "unwrapped": False}
+
+ @overload
def __init__(
self,
*,
id: str, # pylint: disable=redefined-builtin
access_policy: Optional["_models.AccessPolicy"] = None,
- **kwargs: Any
- ) -> None:
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword id: A unique id. Required.
- :paramtype id: str
- :keyword access_policy: The access policy.
- :paramtype access_policy: ~azure.table.models.AccessPolicy
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.id = id
- self.access_policy = access_policy
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class TableEntityQueryResponse(_serialization.Model):
- """The properties for the table entity query response.
-
- :ivar odata_metadata: The metadata response of the table.
- :vartype odata_metadata: str
- :ivar value: List of table entities.
- :vartype value: list[dict[str, any]]
- """
-
- _attribute_map = {
- "odata_metadata": {"key": "odata\\.metadata", "type": "str"},
- "value": {"key": "value", "type": "[{object}]"},
- }
- def __init__(
- self, *, odata_metadata: Optional[str] = None, value: Optional[List[Dict[str, Any]]] = None, **kwargs: Any
- ) -> None:
- """
- :keyword odata_metadata: The metadata response of the table.
- :paramtype odata_metadata: str
- :keyword value: List of table entities.
- :paramtype value: list[dict[str, any]]
- """
- super().__init__(**kwargs)
- self.odata_metadata = odata_metadata
- self.value = value
+class SignedIdentifiersRequest(_Model):
+ """The set signed identifiers request.
+ :ivar identifiers: Represents an array of signed identifiers. Required.
+ :vartype identifiers: ~azure.data.tables._generated.models.SignedIdentifier
+ """
-class TableProperties(_serialization.Model):
- """The properties for creating a table.
+ identifiers: list["_models.SignedIdentifier"] = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "itemsName": "identifiers", "name": "identifiers", "text": False, "unwrapped": True},
+ )
+ """Represents an array of signed identifiers. Required."""
- :ivar table_name: The name of the table to create.
- :vartype table_name: str
- """
+ _xml = {"attribute": False, "name": "SignedIdentifiers", "text": False, "unwrapped": False}
- _attribute_map = {
- "table_name": {"key": "TableName", "type": "str"},
- }
+ @overload
+ def __init__(
+ self,
+ *,
+ identifiers: list["_models.SignedIdentifier"],
+ ) -> None: ...
- def __init__(self, *, table_name: Optional[str] = None, **kwargs: Any) -> None:
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword table_name: The name of the table to create.
- :paramtype table_name: str
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.table_name = table_name
+
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class TableQueryResponse(_serialization.Model):
- """The properties for the table query response.
+class TableEntityQueryResponse(_Model):
+ """The properties for the table entity query response.
:ivar odata_metadata: The metadata response of the table.
:vartype odata_metadata: str
- :ivar value: List of tables.
- :vartype value: list[~azure.table.models.TableResponseProperties]
+ :ivar value: List of table entities.
+ :vartype value: list[dict[str, any]]
"""
- _attribute_map = {
- "odata_metadata": {"key": "odata\\.metadata", "type": "str"},
- "value": {"key": "value", "type": "[TableResponseProperties]"},
- }
+ odata_metadata: Optional[str] = rest_field(name="odata.metadata", visibility=["read", "query"])
+ """The metadata response of the table."""
+ value: Optional[list[dict[str, Any]]] = rest_field(visibility=["read", "create", "update", "delete", "query"])
+ """List of table entities."""
+ @overload
def __init__(
self,
*,
odata_metadata: Optional[str] = None,
- value: Optional[List["_models.TableResponseProperties"]] = None,
- **kwargs: Any
- ) -> None:
+ value: Optional[list[dict[str, Any]]] = None,
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword odata_metadata: The metadata response of the table.
- :paramtype odata_metadata: str
- :keyword value: List of tables.
- :paramtype value: list[~azure.table.models.TableResponseProperties]
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.odata_metadata = odata_metadata
- self.value = value
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class TableResponseProperties(_serialization.Model):
+
+class TableProperties(_Model):
"""The properties for the table response.
:ivar table_name: The name of the table.
@@ -473,13 +489,16 @@ class TableResponseProperties(_serialization.Model):
:vartype odata_edit_link: str
"""
- _attribute_map = {
- "table_name": {"key": "TableName", "type": "str"},
- "odata_type": {"key": "odata\\.type", "type": "str"},
- "odata_id": {"key": "odata\\.id", "type": "str"},
- "odata_edit_link": {"key": "odata\\.editLink", "type": "str"},
- }
+ table_name: Optional[str] = rest_field(name="TableName", visibility=["read", "create", "update", "delete", "query"])
+ """The name of the table."""
+ odata_type: Optional[str] = rest_field(name="odata.type", visibility=["read", "query"])
+ """The odata type of the table."""
+ odata_id: Optional[str] = rest_field(name="odata.id", visibility=["read", "query"])
+ """The id of the table."""
+ odata_edit_link: Optional[str] = rest_field(name="odata.editLink", visibility=["read", "query"])
+ """The edit link of the table."""
+ @overload
def __init__(
self,
*,
@@ -487,27 +506,21 @@ def __init__(
odata_type: Optional[str] = None,
odata_id: Optional[str] = None,
odata_edit_link: Optional[str] = None,
- **kwargs: Any
- ) -> None:
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword table_name: The name of the table.
- :paramtype table_name: str
- :keyword odata_type: The odata type of the table.
- :paramtype odata_type: str
- :keyword odata_id: The id of the table.
- :paramtype odata_id: str
- :keyword odata_edit_link: The edit link of the table.
- :paramtype odata_edit_link: str
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.table_name = table_name
- self.odata_type = odata_type
- self.odata_id = odata_id
- self.odata_edit_link = odata_edit_link
+
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class TableResponse(TableResponseProperties):
- """The response for a single table.
+class TableResponse(_Model):
+ """The table properties as returned in an echo response.
:ivar table_name: The name of the table.
:vartype table_name: str
@@ -521,14 +534,18 @@ class TableResponse(TableResponseProperties):
:vartype odata_metadata: str
"""
- _attribute_map = {
- "table_name": {"key": "TableName", "type": "str"},
- "odata_type": {"key": "odata\\.type", "type": "str"},
- "odata_id": {"key": "odata\\.id", "type": "str"},
- "odata_edit_link": {"key": "odata\\.editLink", "type": "str"},
- "odata_metadata": {"key": "odata\\.metadata", "type": "str"},
- }
-
+ table_name: Optional[str] = rest_field(name="TableName", visibility=["read", "create", "update", "delete", "query"])
+ """The name of the table."""
+ odata_type: Optional[str] = rest_field(name="odata.type", visibility=["read", "query"])
+ """The odata type of the table."""
+ odata_id: Optional[str] = rest_field(name="odata.id", visibility=["read", "query"])
+ """The id of the table."""
+ odata_edit_link: Optional[str] = rest_field(name="odata.editLink", visibility=["read", "query"])
+ """The edit link of the table."""
+ odata_metadata: Optional[str] = rest_field(name="odata.metadata", visibility=["read", "query"])
+ """The metadata response of the table."""
+
+ @overload
def __init__(
self,
*,
@@ -537,117 +554,176 @@ def __init__(
odata_id: Optional[str] = None,
odata_edit_link: Optional[str] = None,
odata_metadata: Optional[str] = None,
- **kwargs: Any
- ) -> None:
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword table_name: The name of the table.
- :paramtype table_name: str
- :keyword odata_type: The odata type of the table.
- :paramtype odata_type: str
- :keyword odata_id: The id of the table.
- :paramtype odata_id: str
- :keyword odata_edit_link: The edit link of the table.
- :paramtype odata_edit_link: str
- :keyword odata_metadata: The metadata response of the table.
- :paramtype odata_metadata: str
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(
- table_name=table_name, odata_type=odata_type, odata_id=odata_id, odata_edit_link=odata_edit_link, **kwargs
- )
- self.odata_metadata = odata_metadata
+
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class TableServiceError(_serialization.Model):
- """Table Service error.
+class TablesError(_Model):
+ """Table JSON error.
:ivar message: The error message.
:vartype message: str
"""
- _attribute_map = {
- "message": {"key": "Message", "type": "str", "xml": {"name": "Message"}},
- }
+ message: Optional[str] = rest_field(name="Message", visibility=["read", "create", "update", "delete", "query"])
+ """The error message."""
- def __init__(self, *, message: Optional[str] = None, **kwargs: Any) -> None:
+ @overload
+ def __init__(
+ self,
+ *,
+ message: Optional[str] = None,
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword message: The error message.
- :paramtype message: str
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.message = message
-
-
-class TableServiceProperties(_serialization.Model):
- """Table Service Properties.
-
- :ivar logging: Azure Analytics Logging settings.
- :vartype logging: ~azure.table.models.Logging
- :ivar hour_metrics: A summary of request statistics grouped by API in hourly aggregates for
- tables.
- :vartype hour_metrics: ~azure.table.models.Metrics
- :ivar minute_metrics: A summary of request statistics grouped by API in minute aggregates for
- tables.
- :vartype minute_metrics: ~azure.table.models.Metrics
- :ivar cors: The set of CORS rules.
- :vartype cors: ~azure.table.models.CorsRule
- """
- _attribute_map = {
- "logging": {"key": "Logging", "type": "Logging"},
- "hour_metrics": {"key": "HourMetrics", "type": "Metrics"},
- "minute_metrics": {"key": "MinuteMetrics", "type": "Metrics"},
- "cors": {
- "key": "Cors",
- "type": "[CorsRule]",
- "xml": {"name": "Cors", "wrapped": True, "itemsName": "CorsRule"},
- },
- }
- _xml_map = {"name": "StorageServiceProperties"}
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
+
+class TableServiceProperties(_Model):
+ """The service properties.
+
+ :ivar logging: The logging properties.
+ :vartype logging: ~azure.data.tables._generated.models.Logging
+ :ivar hour_metrics: The hour metrics properties.
+ :vartype hour_metrics: ~azure.data.tables._generated.models.Metrics
+ :ivar minute_metrics: The minute metrics properties.
+ :vartype minute_metrics: ~azure.data.tables._generated.models.Metrics
+ :ivar cors: The CORS properties.
+ :vartype cors: ~azure.data.tables._generated.models.CorsRule
+ """
+
+ logging: Optional["_models.Logging"] = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Logging", "text": False, "unwrapped": False},
+ )
+ """The logging properties."""
+ hour_metrics: Optional["_models.Metrics"] = rest_field(
+ name="hourMetrics",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "HourMetrics", "text": False, "unwrapped": False},
+ )
+ """The hour metrics properties."""
+ minute_metrics: Optional["_models.Metrics"] = rest_field(
+ name="minuteMetrics",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "MinuteMetrics", "text": False, "unwrapped": False},
+ )
+ """The minute metrics properties."""
+ cors: Optional[list["_models.CorsRule"]] = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "itemsName": "CorsRule", "name": "Cors", "text": False, "unwrapped": False},
+ )
+ """The CORS properties."""
+
+ _xml = {"attribute": False, "name": "StorageServiceProperties", "text": False, "unwrapped": False}
+
+ @overload
def __init__(
self,
*,
logging: Optional["_models.Logging"] = None,
hour_metrics: Optional["_models.Metrics"] = None,
minute_metrics: Optional["_models.Metrics"] = None,
- cors: Optional[List["_models.CorsRule"]] = None,
- **kwargs: Any
- ) -> None:
+ cors: Optional[list["_models.CorsRule"]] = None,
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword logging: Azure Analytics Logging settings.
- :paramtype logging: ~azure.table.models.Logging
- :keyword hour_metrics: A summary of request statistics grouped by API in hourly aggregates for
- tables.
- :paramtype hour_metrics: ~azure.table.models.Metrics
- :keyword minute_metrics: A summary of request statistics grouped by API in minute aggregates
- for tables.
- :paramtype minute_metrics: ~azure.table.models.Metrics
- :keyword cors: The set of CORS rules.
- :paramtype cors: ~azure.table.models.CorsRule
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.logging = logging
- self.hour_metrics = hour_metrics
- self.minute_metrics = minute_metrics
- self.cors = cors
+
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
-class TableServiceStats(_serialization.Model):
- """Stats for the service.
+class TableServiceStats(_Model):
+ """Stats for the table service.
:ivar geo_replication: Geo-Replication information for the Secondary Storage Service.
- :vartype geo_replication: ~azure.table.models.GeoReplication
+ :vartype geo_replication: ~azure.data.tables._generated.models.GeoReplication
"""
- _attribute_map = {
- "geo_replication": {"key": "GeoReplication", "type": "GeoReplication"},
- }
- _xml_map = {"name": "StorageServiceStats"}
+ geo_replication: Optional["_models.GeoReplication"] = rest_field(
+ name="geoReplication",
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "GeoReplication", "text": False, "unwrapped": False},
+ )
+ """Geo-Replication information for the Secondary Storage Service."""
- def __init__(self, *, geo_replication: Optional["_models.GeoReplication"] = None, **kwargs: Any) -> None:
+ _xml = {"attribute": False, "name": "StorageServiceStats", "text": False, "unwrapped": False}
+
+ @overload
+ def __init__(
+ self,
+ *,
+ geo_replication: Optional["_models.GeoReplication"] = None,
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
+ """
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
+ """
+
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
+
+
+class TablesServiceError(_Model):
+ """The Tables service XML error.
+
+ :ivar code: The error code.
+ :vartype code: str
+ :ivar message: The error message.
+ :vartype message: str
+ """
+
+ code: Optional[str] = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Code", "text": False, "unwrapped": False},
+ )
+ """The error code."""
+ message: Optional[str] = rest_field(
+ visibility=["read", "create", "update", "delete", "query"],
+ xml={"attribute": False, "name": "Message", "text": False, "unwrapped": False},
+ )
+ """The error message."""
+
+ _xml = {"attribute": False, "name": "TablesServiceError", "text": False, "unwrapped": False}
+
+ @overload
+ def __init__(
+ self,
+ *,
+ code: Optional[str] = None,
+ message: Optional[str] = None,
+ ) -> None: ...
+
+ @overload
+ def __init__(self, mapping: Mapping[str, Any]) -> None:
"""
- :keyword geo_replication: Geo-Replication information for the Secondary Storage Service.
- :paramtype geo_replication: ~azure.table.models.GeoReplication
+ :param mapping: raw JSON to initialize the model.
+ :type mapping: Mapping[str, Any]
"""
- super().__init__(**kwargs)
- self.geo_replication = geo_replication
+
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/__init__.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/__init__.py
index 8467e05a2502..7b004d4708fa 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/__init__.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/__init__.py
@@ -2,20 +2,26 @@
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
-from ._operations import TableOperations
-from ._operations import ServiceOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from ._patch import * # pylint: disable=unused-wildcard-import
+
+from ._operations import TableOperations # type: ignore
+from ._operations import ServiceOperations # type: ignore
from ._patch import __all__ as _patch_all
-from ._patch import * # pylint: disable=unused-wildcard-import
+from ._patch import *
from ._patch import patch_sdk as _patch_sdk
__all__ = [
"TableOperations",
"ServiceOperations",
]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
_patch_sdk()
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/_operations.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/_operations.py
index 712c2b61bea0..1c219c3e40c3 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/_operations.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/_operations.py
@@ -1,16 +1,18 @@
-# pylint: disable=too-many-lines
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
+from collections.abc import MutableMapping
from io import IOBase
-import sys
-from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload
+import json
+from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, overload
+import urllib.parse
-from azure.core import MatchConditions
+from azure.core import MatchConditions, PipelineClient
from azure.core.exceptions import (
ClientAuthenticationError,
HttpResponseError,
@@ -18,23 +20,32 @@
ResourceModifiedError,
ResourceNotFoundError,
ResourceNotModifiedError,
+ StreamClosedError,
+ StreamConsumedError,
map_error,
)
+from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
from azure.core.rest import HttpRequest, HttpResponse
from azure.core.tracing.decorator import distributed_trace
from azure.core.utils import case_insensitive_dict
from .. import models as _models
-from .._serialization import Serializer
-from .._vendor import prep_if_match, prep_if_none_match
+from .._configuration import TablesClientConfiguration
+from .._utils.model_base import (
+ SdkJSONEncoder,
+ _deserialize,
+ _deserialize_xml,
+ _failsafe_deserialize,
+ _failsafe_deserialize_xml,
+ _get_element,
+)
+from .._utils.serialization import Deserializer, Serializer
+from .._utils.utils import prep_if_match, prep_if_none_match
-if sys.version_info >= (3, 8):
- from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
-else:
- from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
+JSON = MutableMapping[str, Any]
T = TypeVar("T")
-ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]]
_SERIALIZER = Serializer()
_SERIALIZER.client_side_validation = False
@@ -53,7 +64,7 @@ def build_table_query_request(
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
data_service_version: Literal["3.0"] = kwargs.pop("data_service_version", _headers.pop("DataServiceVersion", "3.0"))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/json;odata=minimalmetadata")
# Construct URL
@@ -63,7 +74,7 @@ def build_table_query_request(
if format is not None:
_params["$format"] = _SERIALIZER.query("format", format, "str")
if top is not None:
- _params["$top"] = _SERIALIZER.query("top", top, "int", minimum=0)
+ _params["$top"] = _SERIALIZER.query("top", top, "int")
if select is not None:
_params["$select"] = _SERIALIZER.query("select", select, "str")
if filter is not None:
@@ -72,8 +83,8 @@ def build_table_query_request(
_params["NextTableName"] = _SERIALIZER.query("next_table_name", next_table_name, "str")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
_headers["DataServiceVersion"] = _SERIALIZER.header("data_service_version", data_service_version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
@@ -81,9 +92,8 @@ def build_table_query_request(
def build_table_create_request(
*,
- json: _models.TableProperties,
format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
- response_preference: Optional[Union[str, _models.ResponseFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
**kwargs: Any
) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
@@ -91,7 +101,7 @@ def build_table_create_request(
data_service_version: Literal["3.0"] = kwargs.pop("data_service_version", _headers.pop("DataServiceVersion", "3.0"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/json;odata=minimalmetadata")
# Construct URL
@@ -102,21 +112,21 @@ def build_table_create_request(
_params["$format"] = _SERIALIZER.query("format", format, "str")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
- _headers["DataServiceVersion"] = _SERIALIZER.header("data_service_version", data_service_version, "str")
- if response_preference is not None:
- _headers["Prefer"] = _SERIALIZER.header("response_preference", response_preference, "str")
if content_type is not None:
_headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+ _headers["DataServiceVersion"] = _SERIALIZER.header("data_service_version", data_service_version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
+ if prefer is not None:
+ _headers["Prefer"] = _SERIALIZER.header("prefer", prefer, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
- return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, json=json, **kwargs)
+ return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
def build_table_delete_request(table: str, **kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -128,7 +138,7 @@ def build_table_delete_request(table: str, **kwargs: Any) -> HttpRequest:
_url: str = _url.format(**path_format_arguments) # type: ignore
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
return HttpRequest(method="DELETE", url=_url, headers=_headers, **kwargs)
@@ -137,11 +147,11 @@ def build_table_delete_request(table: str, **kwargs: Any) -> HttpRequest:
def build_table_query_entities_request(
table: str,
*,
- timeout: Optional[int] = None,
format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
top: Optional[int] = None,
select: Optional[str] = None,
filter: Optional[str] = None,
+ timeout: Optional[int] = None,
next_partition_key: Optional[str] = None,
next_row_key: Optional[str] = None,
**kwargs: Any
@@ -150,7 +160,7 @@ def build_table_query_entities_request(
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
data_service_version: Literal["3.0"] = kwargs.pop("data_service_version", _headers.pop("DataServiceVersion", "3.0"))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/json;odata=minimalmetadata")
# Construct URL
@@ -162,24 +172,24 @@ def build_table_query_entities_request(
_url: str = _url.format(**path_format_arguments) # type: ignore
# Construct parameters
- if timeout is not None:
- _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int", minimum=0)
if format is not None:
_params["$format"] = _SERIALIZER.query("format", format, "str")
if top is not None:
- _params["$top"] = _SERIALIZER.query("top", top, "int", minimum=0)
+ _params["$top"] = _SERIALIZER.query("top", top, "int")
if select is not None:
_params["$select"] = _SERIALIZER.query("select", select, "str")
if filter is not None:
_params["$filter"] = _SERIALIZER.query("filter", filter, "str")
+ if timeout is not None:
+ _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int")
if next_partition_key is not None:
_params["NextPartitionKey"] = _SERIALIZER.query("next_partition_key", next_partition_key, "str")
if next_row_key is not None:
_params["NextRowKey"] = _SERIALIZER.query("next_row_key", next_row_key, "str")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
_headers["DataServiceVersion"] = _SERIALIZER.header("data_service_version", data_service_version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
@@ -200,7 +210,7 @@ def build_table_query_entity_with_partition_and_row_key_request( # pylint: disa
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
data_service_version: Literal["3.0"] = kwargs.pop("data_service_version", _headers.pop("DataServiceVersion", "3.0"))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/json;odata=minimalmetadata")
# Construct URL
@@ -215,7 +225,7 @@ def build_table_query_entity_with_partition_and_row_key_request( # pylint: disa
# Construct parameters
if timeout is not None:
- _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int", minimum=0)
+ _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int")
if format is not None:
_params["$format"] = _SERIALIZER.query("format", format, "str")
if select is not None:
@@ -224,8 +234,8 @@ def build_table_query_entity_with_partition_and_row_key_request( # pylint: disa
_params["$filter"] = _SERIALIZER.query("filter", filter, "str")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
_headers["DataServiceVersion"] = _SERIALIZER.header("data_service_version", data_service_version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
@@ -237,7 +247,6 @@ def build_table_update_entity_request(
row_key: str,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
**kwargs: Any
@@ -247,7 +256,7 @@ def build_table_update_entity_request(
data_service_version: Literal["3.0"] = kwargs.pop("data_service_version", _headers.pop("DataServiceVersion", "3.0"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -262,13 +271,11 @@ def build_table_update_entity_request(
# Construct parameters
if timeout is not None:
- _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int", minimum=0)
- if format is not None:
- _params["$format"] = _SERIALIZER.query("format", format, "str")
+ _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
_headers["DataServiceVersion"] = _SERIALIZER.header("data_service_version", data_service_version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
if content_type is not None:
_headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
@@ -288,7 +295,6 @@ def build_table_merge_entity_request(
row_key: str,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
**kwargs: Any
@@ -298,7 +304,7 @@ def build_table_merge_entity_request(
data_service_version: Literal["3.0"] = kwargs.pop("data_service_version", _headers.pop("DataServiceVersion", "3.0"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/json")
# Construct URL
@@ -313,13 +319,11 @@ def build_table_merge_entity_request(
# Construct parameters
if timeout is not None:
- _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int", minimum=0)
- if format is not None:
- _params["$format"] = _SERIALIZER.query("format", format, "str")
+ _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
_headers["DataServiceVersion"] = _SERIALIZER.header("data_service_version", data_service_version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
if content_type is not None:
_headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
@@ -341,15 +345,14 @@ def build_table_delete_entity_request(
etag: str,
match_condition: MatchConditions,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
**kwargs: Any
) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
data_service_version: Literal["3.0"] = kwargs.pop("data_service_version", _headers.pop("DataServiceVersion", "3.0"))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
- accept = _headers.pop("Accept", "application/json;odata=minimalmetadata")
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
+ accept = _headers.pop("Accept", "application/json")
# Construct URL
_url = "/{table}(PartitionKey='{partitionKey}',RowKey='{rowKey}')"
@@ -363,13 +366,11 @@ def build_table_delete_entity_request(
# Construct parameters
if timeout is not None:
- _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int", minimum=0)
- if format is not None:
- _params["$format"] = _SERIALIZER.query("format", format, "str")
+ _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
_headers["DataServiceVersion"] = _SERIALIZER.header("data_service_version", data_service_version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
if_match = prep_if_match(etag, match_condition)
if if_match is not None:
@@ -386,8 +387,7 @@ def build_table_insert_entity_request(
*,
timeout: Optional[int] = None,
format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
- response_preference: Optional[Union[str, _models.ResponseFormat]] = None,
- json: Optional[Dict[str, Any]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
**kwargs: Any
) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
@@ -395,7 +395,7 @@ def build_table_insert_entity_request(
data_service_version: Literal["3.0"] = kwargs.pop("data_service_version", _headers.pop("DataServiceVersion", "3.0"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/json;odata=minimalmetadata")
# Construct URL
@@ -408,32 +408,31 @@ def build_table_insert_entity_request(
# Construct parameters
if timeout is not None:
- _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int", minimum=0)
+ _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int")
if format is not None:
_params["$format"] = _SERIALIZER.query("format", format, "str")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
- _headers["DataServiceVersion"] = _SERIALIZER.header("data_service_version", data_service_version, "str")
- if response_preference is not None:
- _headers["Prefer"] = _SERIALIZER.header("response_preference", response_preference, "str")
if content_type is not None:
_headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+ _headers["DataServiceVersion"] = _SERIALIZER.header("data_service_version", data_service_version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
+ if prefer is not None:
+ _headers["Prefer"] = _SERIALIZER.header("prefer", prefer, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
- return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, json=json, **kwargs)
+ return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
def build_table_get_access_policy_request(table: str, *, timeout: Optional[int] = None, **kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- comp: Literal["acl"] = kwargs.pop("comp", _params.pop("comp", "acl"))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/xml")
# Construct URL
- _url = "/{table}"
+ _url = "/{table}?comp=acl"
path_format_arguments = {
"table": _SERIALIZER.url("table", table, "str"),
}
@@ -442,29 +441,25 @@ def build_table_get_access_policy_request(table: str, *, timeout: Optional[int]
# Construct parameters
if timeout is not None:
- _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int", minimum=0)
- _params["comp"] = _SERIALIZER.query("comp", comp, "str")
+ _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
-def build_table_set_access_policy_request(
- table: str, *, timeout: Optional[int] = None, content: Any = None, **kwargs: Any
-) -> HttpRequest:
+def build_table_set_access_policy_request(table: str, *, timeout: Optional[int] = None, **kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- comp: Literal["acl"] = kwargs.pop("comp", _params.pop("comp", "acl"))
- content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ content_type: str = kwargs.pop("content_type")
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/xml")
# Construct URL
- _url = "/{table}"
+ _url = "/{table}?comp=acl"
path_format_arguments = {
"table": _SERIALIZER.url("table", table, "str"),
}
@@ -473,66 +468,55 @@ def build_table_set_access_policy_request(
# Construct parameters
if timeout is not None:
- _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int", minimum=0)
- _params["comp"] = _SERIALIZER.query("comp", comp, "str")
+ _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
- if content_type is not None:
- _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
+ _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
- return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, content=content, **kwargs)
+ return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
-def build_service_set_properties_request(*, content: Any, timeout: Optional[int] = None, **kwargs: Any) -> HttpRequest:
+def build_service_set_properties_request(*, timeout: Optional[int] = None, **kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- restype: Literal["service"] = kwargs.pop("restype", _params.pop("restype", "service"))
- comp: Literal["properties"] = kwargs.pop("comp", _params.pop("comp", "properties"))
- content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ content_type: str = kwargs.pop("content_type")
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/xml")
# Construct URL
- _url = "/"
+ _url = "/?restype=service&comp=properties"
# Construct parameters
- _params["restype"] = _SERIALIZER.query("restype", restype, "str")
- _params["comp"] = _SERIALIZER.query("comp", comp, "str")
if timeout is not None:
- _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int", minimum=0)
+ _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
- if content_type is not None:
- _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
+ _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
- return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, content=content, **kwargs)
+ return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
def build_service_get_properties_request(*, timeout: Optional[int] = None, **kwargs: Any) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- restype: Literal["service"] = kwargs.pop("restype", _params.pop("restype", "service"))
- comp: Literal["properties"] = kwargs.pop("comp", _params.pop("comp", "properties"))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/xml")
# Construct URL
- _url = "/"
+ _url = "/?restype=service&comp=properties"
# Construct parameters
- _params["restype"] = _SERIALIZER.query("restype", restype, "str")
- _params["comp"] = _SERIALIZER.query("comp", comp, "str")
if timeout is not None:
- _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int", minimum=0)
+ _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
@@ -542,22 +526,18 @@ def build_service_get_statistics_request(*, timeout: Optional[int] = None, **kwa
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
- restype: Literal["service"] = kwargs.pop("restype", _params.pop("restype", "service"))
- comp: Literal["stats"] = kwargs.pop("comp", _params.pop("comp", "stats"))
- version: Literal["2019-02-02"] = kwargs.pop("version", _headers.pop("x-ms-version", "2019-02-02"))
+ api_version: str = kwargs.pop("api_version", _headers.pop("x-ms-version", "2019-02-02"))
accept = _headers.pop("Accept", "application/xml")
# Construct URL
- _url = "/"
+ _url = "/?restype=service&comp=stats"
# Construct parameters
- _params["restype"] = _SERIALIZER.query("restype", restype, "str")
- _params["comp"] = _SERIALIZER.query("comp", comp, "str")
if timeout is not None:
- _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int", minimum=0)
+ _params["timeout"] = _SERIALIZER.query("timeout", timeout, "int")
# Construct headers
- _headers["x-ms-version"] = _SERIALIZER.header("version", version, "str")
+ _headers["x-ms-version"] = _SERIALIZER.header("api_version", api_version, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
@@ -569,18 +549,16 @@ class TableOperations:
**DO NOT** instantiate this class directly.
Instead, you should access the following operations through
- :class:`~azure.table.AzureTable`'s
+ :class:`~azure.data.tables._generated.TablesClient`'s
:attr:`table` attribute.
"""
- models = _models
-
- def __init__(self, *args, **kwargs):
+ def __init__(self, *args, **kwargs) -> None:
input_args = list(args)
- self._client = input_args.pop(0) if input_args else kwargs.pop("client")
- self._config = input_args.pop(0) if input_args else kwargs.pop("config")
- self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
- self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+ self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
+ self._config: TablesClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
+ self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer")
+ self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
@distributed_trace
def query(
@@ -590,33 +568,34 @@ def query(
top: Optional[int] = None,
select: Optional[str] = None,
filter: Optional[str] = None,
- next_table_name: Optional[str] = None,
**kwargs: Any
- ) -> _models.TableQueryResponse:
+ ) -> ItemPaged["_models.TableProperties"]:
"""Queries tables under the given account.
- :keyword format: Specifies the media type for the response. Known values are:
+ :keyword format: Specifies the metadata format for the response. Known values are:
"application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
"application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
- :keyword top: Maximum number of records to return. Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword top: Specifies the maximum number of records to return. Default value is None.
:paramtype top: int
:keyword select: Select expression using OData notation. Limits the columns on each record to
- just those requested, e.g. "$select=PolicyAssignmentId, ResourceId". Default value is None.
+ just those requested. Default value is None.
:paramtype select: str
:keyword filter: OData filter expression. Default value is None.
:paramtype filter: str
- :keyword next_table_name: A table query continuation token from a previous call. Default value
- is None.
- :paramtype next_table_name: str
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
- :return: TableQueryResponse
- :rtype: ~azure.table.models.TableQueryResponse
+ :return: An iterator like instance of TableProperties
+ :rtype: ~azure.core.paging.ItemPaged[~azure.data.tables._generated.models.TableProperties]
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ _headers = kwargs.pop("headers", {}) or {}
+ _params = kwargs.pop("params", {}) or {}
+
+ data_service_version: Literal["3.0"] = kwargs.pop(
+ "data_service_version", _headers.pop("DataServiceVersion", "3.0")
+ )
+ cls: ClsType[list[_models.TableProperties]] = kwargs.pop("cls", None)
+
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -624,90 +603,173 @@ def query(
}
error_map.update(kwargs.pop("error_map", {}) or {})
- _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
- _params = kwargs.pop("params", {}) or {}
+ def prepare_request(_continuation_token=None):
+
+ _request = build_table_query_request(
+ format=format,
+ top=top,
+ select=select,
+ filter=filter,
+ next_table_name=_continuation_token,
+ data_service_version=data_service_version,
+ api_version=self._config.api_version,
+ headers=_headers,
+ params=_params,
+ )
+ path_format_arguments = {
+ "url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
+ }
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
+ return _request
+
+ def extract_data(pipeline_response):
+ deserialized = pipeline_response.http_response.json()
+ list_of_elem = _deserialize(list[_models.TableProperties], deserialized.get("value", []))
+ if cls:
+ list_of_elem = cls(list_of_elem) # type: ignore
+ return pipeline_response.http_response.headers.get("x-ms-continuation-NextTableName") or None, iter(
+ list_of_elem
+ )
- data_service_version: Literal["3.0"] = kwargs.pop(
- "data_service_version", _headers.pop("DataServiceVersion", "3.0")
- )
- cls: ClsType[_models.TableQueryResponse] = kwargs.pop("cls", None)
+ def get_next(_continuation_token=None):
+ _request = prepare_request(_continuation_token)
- request = build_table_query_request(
- format=format,
- top=top,
- select=select,
- filter=filter,
- next_table_name=next_table_name,
- data_service_version=data_service_version,
- version=self._config.version,
- headers=_headers,
- params=_params,
- )
- path_format_arguments = {
- "url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
- }
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _stream = False
+ pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
+ _request, stream=_stream, **kwargs
+ )
+ response = pipeline_response.http_response
- _stream = False
- pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
- )
+ if response.status_code not in [200]:
+ map_error(status_code=response.status_code, response=response, error_map=error_map)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
+ raise HttpResponseError(response=response, model=error)
- response = pipeline_response.http_response
+ return pipeline_response
- if response.status_code not in [200]:
- if _stream:
- response.read() # Load the body in memory and close the socket
- map_error(status_code=response.status_code, response=response, error_map=error_map)
- raise HttpResponseError(response=response)
+ return ItemPaged(get_next, extract_data)
- response_headers = {}
- response_headers["x-ms-client-request-id"] = self._deserialize(
- "str", response.headers.get("x-ms-client-request-id")
- )
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
- response_headers["x-ms-continuation-NextTableName"] = self._deserialize(
- "str", response.headers.get("x-ms-continuation-NextTableName")
- )
+ @overload
+ def create(
+ self,
+ table_properties: _models.TableProperties,
+ *,
+ content_type: str = "application/json",
+ format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
+ **kwargs: Any
+ ) -> Optional[_models.TableResponse]:
+ """Creates a new table under the given account.
- deserialized = self._deserialize("TableQueryResponse", pipeline_response)
+ :param table_properties: The table properties to create. Required.
+ :type table_properties: ~azure.data.tables._generated.models.TableProperties
+ :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :keyword format: Specifies the metadata format for the response. Known values are:
+ "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
+ "application/json;odata=fullmetadata". Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the created table in the
+ payload. Possible values are return-no-content and return-content. Known values are:
+ "return-no-content" and "return-content". Default value is None.
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: TableResponse or None. The TableResponse is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableResponse or None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
- if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ @overload
+ def create(
+ self,
+ table_properties: JSON,
+ *,
+ content_type: str = "application/json",
+ format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
+ **kwargs: Any
+ ) -> Optional[_models.TableResponse]:
+ """Creates a new table under the given account.
- return deserialized
+ :param table_properties: The table properties to create. Required.
+ :type table_properties: JSON
+ :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :keyword format: Specifies the metadata format for the response. Known values are:
+ "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
+ "application/json;odata=fullmetadata". Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the created table in the
+ payload. Possible values are return-no-content and return-content. Known values are:
+ "return-no-content" and "return-content". Default value is None.
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: TableResponse or None. The TableResponse is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableResponse or None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+
+ @overload
+ def create(
+ self,
+ table_properties: IO[bytes],
+ *,
+ content_type: str = "application/json",
+ format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
+ **kwargs: Any
+ ) -> Optional[_models.TableResponse]:
+ """Creates a new table under the given account.
+
+ :param table_properties: The table properties to create. Required.
+ :type table_properties: IO[bytes]
+ :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :keyword format: Specifies the metadata format for the response. Known values are:
+ "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
+ "application/json;odata=fullmetadata". Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the created table in the
+ payload. Possible values are return-no-content and return-content. Known values are:
+ "return-no-content" and "return-content". Default value is None.
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: TableResponse or None. The TableResponse is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableResponse or None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
@distributed_trace
def create(
self,
- table_properties: _models.TableProperties,
+ table_properties: Union[_models.TableProperties, JSON, IO[bytes]],
*,
format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
- response_preference: Optional[Union[str, _models.ResponseFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
**kwargs: Any
) -> Optional[_models.TableResponse]:
"""Creates a new table under the given account.
- :param table_properties: The Table properties. Required.
- :type table_properties: ~azure.table.models.TableProperties
- :keyword format: Specifies the media type for the response. Known values are:
+ :param table_properties: The table properties to create. Is one of the following types:
+ TableProperties, JSON, IO[bytes] Required.
+ :type table_properties: ~azure.data.tables._generated.models.TableProperties or JSON or
+ IO[bytes]
+ :keyword format: Specifies the metadata format for the response. Known values are:
"application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
"application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
- :keyword response_preference: Specifies whether the response should include the inserted entity
- in the payload. Possible values are return-no-content and return-content. Known values are:
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the created table in the
+ payload. Possible values are return-no-content and return-content. Known values are:
"return-no-content" and "return-content". Default value is None.
- :paramtype response_preference: str or ~azure.table.models.ResponseFormat
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
- :return: TableResponse or None
- :rtype: ~azure.table.models.TableResponse or None
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: TableResponse or None. The TableResponse is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableResponse or None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -721,76 +783,89 @@ def create(
data_service_version: Literal["3.0"] = kwargs.pop(
"data_service_version", _headers.pop("DataServiceVersion", "3.0")
)
- content_type: str = kwargs.pop(
- "content_type", _headers.pop("Content-Type", "application/json;odata=nometadata")
- )
+ content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
cls: ClsType[Optional[_models.TableResponse]] = kwargs.pop("cls", None)
- _json = self._serialize.body(table_properties, "TableProperties")
+ content_type = content_type or "application/json"
+ _content = None
+ if isinstance(table_properties, (IOBase, bytes)):
+ _content = table_properties
+ else:
+ _content = json.dumps(table_properties, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
- request = build_table_create_request(
+ _request = build_table_create_request(
format=format,
- response_preference=response_preference,
+ prefer=prefer,
data_service_version=data_service_version,
content_type=content_type,
- version=self._config.version,
- json=_json,
+ api_version=self._config.api_version,
+ content=_content,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [201, 204]:
if _stream:
- response.read() # Load the body in memory and close the socket
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
deserialized = None
response_headers = {}
if response.status_code == 201:
+ response_headers["Preference-Applied"] = self._deserialize(
+ "str", response.headers.get("Preference-Applied")
+ )
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
- response_headers["Preference-Applied"] = self._deserialize(
- "str", response.headers.get("Preference-Applied")
- )
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("TableResponse", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize(_models.TableResponse, response.json())
if response.status_code == 204:
+ response_headers["Preference-Applied"] = self._deserialize(
+ "str", response.headers.get("Preference-Applied")
+ )
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
- response_headers["Preference-Applied"] = self._deserialize(
- "str", response.headers.get("Preference-Applied")
- )
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@distributed_trace
def delete(self, table: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements
- """Operation permanently deletes the specified table.
+ """Deletes an existing table.
:param table: The name of the table. Required.
:type table: str
@@ -798,7 +873,7 @@ def delete(self, table: str, **kwargs: Any) -> None: # pylint: disable=inconsis
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -811,87 +886,86 @@ def delete(self, table: str, **kwargs: Any) -> None: # pylint: disable=inconsis
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_table_delete_request(
+ _request = build_table_delete_request(
table=table,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [204]:
- if _stream:
- response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
@distributed_trace
def query_entities(
self,
table: str,
*,
- timeout: Optional[int] = None,
format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
top: Optional[int] = None,
select: Optional[str] = None,
filter: Optional[str] = None,
+ timeout: Optional[int] = None,
next_partition_key: Optional[str] = None,
next_row_key: Optional[str] = None,
**kwargs: Any
) -> _models.TableEntityQueryResponse:
- """Queries entities in a table.
+ """Queries entities under the given table.
:param table: The name of the table. Required.
:type table: str
- :keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
- :paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
+ :keyword format: Specifies the metadata format for the response. Known values are:
"application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
"application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
- :keyword top: Maximum number of records to return. Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword top: Specifies the maximum number of records to return. Default value is None.
:paramtype top: int
:keyword select: Select expression using OData notation. Limits the columns on each record to
- just those requested, e.g. "$select=PolicyAssignmentId, ResourceId". Default value is None.
+ just those requested. Default value is None.
:paramtype select: str
:keyword filter: OData filter expression. Default value is None.
:paramtype filter: str
- :keyword next_partition_key: An entity query continuation token from a previous call. Default
- value is None.
+ :keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
+ :paramtype timeout: int
+ :keyword next_partition_key: An entity partition key query continuation token from a previous
+ call. Default value is None.
:paramtype next_partition_key: str
- :keyword next_row_key: An entity query continuation token from a previous call. Default value
- is None.
+ :keyword next_row_key: An entity row key query continuation token from a previous call. Default
+ value is None.
:paramtype next_row_key: str
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
- :return: TableEntityQueryResponse
- :rtype: ~azure.table.models.TableEntityQueryResponse
+ :return: TableEntityQueryResponse. The TableEntityQueryResponse is compatible with
+ MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableEntityQueryResponse
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -899,7 +973,7 @@ def query_entities(
}
error_map.update(kwargs.pop("error_map", {}) or {})
- _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _headers = kwargs.pop("headers", {}) or {}
_params = kwargs.pop("params", {}) or {}
data_service_version: Literal["3.0"] = kwargs.pop(
@@ -907,59 +981,69 @@ def query_entities(
)
cls: ClsType[_models.TableEntityQueryResponse] = kwargs.pop("cls", None)
- request = build_table_query_entities_request(
+ _request = build_table_query_entities_request(
table=table,
- timeout=timeout,
format=format,
top=top,
select=select,
filter=filter,
+ timeout=timeout,
next_partition_key=next_partition_key,
next_row_key=next_row_key,
data_service_version=data_service_version,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
if _stream:
- response.read() # Load the body in memory and close the socket
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
- response_headers["x-ms-client-request-id"] = self._deserialize(
- "str", response.headers.get("x-ms-client-request-id")
- )
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
response_headers["x-ms-continuation-NextPartitionKey"] = self._deserialize(
"str", response.headers.get("x-ms-continuation-NextPartitionKey")
)
response_headers["x-ms-continuation-NextRowKey"] = self._deserialize(
"str", response.headers.get("x-ms-continuation-NextRowKey")
)
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
+ response_headers["x-ms-client-request-id"] = self._deserialize(
+ "str", response.headers.get("x-ms-client-request-id")
+ )
+ response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("TableEntityQueryResponse", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize(_models.TableEntityQueryResponse, response.json())
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@distributed_trace
def query_entity_with_partition_and_row_key(
@@ -973,8 +1057,8 @@ def query_entity_with_partition_and_row_key(
select: Optional[str] = None,
filter: Optional[str] = None,
**kwargs: Any
- ) -> Dict[str, Any]:
- """Queries a single entity in a table.
+ ) -> dict[str, Any]:
+ """Retrieve a single entity.
:param table: The name of the table. Required.
:type table: str
@@ -984,23 +1068,20 @@ def query_entity_with_partition_and_row_key(
:type row_key: str
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
+ :keyword format: Specifies the metadata format for the response. Known values are:
"application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
"application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
:keyword select: Select expression using OData notation. Limits the columns on each record to
- just those requested, e.g. "$select=PolicyAssignmentId, ResourceId". Default value is None.
+ just those requested. Default value is None.
:paramtype select: str
:keyword filter: OData filter expression. Default value is None.
:paramtype filter: str
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: dict mapping str to any
:rtype: dict[str, any]
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1008,15 +1089,15 @@ def query_entity_with_partition_and_row_key(
}
error_map.update(kwargs.pop("error_map", {}) or {})
- _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _headers = kwargs.pop("headers", {}) or {}
_params = kwargs.pop("params", {}) or {}
data_service_version: Literal["3.0"] = kwargs.pop(
"data_service_version", _headers.pop("DataServiceVersion", "3.0")
)
- cls: ClsType[Dict[str, Any]] = kwargs.pop("cls", None)
+ cls: ClsType[dict[str, Any]] = kwargs.pop("cls", None)
- request = build_table_query_entity_with_partition_and_row_key_request(
+ _request = build_table_query_entity_with_partition_and_row_key_request(
table=table,
partition_key=partition_key,
row_key=row_key,
@@ -1025,36 +1106,36 @@ def query_entity_with_partition_and_row_key(
select=select,
filter=filter,
data_service_version=data_service_version,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
if _stream:
- response.read() # Load the body in memory and close the socket
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
- response_headers["x-ms-client-request-id"] = self._deserialize(
- "str", response.headers.get("x-ms-client-request-id")
- )
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
response_headers["x-ms-continuation-NextPartitionKey"] = self._deserialize(
"str", response.headers.get("x-ms-continuation-NextPartitionKey")
@@ -1062,24 +1143,33 @@ def query_entity_with_partition_and_row_key(
response_headers["x-ms-continuation-NextRowKey"] = self._deserialize(
"str", response.headers.get("x-ms-continuation-NextRowKey")
)
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
+ response_headers["x-ms-client-request-id"] = self._deserialize(
+ "str", response.headers.get("x-ms-client-request-id")
+ )
+ response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("{object}", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize(dict[str, Any], response.json())
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@overload
- def update_entity( # pylint: disable=inconsistent-return-statements
+ def update_entity(
self,
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[Dict[str, Any]] = None,
+ table_entity_properties: Optional[dict[str, Any]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
content_type: str = "application/json",
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
@@ -1097,10 +1187,6 @@ def update_entity( # pylint: disable=inconsistent-return-statements
:type table_entity_properties: dict[str, any]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
@@ -1109,24 +1195,20 @@ def update_entity( # pylint: disable=inconsistent-return-statements
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
@overload
- def update_entity( # pylint: disable=inconsistent-return-statements
+ def update_entity(
self,
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[IO] = None,
+ table_entity_properties: Optional[IO[bytes]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
content_type: str = "application/json",
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
@@ -1141,13 +1223,9 @@ def update_entity( # pylint: disable=inconsistent-return-statements
:param row_key: The row key of the entity. Required.
:type row_key: str
:param table_entity_properties: The properties for the table entity. Default value is None.
- :type table_entity_properties: IO
+ :type table_entity_properties: IO[bytes]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
@@ -1156,9 +1234,6 @@ def update_entity( # pylint: disable=inconsistent-return-statements
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
@@ -1170,10 +1245,9 @@ def update_entity( # pylint: disable=inconsistent-return-statements
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[Union[Dict[str, Any], IO]] = None,
+ table_entity_properties: Optional[Union[dict[str, Any], IO[bytes]]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
**kwargs: Any
@@ -1187,30 +1261,20 @@ def update_entity( # pylint: disable=inconsistent-return-statements
:param row_key: The row key of the entity. Required.
:type row_key: str
:param table_entity_properties: The properties for the table entity. Is either a {str: Any}
- type or a IO type. Default value is None.
- :type table_entity_properties: dict[str, any] or IO
+ type or a IO[bytes] type. Default value is None.
+ :type table_entity_properties: dict[str, any] or IO[bytes]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword etag: check if resource is changed. Set None to skip checking etag. Default value is
None.
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1231,31 +1295,29 @@ def update_entity( # pylint: disable=inconsistent-return-statements
"data_service_version", _headers.pop("DataServiceVersion", "3.0")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+ content_type = content_type if table_entity_properties else None
cls: ClsType[None] = kwargs.pop("cls", None)
- content_type = content_type or "application/json"
- _json = None
+ content_type = content_type or "application/json" if table_entity_properties else None
_content = None
if isinstance(table_entity_properties, (IOBase, bytes)):
_content = table_entity_properties
else:
if table_entity_properties is not None:
- _json = self._serialize.body(table_entity_properties, "{object}")
+ _content = json.dumps(table_entity_properties, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
else:
- _json = None
+ _content = None
- request = build_table_update_entity_request(
+ _request = build_table_update_entity_request(
table=table,
partition_key=partition_key,
row_key=row_key,
timeout=timeout,
- format=format,
etag=etag,
match_condition=match_condition,
data_service_version=data_service_version,
content_type=content_type,
- version=self._config.version,
- json=_json,
+ api_version=self._config.api_version,
content=_content,
headers=_headers,
params=_params,
@@ -1263,44 +1325,44 @@ def update_entity( # pylint: disable=inconsistent-return-statements
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [204]:
- if _stream:
- response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
- response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
@overload
- def merge_entity( # pylint: disable=inconsistent-return-statements
+ def merge_entity(
self,
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[Dict[str, Any]] = None,
+ table_entity_properties: Optional[dict[str, Any]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
content_type: str = "application/json",
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
@@ -1318,10 +1380,6 @@ def merge_entity( # pylint: disable=inconsistent-return-statements
:type table_entity_properties: dict[str, any]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
Default value is "application/json".
:paramtype content_type: str
@@ -1330,24 +1388,20 @@ def merge_entity( # pylint: disable=inconsistent-return-statements
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
@overload
- def merge_entity( # pylint: disable=inconsistent-return-statements
+ def merge_entity(
self,
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[IO] = None,
+ table_entity_properties: Optional[IO[bytes]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
content_type: str = "application/json",
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
@@ -1362,13 +1416,9 @@ def merge_entity( # pylint: disable=inconsistent-return-statements
:param row_key: The row key of the entity. Required.
:type row_key: str
:param table_entity_properties: The properties for the table entity. Default value is None.
- :type table_entity_properties: IO
+ :type table_entity_properties: IO[bytes]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword content_type: Body Parameter content-type. Content type parameter for binary body.
Default value is "application/json".
:paramtype content_type: str
@@ -1377,9 +1427,6 @@ def merge_entity( # pylint: disable=inconsistent-return-statements
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
@@ -1391,10 +1438,9 @@ def merge_entity( # pylint: disable=inconsistent-return-statements
table: str,
partition_key: str,
row_key: str,
- table_entity_properties: Optional[Union[Dict[str, Any], IO]] = None,
+ table_entity_properties: Optional[Union[dict[str, Any], IO[bytes]]] = None,
*,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
etag: Optional[str] = None,
match_condition: Optional[MatchConditions] = None,
**kwargs: Any
@@ -1408,30 +1454,20 @@ def merge_entity( # pylint: disable=inconsistent-return-statements
:param row_key: The row key of the entity. Required.
:type row_key: str
:param table_entity_properties: The properties for the table entity. Is either a {str: Any}
- type or a IO type. Default value is None.
- :type table_entity_properties: dict[str, any] or IO
+ type or a IO[bytes] type. Default value is None.
+ :type table_entity_properties: dict[str, any] or IO[bytes]
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
:keyword etag: check if resource is changed. Set None to skip checking etag. Default value is
None.
:paramtype etag: str
:keyword match_condition: The match condition to use upon the etag. Default value is None.
:paramtype match_condition: ~azure.core.MatchConditions
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
- :keyword content_type: Body Parameter content-type. Known values are: 'application/json'.
- Default value is None.
- :paramtype content_type: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1452,31 +1488,29 @@ def merge_entity( # pylint: disable=inconsistent-return-statements
"data_service_version", _headers.pop("DataServiceVersion", "3.0")
)
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+ content_type = content_type if table_entity_properties else None
cls: ClsType[None] = kwargs.pop("cls", None)
- content_type = content_type or "application/json"
- _json = None
+ content_type = content_type or "application/json" if table_entity_properties else None
_content = None
if isinstance(table_entity_properties, (IOBase, bytes)):
_content = table_entity_properties
else:
if table_entity_properties is not None:
- _json = self._serialize.body(table_entity_properties, "{object}")
+ _content = json.dumps(table_entity_properties, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
else:
- _json = None
+ _content = None
- request = build_table_merge_entity_request(
+ _request = build_table_merge_entity_request(
table=table,
partition_key=partition_key,
row_key=row_key,
timeout=timeout,
- format=format,
etag=etag,
match_condition=match_condition,
data_service_version=data_service_version,
content_type=content_type,
- version=self._config.version,
- json=_json,
+ api_version=self._config.api_version,
content=_content,
headers=_headers,
params=_params,
@@ -1484,33 +1518,34 @@ def merge_entity( # pylint: disable=inconsistent-return-statements
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [204]:
- if _stream:
- response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
- response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
@distributed_trace
def delete_entity( # pylint: disable=inconsistent-return-statements
@@ -1522,7 +1557,6 @@ def delete_entity( # pylint: disable=inconsistent-return-statements
etag: str,
match_condition: MatchConditions,
timeout: Optional[int] = None,
- format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
**kwargs: Any
) -> None:
"""Deletes the specified entity in a table.
@@ -1539,18 +1573,11 @@ def delete_entity( # pylint: disable=inconsistent-return-statements
:paramtype match_condition: ~azure.core.MatchConditions
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
- "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
- "application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1564,7 +1591,7 @@ def delete_entity( # pylint: disable=inconsistent-return-statements
error_map[412] = ResourceExistsError
error_map.update(kwargs.pop("error_map", {}) or {})
- _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+ _headers = kwargs.pop("headers", {}) or {}
_params = kwargs.pop("params", {}) or {}
data_service_version: Literal["3.0"] = kwargs.pop(
@@ -1572,84 +1599,154 @@ def delete_entity( # pylint: disable=inconsistent-return-statements
)
cls: ClsType[None] = kwargs.pop("cls", None)
- request = build_table_delete_entity_request(
+ _request = build_table_delete_entity_request(
table=table,
partition_key=partition_key,
row_key=row_key,
etag=etag,
match_condition=match_condition,
timeout=timeout,
- format=format,
data_service_version=data_service_version,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [204]:
- if _stream:
- response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
- @distributed_trace
+ @overload
def insert_entity(
self,
table: str,
- table_entity_properties: Optional[Dict[str, Any]] = None,
+ table_entity_properties: Optional[dict[str, Any]] = None,
*,
+ content_type: str = "application/json",
timeout: Optional[int] = None,
format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
- response_preference: Optional[Union[str, _models.ResponseFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
**kwargs: Any
- ) -> Optional[Dict[str, Any]]:
+ ) -> Optional[dict[str, Any]]:
"""Insert entity in a table.
:param table: The name of the table. Required.
:type table: str
- :param table_entity_properties: The properties for the table entity. Default value is None.
+ :param table_entity_properties: The entity properties to insert. Default value is None.
:type table_entity_properties: dict[str, any]
+ :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+ Default value is "application/json".
+ :paramtype content_type: str
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword format: Specifies the media type for the response. Known values are:
+ :keyword format: Specifies the metadata format for the response. Known values are:
"application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
"application/json;odata=fullmetadata". Default value is None.
- :paramtype format: str or ~azure.table.models.OdataMetadataFormat
- :keyword response_preference: Specifies whether the response should include the inserted entity
- in the payload. Possible values are return-no-content and return-content. Known values are:
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the inserted entity in the
+ payload. Possible values are return-no-content and return-content. Known values are:
"return-no-content" and "return-content". Default value is None.
- :paramtype response_preference: str or ~azure.table.models.ResponseFormat
- :keyword data_service_version: Specifies the data service version. Default value is "3.0". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype data_service_version: str
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
:return: dict mapping str to any or None
:rtype: dict[str, any] or None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+
+ @overload
+ def insert_entity(
+ self,
+ table: str,
+ table_entity_properties: Optional[IO[bytes]] = None,
+ *,
+ content_type: str = "application/json",
+ timeout: Optional[int] = None,
+ format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
+ **kwargs: Any
+ ) -> Optional[dict[str, Any]]:
+ """Insert entity in a table.
+
+ :param table: The name of the table. Required.
+ :type table: str
+ :param table_entity_properties: The entity properties to insert. Default value is None.
+ :type table_entity_properties: IO[bytes]
+ :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+ Default value is "application/json".
+ :paramtype content_type: str
+ :keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
+ :paramtype timeout: int
+ :keyword format: Specifies the metadata format for the response. Known values are:
+ "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
+ "application/json;odata=fullmetadata". Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the inserted entity in the
+ payload. Possible values are return-no-content and return-content. Known values are:
+ "return-no-content" and "return-content". Default value is None.
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: dict mapping str to any or None
+ :rtype: dict[str, any] or None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+
+ @distributed_trace
+ def insert_entity(
+ self,
+ table: str,
+ table_entity_properties: Optional[Union[dict[str, Any], IO[bytes]]] = None,
+ *,
+ timeout: Optional[int] = None,
+ format: Optional[Union[str, _models.OdataMetadataFormat]] = None,
+ prefer: Optional[Union[str, _models.ResponseFormat]] = None,
+ **kwargs: Any
+ ) -> Optional[dict[str, Any]]:
+ """Insert entity in a table.
+
+ :param table: The name of the table. Required.
+ :type table: str
+ :param table_entity_properties: The entity properties to insert. Is either a {str: Any} type or
+ a IO[bytes] type. Default value is None.
+ :type table_entity_properties: dict[str, any] or IO[bytes]
+ :keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
+ :paramtype timeout: int
+ :keyword format: Specifies the metadata format for the response. Known values are:
+ "application/json;odata=nometadata", "application/json;odata=minimalmetadata", and
+ "application/json;odata=fullmetadata". Default value is None.
+ :paramtype format: str or ~azure.data.tables._generated.models.OdataMetadataFormat
+ :keyword prefer: Specifies whether the response should include the inserted entity in the
+ payload. Possible values are return-no-content and return-content. Known values are:
+ "return-no-content" and "return-content". Default value is None.
+ :paramtype prefer: str or ~azure.data.tables._generated.models.ResponseFormat
+ :return: dict mapping str to any or None
+ :rtype: dict[str, any] or None
+ :raises ~azure.core.exceptions.HttpResponseError:
+ """
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1663,86 +1760,98 @@ def insert_entity(
data_service_version: Literal["3.0"] = kwargs.pop(
"data_service_version", _headers.pop("DataServiceVersion", "3.0")
)
- content_type: str = kwargs.pop(
- "content_type", _headers.pop("Content-Type", "application/json;odata=nometadata")
- )
- cls: ClsType[Optional[Dict[str, Any]]] = kwargs.pop("cls", None)
+ content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+ content_type = content_type if table_entity_properties else None
+ cls: ClsType[Optional[dict[str, Any]]] = kwargs.pop("cls", None)
- if table_entity_properties is not None:
- _json = self._serialize.body(table_entity_properties, "{object}")
+ content_type = content_type or "application/json" if table_entity_properties else None
+ _content = None
+ if isinstance(table_entity_properties, (IOBase, bytes)):
+ _content = table_entity_properties
else:
- _json = None
+ if table_entity_properties is not None:
+ _content = json.dumps(table_entity_properties, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore
+ else:
+ _content = None
- request = build_table_insert_entity_request(
+ _request = build_table_insert_entity_request(
table=table,
timeout=timeout,
format=format,
- response_preference=response_preference,
+ prefer=prefer,
data_service_version=data_service_version,
content_type=content_type,
- version=self._config.version,
- json=_json,
+ api_version=self._config.api_version,
+ content=_content,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [201, 204]:
if _stream:
- response.read() # Load the body in memory and close the socket
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize(
+ _models.TablesError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
deserialized = None
response_headers = {}
if response.status_code == 201:
+ response_headers["Preference-Applied"] = self._deserialize(
+ "str", response.headers.get("Preference-Applied")
+ )
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
- response_headers["Preference-Applied"] = self._deserialize(
- "str", response.headers.get("Preference-Applied")
- )
response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("{object}", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize(dict[str, Any], response.json())
if response.status_code == 204:
+ response_headers["Preference-Applied"] = self._deserialize(
+ "str", response.headers.get("Preference-Applied")
+ )
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
- response_headers["Preference-Applied"] = self._deserialize(
- "str", response.headers.get("Preference-Applied")
- )
- response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@distributed_trace
def get_access_policy(
self, table: str, *, timeout: Optional[int] = None, **kwargs: Any
- ) -> List[_models.SignedIdentifier]:
+ ) -> list[_models.SignedIdentifier]:
"""Retrieves details about any stored access policies specified on the table that may be used with
Shared Access Signatures.
@@ -1750,15 +1859,11 @@ def get_access_policy(
:type table: str
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword comp: Required query string to handle stored access policies for the table that may be
- used with Shared Access Signatures. Default value is "acl". Note that overriding this default
- value may result in unsupported behavior.
- :paramtype comp: str
:return: SignedIdentifier
- :rtype: ~azure.table.models.SignedIdentifier
+ :rtype: ~azure.data.tables._generated.models.SignedIdentifier
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1767,79 +1872,78 @@ def get_access_policy(
error_map.update(kwargs.pop("error_map", {}) or {})
_headers = kwargs.pop("headers", {}) or {}
- _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+ _params = kwargs.pop("params", {}) or {}
- comp: Literal["acl"] = kwargs.pop("comp", _params.pop("comp", "acl"))
- cls: ClsType[List[_models.SignedIdentifier]] = kwargs.pop("cls", None)
+ cls: ClsType[list[_models.SignedIdentifier]] = kwargs.pop("cls", None)
- request = build_table_get_access_policy_request(
+ _request = build_table_get_access_policy_request(
table=table,
timeout=timeout,
- comp=comp,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
if _stream:
- response.read() # Load the body in memory and close the socket
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize_xml(
+ _models.TablesServiceError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("[SignedIdentifier]", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize_xml(list[_models.SignedIdentifier], response.text())
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@distributed_trace
def set_access_policy( # pylint: disable=inconsistent-return-statements
- self,
- table: str,
- table_acl: Optional[List[_models.SignedIdentifier]] = None,
- *,
- timeout: Optional[int] = None,
- **kwargs: Any
+ self, table: str, table_acl: _models.SignedIdentifiersRequest, *, timeout: Optional[int] = None, **kwargs: Any
) -> None:
"""Sets stored access policies for the table that may be used with Shared Access Signatures.
:param table: The name of the table. Required.
:type table: str
- :param table_acl: The acls for the table. Default value is None.
- :type table_acl: ~azure.table.models.SignedIdentifier
+ :param table_acl: The access control list for the table. Required.
+ :type table_acl: ~azure.data.tables._generated.models.SignedIdentifiersRequest
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword comp: Required query string to handle stored access policies for the table that may be
- used with Shared Access Signatures. Default value is "acl". Note that overriding this default
- value may result in unsupported behavior.
- :paramtype comp: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1848,26 +1952,18 @@ def set_access_policy( # pylint: disable=inconsistent-return-statements
error_map.update(kwargs.pop("error_map", {}) or {})
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
- _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+ _params = kwargs.pop("params", {}) or {}
- comp: Literal["acl"] = kwargs.pop("comp", _params.pop("comp", "acl"))
content_type: str = kwargs.pop("content_type", _headers.pop("Content-Type", "application/xml"))
cls: ClsType[None] = kwargs.pop("cls", None)
- serialization_ctxt = {"xml": {"name": "SignedIdentifiers", "wrapped": True, "itemsName": "SignedIdentifier"}}
- if table_acl is not None:
- _content = self._serialize.body(
- table_acl, "[SignedIdentifier]", is_xml=True, serialization_ctxt=serialization_ctxt
- )
- else:
- _content = None
+ _content = _get_element(table_acl)
- request = build_table_set_access_policy_request(
+ _request = build_table_set_access_policy_request(
table=table,
timeout=timeout,
- comp=comp,
content_type=content_type,
- version=self._config.version,
+ api_version=self._config.api_version,
content=_content,
headers=_headers,
params=_params,
@@ -1875,32 +1971,33 @@ def set_access_policy( # pylint: disable=inconsistent-return-statements
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [204]:
- if _stream:
- response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize_xml(
+ _models.TablesServiceError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
class ServiceOperations:
@@ -1909,18 +2006,16 @@ class ServiceOperations:
**DO NOT** instantiate this class directly.
Instead, you should access the following operations through
- :class:`~azure.table.AzureTable`'s
+ :class:`~azure.data.tables._generated.TablesClient`'s
:attr:`service` attribute.
"""
- models = _models
-
- def __init__(self, *args, **kwargs):
+ def __init__(self, *args, **kwargs) -> None:
input_args = list(args)
- self._client = input_args.pop(0) if input_args else kwargs.pop("client")
- self._config = input_args.pop(0) if input_args else kwargs.pop("config")
- self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
- self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+ self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
+ self._config: TablesClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
+ self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer")
+ self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
@distributed_trace
def set_properties( # pylint: disable=inconsistent-return-statements
@@ -1929,21 +2024,15 @@ def set_properties( # pylint: disable=inconsistent-return-statements
"""Sets properties for an account's Table service endpoint, including properties for Analytics and
CORS (Cross-Origin Resource Sharing) rules.
- :param table_service_properties: The Table Service properties. Required.
- :type table_service_properties: ~azure.table.models.TableServiceProperties
+ :param table_service_properties: The table service properties to set. Required.
+ :type table_service_properties: ~azure.data.tables._generated.models.TableServiceProperties
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword restype: Required query string to set the service properties. Default value is
- "service". Note that overriding this default value may result in unsupported behavior.
- :paramtype restype: str
- :keyword comp: Required query string to set the service properties. Default value is
- "properties". Note that overriding this default value may result in unsupported behavior.
- :paramtype comp: str
:return: None
:rtype: None
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -1952,21 +2041,17 @@ def set_properties( # pylint: disable=inconsistent-return-statements
error_map.update(kwargs.pop("error_map", {}) or {})
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
- _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+ _params = kwargs.pop("params", {}) or {}
- restype: Literal["service"] = kwargs.pop("restype", _params.pop("restype", "service"))
- comp: Literal["properties"] = kwargs.pop("comp", _params.pop("comp", "properties"))
content_type: str = kwargs.pop("content_type", _headers.pop("Content-Type", "application/xml"))
cls: ClsType[None] = kwargs.pop("cls", None)
- _content = self._serialize.body(table_service_properties, "TableServiceProperties", is_xml=True)
+ _content = _get_element(table_service_properties)
- request = build_service_set_properties_request(
+ _request = build_service_set_properties_request(
timeout=timeout,
- restype=restype,
- comp=comp,
content_type=content_type,
- version=self._config.version,
+ api_version=self._config.api_version,
content=_content,
headers=_headers,
params=_params,
@@ -1974,31 +2059,32 @@ def set_properties( # pylint: disable=inconsistent-return-statements
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
_stream = False
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [202]:
- if _stream:
- response.read() # Load the body in memory and close the socket
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize_xml(
+ _models.TablesServiceError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
if cls:
- return cls(pipeline_response, None, response_headers)
+ return cls(pipeline_response, None, response_headers) # type: ignore
@distributed_trace
def get_properties(self, *, timeout: Optional[int] = None, **kwargs: Any) -> _models.TableServiceProperties:
@@ -2007,17 +2093,11 @@ def get_properties(self, *, timeout: Optional[int] = None, **kwargs: Any) -> _mo
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword restype: Required query string to set the service properties. Default value is
- "service". Note that overriding this default value may result in unsupported behavior.
- :paramtype restype: str
- :keyword comp: Required query string to set the service properties. Default value is
- "properties". Note that overriding this default value may result in unsupported behavior.
- :paramtype comp: str
- :return: TableServiceProperties
- :rtype: ~azure.table.models.TableServiceProperties
+ :return: TableServiceProperties. The TableServiceProperties is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableServiceProperties
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -2026,52 +2106,58 @@ def get_properties(self, *, timeout: Optional[int] = None, **kwargs: Any) -> _mo
error_map.update(kwargs.pop("error_map", {}) or {})
_headers = kwargs.pop("headers", {}) or {}
- _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+ _params = kwargs.pop("params", {}) or {}
- restype: Literal["service"] = kwargs.pop("restype", _params.pop("restype", "service"))
- comp: Literal["properties"] = kwargs.pop("comp", _params.pop("comp", "properties"))
cls: ClsType[_models.TableServiceProperties] = kwargs.pop("cls", None)
- request = build_service_get_properties_request(
+ _request = build_service_get_properties_request(
timeout=timeout,
- restype=restype,
- comp=comp,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
if _stream:
- response.read() # Load the body in memory and close the socket
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize_xml(
+ _models.TablesServiceError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize_xml(_models.TableServiceProperties, response.text())
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
@distributed_trace
def get_statistics(self, *, timeout: Optional[int] = None, **kwargs: Any) -> _models.TableServiceStats:
@@ -2081,17 +2167,11 @@ def get_statistics(self, *, timeout: Optional[int] = None, **kwargs: Any) -> _mo
:keyword timeout: The timeout parameter is expressed in seconds. Default value is None.
:paramtype timeout: int
- :keyword restype: Required query string to get service stats. Default value is "service". Note
- that overriding this default value may result in unsupported behavior.
- :paramtype restype: str
- :keyword comp: Required query string to get service stats. Default value is "stats". Note that
- overriding this default value may result in unsupported behavior.
- :paramtype comp: str
- :return: TableServiceStats
- :rtype: ~azure.table.models.TableServiceStats
+ :return: TableServiceStats. The TableServiceStats is compatible with MutableMapping
+ :rtype: ~azure.data.tables._generated.models.TableServiceStats
:raises ~azure.core.exceptions.HttpResponseError:
"""
- error_map = {
+ error_map: MutableMapping = {
401: ClientAuthenticationError,
404: ResourceNotFoundError,
409: ResourceExistsError,
@@ -2100,50 +2180,56 @@ def get_statistics(self, *, timeout: Optional[int] = None, **kwargs: Any) -> _mo
error_map.update(kwargs.pop("error_map", {}) or {})
_headers = kwargs.pop("headers", {}) or {}
- _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+ _params = kwargs.pop("params", {}) or {}
- restype: Literal["service"] = kwargs.pop("restype", _params.pop("restype", "service"))
- comp: Literal["stats"] = kwargs.pop("comp", _params.pop("comp", "stats"))
cls: ClsType[_models.TableServiceStats] = kwargs.pop("cls", None)
- request = build_service_get_statistics_request(
+ _request = build_service_get_statistics_request(
timeout=timeout,
- restype=restype,
- comp=comp,
- version=self._config.version,
+ api_version=self._config.api_version,
headers=_headers,
params=_params,
)
path_format_arguments = {
"url": self._serialize.url("self._config.url", self._config.url, "str", skip_quote=True),
}
- request.url = self._client.format_url(request.url, **path_format_arguments)
+ _request.url = self._client.format_url(_request.url, **path_format_arguments)
- _stream = False
+ _stream = kwargs.pop("stream", False)
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
- request, stream=_stream, **kwargs
+ _request, stream=_stream, **kwargs
)
response = pipeline_response.http_response
if response.status_code not in [200]:
if _stream:
- response.read() # Load the body in memory and close the socket
+ try:
+ response.read() # Load the body in memory and close the socket
+ except (StreamConsumedError, StreamClosedError):
+ pass
map_error(status_code=response.status_code, response=response, error_map=error_map)
- error = self._deserialize.failsafe_deserialize(_models.TableServiceError, pipeline_response)
+ error = _failsafe_deserialize_xml(
+ _models.TablesServiceError,
+ response,
+ )
raise HttpResponseError(response=response, model=error)
response_headers = {}
+ response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+ response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
response_headers["x-ms-client-request-id"] = self._deserialize(
"str", response.headers.get("x-ms-client-request-id")
)
- response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
- response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
- response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
+ response_headers["Content-Type"] = self._deserialize("str", response.headers.get("Content-Type"))
- deserialized = self._deserialize("TableServiceStats", pipeline_response)
+ if _stream:
+ deserialized = response.iter_bytes()
+ else:
+ deserialized = _deserialize_xml(_models.TableServiceStats, response.text())
if cls:
- return cls(pipeline_response, deserialized, response_headers)
+ return cls(pipeline_response, deserialized, response_headers) # type: ignore
- return deserialized
+ return deserialized # type: ignore
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/_patch.py b/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/_patch.py
index f7dd32510333..87676c65a8f0 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/_patch.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_generated/operations/_patch.py
@@ -1,14 +1,15 @@
-# ------------------------------------
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-# ------------------------------------
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------
"""Customize generated code here.
Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
"""
-from typing import List
-__all__: List[str] = [] # Add all objects you want publicly available to users at this package level
+
+__all__: list[str] = [] # Add all objects you want publicly available to users at this package level
def patch_sdk():
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_models.py b/sdk/tables/azure-data-tables/azure/data/tables/_models.py
index e59d798d8d8e..2951457f9d05 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_models.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_models.py
@@ -18,6 +18,7 @@
Metrics as GeneratedMetrics,
RetentionPolicy as GeneratedRetentionPolicy,
CorsRule as GeneratedCorsRule,
+ TableProperties as GenTableItem,
)
from ._error import _process_table_error
from ._decoder import TableEntityDecoder
@@ -28,7 +29,7 @@ def _return_context_and_deserialized(response, deserialized, response_headers):
return response.context["location_mode"], deserialized, response_headers
-class TableAccessPolicy(GenAccessPolicy):
+class TableAccessPolicy:
"""Access Policy class used by the set and get access policy methods.
A stored access policy can specify the start time, expiry time, and
@@ -85,7 +86,7 @@ def __repr__(self) -> str:
return f"TableAccessPolicy(start={self.start}, expiry={self.expiry}, permission={self.permission})"[1024:]
-class TableRetentionPolicy(GeneratedRetentionPolicy):
+class TableRetentionPolicy:
"""The retention policy which determines how long the associated data should persist."""
enabled: bool
@@ -113,11 +114,17 @@ def _from_generated(cls, generated: Optional[GeneratedRetentionPolicy]) -> "Tabl
days=generated.days,
)
+ def _to_generated(self) -> GeneratedRetentionPolicy:
+ return GeneratedRetentionPolicy(
+ enabled=self.enabled,
+ days=self.days,
+ )
+
def __repr__(self) -> str:
return f"TableRetentionPolicy(enabled={self.enabled}, days={self.days})"[1024:]
-class TableAnalyticsLogging(GeneratedLogging):
+class TableAnalyticsLogging:
"""Azure Analytics Logging settings."""
version: str
@@ -155,6 +162,15 @@ def _from_generated(cls, generated: Optional[GeneratedLogging]) -> "TableAnalyti
),
)
+ def _to_generated(self) -> GeneratedLogging:
+ return GeneratedLogging(
+ version=self.version,
+ delete=self.delete,
+ read=self.read,
+ write=self.write,
+ retention_policy=self.retention_policy._to_generated(), # pylint: disable=protected-access
+ )
+
def __repr__(self) -> str:
return f"TableAnalyticsLogging(version={self.version}, delete={self.delete}, read={self.read}, \
write={self.write}, retention_policy={self.retention_policy})"[
@@ -162,7 +178,7 @@ def __repr__(self) -> str:
]
-class TableMetrics(GeneratedMetrics):
+class TableMetrics:
"""A summary of request statistics grouped by API in hour or minute aggregates."""
version: str
@@ -197,6 +213,14 @@ def _from_generated(cls, generated: Optional[GeneratedMetrics]) -> "TableMetrics
),
)
+ def _to_generated(self) -> GeneratedMetrics:
+ return GeneratedMetrics(
+ version=self.version,
+ enabled=self.enabled,
+ include_apis=self.include_apis,
+ retention_policy=self.retention_policy._to_generated(), # pylint: disable=protected-access
+ )
+
def __repr__(self) -> str:
return f"TableMetrics(version={self.version}, enabled={self.enabled}, include_apis={self.include_apis}, \
retention_policy={self.retention_policy})"[
@@ -515,11 +539,15 @@ def __init__(self, name: str) -> None:
"""
self.name = name
+ @classmethod
+ def _from_generated(cls, generated: GenTableItem) -> "TableItem":
+ return cls(name=generated.table_name)
+
def __repr__(self) -> str:
return f"TableItem(name={self.name})"[1024:]
-class TablePayloadFormat(object):
+class TablePayloadFormat:
"""
Specifies the accepted content type of the response payload. More information
can be found here: https://msdn.microsoft.com/library/azure/dn535600.aspx
@@ -563,7 +591,7 @@ class LocationMode(str, Enum, metaclass=CaseInsensitiveEnumMeta):
SECONDARY = "secondary" #: Requests should be sent to the secondary location, if possible.
-class ResourceTypes(object):
+class ResourceTypes:
"""Specifies the resource types that are accessible with the account SAS."""
service: bool
@@ -610,7 +638,7 @@ def from_string(cls, string: str) -> "ResourceTypes":
return parsed
-class AccountSasPermissions(object):
+class AccountSasPermissions:
""":class:`~AccountSasPermissions` class to be used with generate_account_sas."""
read: bool
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_table_batch.py b/sdk/tables/azure-data-tables/azure/data/tables/_table_batch.py
index 256efbf1fbdf..a2bd0ad7c356 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_table_batch.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_table_batch.py
@@ -19,8 +19,8 @@
build_table_update_entity_request,
build_table_delete_entity_request,
)
-from ._generated._configuration import AzureTableConfiguration
-from ._generated.aio._configuration import AzureTableConfiguration as AsyncAzureTableConfiguration
+from ._generated._configuration import TablesClientConfiguration as AzureTableConfiguration
+from ._generated.aio._configuration import TablesClientConfiguration as AsyncAzureTableConfiguration
EntityType = Union[TableEntity, Mapping[str, Any]]
@@ -126,7 +126,7 @@ def create(self, entity: EntityType, **kwargs) -> None:
entity_json = self._encoder(entity)
self._verify_partition_key(entity_json)
request = build_table_insert_entity_request(
- table=self.table_name, json=entity_json, version=self._config.version, **kwargs
+ table=self.table_name, json=entity_json, api_version=self._config.api_version, **kwargs
)
request.url = self._base_url + request.url
self.requests.append(request)
@@ -180,7 +180,7 @@ def update(
etag=etag,
match_condition=match_condition,
json=entity_json,
- version=self._config.version,
+ api_version=self._config.api_version,
**kwargs,
)
elif mode == UpdateMode.MERGE:
@@ -191,7 +191,7 @@ def update(
etag=etag,
match_condition=match_condition,
json=entity_json,
- version=self._config.version,
+ api_version=self._config.api_version,
**kwargs,
)
if self._is_cosmos_endpoint:
@@ -244,7 +244,7 @@ def delete(
match_condition=_get_match_condition(
etag=etag, match_condition=match_condition or MatchConditions.Unconditionally
),
- version=self._config.version,
+ api_version=self._config.api_version,
**kwargs,
)
request.url = self._base_url + request.url
@@ -280,7 +280,7 @@ def upsert(self, entity: EntityType, mode: Union[str, UpdateMode] = UpdateMode.M
partition_key=_prepare_key(partition_key), # type: ignore[arg-type]
row_key=_prepare_key(row_key), # type: ignore[arg-type]
json=entity_json,
- version=self._config.version,
+ api_version=self._config.api_version,
**kwargs,
)
elif mode == UpdateMode.MERGE:
@@ -289,7 +289,7 @@ def upsert(self, entity: EntityType, mode: Union[str, UpdateMode] = UpdateMode.M
partition_key=_prepare_key(partition_key), # type: ignore[arg-type]
row_key=_prepare_key(row_key), # type: ignore[arg-type]
json=entity_json,
- version=self._config.version,
+ api_version=self._config.api_version,
**kwargs,
)
if self._is_cosmos_endpoint:
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py b/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py
index 63f8c891038f..78e130643315 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
@@ -26,7 +27,7 @@
_validate_tablename_error,
_validate_key_values,
)
-from ._generated.models import SignedIdentifier, TableProperties
+from ._generated.models import SignedIdentifier, TableProperties, AccessPolicy, SignedIdentifiersRequest
from ._serialize import (
serialize_iso,
_parameter_filter_substitution,
@@ -203,8 +204,9 @@ def get_table_access_policy(self, **kwargs) -> Dict[str, Optional[TableAccessPol
)
except HttpResponseError as error:
_process_table_error(error, table_name=self.table_name)
+ raise
output: Dict[str, Optional[TableAccessPolicy]] = {}
- for identifier in cast(List[SignedIdentifier], identifiers):
+ for identifier in identifiers:
if identifier.access_policy:
output[identifier.id] = TableAccessPolicy(
start=deserialize_iso(identifier.access_policy.start),
@@ -228,14 +230,15 @@ def set_table_access_policy(self, signed_identifiers: Mapping[str, Optional[Tabl
for key, value in signed_identifiers.items():
payload = None
if value:
- payload = TableAccessPolicy(
+ payload = AccessPolicy(
start=serialize_iso(value.start),
expiry=serialize_iso(value.expiry),
permission=value.permission,
)
identifiers.append(SignedIdentifier(id=key, access_policy=payload))
try:
- self._client.table.set_access_policy(table=self.table_name, table_acl=identifiers or None, **kwargs)
+ signed_ids = SignedIdentifiersRequest(identifiers=identifiers)
+ self._client.table.set_access_policy(table=self.table_name, table_acl=signed_ids, **kwargs)
except HttpResponseError as error:
try:
_process_table_error(error, table_name=self.table_name)
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py b/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py
index cf09329bcd40..46f51a85c9fd 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/_table_service_client.py
@@ -152,9 +152,15 @@ def set_service_properties(
:raises: :class:`~azure.core.exceptions.HttpResponseError`
"""
props = TableServiceProperties(
- logging=analytics_logging,
- hour_metrics=hour_metrics,
- minute_metrics=minute_metrics,
+ logging=(
+ analytics_logging._to_generated() if analytics_logging is not None else analytics_logging
+ ), # pylint:disable=protected-access
+ hour_metrics=(
+ hour_metrics._to_generated() if hour_metrics is not None else hour_metrics
+ ), # pylint:disable=protected-access
+ minute_metrics=(
+ minute_metrics._to_generated() if minute_metrics is not None else minute_metrics
+ ), # pylint:disable=protected-access
cors=[c._to_generated() for c in cors] if cors is not None else cors, # pylint:disable=protected-access
)
try:
@@ -268,13 +274,11 @@ def query_tables(
:caption: Querying tables in a storage account
"""
query_filter = _parameter_filter_substitution(parameters, query_filter)
-
- command = functools.partial(self._client.table.query, **kwargs)
- return ItemPaged(
- command,
- results_per_page=results_per_page,
+ return self._client.table.query(
filter=query_filter,
- page_iterator_class=TablePropertiesPaged,
+ top=results_per_page,
+ cls=lambda objs: [TableItem._from_generated(o) for o in objs],
+ **kwargs,
)
@distributed_trace
@@ -295,11 +299,8 @@ def list_tables(self, *, results_per_page: Optional[int] = None, **kwargs) -> It
:dedent: 16
:caption: Listing all tables in a storage account
"""
- command = functools.partial(self._client.table.query, **kwargs)
- return ItemPaged(
- command,
- results_per_page=results_per_page,
- page_iterator_class=TablePropertiesPaged,
+ return self._client.table.query(
+ top=results_per_page, cls=lambda objs: [TableItem._from_generated(o) for o in objs], **kwargs
)
def get_table_client(self, table_name: str, **kwargs: Any) -> TableClient:
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_base_client_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_base_client_async.py
index e5b0307a1dc2..b0583e209eef 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/aio/_base_client_async.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/aio/_base_client_async.py
@@ -29,7 +29,7 @@
from ._authentication_async import _configure_credential
from .._common_conversion import _is_cosmos_endpoint, _get_account
from .._constants import DEFAULT_STORAGE_ENDPOINT_SUFFIX
-from .._generated.aio import AzureTable
+from .._generated.aio import TablesClient as AzureTable
from .._base_client import extract_batch_part_metadata, parse_query, format_query_string, get_api_version, AudienceType
from .._error import (
RequestTooLargeError,
@@ -120,14 +120,20 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential
}
self._hosts = _hosts
- self._policies = self._configure_policies(audience=audience, hosts=self._hosts, **kwargs)
+ auth_policy, self._policies = self._configure_policies(audience=audience, hosts=self._hosts, **kwargs)
if self._cosmos_endpoint:
self._policies.insert(0, CosmosPatchTransformPolicy())
- self._client = AzureTable(self.url, policies=kwargs.pop("policies", self._policies), **kwargs)
+ self._client = AzureTable(
+ self.url,
+ credential=credential,
+ authentication_policy=auth_policy,
+ policies=kwargs.pop("policies", self._policies),
+ **kwargs,
+ )
# Incompatible assignment when assigning a str value to a Literal type variable
- self._client._config.version = get_api_version(
- api_version, self._client._config.version
+ self._client._config.api_version = get_api_version(
+ api_version, self._client._config.api_version
) # type: ignore[assignment]
@property
@@ -194,7 +200,7 @@ def api_version(self) -> str:
:return: The Storage API version.
:type: str
"""
- return self._client._config.version # pylint: disable=protected-access
+ return self._client._config.api_version # pylint: disable=protected-access
async def __aenter__(self) -> Self:
await self._client.__aenter__()
@@ -219,9 +225,9 @@ def _format_url(self, hostname):
"""
return f"{self.scheme}://{hostname}{self._query_str}"
- def _configure_policies(self, *, audience: Optional[str] = None, **kwargs: Any) -> List[Any]:
+ def _configure_policies(self, *, audience: Optional[str] = None, **kwargs: Any) -> tuple[Any, List[Any]]:
credential_policy = _configure_credential(self.credential, self._cosmos_endpoint, audience=audience)
- return [
+ return credential_policy, [
RequestIdPolicy(**kwargs),
StorageHeadersPolicy(**kwargs),
UserAgentPolicy(sdk_moniker=SDK_MONIKER, **kwargs),
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py
index d8d69f8f1a01..2df21687478d 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
@@ -21,7 +22,7 @@
from .._encoder import TableEntityEncoder, EncoderMapType
from .._entity import TableEntity
from .._decoder import TableEntityDecoder, deserialize_iso, DecoderMapType
-from .._generated.models import SignedIdentifier, TableProperties
+from .._generated.models import SignedIdentifier, TableProperties, AccessPolicy, SignedIdentifiersRequest
from .._models import TableAccessPolicy, TableItem, UpdateMode
from .._serialize import (
serialize_iso,
@@ -204,8 +205,9 @@ async def get_table_access_policy(self, **kwargs) -> Mapping[str, Optional[Table
)
except HttpResponseError as error:
_process_table_error(error, table_name=self.table_name)
+ raise
output = {} # type: Dict[str, Optional[TableAccessPolicy]]
- for identifier in cast(List[SignedIdentifier], identifiers):
+ for identifier in identifiers:
if identifier.access_policy:
output[identifier.id] = TableAccessPolicy(
start=deserialize_iso(identifier.access_policy.start),
@@ -231,14 +233,15 @@ async def set_table_access_policy(
for key, value in signed_identifiers.items():
payload = None
if value:
- payload = TableAccessPolicy(
+ payload = AccessPolicy(
start=serialize_iso(value.start),
expiry=serialize_iso(value.expiry),
permission=value.permission,
)
identifiers.append(SignedIdentifier(id=key, access_policy=payload))
try:
- await self._client.table.set_access_policy(table=self.table_name, table_acl=identifiers or None, **kwargs)
+ signed_identifiers = SignedIdentifiersRequest(identifiers=identifiers)
+ await self._client.table.set_access_policy(table=self.table_name, table_acl=signed_identifiers, **kwargs)
except HttpResponseError as error:
try:
_process_table_error(error, table_name=self.table_name)
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py
index c8e632491218..075d7e1f4747 100644
--- a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py
+++ b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_service_client_async.py
@@ -157,9 +157,15 @@ async def set_service_properties(
:raises: :class:`~azure.core.exceptions.HttpResponseError`
"""
props = TableServiceProperties(
- logging=analytics_logging,
- hour_metrics=hour_metrics,
- minute_metrics=minute_metrics,
+ logging=(
+ analytics_logging._to_generated() if analytics_logging is not None else analytics_logging
+ ), # pylint:disable=protected-access
+ hour_metrics=(
+ hour_metrics._to_generated() if hour_metrics is not None else hour_metrics
+ ), # pylint:disable=protected-access
+ minute_metrics=(
+ minute_metrics._to_generated() if minute_metrics is not None else minute_metrics
+ ), # pylint:disable=protected-access
cors=[c._to_generated() for c in cors] if cors is not None else cors, # pylint:disable=protected-access
)
try:
@@ -259,11 +265,8 @@ def list_tables(self, *, results_per_page: Optional[int] = None, **kwargs) -> As
:dedent: 16
:caption: Listing all tables in an account
"""
- command = functools.partial(self._client.table.query, **kwargs)
- return AsyncItemPaged(
- command,
- results_per_page=results_per_page,
- page_iterator_class=TablePropertiesPaged,
+ return self._client.table.query(
+ top=results_per_page, cls=lambda objs: [TableItem._from_generated(o) for o in objs], **kwargs
)
@distributed_trace
@@ -295,12 +298,11 @@ def query_tables(
:caption: Querying tables in an account given specific parameters
"""
query_filter = _parameter_filter_substitution(parameters, query_filter)
- command = functools.partial(self._client.table.query, **kwargs)
- return AsyncItemPaged(
- command,
- results_per_page=results_per_page,
+ return self._client.table.query(
filter=query_filter,
- page_iterator_class=TablePropertiesPaged,
+ top=results_per_page,
+ cls=lambda objs: [TableItem._from_generated(o) for o in objs],
+ **kwargs,
)
def get_table_client(self, table_name: str, **kwargs: Any) -> TableClient:
diff --git a/sdk/tables/azure-data-tables/pyproject.toml b/sdk/tables/azure-data-tables/pyproject.toml
index e9b975a7d2b3..f223906014bc 100644
--- a/sdk/tables/azure-data-tables/pyproject.toml
+++ b/sdk/tables/azure-data-tables/pyproject.toml
@@ -3,4 +3,4 @@ pyright = false
black = true
[tool.azure-sdk-conda]
-in_bundle = false
+in_bundle = false
\ No newline at end of file
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_authentication_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_authentication_async.py
index 8700228cd07d..ddecf23d1943 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_authentication_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_authentication_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_batching_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_batching_async.py
index 3c0d09b16b76..1ce5df93a8c4 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_batching_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_batching_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_conditional_update_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_conditional_update_async.py
index d3920cd8c17b..7fd5418a5a69 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_conditional_update_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_conditional_update_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_copy_table_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_copy_table_async.py
index 13e812675435..e57bff8cd144 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_copy_table_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_copy_table_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_create_client_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_create_client_async.py
index e7705a3f715c..964fdfe16b9c 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_create_client_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_create_client_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_create_delete_table_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_create_delete_table_async.py
index 753891adbdea..ebe982201761 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_create_delete_table_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_create_delete_table_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_encode_dataclass_model_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_encode_dataclass_model_async.py
index 4d2a80e24be8..c8f6f5ee9501 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_encode_dataclass_model_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_encode_dataclass_model_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_encode_pydantic_model_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_encode_pydantic_model_async.py
index b7d151a0be37..d130d8b92b60 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_encode_pydantic_model_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_encode_pydantic_model_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_insert_delete_entities_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_insert_delete_entities_async.py
index 88bec6726acb..2a213efc4cf1 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_insert_delete_entities_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_insert_delete_entities_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_query_table_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_query_table_async.py
index 18368a589341..0eb99fd7addc 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_query_table_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_query_table_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_query_tables_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_query_tables_async.py
index d2b14bd0af90..7b4b9610c7a5 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_query_tables_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_query_tables_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/async_samples/sample_update_upsert_merge_entities_async.py b/sdk/tables/azure-data-tables/samples/async_samples/sample_update_upsert_merge_entities_async.py
index dbc0cc2dfe76..63166b0e587c 100644
--- a/sdk/tables/azure-data-tables/samples/async_samples/sample_update_upsert_merge_entities_async.py
+++ b/sdk/tables/azure-data-tables/samples/async_samples/sample_update_upsert_merge_entities_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/sample_authentication.py b/sdk/tables/azure-data-tables/samples/sample_authentication.py
index a5514e89c243..c046f7a33748 100644
--- a/sdk/tables/azure-data-tables/samples/sample_authentication.py
+++ b/sdk/tables/azure-data-tables/samples/sample_authentication.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/sample_batching.py b/sdk/tables/azure-data-tables/samples/sample_batching.py
index 28d8c69f1d54..0710bf871aae 100644
--- a/sdk/tables/azure-data-tables/samples/sample_batching.py
+++ b/sdk/tables/azure-data-tables/samples/sample_batching.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/sample_conditional_update.py b/sdk/tables/azure-data-tables/samples/sample_conditional_update.py
index fa0d4f51d7b7..2f4492e0b786 100644
--- a/sdk/tables/azure-data-tables/samples/sample_conditional_update.py
+++ b/sdk/tables/azure-data-tables/samples/sample_conditional_update.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/sample_copy_table.py b/sdk/tables/azure-data-tables/samples/sample_copy_table.py
index ead1d5790fc9..879ebd9e5f02 100644
--- a/sdk/tables/azure-data-tables/samples/sample_copy_table.py
+++ b/sdk/tables/azure-data-tables/samples/sample_copy_table.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/sample_create_client.py b/sdk/tables/azure-data-tables/samples/sample_create_client.py
index 5e1b75207eef..c69ae7dde330 100644
--- a/sdk/tables/azure-data-tables/samples/sample_create_client.py
+++ b/sdk/tables/azure-data-tables/samples/sample_create_client.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/sample_create_delete_table.py b/sdk/tables/azure-data-tables/samples/sample_create_delete_table.py
index 377f0c5e7df1..ebcbf693fdee 100644
--- a/sdk/tables/azure-data-tables/samples/sample_create_delete_table.py
+++ b/sdk/tables/azure-data-tables/samples/sample_create_delete_table.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/sample_encode_dataclass_model.py b/sdk/tables/azure-data-tables/samples/sample_encode_dataclass_model.py
index 4263f8a87929..50766318c658 100644
--- a/sdk/tables/azure-data-tables/samples/sample_encode_dataclass_model.py
+++ b/sdk/tables/azure-data-tables/samples/sample_encode_dataclass_model.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/sample_encode_pydantic_model.py b/sdk/tables/azure-data-tables/samples/sample_encode_pydantic_model.py
index 6170bc808cc2..78356f9fbdbb 100644
--- a/sdk/tables/azure-data-tables/samples/sample_encode_pydantic_model.py
+++ b/sdk/tables/azure-data-tables/samples/sample_encode_pydantic_model.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License in the project root for
diff --git a/sdk/tables/azure-data-tables/samples/sample_insert_delete_entities.py b/sdk/tables/azure-data-tables/samples/sample_insert_delete_entities.py
index 199a0181822d..d76e507889de 100644
--- a/sdk/tables/azure-data-tables/samples/sample_insert_delete_entities.py
+++ b/sdk/tables/azure-data-tables/samples/sample_insert_delete_entities.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/sample_query_table.py b/sdk/tables/azure-data-tables/samples/sample_query_table.py
index eedf56f62034..2c0aa67bd704 100644
--- a/sdk/tables/azure-data-tables/samples/sample_query_table.py
+++ b/sdk/tables/azure-data-tables/samples/sample_query_table.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/sample_query_tables.py b/sdk/tables/azure-data-tables/samples/sample_query_tables.py
index a2310009a424..696dbb6c81f3 100644
--- a/sdk/tables/azure-data-tables/samples/sample_query_tables.py
+++ b/sdk/tables/azure-data-tables/samples/sample_query_tables.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/samples/sample_update_upsert_merge_entities.py b/sdk/tables/azure-data-tables/samples/sample_update_upsert_merge_entities.py
index b309b84d36e7..859c497af43a 100644
--- a/sdk/tables/azure-data-tables/samples/sample_update_upsert_merge_entities.py
+++ b/sdk/tables/azure-data-tables/samples/sample_update_upsert_merge_entities.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/tests/_shared/testcase.py b/sdk/tables/azure-data-tables/tests/_shared/testcase.py
index 9d38ed317cb9..2cad4ee8c826 100644
--- a/sdk/tables/azure-data-tables/tests/_shared/testcase.py
+++ b/sdk/tables/azure-data-tables/tests/_shared/testcase.py
@@ -483,12 +483,11 @@ def _assert_stats_unavailable(self, stats):
@staticmethod
def override_response_body_with_unavailable_status(response):
- response.http_response.text = lambda _: SERVICE_UNAVAILABLE_RESP_BODY
+ response.http_response.text = lambda: SERVICE_UNAVAILABLE_RESP_BODY
@staticmethod
def override_response_body_with_live_status(response):
- response.http_response.text = lambda _: SERVICE_LIVE_RESP_BODY
-
+ response.http_response.text = lambda: SERVICE_LIVE_RESP_BODY
class ResponseCallback(object):
def __init__(self, status=None, new_status=None):
diff --git a/sdk/tables/azure-data-tables/tests/perfstress_tests/_base.py b/sdk/tables/azure-data-tables/tests/perfstress_tests/_base.py
index 8985c983da68..9c4b25e81cd4 100644
--- a/sdk/tables/azure-data-tables/tests/perfstress_tests/_base.py
+++ b/sdk/tables/azure-data-tables/tests/perfstress_tests/_base.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
diff --git a/sdk/tables/azure-data-tables/tests/test_encoder.py b/sdk/tables/azure-data-tables/tests/test_encoder.py
index 8a1754a9cc52..53d10ffdd7d9 100644
--- a/sdk/tables/azure-data-tables/tests/test_encoder.py
+++ b/sdk/tables/azure-data-tables/tests/test_encoder.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# coding: utf-8
# -------------------------------------------------------------------------
@@ -135,7 +136,7 @@ def test_encoder_create_entity_basic(self, tables_storage_account_name, tables_p
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -147,7 +148,7 @@ def test_encoder_create_entity_basic(self, tables_storage_account_name, tables_p
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -160,7 +161,10 @@ def test_encoder_create_entity_basic(self, tables_storage_account_name, tables_p
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -176,7 +180,10 @@ def test_encoder_create_entity_basic(self, tables_storage_account_name, tables_p
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -196,7 +203,10 @@ def test_encoder_create_entity_basic(self, tables_storage_account_name, tables_p
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -235,7 +245,10 @@ def test_encoder_create_entity_complex_keys(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -258,7 +271,10 @@ def test_encoder_create_entity_complex_keys(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -315,7 +331,7 @@ def test_encoder_create_entity_type_conversion(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(
lambda: client.get_entity("PK", "RK"),
{k: v for k, v in test_entity.items() if v is not None},
@@ -391,7 +407,7 @@ def test_encoder_create_entity_tuples(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -445,7 +461,7 @@ def test_encoder_create_entity_tuples(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -559,7 +575,7 @@ def test_encoder_create_entity_raw(self, tables_storage_account_name, tables_pri
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -586,7 +602,7 @@ def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -613,7 +629,10 @@ def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -634,7 +653,7 @@ def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -668,7 +687,7 @@ def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -687,7 +706,10 @@ def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_payload_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -706,7 +728,7 @@ def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", EnumBasicOptions.ONE.value), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -721,7 +743,7 @@ def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -737,7 +759,10 @@ def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
verify_response=(lambda: client.get_entity("PK", "1"), expected_entity),
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
@@ -765,7 +790,7 @@ def test_encoder_upsert_entity_basic(self, tables_storage_account_name, tables_p
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -774,7 +799,7 @@ def test_encoder_upsert_entity_basic(self, tables_storage_account_name, tables_p
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -787,7 +812,7 @@ def test_encoder_upsert_entity_basic(self, tables_storage_account_name, tables_p
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -796,7 +821,7 @@ def test_encoder_upsert_entity_basic(self, tables_storage_account_name, tables_p
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -873,7 +898,6 @@ def test_encoder_upsert_entity_complex_keys(
verify_url=f"{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
@@ -885,7 +909,6 @@ def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
@@ -909,7 +932,6 @@ def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
@@ -921,7 +943,6 @@ def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
@@ -978,7 +999,6 @@ def test_encoder_upsert_entity_type_conversion(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
@@ -990,7 +1010,6 @@ def test_encoder_upsert_entity_type_conversion(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
@@ -1067,7 +1086,6 @@ def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
@@ -1079,7 +1097,6 @@ def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
@@ -1136,7 +1153,6 @@ def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
@@ -1148,7 +1164,6 @@ def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
@@ -1291,7 +1306,6 @@ def test_encoder_upsert_entity_raw(self, tables_storage_account_name, tables_pri
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
@@ -1303,7 +1317,6 @@ def test_encoder_upsert_entity_raw(self, tables_storage_account_name, tables_pri
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
@@ -1340,7 +1353,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
@@ -1352,7 +1364,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
@@ -1386,7 +1397,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "An error occurred while processing this request." in str(error.value)
@@ -1399,7 +1409,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "An error occurred while processing this request." in str(error.value)
@@ -1421,7 +1430,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
@@ -1433,7 +1441,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
@@ -1475,7 +1482,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
@@ -1487,7 +1493,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
@@ -1507,7 +1512,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "The property name is invalid" in str(error.value)
@@ -1520,7 +1524,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "The property name is invalid" in str(error.value)
@@ -1541,7 +1544,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
@@ -1553,7 +1555,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
@@ -1573,7 +1574,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
@@ -1585,7 +1585,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
@@ -1605,7 +1604,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
@@ -1617,7 +1615,6 @@ def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
@@ -1642,7 +1639,7 @@ def test_encoder_update_entity_basic(self, tables_storage_account_name, tables_p
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1651,7 +1648,7 @@ def test_encoder_update_entity_basic(self, tables_storage_account_name, tables_p
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1665,7 +1662,7 @@ def test_encoder_update_entity_basic(self, tables_storage_account_name, tables_p
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1674,7 +1671,7 @@ def test_encoder_update_entity_basic(self, tables_storage_account_name, tables_p
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1750,7 +1747,7 @@ def test_encoder_update_entity_complex_keys(
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1759,7 +1756,7 @@ def test_encoder_update_entity_complex_keys(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1781,7 +1778,7 @@ def test_encoder_update_entity_complex_keys(
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1790,7 +1787,7 @@ def test_encoder_update_entity_complex_keys(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1845,7 +1842,7 @@ def test_encoder_update_entity_type_conversion(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1854,7 +1851,7 @@ def test_encoder_update_entity_type_conversion(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1929,7 +1926,7 @@ def test_encoder_update_entity_tuples(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1938,7 +1935,7 @@ def test_encoder_update_entity_tuples(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1993,7 +1990,7 @@ def test_encoder_update_entity_tuples(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2002,7 +1999,7 @@ def test_encoder_update_entity_tuples(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2143,7 +2140,7 @@ def test_encoder_update_entity_raw(self, tables_storage_account_name, tables_pri
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2152,7 +2149,7 @@ def test_encoder_update_entity_raw(self, tables_storage_account_name, tables_pri
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2187,7 +2184,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2196,7 +2193,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2228,7 +2225,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "An error occurred while processing this request" in str(error.value)
assert error.value.error_code == "InvalidInput"
@@ -2238,7 +2235,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "An error occurred while processing this request" in str(error.value)
assert error.value.error_code == "InvalidInput"
@@ -2258,7 +2255,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2267,7 +2264,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2307,7 +2304,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2316,7 +2313,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2334,7 +2331,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "The property name is invalid" in str(error.value)
assert error.value.error_code.value == "PropertyNameInvalid"
@@ -2344,7 +2341,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "The property name is invalid" in str(error.value)
assert error.value.error_code.value == "PropertyNameInvalid"
@@ -2363,7 +2360,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2372,7 +2369,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2390,7 +2387,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2399,7 +2396,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2417,7 +2414,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2426,7 +2423,7 @@ def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2448,7 +2445,7 @@ def test_encoder_delete_entity_basic(self, tables_storage_account_name, tables_p
"bar",
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='bar')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2457,7 +2454,7 @@ def test_encoder_delete_entity_basic(self, tables_storage_account_name, tables_p
{"PartitionKey": "foo", "RowKey": "bar"},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='bar')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2467,7 +2464,7 @@ def test_encoder_delete_entity_basic(self, tables_storage_account_name, tables_p
"RK'@*$!%", # cspell:disable-line
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2476,7 +2473,7 @@ def test_encoder_delete_entity_basic(self, tables_storage_account_name, tables_p
{"PartitionKey": "foo", "RowKey": "RK'@*$!%"}, # cspell:disable-line
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2565,7 +2562,7 @@ def test_encoder_delete_entity_atypical_values(
non_utf8_char,
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2574,7 +2571,7 @@ def test_encoder_delete_entity_atypical_values(
{"PartitionKey": "PK", "RowKey": non_utf8_char},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2595,7 +2592,7 @@ def test_encoder_delete_entity_atypical_values(
EnumStrOptions.ONE,
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='One')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2604,7 +2601,7 @@ def test_encoder_delete_entity_atypical_values(
{"PartitionKey": "foo", "RowKey": EnumStrOptions.ONE},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='One')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
client.delete_table()
diff --git a/sdk/tables/azure-data-tables/tests/test_encoder_async.py b/sdk/tables/azure-data-tables/tests/test_encoder_async.py
index 26f70107572d..ccf2951ef427 100644
--- a/sdk/tables/azure-data-tables/tests/test_encoder_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_encoder_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# coding: utf-8
# -------------------------------------------------------------------------
@@ -99,7 +100,7 @@ async def test_encoder_create_entity_basic(self, tables_storage_account_name, ta
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -111,7 +112,7 @@ async def test_encoder_create_entity_basic(self, tables_storage_account_name, ta
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -124,7 +125,7 @@ async def test_encoder_create_entity_basic(self, tables_storage_account_name, ta
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -140,7 +141,7 @@ async def test_encoder_create_entity_basic(self, tables_storage_account_name, ta
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -160,7 +161,7 @@ async def test_encoder_create_entity_basic(self, tables_storage_account_name, ta
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -199,7 +200,7 @@ async def test_encoder_create_entity_complex_keys(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -222,7 +223,7 @@ async def test_encoder_create_entity_complex_keys(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -279,7 +280,7 @@ async def test_encoder_create_entity_type_conversion(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(
lambda: client.get_entity("PK", "RK"),
{k: v for k, v in test_entity.items() if v is not None},
@@ -355,7 +356,7 @@ async def test_encoder_create_entity_tuples(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -409,7 +410,7 @@ async def test_encoder_create_entity_tuples(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -525,7 +526,7 @@ async def test_encoder_create_entity_raw(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -552,7 +553,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -579,7 +580,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -600,7 +601,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -634,7 +635,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -653,7 +654,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_payload_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -672,7 +673,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", EnumBasicOptions.ONE.value), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -687,7 +688,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -703,7 +704,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "1"), expected_entity),
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
@@ -731,7 +732,7 @@ async def test_encoder_upsert_entity_basic(self, tables_storage_account_name, ta
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -740,7 +741,7 @@ async def test_encoder_upsert_entity_basic(self, tables_storage_account_name, ta
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -753,7 +754,7 @@ async def test_encoder_upsert_entity_basic(self, tables_storage_account_name, ta
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -762,7 +763,7 @@ async def test_encoder_upsert_entity_basic(self, tables_storage_account_name, ta
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -839,7 +840,6 @@ async def test_encoder_upsert_entity_complex_keys(
verify_url=f"{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
@@ -851,7 +851,6 @@ async def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
@@ -875,7 +874,6 @@ async def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
@@ -887,7 +885,6 @@ async def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
@@ -944,7 +941,6 @@ async def test_encoder_upsert_entity_type_conversion(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
@@ -956,7 +952,6 @@ async def test_encoder_upsert_entity_type_conversion(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
@@ -1033,7 +1028,6 @@ async def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
@@ -1045,7 +1039,6 @@ async def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
@@ -1102,7 +1095,6 @@ async def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
@@ -1114,7 +1106,6 @@ async def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
@@ -1259,7 +1250,6 @@ async def test_encoder_upsert_entity_raw(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
@@ -1271,7 +1261,6 @@ async def test_encoder_upsert_entity_raw(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
@@ -1308,7 +1297,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
@@ -1320,7 +1308,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
@@ -1355,7 +1342,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "An error occurred while processing this request." in str(error.value)
@@ -1368,7 +1354,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "An error occurred while processing this request." in str(error.value)
@@ -1390,7 +1375,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
@@ -1402,7 +1386,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
@@ -1444,7 +1427,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
@@ -1456,7 +1438,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
@@ -1476,7 +1457,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "The property name is invalid" in str(error.value)
@@ -1489,7 +1469,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "The property name is invalid" in str(error.value)
@@ -1510,7 +1489,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
@@ -1522,7 +1500,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
@@ -1542,7 +1519,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
@@ -1554,7 +1530,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
@@ -1574,7 +1549,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
@@ -1586,7 +1560,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
@@ -1611,7 +1584,7 @@ async def test_encoder_update_entity_basic(self, tables_storage_account_name, ta
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1620,7 +1593,7 @@ async def test_encoder_update_entity_basic(self, tables_storage_account_name, ta
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1634,7 +1607,7 @@ async def test_encoder_update_entity_basic(self, tables_storage_account_name, ta
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1643,7 +1616,7 @@ async def test_encoder_update_entity_basic(self, tables_storage_account_name, ta
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1719,7 +1692,7 @@ async def test_encoder_update_entity_complex_keys(
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1728,7 +1701,7 @@ async def test_encoder_update_entity_complex_keys(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1750,7 +1723,7 @@ async def test_encoder_update_entity_complex_keys(
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1759,7 +1732,7 @@ async def test_encoder_update_entity_complex_keys(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1814,7 +1787,7 @@ async def test_encoder_update_entity_type_conversion(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1823,7 +1796,7 @@ async def test_encoder_update_entity_type_conversion(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1898,7 +1871,7 @@ async def test_encoder_update_entity_tuples(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1907,7 +1880,7 @@ async def test_encoder_update_entity_tuples(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1962,7 +1935,7 @@ async def test_encoder_update_entity_tuples(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1971,7 +1944,7 @@ async def test_encoder_update_entity_tuples(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2114,7 +2087,7 @@ async def test_encoder_update_entity_raw(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2123,7 +2096,7 @@ async def test_encoder_update_entity_raw(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2158,7 +2131,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2167,7 +2140,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2199,7 +2172,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "An error occurred while processing this request" in str(error.value)
assert error.value.error_code == "InvalidInput"
@@ -2209,7 +2182,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "An error occurred while processing this request" in str(error.value)
assert error.value.error_code == "InvalidInput"
@@ -2229,7 +2202,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2238,7 +2211,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2278,7 +2251,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2287,7 +2260,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2305,7 +2278,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "The property name is invalid" in str(error.value)
assert error.value.error_code.value == "PropertyNameInvalid"
@@ -2315,7 +2288,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "The property name is invalid" in str(error.value)
assert error.value.error_code.value == "PropertyNameInvalid"
@@ -2334,7 +2307,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2343,7 +2316,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2361,7 +2334,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2370,7 +2343,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2388,7 +2361,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2397,7 +2370,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2419,7 +2392,7 @@ async def test_encoder_delete_entity_basic(self, tables_storage_account_name, ta
"bar",
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='bar')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2428,7 +2401,7 @@ async def test_encoder_delete_entity_basic(self, tables_storage_account_name, ta
{"PartitionKey": "foo", "RowKey": "bar"},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='bar')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2438,7 +2411,7 @@ async def test_encoder_delete_entity_basic(self, tables_storage_account_name, ta
"RK'@*$!%", # cspell:disable-line
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2447,7 +2420,7 @@ async def test_encoder_delete_entity_basic(self, tables_storage_account_name, ta
{"PartitionKey": "foo", "RowKey": "RK'@*$!%"}, # cspell:disable-line
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2536,7 +2509,7 @@ async def test_encoder_delete_entity_atypical_values(
non_utf8_char,
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2545,7 +2518,7 @@ async def test_encoder_delete_entity_atypical_values(
{"PartitionKey": "PK", "RowKey": non_utf8_char},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2566,7 +2539,7 @@ async def test_encoder_delete_entity_atypical_values(
EnumStrOptions.ONE,
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='One')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2575,7 +2548,7 @@ async def test_encoder_delete_entity_atypical_values(
{"PartitionKey": "foo", "RowKey": EnumStrOptions.ONE},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='One')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
await client.delete_table()
diff --git a/sdk/tables/azure-data-tables/tests/test_encoder_cosmos.py b/sdk/tables/azure-data-tables/tests/test_encoder_cosmos.py
index 5369fdbb2306..258990c9f192 100644
--- a/sdk/tables/azure-data-tables/tests/test_encoder_cosmos.py
+++ b/sdk/tables/azure-data-tables/tests/test_encoder_cosmos.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# coding: utf-8
# -------------------------------------------------------------------------
@@ -46,7 +47,7 @@ def test_encoder_create_entity_basic(self, tables_cosmos_account_name, tables_pr
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -58,7 +59,7 @@ def test_encoder_create_entity_basic(self, tables_cosmos_account_name, tables_pr
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -71,7 +72,10 @@ def test_encoder_create_entity_basic(self, tables_cosmos_account_name, tables_pr
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -87,7 +91,10 @@ def test_encoder_create_entity_basic(self, tables_cosmos_account_name, tables_pr
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -107,7 +114,10 @@ def test_encoder_create_entity_basic(self, tables_cosmos_account_name, tables_pr
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -146,7 +156,10 @@ def test_encoder_create_entity_complex_keys(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -169,7 +182,10 @@ def test_encoder_create_entity_complex_keys(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -226,7 +242,7 @@ def test_encoder_create_entity_type_conversion(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(
lambda: client.get_entity("PK", "RK"),
{k: v for k, v in test_entity.items() if v is not None},
@@ -302,7 +318,7 @@ def test_encoder_create_entity_tuples(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -356,7 +372,7 @@ def test_encoder_create_entity_tuples(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -470,7 +486,7 @@ def test_encoder_create_entity_raw(self, tables_cosmos_account_name, tables_prim
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -495,7 +511,7 @@ def test_encoder_create_entity_atypical_values(self, tables_cosmos_account_name,
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -522,7 +538,10 @@ def test_encoder_create_entity_atypical_values(self, tables_cosmos_account_name,
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -543,7 +562,7 @@ def test_encoder_create_entity_atypical_values(self, tables_cosmos_account_name,
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -577,7 +596,7 @@ def test_encoder_create_entity_atypical_values(self, tables_cosmos_account_name,
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -596,7 +615,10 @@ def test_encoder_create_entity_atypical_values(self, tables_cosmos_account_name,
test_entity,
verify_payload=json.dumps(expected_payload_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -615,7 +637,7 @@ def test_encoder_create_entity_atypical_values(self, tables_cosmos_account_name,
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", EnumBasicOptions.ONE.value), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -630,7 +652,7 @@ def test_encoder_create_entity_atypical_values(self, tables_cosmos_account_name,
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -646,7 +668,10 @@ def test_encoder_create_entity_atypical_values(self, tables_cosmos_account_name,
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
verify_response=(lambda: client.get_entity("PK", "1"), expected_entity),
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
@@ -674,7 +699,7 @@ def test_encoder_upsert_entity_basic(self, tables_cosmos_account_name, tables_pr
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -683,7 +708,7 @@ def test_encoder_upsert_entity_basic(self, tables_cosmos_account_name, tables_pr
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -696,7 +721,7 @@ def test_encoder_upsert_entity_basic(self, tables_cosmos_account_name, tables_pr
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -705,7 +730,7 @@ def test_encoder_upsert_entity_basic(self, tables_cosmos_account_name, tables_pr
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -782,7 +807,6 @@ def test_encoder_upsert_entity_complex_keys(
verify_url=f"{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert (
@@ -797,7 +821,6 @@ def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert (
@@ -823,7 +846,6 @@ def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert (
@@ -838,7 +860,6 @@ def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert (
@@ -897,7 +918,6 @@ def test_encoder_upsert_entity_type_conversion(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
@@ -909,7 +929,6 @@ def test_encoder_upsert_entity_type_conversion(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
@@ -986,7 +1005,6 @@ def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
@@ -998,7 +1016,6 @@ def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
@@ -1055,7 +1072,6 @@ def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
@@ -1067,7 +1083,6 @@ def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
@@ -1210,7 +1225,6 @@ def test_encoder_upsert_entity_raw(self, tables_cosmos_account_name, tables_prim
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
@@ -1222,7 +1236,6 @@ def test_encoder_upsert_entity_raw(self, tables_cosmos_account_name, tables_prim
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
@@ -1257,7 +1270,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
@@ -1269,7 +1281,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
@@ -1303,7 +1314,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "One of the input values is invalid." in str(error.value)
@@ -1316,7 +1326,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "One of the input values is invalid." in str(error.value)
@@ -1338,7 +1347,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
@@ -1350,7 +1358,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
@@ -1392,7 +1399,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
@@ -1404,7 +1410,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
@@ -1424,7 +1429,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "The property name '123' is invalid" in str(error.value)
@@ -1437,7 +1441,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "The property name '123' is invalid" in str(error.value)
@@ -1458,7 +1461,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
@@ -1470,7 +1472,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
@@ -1490,7 +1491,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
@@ -1502,7 +1502,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
@@ -1522,7 +1521,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
@@ -1534,7 +1532,6 @@ def test_encoder_upsert_entity_atypical_values(self, tables_cosmos_account_name,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
@@ -1559,7 +1556,7 @@ def test_encoder_update_entity_basic(self, tables_cosmos_account_name, tables_pr
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1568,7 +1565,7 @@ def test_encoder_update_entity_basic(self, tables_cosmos_account_name, tables_pr
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1582,7 +1579,7 @@ def test_encoder_update_entity_basic(self, tables_cosmos_account_name, tables_pr
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1591,7 +1588,7 @@ def test_encoder_update_entity_basic(self, tables_cosmos_account_name, tables_pr
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1668,7 +1665,7 @@ def test_encoder_update_entity_complex_keys(
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert (
'"code":"InvalidInput","message":{"lang":"en-us","value":"One of the input values is invalid.'
@@ -1680,7 +1677,7 @@ def test_encoder_update_entity_complex_keys(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
assert (
@@ -1706,7 +1703,7 @@ def test_encoder_update_entity_complex_keys(
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert (
'"code":"InvalidInput","message":{"lang":"en-us","value":"One of the input values is invalid.'
@@ -1718,7 +1715,7 @@ def test_encoder_update_entity_complex_keys(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert (
'"code":"InvalidInput","message":{"lang":"en-us","value":"One of the input values is invalid.'
@@ -1775,7 +1772,7 @@ def test_encoder_update_entity_type_conversion(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1784,7 +1781,7 @@ def test_encoder_update_entity_type_conversion(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1859,7 +1856,7 @@ def test_encoder_update_entity_tuples(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1868,7 +1865,7 @@ def test_encoder_update_entity_tuples(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1923,7 +1920,7 @@ def test_encoder_update_entity_tuples(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1932,7 +1929,7 @@ def test_encoder_update_entity_tuples(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2073,7 +2070,7 @@ def test_encoder_update_entity_raw(self, tables_cosmos_account_name, tables_prim
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2082,7 +2079,7 @@ def test_encoder_update_entity_raw(self, tables_cosmos_account_name, tables_prim
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2115,7 +2112,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2124,7 +2121,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2156,7 +2153,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "One of the input values is invalid." in str(error.value)
assert error.value.error_code == "InvalidInput"
@@ -2166,7 +2163,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "One of the input values is invalid." in str(error.value)
assert error.value.error_code == "InvalidInput"
@@ -2186,7 +2183,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2195,7 +2192,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2235,7 +2232,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2244,7 +2241,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2262,7 +2259,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "The property name '123' is invalid." in str(error.value)
assert error.value.error_code.value == "PropertyNameInvalid"
@@ -2272,7 +2269,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "The property name '123' is invalid." in str(error.value)
assert error.value.error_code.value == "PropertyNameInvalid"
@@ -2291,7 +2288,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2300,7 +2297,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2318,7 +2315,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2327,7 +2324,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2345,7 +2342,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2354,7 +2351,7 @@ def test_encoder_update_entity_atypical_values(self, tables_cosmos_account_name,
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2376,7 +2373,7 @@ def test_encoder_delete_entity_basic(self, tables_cosmos_account_name, tables_pr
"bar",
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='bar')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2385,7 +2382,7 @@ def test_encoder_delete_entity_basic(self, tables_cosmos_account_name, tables_pr
{"PartitionKey": "foo", "RowKey": "bar"},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='bar')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2395,7 +2392,7 @@ def test_encoder_delete_entity_basic(self, tables_cosmos_account_name, tables_pr
"RK'@*$!%", # cspell:disable-line
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2404,7 +2401,7 @@ def test_encoder_delete_entity_basic(self, tables_cosmos_account_name, tables_pr
{"PartitionKey": "foo", "RowKey": "RK'@*$!%"}, # cspell:disable-line
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2491,7 +2488,7 @@ def test_encoder_delete_entity_atypical_values(self, tables_cosmos_account_name,
non_utf8_char,
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2500,7 +2497,7 @@ def test_encoder_delete_entity_atypical_values(self, tables_cosmos_account_name,
{"PartitionKey": "PK", "RowKey": non_utf8_char},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2521,7 +2518,7 @@ def test_encoder_delete_entity_atypical_values(self, tables_cosmos_account_name,
EnumStrOptions.ONE,
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='One')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2530,7 +2527,7 @@ def test_encoder_delete_entity_atypical_values(self, tables_cosmos_account_name,
{"PartitionKey": "foo", "RowKey": EnumStrOptions.ONE},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='One')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
client.delete_table()
diff --git a/sdk/tables/azure-data-tables/tests/test_encoder_cosmos_async.py b/sdk/tables/azure-data-tables/tests/test_encoder_cosmos_async.py
index 6fad38e25f57..9a08c304bcdd 100644
--- a/sdk/tables/azure-data-tables/tests/test_encoder_cosmos_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_encoder_cosmos_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# coding: utf-8
# -------------------------------------------------------------------------
@@ -43,7 +44,7 @@ async def test_encoder_create_entity_basic(self, tables_cosmos_account_name, tab
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -55,7 +56,7 @@ async def test_encoder_create_entity_basic(self, tables_cosmos_account_name, tab
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -68,7 +69,10 @@ async def test_encoder_create_entity_basic(self, tables_cosmos_account_name, tab
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -84,7 +88,10 @@ async def test_encoder_create_entity_basic(self, tables_cosmos_account_name, tab
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -104,7 +111,10 @@ async def test_encoder_create_entity_basic(self, tables_cosmos_account_name, tab
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -143,7 +153,10 @@ async def test_encoder_create_entity_complex_keys(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -166,7 +179,10 @@ async def test_encoder_create_entity_complex_keys(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -223,7 +239,7 @@ async def test_encoder_create_entity_type_conversion(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(
lambda: client.get_entity("PK", "RK"),
{k: v for k, v in test_entity.items() if v is not None},
@@ -299,7 +315,7 @@ async def test_encoder_create_entity_tuples(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -353,7 +369,7 @@ async def test_encoder_create_entity_tuples(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -469,7 +485,7 @@ async def test_encoder_create_entity_raw(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -496,7 +512,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -523,7 +539,10 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -544,7 +563,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -578,7 +597,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -597,7 +616,10 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_payload_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
assert (
@@ -616,7 +638,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", EnumBasicOptions.ONE.value), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -631,7 +653,7 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={"Content-Type": "application/json", "Accept": "application/json;odata=minimalmetadata"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -647,7 +669,10 @@ async def test_encoder_create_entity_atypical_values(
test_entity,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}",
- verify_headers={"Content-Type": "application/json;odata=nometadata"},
+ verify_headers={
+ "Content-Type": "application/json",
+ "Accept": "application/json;odata=minimalmetadata",
+ },
verify_response=(lambda: client.get_entity("PK", "1"), expected_entity),
)
assert "Operation returned an invalid status 'Bad Request'" in str(error.value)
@@ -675,7 +700,7 @@ async def test_encoder_upsert_entity_basic(self, tables_cosmos_account_name, tab
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -684,7 +709,7 @@ async def test_encoder_upsert_entity_basic(self, tables_cosmos_account_name, tab
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -697,7 +722,7 @@ async def test_encoder_upsert_entity_basic(self, tables_cosmos_account_name, tab
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -706,7 +731,7 @@ async def test_encoder_upsert_entity_basic(self, tables_cosmos_account_name, tab
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json"},
+ verify_headers={"Content-Type": "application/json"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -783,7 +808,6 @@ async def test_encoder_upsert_entity_complex_keys(
verify_url=f"{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert (
@@ -798,7 +822,6 @@ async def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert (
@@ -824,7 +847,6 @@ async def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert (
@@ -839,7 +861,6 @@ async def test_encoder_upsert_entity_complex_keys(
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert (
@@ -898,7 +919,6 @@ async def test_encoder_upsert_entity_type_conversion(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
@@ -910,7 +930,6 @@ async def test_encoder_upsert_entity_type_conversion(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
@@ -987,7 +1006,6 @@ async def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
@@ -999,7 +1017,6 @@ async def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
@@ -1056,7 +1073,6 @@ async def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
@@ -1068,7 +1084,6 @@ async def test_encoder_upsert_entity_tuples(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
@@ -1213,7 +1228,6 @@ async def test_encoder_upsert_entity_raw(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
@@ -1225,7 +1239,6 @@ async def test_encoder_upsert_entity_raw(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
@@ -1262,7 +1275,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
@@ -1274,7 +1286,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
@@ -1309,7 +1320,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "One of the input values is invalid." in str(error.value)
@@ -1322,7 +1332,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "One of the input values is invalid." in str(error.value)
@@ -1344,7 +1353,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
@@ -1356,7 +1364,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
@@ -1398,7 +1405,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
@@ -1410,7 +1416,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
@@ -1430,7 +1435,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "The property name '123' is invalid" in str(error.value)
@@ -1443,7 +1447,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
)
assert "The property name '123' is invalid" in str(error.value)
@@ -1464,7 +1467,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
@@ -1476,7 +1478,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
@@ -1496,7 +1497,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
@@ -1508,7 +1508,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
@@ -1528,7 +1527,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
@@ -1540,7 +1538,6 @@ async def test_encoder_upsert_entity_atypical_values(
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
verify_headers={
"Content-Type": "application/json",
- "Accept": "application/json",
},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
@@ -1565,7 +1562,7 @@ async def test_encoder_update_entity_basic(self, tables_cosmos_account_name, tab
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1574,7 +1571,7 @@ async def test_encoder_update_entity_basic(self, tables_cosmos_account_name, tab
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1588,7 +1585,7 @@ async def test_encoder_update_entity_basic(self, tables_cosmos_account_name, tab
mode="merge",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1597,7 +1594,7 @@ async def test_encoder_update_entity_basic(self, tables_cosmos_account_name, tab
mode="replace",
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK'@*$!%"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1674,7 +1671,7 @@ async def test_encoder_update_entity_complex_keys(
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert (
'"code":"InvalidInput","message":{"lang":"en-us","value":"One of the input values is invalid.'
@@ -1686,7 +1683,7 @@ async def test_encoder_update_entity_complex_keys(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{quote(rk)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity(pk, rk), response_entity),
)
assert (
@@ -1712,7 +1709,7 @@ async def test_encoder_update_entity_complex_keys(
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert (
'"code":"InvalidInput","message":{"lang":"en-us","value":"One of the input values is invalid.'
@@ -1724,7 +1721,7 @@ async def test_encoder_update_entity_complex_keys(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='{quote(pk)}',RowKey='{rk}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert (
'"code":"InvalidInput","message":{"lang":"en-us","value":"One of the input values is invalid.'
@@ -1781,7 +1778,7 @@ async def test_encoder_update_entity_type_conversion(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1790,7 +1787,7 @@ async def test_encoder_update_entity_type_conversion(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1865,7 +1862,7 @@ async def test_encoder_update_entity_tuples(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1874,7 +1871,7 @@ async def test_encoder_update_entity_tuples(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK1',RowKey='RK1')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK1", "RK1"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1929,7 +1926,7 @@ async def test_encoder_update_entity_tuples(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -1938,7 +1935,7 @@ async def test_encoder_update_entity_tuples(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK2", "RK2"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2081,7 +2078,7 @@ async def test_encoder_update_entity_raw(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2090,7 +2087,7 @@ async def test_encoder_update_entity_raw(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), response_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2125,7 +2122,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2134,7 +2131,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", non_utf8_char), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2166,7 +2163,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "One of the input values is invalid." in str(error.value)
assert error.value.error_code == "InvalidInput"
@@ -2176,7 +2173,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK2',RowKey='RK2')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "One of the input values is invalid." in str(error.value)
assert error.value.error_code == "InvalidInput"
@@ -2196,7 +2193,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2205,7 +2202,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=json.dumps(expected_entity, sort_keys=True),
verify_url=f"/{table_name}(PartitionKey='PK3',RowKey='RK3')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK3", "RK3"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2245,7 +2242,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2254,7 +2251,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK5',RowKey='RK5')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK5", "RK5"), test_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2272,7 +2269,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "The property name '123' is invalid." in str(error.value)
assert error.value.error_code.value == "PropertyNameInvalid"
@@ -2282,7 +2279,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
)
assert "The property name '123' is invalid." in str(error.value)
assert error.value.error_code.value == "PropertyNameInvalid"
@@ -2301,7 +2298,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2310,7 +2307,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='One')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "One"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2328,7 +2325,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2337,7 +2334,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='Two')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "Two"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2355,7 +2352,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.MERGE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2364,7 +2361,7 @@ async def test_encoder_update_entity_atypical_values(
mode=UpdateMode.REPLACE,
verify_payload=verification,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='RK')",
- verify_headers={"Content-Type": "application/json", "Accept": "application/json", "If-Match": "*"},
+ verify_headers={"Content-Type": "application/json", "If-Match": "*"},
verify_response=(lambda: client.get_entity("PK", "RK"), expected_entity),
)
assert list(resp.keys()) == ["date", "etag", "version"]
@@ -2386,7 +2383,7 @@ async def test_encoder_delete_entity_basic(self, tables_cosmos_account_name, tab
"bar",
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='bar')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2395,7 +2392,7 @@ async def test_encoder_delete_entity_basic(self, tables_cosmos_account_name, tab
{"PartitionKey": "foo", "RowKey": "bar"},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='bar')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2405,7 +2402,7 @@ async def test_encoder_delete_entity_basic(self, tables_cosmos_account_name, tab
"RK'@*$!%", # cspell:disable-line
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2414,7 +2411,7 @@ async def test_encoder_delete_entity_basic(self, tables_cosmos_account_name, tab
{"PartitionKey": "foo", "RowKey": "RK'@*$!%"}, # cspell:disable-line
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='RK%27%27%40%2A%24%21%25')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2503,7 +2500,7 @@ async def test_encoder_delete_entity_atypical_values(
non_utf8_char,
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2512,7 +2509,7 @@ async def test_encoder_delete_entity_atypical_values(
{"PartitionKey": "PK", "RowKey": non_utf8_char},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='PK',RowKey='{quote(non_utf8_char)}')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2533,7 +2530,7 @@ async def test_encoder_delete_entity_atypical_values(
EnumStrOptions.ONE,
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='One')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
@@ -2542,7 +2539,7 @@ async def test_encoder_delete_entity_atypical_values(
{"PartitionKey": "foo", "RowKey": EnumStrOptions.ONE},
verify_payload=None,
verify_url=f"/{table_name}(PartitionKey='foo',RowKey='One')",
- verify_headers={"Accept": "application/json;odata=minimalmetadata", "If-Match": "*"},
+ verify_headers={"If-Match": "*"},
)
assert resp is None
await client.delete_table()
diff --git a/sdk/tables/azure-data-tables/tests/test_retry.py b/sdk/tables/azure-data-tables/tests/test_retry.py
index 16d47a766d51..4bb830116ddf 100644
--- a/sdk/tables/azure-data-tables/tests/test_retry.py
+++ b/sdk/tables/azure-data-tables/tests/test_retry.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
diff --git a/sdk/tables/azure-data-tables/tests/test_retry_cosmos.py b/sdk/tables/azure-data-tables/tests/test_retry_cosmos.py
index 3b160469f9cb..f1ed2ba90ebf 100644
--- a/sdk/tables/azure-data-tables/tests/test_retry_cosmos.py
+++ b/sdk/tables/azure-data-tables/tests/test_retry_cosmos.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
diff --git a/sdk/tables/azure-data-tables/tests/test_table.py b/sdk/tables/azure-data-tables/tests/test_table.py
index d63f498c6ec9..89c4bf092f20 100644
--- a/sdk/tables/azure-data-tables/tests/test_table.py
+++ b/sdk/tables/azure-data-tables/tests/test_table.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
@@ -241,8 +242,8 @@ def test_query_tables_with_marker(self, tables_storage_account_name, tables_prim
generator2 = ts.list_tables(results_per_page=2).by_page(continuation_token=generator1.continuation_token)
next(generator2)
- tables1 = generator1._current_page
- tables2 = generator2._current_page
+ tables1 = list(generator1._current_page)
+ tables2 = list(generator2._current_page)
# Assert
assert len(tables1) == 2
diff --git a/sdk/tables/azure-data-tables/tests/test_table_async.py b/sdk/tables/azure-data-tables/tests/test_table_async.py
index 6554b1895f4d..17e9a7e37e36 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
diff --git a/sdk/tables/azure-data-tables/tests/test_table_batch.py b/sdk/tables/azure-data-tables/tests/test_table_batch.py
index d657ba4b701f..ad28c2c6b312 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_batch.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_batch.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/tests/test_table_batch_async.py b/sdk/tables/azure-data-tables/tests/test_table_batch_async.py
index 0a9f0f70d109..a1e923322279 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_batch_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_batch_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos.py b/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos.py
index 24661328fedb..cc8663be4312 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos_async.py b/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos_async.py
index 43e7bf718e88..e731e799fb8b 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_batch_cosmos_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/tests/test_table_client.py b/sdk/tables/azure-data-tables/tests/test_table_client.py
index f4e11d11ab22..f31da793b974 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_client.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_client.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
diff --git a/sdk/tables/azure-data-tables/tests/test_table_client_async.py b/sdk/tables/azure-data-tables/tests/test_table_client_async.py
index 52cf51514c97..c6448838f888 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_client_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_client_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
diff --git a/sdk/tables/azure-data-tables/tests/test_table_client_cosmos.py b/sdk/tables/azure-data-tables/tests/test_table_client_cosmos.py
index f45b9cb0a80c..a1187d74e31f 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_client_cosmos.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_client_cosmos.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
diff --git a/sdk/tables/azure-data-tables/tests/test_table_client_cosmos_async.py b/sdk/tables/azure-data-tables/tests/test_table_client_cosmos_async.py
index 0e14849e0bff..5566ce0371b0 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_client_cosmos_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_client_cosmos_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
diff --git a/sdk/tables/azure-data-tables/tests/test_table_entity.py b/sdk/tables/azure-data-tables/tests/test_table_entity.py
index 572b449a82f4..58ecdc6a48a7 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_entity.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_entity.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/tests/test_table_entity_async.py b/sdk/tables/azure-data-tables/tests/test_table_entity_async.py
index 503dc9a857cd..5ae047a0c3eb 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_entity_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_entity_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=line-too-long,useless-suppression,too-many-lines
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/tests/test_table_entity_cosmos.py b/sdk/tables/azure-data-tables/tests/test_table_entity_cosmos.py
index 3fb42485a2e7..b9c808997245 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_entity_cosmos.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_entity_cosmos.py
@@ -1,3 +1,4 @@
+# pylint: disable=too-many-lines
# coding: utf-8
# -------------------------------------------------------------------------
diff --git a/sdk/tables/azure-data-tables/tests/test_table_entity_cosmos_async.py b/sdk/tables/azure-data-tables/tests/test_table_entity_cosmos_async.py
index 303086dec8ec..f1f936c7c967 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_entity_cosmos_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_entity_cosmos_async.py
@@ -1,3 +1,4 @@
+# pylint: disable=too-many-lines
# coding: utf-8
# -------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/sdk/tables/azure-data-tables/tests/test_table_service_stats_async.py b/sdk/tables/azure-data-tables/tests/test_table_service_stats_async.py
index 5cf30f4e3830..696a594856c9 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_service_stats_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_service_stats_async.py
@@ -27,11 +27,11 @@
class TestTableServiceStatsAsync(AzureRecordedTestCase, AsyncTableTestCase):
@staticmethod
def override_response_body_with_unavailable_status(response):
- response.http_response.text = lambda _: SERVICE_UNAVAILABLE_RESP_BODY
+ response.http_response.text = lambda: SERVICE_UNAVAILABLE_RESP_BODY
@staticmethod
def override_response_body_with_live_status(response):
- response.http_response.text = lambda _: SERVICE_LIVE_RESP_BODY
+ response.http_response.text = lambda: SERVICE_LIVE_RESP_BODY
# --Test cases per service ---------------------------------------
@tables_decorator_async
diff --git a/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos.py b/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos.py
index bfff2874b4a0..8f282b84fb66 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos.py
@@ -28,12 +28,11 @@
class TestTableServiceStatsCosmos(AzureRecordedTestCase, TableTestCase):
@staticmethod
def override_response_body_with_unavailable_status(response):
- response.http_response.text = lambda _: SERVICE_UNAVAILABLE_RESP_BODY
+ response.http_response.text = lambda: SERVICE_UNAVAILABLE_RESP_BODY
@staticmethod
def override_response_body_with_live_status(response):
- response.http_response.text = lambda _: SERVICE_LIVE_RESP_BODY
-
+ response.http_response.text = lambda: SERVICE_LIVE_RESP_BODY
# TODO: Should we remove these both from cosmos sync/async?
# --Test cases per service ---------------------------------------
@pytest.mark.skip("JSON is invalid for cosmos")
diff --git a/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos_async.py b/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos_async.py
index 77a56445fcc1..1c10948f07f1 100644
--- a/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos_async.py
+++ b/sdk/tables/azure-data-tables/tests/test_table_service_stats_cosmos_async.py
@@ -29,12 +29,11 @@
class TestTableServiceStatsCosmosAsync(AzureRecordedTestCase, AsyncTableTestCase):
@staticmethod
def override_response_body_with_unavailable_status(response):
- response.http_response.text = lambda _: SERVICE_UNAVAILABLE_RESP_BODY
+ response.http_response.text = lambda: SERVICE_UNAVAILABLE_RESP_BODY
@staticmethod
def override_response_body_with_live_status(response):
- response.http_response.text = lambda _: SERVICE_LIVE_RESP_BODY
-
+ response.http_response.text = lambda: SERVICE_LIVE_RESP_BODY
# --Test cases per service ---------------------------------------
@pytest.mark.skip("JSON is invalid for cosmos")
@cosmos_decorator_async
diff --git a/sdk/tables/azure-data-tables/tsp-location.yaml b/sdk/tables/azure-data-tables/tsp-location.yaml
new file mode 100644
index 000000000000..68e58791adde
--- /dev/null
+++ b/sdk/tables/azure-data-tables/tsp-location.yaml
@@ -0,0 +1,4 @@
+directory: specification/cosmos-db/data-plane/Tables
+commit:
+repo:
+additionalDirectories: