Bump cadl ranch (#2546)

Azure · Apr 26, 2024 · 4d3d30c · 4d3d30c
1 parent fc6febb
commit 4d3d30c
Show file tree

Hide file tree

Showing 116 changed files with 4,732 additions and 188 deletions.
diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json
@@ -66,7 +66,7 @@
     "@azure-tools/typespec-azure-resource-manager": "~0.41.0",
     "@azure-tools/typespec-autorest": "~0.41.0",
     "@azure-tools/cadl-ranch-expect": "~0.13.3",
-    "@azure-tools/cadl-ranch-specs": "~0.32.0",
+    "@azure-tools/cadl-ranch-specs": "~0.33.0",
     "@types/js-yaml": "~4.0.5",
     "@types/mocha": "~10.0.1",
     "@types/node": "^18.16.3",

diff --git a/packages/typespec-python/tasks.py b/packages/typespec-python/tasks.py
@@ -59,6 +59,9 @@
     "type/model/empty": {
         "package-name": "typetest-model-empty",
     },
+    "type/model/flatten": {
+        "package-name": "typetest-model-flatten",
+    },
     "type/model/inheritance/enum-discriminator": {
         "package-name": "typetest-model-enumdiscriminator",
     },

diff --git a/...ages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/MANIFEST.in b/...ages/typespec-python/test/azure/generated/azure-client-generator-core-flatten/MANIFEST.in
diff --git a/...thon/test/azure/generated/azure-client-generator-core-flatten/apiview_mapping_python.json b/...thon/test/azure/generated/azure-client-generator-core-flatten/apiview_mapping_python.json
diff --git a/...erated/azure-client-generator-core-flatten/type/model/flatten/apiview_mapping_python.json b/...erated/azure-client-generator-core-flatten/type/model/flatten/apiview_mapping_python.json
diff --git a/...lient-generator-core-flatten/CHANGELOG.md → ...al-headers-client-request-id/CHANGELOG.md b/...lient-generator-core-flatten/CHANGELOG.md → ...al-headers-client-request-id/CHANGELOG.md
diff --git a/...ure-client-generator-core-flatten/LICENSE → ...special-headers-client-request-id/LICENSE b/...ure-client-generator-core-flatten/LICENSE → ...special-headers-client-request-id/LICENSE
diff --git a/.../typespec-python/test/azure/generated/azure-special-headers-client-request-id/MANIFEST.in b/.../typespec-python/test/azure/generated/azure-special-headers-client-request-id/MANIFEST.in
@@ -0,0 +1,7 @@
+include *.md
+include LICENSE
+include azure/specialheaders/xmsclientrequestid/py.typed
+recursive-include tests *.py
+recursive-include samples *.py *.md
+include azure/__init__.py
+include azure/specialheaders/__init__.py
diff --git a/...ecial-headers-client-request-id/README.md → ...ecial-headers-client-request-id/README.md b/...ecial-headers-client-request-id/README.md → ...ecial-headers-client-request-id/README.md
@@ -1,21 +1,21 @@
 
 
-# Specialheaders Clientrequestid client library for Python
+# Azure Specialheaders Xmsclientrequestid client library for Python
 <!-- write necessary description of service -->
 
 ## Getting started
 
 ### Install the package
 
 ```bash
-python -m pip install specialheaders-clientrequestid
+python -m pip install azure-specialheaders-xmsclientrequestid
 ```
 
 #### Prequisites
 
 - Python 3.8 or later is required to use this package.
 - You need an [Azure subscription][azure_sub] to use this package.
-- An existing Specialheaders Clientrequestid instance.
+- An existing Azure Specialheaders Xmsclientrequestid instance.
 
 ## Contributing
 

diff --git a/.../test/azure/generated/azure-special-headers-client-request-id/apiview_mapping_python.json b/.../test/azure/generated/azure-special-headers-client-request-id/apiview_mapping_python.json
@@ -0,0 +1,6 @@
+{
+    "CrossLanguagePackageId": "Azure.SpecialHeaders.XmsClientRequestId",
+    "CrossLanguageDefinitionId": {
+        "azure.specialheaders.xmsclientrequestid.XmsClientRequestIdClient.get": "get"
+    }
+}
diff --git a/...t-generator-core-flatten/type/__init__.py → ...aders-client-request-id/azure/__init__.py b/...t-generator-core-flatten/type/__init__.py → ...aders-client-request-id/azure/__init__.py
diff --git a/...rator-core-flatten/type/model/__init__.py → ...quest-id/azure/specialheaders/__init__.py b/...rator-core-flatten/type/model/__init__.py → ...quest-id/azure/specialheaders/__init__.py
diff --git a/...pecialheaders/clientrequestid/__init__.py → ...ialheaders/xmsclientrequestid/__init__.py b/...pecialheaders/clientrequestid/__init__.py → ...ialheaders/xmsclientrequestid/__init__.py
@@ -6,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._client import ClientRequestIdClient
+from ._client import XmsClientRequestIdClient
 from ._version import VERSION
 
 __version__ = VERSION
@@ -19,7 +19,7 @@
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
-    "ClientRequestIdClient",
+    "XmsClientRequestIdClient",
 ]
 __all__.extend([p for p in _patch_all if p not in __all__])
 

