regen - removed azure refs in gen code

sdk/eventgrid/azure-eventgrid/azure/eventgrid/_model_base.py

@@ -31,7 +31,7 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-__all__ = ["AzureJSONEncoder", "Model", "rest_field", "rest_discriminator"]
+__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"]
 
 TZ_UTC = timezone.utc
 
@@ -125,7 +125,7 @@ def _is_readonly(p):
         return False
 
 
-class AzureJSONEncoder(JSONEncoder):
+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):
@@ -140,7 +140,7 @@ def default(self, o):  # pylint: disable=too-many-return-statements
                 return {k: v for k, v in o.items() if k not in readonly_props}
             return dict(o.items())
         try:
-            return super(AzureJSONEncoder, self).default(o)
+            return super(SdkJSONEncoder, self).default(o)
         except TypeError:
             if isinstance(o, _Null):
                 return None
@@ -157,7 +157,7 @@ def default(self, o):  # pylint: disable=too-many-return-statements
             except AttributeError:
                 # This will be raised when it hits value.total_seconds in the method above
                 pass
-            return super(AzureJSONEncoder, self).default(o)
+            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}]?")
@@ -754,9 +754,12 @@ def _deserialize(
     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)
     deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf)
     return _deserialize_with_callable(deserializer, value)
 

sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_operations.py

@@ -18,7 +18,7 @@
 from azure.core.utils import case_insensitive_dict
 
 from .. import models as _models
-from .._model_base import AzureJSONEncoder, _deserialize
+from .._model_base import SdkJSONEncoder, _deserialize
 from .._serialization import Serializer
 from .._vendor import EventGridClientMixinABC
 
@@ -344,7 +344,7 @@ def _publish_cloud_event(  # pylint: disable=protected-access
             'cls', None
         )
 
