[fern-replay] Resolved conflicts

Patches replayed:
  - patch-4894603d: chore: Restore custom wiring in management/__init__.py
  - patch-7271f157: Revert wrapper file to preserve Auth0 telemetry customizations
  - patch-c04f0b4d: Fix for incorrect return type and missing __all__ type
  - patch-95211006: Restore Auth0 telemetry and custom client wiring after regeneration
  - patch-f7384913: Remove duplicate FedCmLoginGooglePatch and FedCmLoginPatch entries
  - patch-1e44613d: Added migration guide for v5 to v6
  - patch-30b1089a: Updated UPGRADING.md doc
  - patch-d6d69aeb: Remove duplicate FedCmLoginGooglePatch and FedCmLoginPatch entries

Author: developerkunal

.fern/replay.lock

@@ -8856,7 +8856,7 @@ patches:
             "verifiable_credentials",
         ]
     user_owned: true
-    status: unresolved
+    status: resolving
   - id: patch-7271f157
     content_hash: sha256:cd98dd1948587cf3396a2eacf46626176784bd00996eb660374161bfef686e93
     original_commit: 7271f15759cfb545c9ef82b5a4f519ffe0a89db2
@@ -9037,7 +9037,7 @@ patches:
                     token = await self._async_token()
                     headers["Authorization"] = f"Bearer {token}"
                 return headers
-    status: unresolved
+    status: resolving
   - id: patch-c04f0b4d
     content_hash: sha256:b56317f901bea2a9448227a5dcc0bbd6878bc3f01e31ba601803c3ab93c573ef
     original_commit: c04f0b4dbbe8f2300f4f1bf42f62350888a92da5
@@ -30892,7 +30892,7 @@ patches:
                     headers["Authorization"] = f"Bearer {token}"
                 return headers
     user_owned: true
-    status: unresolved
+    status: resolving
   - id: patch-f7384913
     content_hash: sha256:b56317f901bea2a9448227a5dcc0bbd6878bc3f01e31ba601803c3ab93c573ef
     original_commit: f7384913ab0a14df83dbc602d2b694e2cb7b7668

src/auth0/management/__init__.py

@@ -2514,8 +2514,6 @@
         FedCmLoginGoogle,
         FedCmLoginGooglePatch,
         FedCmLoginPatch,
-        FedCmLoginGooglePatch,
-        FedCmLoginPatch,
         FlowAction,
         FlowActionActivecampaign,
         FlowActionActivecampaignListContacts,
@@ -3935,8 +3933,6 @@
     from .management_client import AsyncManagementClient, CustomDomainHeader, ManagementClient
     from .token_provider import AsyncTokenProvider, TokenProvider
     from .version import __version__
-    from .management_client import AsyncManagementClient, CustomDomainHeader, ManagementClient
-    from .token_provider import AsyncTokenProvider, TokenProvider
 _dynamic_imports: typing.Dict[str, str] = {
     "Action": ".types",
     "ActionBase": ".types",
@@ -5027,7 +5023,6 @@
     "CspReportingEndpoints": ".types",
     "CspReportingInfrastructure": ".types",
     "CustomDomain": ".types",
-    "CustomDomainHeader": ".management_client",
     "CustomDomainCustomClientIpHeader": ".types",
     "CustomDomainCustomClientIpHeaderEnum": ".types",
     "CustomDomainHeader": ".management_client",
@@ -6458,8 +6453,6 @@
     "FedCmLoginGoogle": ".types",
     "FedCmLoginGooglePatch": ".types",
     "FedCmLoginPatch": ".types",
-    "FedCmLoginGooglePatch": ".types",
-    "FedCmLoginPatch": ".types",
     "FlowAction": ".types",
     "FlowActionActivecampaign": ".types",
     "FlowActionActivecampaignListContacts": ".types",
@@ -8981,7 +8974,6 @@ def __dir__():
     "CspReportingEndpoints",
     "CspReportingInfrastructure",
     "CustomDomain",
-    "CustomDomainHeader",
     "CustomDomainCustomClientIpHeader",
     "CustomDomainCustomClientIpHeaderEnum",
     "CustomDomainHeader",
@@ -10412,8 +10404,6 @@ def __dir__():
     "FedCmLoginGoogle",
     "FedCmLoginGooglePatch",
     "FedCmLoginPatch",
-    "FedCmLoginGooglePatch",
-    "FedCmLoginPatch",
     "FlowAction",
     "FlowActionActivecampaign",
     "FlowActionActivecampaignListContacts",

src/auth0/management/core/client_wrapper.py

@@ -35,7 +35,18 @@ def __init__(
         self._logging = logging
 
     def get_headers(self) -> typing.Dict[str, str]:
+        py_version = platform.python_version()
+        version = sys.modules["auth0"].__version__
+
+        auth0_client = dumps({
+            "name": "auth0-python",
+            "version": version,
+            "env": {"python": py_version}
+        }).encode("utf-8")
+
         headers: typing.Dict[str, str] = {
+            "User-Agent": f"Python/{py_version}",
+            "Auth0-Client": base64.b64encode(auth0_client).decode(),
             **(self.get_custom_headers() or {}),
         }
         headers["Authorization"] = f"Bearer {self._get_token()}"