diff --git a/...specialheaders/clientrequestid/_client.py → ...cialheaders/xmsclientrequestid/_client.py b/...specialheaders/clientrequestid/_client.py → ...cialheaders/xmsclientrequestid/_client.py
@@ -13,12 +13,14 @@
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
 
-from ._configuration import ClientRequestIdClientConfiguration
-from ._operations import ClientRequestIdClientOperationsMixin
+from ._configuration import XmsClientRequestIdClientConfiguration
+from ._operations import XmsClientRequestIdClientOperationsMixin
 from ._serialization import Deserializer, Serializer
 
 
-class ClientRequestIdClient(ClientRequestIdClientOperationsMixin):  # pylint: disable=client-accepts-api-version-keyword
+class XmsClientRequestIdClient(
+    XmsClientRequestIdClientOperationsMixin
+):  # pylint: disable=client-accepts-api-version-keyword
     """Azure client request id header configurations.
 
     :keyword endpoint: Service host. Default value is "http://localhost:3000".
@@ -28,8 +30,7 @@ class ClientRequestIdClient(ClientRequestIdClientOperationsMixin):  # pylint: di
     def __init__(  # pylint: disable=missing-client-constructor-parameter-credential
         self, *, endpoint: str = "http://localhost:3000", **kwargs: Any
     ) -> None:
-        self._config = ClientRequestIdClientConfiguration(**kwargs)
-        kwargs["request_id_header_name"] = "client-request-id"
+        self._config = XmsClientRequestIdClientConfiguration(**kwargs)
         _policies = kwargs.pop("policies", None)
         if _policies is None:
             _policies = [
@@ -78,7 +79,7 @@ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "ClientRequestIdClient":
+    def __enter__(self) -> "XmsClientRequestIdClient":
         self._client.__enter__()
         return self
 

diff --git a/...headers/clientrequestid/_configuration.py → ...ders/xmsclientrequestid/_configuration.py b/...headers/clientrequestid/_configuration.py → ...ders/xmsclientrequestid/_configuration.py
@@ -13,16 +13,16 @@
 from ._version import VERSION
 
 
-class ClientRequestIdClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
-    """Configuration for ClientRequestIdClient.
+class XmsClientRequestIdClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+    """Configuration for XmsClientRequestIdClient.
 
     Note that all parameters used to create this instance are saved as instance
     attributes.
     """
 
     def __init__(self, **kwargs: Any) -> None:
 
-        kwargs.setdefault("sdk_moniker", "specialheaders-clientrequestid/{}".format(VERSION))
+        kwargs.setdefault("sdk_moniker", "specialheaders-xmsclientrequestid/{}".format(VERSION))
         self.polling_interval = kwargs.get("polling_interval", 30)
         self._configure(**kwargs)
 

diff --git a/...flatten/type/model/flatten/_model_base.py → ...headers/xmsclientrequestid/_model_base.py b/...flatten/type/model/flatten/_model_base.py → ...headers/xmsclientrequestid/_model_base.py
diff --git a/...ientrequestid/aio/_operations/__init__.py → ...msclientrequestid/_operations/__init__.py b/...ientrequestid/aio/_operations/__init__.py → ...msclientrequestid/_operations/__init__.py
@@ -6,14 +6,14 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._operations import ClientRequestIdClientOperationsMixin
+from ._operations import XmsClientRequestIdClientOperationsMixin
 
 from ._patch import __all__ as _patch_all
 from ._patch import *  # pylint: disable=unused-wildcard-import
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
-    "ClientRequestIdClientOperationsMixin",
+    "XmsClientRequestIdClientOperationsMixin",
 ]
 __all__.extend([p for p in _patch_all if p not in __all__])
 _patch_sdk()
diff --git a/...lientrequestid/_operations/_operations.py → ...lientrequestid/_operations/_operations.py b/...lientrequestid/_operations/_operations.py → ...lientrequestid/_operations/_operations.py
@@ -23,7 +23,7 @@
 from azure.core.utils import case_insensitive_dict
 
 from .._serialization import Serializer