-        _content = json.dumps(event, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+        _content = json.dumps(event, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_publish_cloud_event_request(
             topic_name=topic_name,
@@ -428,7 +428,7 @@ def _publish_cloud_events(  # pylint: disable=protected-access
             'cls', None
         )
 
-        _content = json.dumps(events, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+        _content = json.dumps(events, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_publish_cloud_events_request(
             topic_name=topic_name,
@@ -702,7 +702,7 @@ def acknowledge_cloud_events(
         if isinstance(acknowledge_options, (IOBase, bytes)):
             _content = acknowledge_options
         else:
-            _content = json.dumps(acknowledge_options, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+            _content = json.dumps(acknowledge_options, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_acknowledge_cloud_events_request(
             topic_name=topic_name,
@@ -902,7 +902,7 @@ def release_cloud_events(
         if isinstance(release_options, (IOBase, bytes)):
             _content = release_options
         else:
-            _content = json.dumps(release_options, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+            _content = json.dumps(release_options, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_release_cloud_events_request(
             topic_name=topic_name,
@@ -1086,7 +1086,7 @@ def reject_cloud_events(
         if isinstance(reject_options, (IOBase, bytes)):
             _content = reject_options
         else:
-            _content = json.dumps(reject_options, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+            _content = json.dumps(reject_options, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_reject_cloud_events_request(
             topic_name=topic_name,
@@ -1277,7 +1277,7 @@ def renew_cloud_event_locks(
         if isinstance(renew_lock_options, (IOBase, bytes)):
             _content = renew_lock_options
         else:
-            _content = json.dumps(renew_lock_options, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+            _content = json.dumps(renew_lock_options, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_renew_cloud_event_locks_request(
             topic_name=topic_name,

sdk/eventgrid/azure-eventgrid/azure/eventgrid/_serialization.py

@@ -64,7 +64,7 @@
 import isodate  # type: ignore
 
 from azure.core.exceptions import DeserializationError, SerializationError
-from azure.core.serialization import NULL as AzureCoreNull
+from azure.core.serialization import NULL as CoreNull
 
 _BOM = codecs.BOM_UTF8.decode(encoding="utf-8")
 
@@ -732,7 +732,6 @@ def url(self, name, data, data_type, **kwargs):
 
             if kwargs.get("skip_quote") is True:
                 output = str(output)
-                # https://github.com/Azure/autorest.python/issues/2063
                 output = output.replace("{", quote("{")).replace("}", quote("}"))
             else:
                 output = quote(str(output), safe="")
@@ -808,7 +807,7 @@ def serialize_data(self, data, data_type, **kwargs):
             raise ValueError("No value for given attribute")
 
         try:
-            if data is AzureCoreNull:
+            if data is CoreNull:
                 return None
             if data_type in self.basic_types.values():
                 return self.serialize_basic(data, data_type, **kwargs)
@@ -1217,7 +1216,6 @@ def rest_key_extractor(attr, attr_desc, 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
-            # https://github.com/Azure/msrest-for-python/issues/197
             return None
         key = ".".join(dict_keys[1:])
 
@@ -1238,7 +1236,6 @@ def rest_key_case_insensitive_extractor(attr, attr_desc, 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
-            # https://github.com/Azure/msrest-for-python/issues/197
             return None
         key = ".".join(dict_keys[1:])
 

sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_operations.py

@@ -18,7 +18,7 @@
 from azure.core.utils import case_insensitive_dict
 
 from ... import models as _models
-from ..._model_base import AzureJSONEncoder, _deserialize
+from ..._model_base import SdkJSONEncoder, _deserialize
 from ..._operations._operations import build_event_grid_acknowledge_cloud_events_request, build_event_grid_publish_cloud_event_request, build_event_grid_publish_cloud_events_request, build_event_grid_receive_cloud_events_request, build_event_grid_reject_cloud_events_request, build_event_grid_release_cloud_events_request, build_event_grid_renew_cloud_event_locks_request
 from .._vendor import EventGridClientMixinABC
 
@@ -73,7 +73,7 @@ async def _publish_cloud_event(  # pylint: disable=protected-access
             'cls', None
         )
 
-        _content = json.dumps(event, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+        _content = json.dumps(event, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_publish_cloud_event_request(
             topic_name=topic_name,
@@ -157,7 +157,7 @@ async def _publish_cloud_events(  # pylint: disable=protected-access
             'cls', None
         )
 
-        _content = json.dumps(events, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+        _content = json.dumps(events, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_publish_cloud_events_request(
             topic_name=topic_name,
@@ -431,7 +431,7 @@ async def acknowledge_cloud_events(
         if isinstance(acknowledge_options, (IOBase, bytes)):
             _content = acknowledge_options
         else:
-            _content = json.dumps(acknowledge_options, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+            _content = json.dumps(acknowledge_options, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_acknowledge_cloud_events_request(
             topic_name=topic_name,
@@ -631,7 +631,7 @@ async def release_cloud_events(
         if isinstance(release_options, (IOBase, bytes)):
             _content = release_options
         else:
-            _content = json.dumps(release_options, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+            _content = json.dumps(release_options, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_release_cloud_events_request(
             topic_name=topic_name,
@@ -815,7 +815,7 @@ async def reject_cloud_events(
         if isinstance(reject_options, (IOBase, bytes)):
             _content = reject_options
         else:
-            _content = json.dumps(reject_options, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+            _content = json.dumps(reject_options, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_reject_cloud_events_request(
             topic_name=topic_name,
@@ -1006,7 +1006,7 @@ async def renew_cloud_event_locks(
         if isinstance(renew_lock_options, (IOBase, bytes)):
             _content = renew_lock_options
         else:
-            _content = json.dumps(renew_lock_options, cls=AzureJSONEncoder, exclude_readonly=True)  # type: ignore
+            _content = json.dumps(renew_lock_options, cls=SdkJSONEncoder, exclude_readonly=True)  # type: ignore
 
         _request = build_event_grid_renew_cloud_event_locks_request(
             topic_name=topic_name,

sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/_models.py

@@ -21,7 +21,7 @@
 class AcknowledgeOptions(_model_base.Model):
     """Array of lock tokens for the corresponding received Cloud Events to be acknowledged.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar lock_tokens: Array of lock tokens. Required.
     :vartype lock_tokens: list[str]
@@ -52,7 +52,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:# pylint: disable=useless-
 class AcknowledgeResult(_model_base.Model):
     """The result of the Acknowledge operation.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar failed_lock_tokens: Array of FailedLockToken for failed cloud events. Each
      FailedLockToken includes the lock token along with the related error information (namely, the
@@ -92,7 +92,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:# pylint: disable=useless-
 class BrokerProperties(_model_base.Model):
     """Properties of the Event Broker operation.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar lock_token: The token of the lock on the event. Required.
     :vartype lock_token: str
@@ -111,7 +111,7 @@ class CloudEvent(_model_base.Model):
     """Properties of an event published to an Azure Messaging EventGrid Namespace topic using the
     CloudEvent 1.0 Schema.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar id: An identifier for the event. The combination of id and source must be unique for each
      distinct event. Required.
@@ -167,7 +167,7 @@ class CloudEvent(_model_base.Model):
 class Error(_model_base.Model):
     """The error object.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar code: One of a server-defined set of error codes. Required.
     :vartype code: str
@@ -219,7 +219,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:# pylint: disable=useless-
 class FailedLockToken(_model_base.Model):
     """Failed LockToken information.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar lock_token: The lock token of an entry in the request. Required.
     :vartype lock_token: str
@@ -300,7 +300,7 @@ class PublishResult(_model_base.Model):
 class ReceiveDetails(_model_base.Model):
     """Receive operation details per Cloud Event.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar broker_properties: The Event Broker details. Required.
     :vartype broker_properties: ~azure.eventgrid.models.BrokerProperties
@@ -318,7 +318,7 @@ class ReceiveDetails(_model_base.Model):
 class ReceiveResult(_model_base.Model):
     """Details of the Receive operation response.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar value: Array of receive responses, one per cloud event. Required.
     :vartype value: list[~azure.eventgrid.models.ReceiveDetails]
@@ -332,7 +332,7 @@ class ReceiveResult(_model_base.Model):
 class RejectOptions(_model_base.Model):
     """Array of lock tokens for the corresponding received Cloud Events to be rejected.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar lock_tokens: Array of lock tokens. Required.
     :vartype lock_tokens: list[str]
@@ -363,7 +363,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:# pylint: disable=useless-
 class RejectResult(_model_base.Model):
     """The result of the Reject operation.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar failed_lock_tokens: Array of FailedLockToken for failed cloud events. Each
      FailedLockToken includes the lock token along with the related error information (namely, the
@@ -403,7 +403,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:# pylint: disable=useless-
 class ReleaseOptions(_model_base.Model):
     """Array of lock tokens for the corresponding received Cloud Events to be released.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar lock_tokens: Array of lock tokens. Required.
     :vartype lock_tokens: list[str]
@@ -434,7 +434,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:# pylint: disable=useless-
 class ReleaseResult(_model_base.Model):
     """The result of the Release operation.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar failed_lock_tokens: Array of FailedLockToken for failed cloud events. Each
      FailedLockToken includes the lock token along with the related error information (namely, the
@@ -474,7 +474,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:# pylint: disable=useless-
 class RenewCloudEventLocksResult(_model_base.Model):
     """The result of the RenewLock operation.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar failed_lock_tokens: Array of FailedLockToken for failed cloud events. Each
      FailedLockToken includes the lock token along with the related error information (namely, the
@@ -513,7 +513,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:# pylint: disable=useless-
 class RenewLockOptions(_model_base.Model):
     """Array of lock tokens for the corresponding received Cloud Events to be renewed.
 
-    All required parameters must be populated in order to send to Azure.
+    All required parameters must be populated in order to send to server.
 
     :ivar lock_tokens: Array of lock tokens. Required.
     :vartype lock_tokens: list[str]

sdk/eventgrid/azure-eventgrid/tsp-location.yaml

@@ -1,4 +1,4 @@
 cleanup: false
-commit: 2515d74715a277aa566249d12b9a2f2d5a20ab11
+commit: 116c17a841a9b37a3fce426558099b5ad5fe16de
 directory: specification/eventgrid/Azure.Messaging.EventGrid
 repo: Azure/azure-rest-api-specs