diff --git a/sdk/eventgrid/azure-eventgrid/CHANGELOG.md b/sdk/eventgrid/azure-eventgrid/CHANGELOG.md
index 2e65032ffaa0..5fef29e01795 100644
--- a/sdk/eventgrid/azure-eventgrid/CHANGELOG.md
+++ b/sdk/eventgrid/azure-eventgrid/CHANGELOG.md
@@ -1,11 +1,11 @@
 # Release History
 
-## 4.20.0 (Unreleased)
+## 4.20.0 (2024-06-11)
 
 ### Features Added
-### Breaking Changes
-### Bugs Fixed
-### Other Changes
+
+- This is a GA of the `EventGridConsumerClient`, the `EventGridConsumerClient` supports the following operations for Cloud Events in Event Grid Namespace: `receive`, `release`, `acknowledge`, `reject` and `renew_locks`.
+- The `EventGridPublisherClient` now supports the Event Grid Namespace tier. Initialize the client with the namespace endpoint, and the `namespace_topic` kwarg to send Cloud Events to an Event Grid Namespace topic.
 
 ## 4.20.0b2 (2024-04-25)
 
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/_helpers.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/_helpers.py
index c0623fe16b58..467466f6d9aa 100644
--- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/_helpers.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/_helpers.py
@@ -48,7 +48,7 @@ def generate_sas(
 
     .. admonition:: Example:
 
-        .. literalinclude:: ../samples/sync_samples/sample_generate_sas.py
+        .. literalinclude:: ../samples/basic/sync_samples/sample_generate_sas.py
             :start-after: [START generate_sas]
             :end-before: [END generate_sas]
             :language: python
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/_publisher_client.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/_publisher_client.py
index faba67dcbb52..f329e05ddded 100644
--- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/_publisher_client.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/_publisher_client.py
@@ -87,14 +87,14 @@ class EventGridPublisherClient(object):  # pylint: disable=client-accepts-api-ve
 
     .. admonition:: Example:
 
-        .. literalinclude:: ../samples/sync_samples/sample_authentication.py
+        .. literalinclude:: ../samples/basic/sync_samples/sample_authentication.py
             :start-after: [START client_auth_with_key_cred]
             :end-before: [END client_auth_with_key_cred]
             :language: python
             :dedent: 0
             :caption: Creating the EventGridPublisherClient with an endpoint and AzureKeyCredential.
 
-        .. literalinclude:: ../samples/sync_samples/sample_authentication.py
+        .. literalinclude:: ../samples/basic/sync_samples/sample_authentication.py
             :start-after: [START client_auth_with_sas_cred]
             :end-before: [END client_auth_with_sas_cred]
             :language: python
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/aio/_publisher_client_async.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/aio/_publisher_client_async.py
index de3cbd309291..ad718665ac01 100644
--- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/aio/_publisher_client_async.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_legacy/aio/_publisher_client_async.py
@@ -81,14 +81,14 @@ class EventGridPublisherClient:  # pylint: disable=client-accepts-api-version-ke
 
     .. admonition:: Example:
 
-        .. literalinclude:: ../samples/async_samples/sample_authentication_async.py
+        .. literalinclude:: ../samples/basic/async_samples/sample_authentication_async.py
             :start-after: [START client_auth_with_key_cred_async]
             :end-before: [END client_auth_with_key_cred_async]
             :language: python
             :dedent: 0
             :caption: Creating the EventGridPublisherClient with an endpoint and AzureKeyCredential.
 
-        .. literalinclude:: ../samples/async_samples/sample_authentication_async.py
+        .. literalinclude:: ../samples/basic/async_samples/sample_authentication_async.py
             :start-after: [START client_auth_with_sas_cred_async]
             :end-before: [END client_auth_with_sas_cred_async]
             :language: python
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py
index f85459747e8b..166c23e99d12 100644
--- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py
@@ -130,13 +130,11 @@ def send(
 
     def _http_response_error_handler(self, exception):
         if isinstance(exception, HttpResponseError):
-            if exception.status_code == 400:
-                raise HttpResponseError("Invalid event data. Please check the data and try again.") from exception
             if exception.status_code == 404:
                 raise ResourceNotFoundError(
                     "Resource not found. "
                     "For Event Grid Namespaces, please specify the namespace_topic name on the client. "
-                     "For Event Grid Basic, do not specify the namespace_topic name."
+                    "For Event Grid Basic, do not specify the namespace_topic name."
                 ) from exception
             raise exception
 
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_patch.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_patch.py
index 945d3e4d29b4..e8ca551d09f9 100644
--- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_patch.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_patch.py
@@ -37,7 +37,7 @@ class EventGridPublisherClient(InternalEventGridPublisherClient):
     If dictionaries are provided and sending to a namespace topic,
     the dictionary must follow the CloudEvent schema.
 
-    :param endpoint: The host name of the namespace, e.g.
+    :param endpoint: The endpoint of the Event Grid tier (basic or namespace), e.g.
      namespaceName1.westus-1.eventgrid.azure.net. Required.
     :type endpoint: str
     :param credential: Credential used to authenticate requests to the service. Is either a
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_patch.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_patch.py
index e39c0a97ce27..cf4bcf026e85 100644
--- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_patch.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_patch.py
@@ -114,8 +114,6 @@ async def send(
 
     def _http_response_error_handler(self, exception):
         if isinstance(exception, HttpResponseError):
-            if exception.status_code == 400:
-                raise HttpResponseError("Invalid event data. Please check the data and try again.") from exception
             if exception.status_code == 404:
                 raise ResourceNotFoundError(
                     "Resource not found. "
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_patch.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_patch.py
index 64bf0555f705..48d1d0153d57 100644
--- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_patch.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_patch.py
@@ -97,7 +97,7 @@ class EventGridConsumerClient(InternalEventGridConsumerClient):
     Consumes and manages events from a namespace topic
     and event subscription specified during the client initialization.
 
-    :param endpoint: The host name of the namespace, e.g.
+    :param endpoint: The endpoint of the Event Grid tier (basic or namespace), e.g.
      namespaceName1.westus-1.eventgrid.azure.net. Required.
     :type endpoint: str
     :param credential: Credential used to authenticate requests to the service. Is either a
diff --git a/sdk/eventgrid/azure-eventgrid/pyproject.toml b/sdk/eventgrid/azure-eventgrid/pyproject.toml
index ab509fcf3611..68d040239901 100644
--- a/sdk/eventgrid/azure-eventgrid/pyproject.toml
+++ b/sdk/eventgrid/azure-eventgrid/pyproject.toml
@@ -1,3 +1,4 @@
 [tool.azure-sdk-build]
 pyright = false
-verifytypes = false
\ No newline at end of file
+verifytypes = false
+strict_sphinx = true
\ No newline at end of file
diff --git a/sdk/eventgrid/azure-eventgrid/samples/basic/async_samples/sample_publish_cloud_event_using_dict_async.py b/sdk/eventgrid/azure-eventgrid/samples/basic/async_samples/sample_publish_cloud_event_using_dict_async.py
index 6541a4ca0323..2d52d720ac3c 100644
--- a/sdk/eventgrid/azure-eventgrid/samples/basic/async_samples/sample_publish_cloud_event_using_dict_async.py
+++ b/sdk/eventgrid/azure-eventgrid/samples/basic/async_samples/sample_publish_cloud_event_using_dict_async.py
@@ -45,5 +45,6 @@ async def publish():
         )
     # [END publish_cloud_event_dict_async]
 
+
 if __name__ == "__main__":
     asyncio.run(publish())
diff --git a/sdk/eventgrid/azure-eventgrid/samples/basic/async_samples/sample_publish_cncf_cloud_events_async.py b/sdk/eventgrid/azure-eventgrid/samples/basic/async_samples/sample_publish_cncf_cloud_events_async.py
index 446206227607..1bcd2a92e0c4 100644
--- a/sdk/eventgrid/azure-eventgrid/samples/basic/async_samples/sample_publish_cncf_cloud_events_async.py
+++ b/sdk/eventgrid/azure-eventgrid/samples/basic/async_samples/sample_publish_cncf_cloud_events_async.py
@@ -37,5 +37,6 @@ async def publish():
         ]
     )
 
+
 if __name__ == "__main__":
     asyncio.run(publish())
diff --git a/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_namespace_authentication_async.py b/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_namespace_authentication_async.py
index cf5aadaaeeae..d003ce5970f3 100644
--- a/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_namespace_authentication_async.py
+++ b/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_namespace_authentication_async.py
@@ -27,7 +27,9 @@
 
 credential_key = AzureKeyCredential(topic_key)
 publisher_client = EventGridPublisherClient(endpoint, credential_key, namespace_topic=topic_name)
-consumer_client = EventGridConsumerClient(endpoint, credential_key, namespace_topic=topic_name, subscription=event_subscription_name)
+consumer_client = EventGridConsumerClient(
+    endpoint, credential_key, namespace_topic=topic_name, subscription=event_subscription_name
+)
 
 
 from azure.identity.aio import DefaultAzureCredential
@@ -36,4 +38,6 @@
 default_az_credential = DefaultAzureCredential()
 endpoint = os.environ["EVENTGRID_TOPIC_ENDPOINT"]
 publisher_client = EventGridPublisherClient(endpoint, default_az_credential, namespace_topic=topic_name)
-consumer_client = EventGridConsumerClient(endpoint, default_az_credential, namespace_topic=topic_name, subscription=event_subscription_name)
+consumer_client = EventGridConsumerClient(
+    endpoint, default_az_credential, namespace_topic=topic_name, subscription=event_subscription_name
+)
diff --git a/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_publish_cloud_event_async.py b/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_publish_cloud_event_async.py
index 8c512a36baee..bcb88e75a8a4 100644
--- a/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_publish_cloud_event_async.py
+++ b/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_publish_cloud_event_async.py
@@ -21,13 +21,14 @@
 from azure.eventgrid.aio import EventGridPublisherClient
 from azure.core.credentials import AzureKeyCredential
 
-topic_key = os.environ["EVENTGRIDKEY"]
+topic_key = os.environ["EVENTGRID_KEY"]
 endpoint = os.environ["EVENTGRID_ENDPOINT"]
 topic_name = os.environ["EVENTGRID_TOPIC_NAME"]
 
 credential = AzureKeyCredential(topic_key)
 client = EventGridPublisherClient(endpoint, credential, namespace_topic=topic_name)
 
+
 async def publish():
     client.send(
         [
@@ -42,5 +43,6 @@ async def publish():
         ]
     )
 
-if __name__ == '__main__':
-    asyncio.run(publish())
\ No newline at end of file
+
+if __name__ == "__main__":
+    asyncio.run(publish())
diff --git a/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_publish_cncf_events_async.py b/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_publish_cncf_events_async.py
index 862bbf052cdf..410d90eead20 100644
--- a/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_publish_cncf_events_async.py
+++ b/sdk/eventgrid/azure-eventgrid/samples/namespace/async_samples/sample_publish_cncf_events_async.py
@@ -28,6 +28,7 @@
 credential = AzureKeyCredential(topic_key)
 client = EventGridPublisherClient(endpoint, credential, namespace_topic=topic_name)
 
+
 async def publish():
     await client.send(
         [
@@ -38,5 +39,6 @@ async def publish():
         ]
     )
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     asyncio.run(publish())
diff --git a/sdk/eventgrid/azure-eventgrid/samples/namespace/sync_samples/sample_namespace_authentication.py b/sdk/eventgrid/azure-eventgrid/samples/namespace/sync_samples/sample_namespace_authentication.py
index ef73807b878f..6657e82647bc 100644
--- a/sdk/eventgrid/azure-eventgrid/samples/namespace/sync_samples/sample_namespace_authentication.py
+++ b/sdk/eventgrid/azure-eventgrid/samples/namespace/sync_samples/sample_namespace_authentication.py
@@ -27,7 +27,9 @@
 
 credential_key = AzureKeyCredential(topic_key)
 publisher_client = EventGridPublisherClient(endpoint, credential_key, namespace_topic=topic_name)
-consumer_client = EventGridConsumerClient(endpoint, credential_key, namespace_topic=topic_name, subscription=event_subscription_name)
+consumer_client = EventGridConsumerClient(
+    endpoint, credential_key, namespace_topic=topic_name, subscription=event_subscription_name
+)
 
 
 from azure.identity import DefaultAzureCredential
@@ -36,4 +38,6 @@
 default_az_credential = DefaultAzureCredential()
 endpoint = os.environ["EVENTGRID_TOPIC_ENDPOINT"]
 publisher_client = EventGridPublisherClient(endpoint, default_az_credential, namespace_topic=topic_name)
-consumer_client = EventGridConsumerClient(endpoint, default_az_credential, namespace_topic=topic_name, subscription=event_subscription_name)
+consumer_client = EventGridConsumerClient(
+    endpoint, default_az_credential, namespace_topic=topic_name, subscription=event_subscription_name
+)
diff --git a/sdk/eventgrid/azure-eventgrid/samples/namespace/sync_samples/sample_publish_cloud_event.py b/sdk/eventgrid/azure-eventgrid/samples/namespace/sync_samples/sample_publish_cloud_event.py
index e39e1b94c366..029abe027e60 100644
--- a/sdk/eventgrid/azure-eventgrid/samples/namespace/sync_samples/sample_publish_cloud_event.py
+++ b/sdk/eventgrid/azure-eventgrid/samples/namespace/sync_samples/sample_publish_cloud_event.py
@@ -20,7 +20,7 @@
 from azure.eventgrid import EventGridPublisherClient
 from azure.core.credentials import AzureKeyCredential
 
-topic_key = os.environ["EVENTGRIDKEY"]
+topic_key = os.environ["EVENTGRID_KEY"]
 endpoint = os.environ["EVENTGRID_ENDPOINT"]
 topic_name = os.environ["EVENTGRID_TOPIC_NAME"]
 
diff --git a/sdk/eventgrid/azure-eventgrid/setup.py b/sdk/eventgrid/azure-eventgrid/setup.py
index ee29cfadd35d..b88a566aff72 100644
--- a/sdk/eventgrid/azure-eventgrid/setup.py
+++ b/sdk/eventgrid/azure-eventgrid/setup.py
@@ -38,7 +38,7 @@
     url="https://github.com/Azure/azure-sdk-for-python/tree/main/sdk",
     keywords="azure, azure sdk",
     classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3",
diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_dual_client_async.py b/sdk/eventgrid/azure-eventgrid/tests/test_dual_client_async.py
index c5afcf85c2bd..47d3c66f234f 100644
--- a/sdk/eventgrid/azure-eventgrid/tests/test_dual_client_async.py
+++ b/sdk/eventgrid/azure-eventgrid/tests/test_dual_client_async.py
@@ -41,7 +41,6 @@ def create_eg_consumer_client(self, endpoint, topic=None, subscription=None):
             subscription=subscription,
         )
         return client