-from .._vendor import ClientRequestIdClientMixinABC
+from .._vendor import XmsClientRequestIdClientMixinABC
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
@@ -36,22 +36,22 @@
 _SERIALIZER.client_side_validation = False
 
 
-def build_client_request_id_get_request(**kwargs: Any) -> HttpRequest:
+def build_xms_client_request_id_get_request(**kwargs: Any) -> HttpRequest:
     _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
 
     # Construct URL
-    _url = "/special-headers/client-request-id"
+    _url = "/azure/special-headers/x-ms-client-request-id"
 
     # Construct headers
 
     return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs)
 
 
-class ClientRequestIdClientOperationsMixin(ClientRequestIdClientMixinABC):
+class XmsClientRequestIdClientOperationsMixin(XmsClientRequestIdClientMixinABC):
 
     @distributed_trace
     def get(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-return-statements
-        """Get operation with azure client request id header.
+        """Get operation with azure ``x-ms-client-request-id`` header.
 
         :return: None
         :rtype: None
@@ -70,7 +70,7 @@ def get(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-return-sta
 
         cls: ClsType[None] = kwargs.pop("cls", None)
 
-        _request = build_client_request_id_get_request(
+        _request = build_xms_client_request_id_get_request(
             headers=_headers,
             params=_params,
         )

diff --git a/.../type/model/flatten/_operations/_patch.py → .../xmsclientrequestid/_operations/_patch.py b/.../type/model/flatten/_operations/_patch.py → .../xmsclientrequestid/_operations/_patch.py
diff --git a/...core-flatten/type/model/flatten/_patch.py → ...ecialheaders/xmsclientrequestid/_patch.py b/...core-flatten/type/model/flatten/_patch.py → ...ecialheaders/xmsclientrequestid/_patch.py
diff --git a/...tten/type/model/flatten/_serialization.py → ...ders/xmsclientrequestid/_serialization.py b/...tten/type/model/flatten/_serialization.py → ...ders/xmsclientrequestid/_serialization.py
diff --git a/...specialheaders/clientrequestid/_vendor.py → ...cialheaders/xmsclientrequestid/_vendor.py b/...specialheaders/clientrequestid/_vendor.py → ...cialheaders/xmsclientrequestid/_vendor.py
@@ -8,7 +8,7 @@
 from abc import ABC
 from typing import TYPE_CHECKING
 
-from ._configuration import ClientRequestIdClientConfiguration
+from ._configuration import XmsClientRequestIdClientConfiguration
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
@@ -17,10 +17,10 @@
     from ._serialization import Deserializer, Serializer
 
 
-class ClientRequestIdClientMixinABC(ABC):
+class XmsClientRequestIdClientMixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 
     _client: "PipelineClient"
-    _config: ClientRequestIdClientConfiguration
+    _config: XmsClientRequestIdClientConfiguration
     _serialize: "Serializer"
     _deserialize: "Deserializer"
diff --git a/...re-flatten/type/model/flatten/_version.py → ...ialheaders/xmsclientrequestid/_version.py b/...re-flatten/type/model/flatten/_version.py → ...ialheaders/xmsclientrequestid/_version.py
diff --git a/...alheaders/clientrequestid/aio/__init__.py → ...eaders/xmsclientrequestid/aio/__init__.py b/...alheaders/clientrequestid/aio/__init__.py → ...eaders/xmsclientrequestid/aio/__init__.py
@@ -6,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._client import ClientRequestIdClient
+from ._client import XmsClientRequestIdClient
 
 try:
     from ._patch import __all__ as _patch_all
@@ -16,7 +16,7 @@
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
-    "ClientRequestIdClient",
+    "XmsClientRequestIdClient",
 ]
 __all__.extend([p for p in _patch_all if p not in __all__])
 

diff --git a/...ialheaders/clientrequestid/aio/_client.py → ...headers/xmsclientrequestid/aio/_client.py b/...ialheaders/clientrequestid/aio/_client.py → ...headers/xmsclientrequestid/aio/_client.py
@@ -14,11 +14,13 @@
 from azure.core.rest import AsyncHttpResponse, HttpRequest
 
 from .._serialization import Deserializer, Serializer
-from ._configuration import ClientRequestIdClientConfiguration
-from ._operations import ClientRequestIdClientOperationsMixin
+from ._configuration import XmsClientRequestIdClientConfiguration
+from ._operations import XmsClientRequestIdClientOperationsMixin
 
 
-class ClientRequestIdClient(ClientRequestIdClientOperationsMixin):  # pylint: disable=client-accepts-api-version-keyword
+class XmsClientRequestIdClient(
+    XmsClientRequestIdClientOperationsMixin
+):  # pylint: disable=client-accepts-api-version-keyword
     """Azure client request id header configurations.
 
     :keyword endpoint: Service host. Default value is "http://localhost:3000".
@@ -28,8 +30,7 @@ class ClientRequestIdClient(ClientRequestIdClientOperationsMixin):  # pylint: di
     def __init__(  # pylint: disable=missing-client-constructor-parameter-credential
         self, *, endpoint: str = "http://localhost:3000", **kwargs: Any
     ) -> None:
-        self._config = ClientRequestIdClientConfiguration(**kwargs)
-        kwargs["request_id_header_name"] = "client-request-id"
+        self._config = XmsClientRequestIdClientConfiguration(**kwargs)
         _policies = kwargs.pop("policies", None)
         if _policies is None:
             _policies = [
@@ -80,7 +81,7 @@ def send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "ClientRequestIdClient":
+    async def __aenter__(self) -> "XmsClientRequestIdClient":
         await self._client.__aenter__()
         return self
 

diff --git a/...ers/clientrequestid/aio/_configuration.py → .../xmsclientrequestid/aio/_configuration.py b/...ers/clientrequestid/aio/_configuration.py → .../xmsclientrequestid/aio/_configuration.py
@@ -13,16 +13,16 @@
 from .._version import VERSION
 
 
-class ClientRequestIdClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
-    """Configuration for ClientRequestIdClient.
+class XmsClientRequestIdClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+    """Configuration for XmsClientRequestIdClient.
 
     Note that all parameters used to create this instance are saved as instance
     attributes.
     """
 
     def __init__(self, **kwargs: Any) -> None:
 
-        kwargs.setdefault("sdk_moniker", "specialheaders-clientrequestid/{}".format(VERSION))
+        kwargs.setdefault("sdk_moniker", "specialheaders-xmsclientrequestid/{}".format(VERSION))
         self.polling_interval = kwargs.get("polling_interval", 30)
         self._configure(**kwargs)
 

diff --git a/...s/clientrequestid/_operations/__init__.py → ...ientrequestid/aio/_operations/__init__.py b/...s/clientrequestid/_operations/__init__.py → ...ientrequestid/aio/_operations/__init__.py
@@ -6,14 +6,14 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._operations import ClientRequestIdClientOperationsMixin
+from ._operations import XmsClientRequestIdClientOperationsMixin
 
 from ._patch import __all__ as _patch_all
 from ._patch import *  # pylint: disable=unused-wildcard-import
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
-    "ClientRequestIdClientOperationsMixin",
+    "XmsClientRequestIdClientOperationsMixin",
 ]
 __all__.extend([p for p in _patch_all if p not in __all__])
 _patch_sdk()
diff --git a/...trequestid/aio/_operations/_operations.py → ...trequestid/aio/_operations/_operations.py b/...trequestid/aio/_operations/_operations.py → ...trequestid/aio/_operations/_operations.py
@@ -21,8 +21,8 @@
 from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 
-from ..._operations._operations import build_client_request_id_get_request
-from .._vendor import ClientRequestIdClientMixinABC
+from ..._operations._operations import build_xms_client_request_id_get_request
+from .._vendor import XmsClientRequestIdClientMixinABC
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
@@ -32,11 +32,11 @@
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
 
-class ClientRequestIdClientOperationsMixin(ClientRequestIdClientMixinABC):
+class XmsClientRequestIdClientOperationsMixin(XmsClientRequestIdClientMixinABC):
 
     @distributed_trace_async
     async def get(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-return-statements
-        """Get operation with azure client request id header.
+        """Get operation with azure ``x-ms-client-request-id`` header.
 
         :return: None
         :rtype: None
@@ -55,7 +55,7 @@ async def get(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-retu
 
         cls: ClsType[None] = kwargs.pop("cls", None)
 
-        _request = build_client_request_id_get_request(
+        _request = build_xms_client_request_id_get_request(
             headers=_headers,
             params=_params,
         )

diff --git a/...e/model/flatten/aio/_operations/_patch.py → ...clientrequestid/aio/_operations/_patch.py b/...e/model/flatten/aio/_operations/_patch.py → ...clientrequestid/aio/_operations/_patch.py
diff --git a/...-flatten/type/model/flatten/aio/_patch.py → ...lheaders/xmsclientrequestid/aio/_patch.py b/...-flatten/type/model/flatten/aio/_patch.py → ...lheaders/xmsclientrequestid/aio/_patch.py