-    
 
     @pytest.mark.live_test_only
     @EventGridPreparer()
@@ -52,7 +51,7 @@ async def test_eg_dual_client_send_eventgrid_event(self, **kwargs):
         event_endpoint = kwargs["eventgrid_topic_endpoint"]
         namespace_client = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
         basic_client = self.create_eg_publisher_client(event_endpoint)
-        
+
         event = {
             "id": uuid.uuid4(),
             "data": {
@@ -68,7 +67,7 @@ async def test_eg_dual_client_send_eventgrid_event(self, **kwargs):
         await basic_client.send(event)
 
         with pytest.raises(TypeError):
-           await namespace_client.send(event)
+            await namespace_client.send(event)
 
     @pytest.mark.live_test_only
     @EventGridPreparer()
@@ -79,7 +78,7 @@ async def test_eg_dual_client_send_custom_event(self, **kwargs):
         custom_event_endpoint = kwargs["eventgrid_custom_event_topic_endpoint"]
         namespace_client = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
         basic_client = self.create_eg_publisher_client(custom_event_endpoint)
-        
+
         custom_event = {
             "customSubject": "sample",
             "customEventType": "sample.event",
@@ -104,7 +103,7 @@ async def test_eg_dual_client_send_channel_name(self, **kwargs):
         channel_name = kwargs["eventgrid_partner_channel_name"]
         namespace_client = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
         basic_client = self.create_eg_publisher_client(cloud_event_endpoint)
-        
+
         cloud_event = CloudEvent(
             source="http://samplesource.dev",
             data={"sample": "cloudevent"},
@@ -124,11 +123,12 @@ async def test_eg_dual_client_consumer(self, **kwargs):
         eventgrid_topic_name = kwargs["eventgrid_topic_name"]
         eventgrid_subscription = kwargs["eventgrid_event_subscription_name"]
         cloud_event_endpoint = kwargs["eventgrid_cloud_event_topic_endpoint"]
-        namespace_client = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_subscription)
-        
+        namespace_client = self.create_eg_consumer_client(
+            eventgrid_endpoint, eventgrid_topic_name, eventgrid_subscription
+        )
 
         await namespace_client.receive()
 
         with pytest.raises(ValueError):
             basic_client = self.create_eg_consumer_client(cloud_event_endpoint)
-            await basic_client.receive()
\ No newline at end of file
+            await basic_client.receive()
diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer_client.py
index 07798d0b8b35..b7f4fb947fb4 100644
--- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer_client.py
+++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer_client.py
@@ -49,7 +49,9 @@ def test_receive_data(self, **kwargs):
         eventgrid_topic_name = kwargs["eventgrid_topic_name"]
         eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
         publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
-        consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
+        consumer = self.create_eg_consumer_client(
+            eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name
+        )
         cloud_event = CloudEvent(
             source="http://samplesource.dev",
             data={"sample": "cloudevent"},
@@ -72,7 +74,9 @@ def test_receive_renew_data(self, **kwargs):
         eventgrid_topic_name = kwargs["eventgrid_topic_name"]
         eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
         publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
-        consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
+        consumer = self.create_eg_consumer_client(
+            eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name
+        )
 
         cloud_event = CloudEvent(
             source="http://samplesource.dev",
@@ -97,7 +101,9 @@ def test_receive_release_data(self, **kwargs):
         eventgrid_topic_name = kwargs["eventgrid_topic_name"]
         eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
         publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
-        consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
+        consumer = self.create_eg_consumer_client(
+            eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name
+        )
 
         cloud_event = CloudEvent(
             source="http://samplesource.dev",
@@ -121,7 +127,9 @@ def test_receive_reject_data(self, **kwargs):
         eventgrid_topic_name = kwargs["eventgrid_topic_name"]
         eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
         publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
-        consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
+        consumer = self.create_eg_consumer_client(
+            eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name
+        )
 
         cloud_event = CloudEvent(
             source="http://samplesource.dev",
diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer_client_async.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer_client_async.py
index 22bbc3461734..b569d41ae9d0 100644
--- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer_client_async.py
+++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_consumer_client_async.py
@@ -50,7 +50,9 @@ async def test_receive_data(self, **kwargs):
         eventgrid_topic_name = kwargs["eventgrid_topic_name"]
         eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
         publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
-        consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
+        consumer = self.create_eg_consumer_client(
+            eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name
+        )
         cloud_event = CloudEvent(
             source="http://samplesource.dev",
             data={"sample": "cloudevent"},
@@ -74,7 +76,9 @@ async def test_receive_renew_data(self, **kwargs):
         eventgrid_topic_name = kwargs["eventgrid_topic_name"]
         eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
         publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
-        consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
+        consumer = self.create_eg_consumer_client(
+            eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name
+        )
         cloud_event = CloudEvent(
             source="http://samplesource.dev",
             data={"sample": "cloudevent"},
@@ -99,7 +103,9 @@ async def test_receive_release_data(self, **kwargs):
         eventgrid_topic_name = kwargs["eventgrid_topic_name"]
         eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
         publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
-        consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
+        consumer = self.create_eg_consumer_client(
+            eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name
+        )
         cloud_event = CloudEvent(
             source="http://samplesource.dev",
             data={"sample": "cloudevent"},
@@ -123,7 +129,9 @@ async def test_receive_reject_data(self, **kwargs):
         eventgrid_topic_name = kwargs["eventgrid_topic_name"]
         eventgrid_event_subscription_name = kwargs["eventgrid_event_subscription_name"]
         publisher = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
-        consumer = self.create_eg_consumer_client(eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name)
+        consumer = self.create_eg_consumer_client(
+            eventgrid_endpoint, eventgrid_topic_name, eventgrid_event_subscription_name
+        )
         cloud_event = CloudEvent(
             source="http://samplesource.dev",
             data={"sample": "cloudevent"},
diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_dual_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_dual_client.py
index b6133ae18e6f..895609dc70d7 100644
--- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_dual_client.py
+++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_dual_client.py
@@ -40,7 +40,6 @@ def create_eg_consumer_client(self, endpoint, topic=None, subscription=None):
             subscription=subscription,
         )
         return client
-    
 
     @pytest.mark.live_test_only
     @EventGridPreparer()
@@ -50,7 +49,7 @@ def test_eg_dual_client_send_eventgrid_event(self, **kwargs):
         event_endpoint = kwargs["eventgrid_topic_endpoint"]
         namespace_client = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
         basic_client = self.create_eg_publisher_client(event_endpoint)
-        
+
         event = {
             "id": uuid.uuid4(),
             "data": {
@@ -76,7 +75,7 @@ def test_eg_dual_client_send_custom_event(self, **kwargs):
         custom_event_endpoint = kwargs["eventgrid_custom_event_topic_endpoint"]
         namespace_client = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
         basic_client = self.create_eg_publisher_client(custom_event_endpoint)
-        
+
         custom_event = {
             "customSubject": "sample",
             "customEventType": "sample.event",
@@ -100,7 +99,7 @@ def test_eg_dual_client_send_channel_name(self, **kwargs):
         channel_name = kwargs["eventgrid_partner_channel_name"]
         namespace_client = self.create_eg_publisher_client(eventgrid_endpoint, eventgrid_topic_name)
         basic_client = self.create_eg_publisher_client(cloud_event_endpoint)
-        
+
         cloud_event = CloudEvent(
             source="http://samplesource.dev",
             data={"sample": "cloudevent"},
@@ -125,4 +124,4 @@ def test_eg_dual_client_consumer(self, **kwargs):
 
         with pytest.raises(ValueError):
             basic_client = self.create_eg_consumer_client(cloud_event_endpoint)
-            basic_client.receive()
\ No newline at end of file
+            basic_client.receive()
diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py
index b3bdd2aad738..9bad81a797b4 100644
--- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py
+++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client.py
@@ -139,7 +139,6 @@ def test_send_event_grid_event_dict_data_dict(self, eventgrid_topic_endpoint):
         }
         client.send(eg_event)
 
-
     @pytest.mark.live_test_only
     @EventGridPreparer()
     def test_send_event_grid_namespace(self, **kwargs):
diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py
index 760e7e81e9d6..f611e3eb91fa 100644
--- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py
+++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_publisher_client_async.py
@@ -31,7 +31,9 @@
 class TestEventGridPublisherClient(AzureRecordedTestCase):
     def create_eg_publisher_client(self, endpoint, topic=None):
         credential = self.get_credential(EventGridPublisherClient, is_async=True)
-        client = self.create_client_from_credential(EventGridPublisherClient, credential=credential, endpoint=endpoint, namespace_topic=topic)
+        client = self.create_client_from_credential(
+            EventGridPublisherClient, credential=credential, endpoint=endpoint, namespace_topic=topic
+        )
         return client
 
     @EventGridPreparer()
diff --git a/sdk/eventgrid/azure-eventgrid/tsp-location.yaml b/sdk/eventgrid/azure-eventgrid/tsp-location.yaml
index b956ab4af3a0..54fc7682d014 100644
--- a/sdk/eventgrid/azure-eventgrid/tsp-location.yaml
+++ b/sdk/eventgrid/azure-eventgrid/tsp-location.yaml
@@ -1,4 +1,4 @@
 cleanup: false
-commit: 871324004185488ac0beddf5cab7165e7432f317
+commit: 25afa22a250c0ad5a28671003f961b9cd20d60f6
 directory: specification/eventgrid/Azure.Messaging.EventGrid
 repo: Azure/azure-rest-api-specs
\ No newline at end of file