Bump cadl ranch 0.37.1

.chronus/changes/bump-cadl-ranch-2024-2024-8-5-17-18-29.md

@@ -0,0 +1,7 @@
+---
+changeKind: feature
+packages:
+  - "@azure-tools/typespec-python"
+---
+
+Add support for `HttpPart<{@body body: XXX}>` of multipart

package.json

@@ -31,7 +31,7 @@
   "homepage": "https://github.com/Azure/autorest.python#readme",
   "devDependencies": {
     "@actions/github": "6.0.0",
-    "@azure-tools/cadl-ranch": "~0.14.2",
+    "@azure-tools/cadl-ranch": "~0.14.5",
     "@chronus/chronus": "^0.10.2",
     "@chronus/github": "^0.3.2",
     "@typespec/prettier-plugin-typespec": "~0.58.0",

packages/typespec-python/generator/pygen/codegen/models/parameter.py

@@ -232,7 +232,11 @@ def entries(self) -> List["BodyParameter"]:
     def is_form_data(self) -> bool:
         # hacky, but rn in legacy, there is no formdata model type, it's just a dict
         # with all of the entries splatted out
-        return self.type.is_form_data or bool(self.entries)
+        return (
+            self.type.is_form_data
+            or bool(self.entries)
+            or ("multipart/form-data" in self.content_types and self.code_model.options["from_typespec"])
+        )
 
     @property
     def is_partial_body(self) -> bool:

packages/typespec-python/generator/pygen/codegen/serializers/test_serializer.py

@@ -80,6 +80,12 @@ def __init__(
         self.operation = operation
         self.is_async = is_async
 
+    @property
+    def name(self) -> str:
+        if self.operation_groups[-1].is_mixin:
+            return self.operation.name
+        return "_".join([og.property_name for og in self.operation_groups] + [self.operation.name])
+
     @property
     def operation_group_prefix(self) -> str:
         if self.operation_groups[-1].is_mixin:

packages/typespec-python/generator/pygen/codegen/templates/test.py.jinja2

@@ -29,9 +29,9 @@ class {{ test.test_class_name }}({{ test.base_test_class_name }}):
     {% endif %}
     @recorded_by_proxy{{ async_suffix }}
     {% if code_model.options["azure_arm"] %}
-    {{ async }}def test_{{ testcase.operation.name }}(self, resource_group):
+    {{ async }}def test_{{ testcase.name }}(self, resource_group):
     {% else %}
-    {{ async }}def test_{{ testcase.operation.name }}(self, {{ prefix_lower }}_endpoint):
+    {{ async }}def test_{{ testcase.name }}(self, {{ prefix_lower }}_endpoint):
         {{ client_var }} = self.{{ test.create_client_name }}(endpoint={{ prefix_lower }}_endpoint)
     {% endif %}
         {{testcase.response }}{{ client_var }}{{ testcase.operation_group_prefix }}.{{ testcase.operation.name }}(

packages/typespec-python/package.json

@@ -65,8 +65,8 @@
   "devDependencies": {
     "@azure-tools/typespec-azure-resource-manager": "~0.45.0",
     "@azure-tools/typespec-autorest": "~0.45.0",
-    "@azure-tools/cadl-ranch-expect": "~0.15.1",
-    "@azure-tools/cadl-ranch-specs": "~0.36.1",
+    "@azure-tools/cadl-ranch-expect": "~0.15.3",
+    "@azure-tools/cadl-ranch-specs": "~0.37.1",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "^18.16.3",
     "@types/yargs": "17.0.32",

packages/typespec-python/scripts/eng/regenerate.ts

@@ -50,9 +50,6 @@ const EMITTER_OPTIONS: Record<string, Record<string, string> | Record<string, st
     "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",
     },

packages/typespec-python/src/types.ts

@@ -216,7 +216,16 @@ function emitProperty<TServiceOperation extends SdkServiceOperation>(
     property: SdkBodyModelPropertyType,
 ): Record<string, any> {
     const isMultipartFileInput = property.multipartOptions?.isFilePart;
-    const sourceType = isMultipartFileInput ? createMultiPartFileType(property.type) : property.type;
+    let sourceType: SdkType | MultiPartFileType = property.type;
+    if (isMultipartFileInput) {
+        sourceType = createMultiPartFileType(property.type);
+    } else if (property.type.kind === "model") {
+        const body = property.type.properties.find((x) => x.kind === "body");
+        if (body) {
+            // for `temperature: HttpPart<{@body body: float64, @header contentType: "text/plain"}>`, the real type is float64
+            sourceType = body.type;
+        }
+    }
     if (isMultipartFileInput) {
         // Python convert all the type of file part to FileType so clear these models' usage so that they won't be generated
         addDisableGenerationMap(property.type);

packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/test_access_public_operation_operations.py

@@ -14,7 +14,7 @@
 class TestAccessPublicOperationOperations(AccessClientTestBase):
     @AccessPreparer()
     @recorded_by_proxy
-    def test_no_decorator_in_public(self, access_endpoint):
+    def test_public_operation_no_decorator_in_public(self, access_endpoint):
         client = self.create_client(endpoint=access_endpoint)
         response = client.public_operation.no_decorator_in_public(
             name="str",
@@ -25,7 +25,7 @@ def test_no_decorator_in_public(self, access_endpoint):
 
     @AccessPreparer()
     @recorded_by_proxy
-    def test_public_decorator_in_public(self, access_endpoint):
+    def test_public_operation_public_decorator_in_public(self, access_endpoint):
         client = self.create_client(endpoint=access_endpoint)
         response = client.public_operation.public_decorator_in_public(
             name="str",

packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/test_access_public_operation_operations_async.py

@@ -15,7 +15,7 @@
 class TestAccessPublicOperationOperationsAsync(AccessClientTestBaseAsync):
     @AccessPreparer()
     @recorded_by_proxy_async
-    async def test_no_decorator_in_public(self, access_endpoint):
+    async def test_public_operation_no_decorator_in_public(self, access_endpoint):
         client = self.create_async_client(endpoint=access_endpoint)
         response = await client.public_operation.no_decorator_in_public(
             name="str",
@@ -26,7 +26,7 @@ async def test_no_decorator_in_public(self, access_endpoint):
 
     @AccessPreparer()
     @recorded_by_proxy_async
-    async def test_public_decorator_in_public(self, access_endpoint):
+    async def test_public_operation_public_decorator_in_public(self, access_endpoint):
         client = self.create_async_client(endpoint=access_endpoint)
         response = await client.public_operation.public_decorator_in_public(
             name="str",

packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/test_access_shared_model_in_operation_operations.py

@@ -14,7 +14,7 @@
 class TestAccessSharedModelInOperationOperations(AccessClientTestBase):
     @AccessPreparer()
     @recorded_by_proxy
-    def test_public(self, access_endpoint):
+    def test_shared_model_in_operation_public(self, access_endpoint):
         client = self.create_client(endpoint=access_endpoint)
         response = client.shared_model_in_operation.public(
             name="str",

packages/typespec-python/test/azure/generated/azure-client-generator-core-access/generated_tests/test_access_shared_model_in_operation_operations_async.py

@@ -15,7 +15,7 @@
 class TestAccessSharedModelInOperationOperationsAsync(AccessClientTestBaseAsync):
     @AccessPreparer()
     @recorded_by_proxy_async
-    async def test_public(self, access_endpoint):
+    async def test_shared_model_in_operation_public(self, access_endpoint):
         client = self.create_async_client(endpoint=access_endpoint)
         response = await client.shared_model_in_operation.public(
             name="str",

packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/MANIFEST.in

@@ -1,8 +1,9 @@
 include *.md
 include LICENSE
-include azure/clientgenerator/core/flattenproperty/py.typed
+include specs/azure/clientgenerator/core/flattenproperty/py.typed
 recursive-include tests *.py
 recursive-include samples *.py *.md
-include azure/__init__.py
-include azure/clientgenerator/__init__.py
-include azure/clientgenerator/core/__init__.py
+include specs/__init__.py
+include specs/azure/__init__.py
+include specs/azure/clientgenerator/__init__.py
+include specs/azure/clientgenerator/core/__init__.py

packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/README.md

@@ -1,21 +1,21 @@
 
 
-# Azure Clientgenerator Core Flattenproperty client library for Python
+# Specs Azure Clientgenerator Core Flattenproperty client library for Python
 <!-- write necessary description of service -->
 
 ## Getting started
 
 ### Install the package
 
 ```bash
-python -m pip install azure-clientgenerator-core-flattenproperty
+python -m pip install specs-azure-clientgenerator-core-flattenproperty
 ```
 
 #### 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 Azure Clientgenerator Core Flattenproperty instance.
+- An existing Specs Azure Clientgenerator Core Flattenproperty instance.
 
 ## Contributing
 

packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/apiview_mapping_python.json

@@ -1,11 +1,11 @@
 {
-    "CrossLanguagePackageId": "Azure.ClientGenerator.Core.FlattenProperty",
+    "CrossLanguagePackageId": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty",
     "CrossLanguageDefinitionId": {
-        "azure.clientgenerator.core.flattenproperty.models.ChildFlattenModel": "Azure.ClientGenerator.Core.FlattenProperty.ChildFlattenModel",
-        "azure.clientgenerator.core.flattenproperty.models.ChildModel": "Azure.ClientGenerator.Core.FlattenProperty.ChildModel",
-        "azure.clientgenerator.core.flattenproperty.models.FlattenModel": "Azure.ClientGenerator.Core.FlattenProperty.FlattenModel",
-        "azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel": "Azure.ClientGenerator.Core.FlattenProperty.NestedFlattenModel",
-        "azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.put_flatten_model": "Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel",
-        "azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.put_nested_flatten_model": "Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel"
+        "specs.azure.clientgenerator.core.flattenproperty.models.ChildFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildFlattenModel",
+        "specs.azure.clientgenerator.core.flattenproperty.models.ChildModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.ChildModel",
+        "specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.FlattenModel",
+        "specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.NestedFlattenModel",
+        "specs.azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.put_flatten_model": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putFlattenModel",
+        "specs.azure.clientgenerator.core.flattenproperty.FlattenPropertyClient.put_nested_flatten_model": "_Specs_.Azure.ClientGenerator.Core.FlattenProperty.putNestedFlattenModel"
     }
 }

packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/generated_tests/testpreparer.py

@@ -5,9 +5,9 @@
 # Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
-from azure.clientgenerator.core.flattenproperty import FlattenPropertyClient
 from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer
 import functools
+from specs.azure.clientgenerator.core.flattenproperty import FlattenPropertyClient
 
 
 class FlattenPropertyClientTestBase(AzureRecordedTestCase):

packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/generated_tests/testpreparer_async.py

@@ -5,8 +5,8 @@
 # Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
-from azure.clientgenerator.core.flattenproperty.aio import FlattenPropertyClient
 from devtools_testutils import AzureRecordedTestCase
+from specs.azure.clientgenerator.core.flattenproperty.aio import FlattenPropertyClient
 
 
 class FlattenPropertyClientTestBaseAsync(AzureRecordedTestCase):

packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/setup.py

@@ -12,8 +12,8 @@
 from setuptools import setup, find_packages
 
 
-PACKAGE_NAME = "azure-clientgenerator-core-flattenproperty"
-PACKAGE_PPRINT_NAME = "Azure Clientgenerator Core Flattenproperty"
+PACKAGE_NAME = "specs-azure-clientgenerator-core-flattenproperty"
+PACKAGE_PPRINT_NAME = "Specs Azure Clientgenerator Core Flattenproperty"
 
 # a-b-c => a/b/c
 package_folder_path = PACKAGE_NAME.replace("-", "/")
@@ -54,14 +54,15 @@
         exclude=[
             "tests",
             # Exclude packages that will be covered by PEP420 or nspkg
-            "azure",
-            "azure.clientgenerator",
-            "azure.clientgenerator.core",
+            "specs",
+            "specs.azure",
+            "specs.azure.clientgenerator",
+            "specs.azure.clientgenerator.core",
         ]
     ),
     include_package_data=True,
     package_data={
-        "azure.clientgenerator.core.flattenproperty": ["py.typed"],
+        "specs.azure.clientgenerator.core.flattenproperty": ["py.typed"],
     },
     install_requires=[
         "isodate>=0.6.1",

packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/__init__.py

@@ -0,0 +1 @@
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore

packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_configuration.py → packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_configuration.py

@@ -26,7 +26,7 @@ class FlattenPropertyClientConfiguration:  # pylint: disable=too-many-instance-a
     def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None:
 
         self.endpoint = endpoint
-        kwargs.setdefault("sdk_moniker", "clientgenerator-core-flattenproperty/{}".format(VERSION))
+        kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-flattenproperty/{}".format(VERSION))
         self.polling_interval = kwargs.get("polling_interval", 30)
         self._configure(**kwargs)
 

packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/_operations/_operations.py → packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/_operations/_operations.py

@@ -88,12 +88,12 @@ def put_flatten_model(
         """put_flatten_model.
 
         :param input: Required.
-        :type input: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel
+        :type input: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel
         :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
          Default value is "application/json".
         :paramtype content_type: str
         :return: FlattenModel. The FlattenModel is compatible with MutableMapping
-        :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel
+        :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
@@ -109,7 +109,7 @@ def put_flatten_model(
          Default value is "application/json".
         :paramtype content_type: str
         :return: FlattenModel. The FlattenModel is compatible with MutableMapping
-        :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel
+        :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
@@ -125,7 +125,7 @@ def put_flatten_model(
          Default value is "application/json".
         :paramtype content_type: str
         :return: FlattenModel. The FlattenModel is compatible with MutableMapping
-        :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel
+        :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
@@ -136,10 +136,10 @@ def put_flatten_model(
         """put_flatten_model.
 
         :param input: Is one of the following types: FlattenModel, JSON, IO[bytes] Required.
-        :type input: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel or JSON or
+        :type input: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel or JSON or
          IO[bytes]
         :return: FlattenModel. The FlattenModel is compatible with MutableMapping
-        :rtype: ~azure.clientgenerator.core.flattenproperty.models.FlattenModel
+        :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.FlattenModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping[int, Type[HttpResponseError]] = {
@@ -207,12 +207,12 @@ def put_nested_flatten_model(
         """put_nested_flatten_model.
 
         :param input: Required.
-        :type input: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel
+        :type input: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel
         :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
          Default value is "application/json".
         :paramtype content_type: str
         :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping
-        :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel
+        :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
@@ -228,7 +228,7 @@ def put_nested_flatten_model(
          Default value is "application/json".
         :paramtype content_type: str
         :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping
-        :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel
+        :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
@@ -244,7 +244,7 @@ def put_nested_flatten_model(
          Default value is "application/json".
         :paramtype content_type: str
         :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping
-        :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel
+        :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
@@ -255,10 +255,10 @@ def put_nested_flatten_model(
         """put_nested_flatten_model.
 
         :param input: Is one of the following types: NestedFlattenModel, JSON, IO[bytes] Required.
-        :type input: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel or JSON or
-         IO[bytes]
+        :type input: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel or
+         JSON or IO[bytes]
         :return: NestedFlattenModel. The NestedFlattenModel is compatible with MutableMapping
-        :rtype: ~azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel
+        :rtype: ~specs.azure.clientgenerator.core.flattenproperty.models.NestedFlattenModel
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping[int, Type[HttpResponseError]] = {

packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/azure/clientgenerator/core/flattenproperty/aio/_configuration.py → packages/typespec-python/test/azure/generated/azure-client-generator-core-flatten-property/specs/azure/clientgenerator/core/flattenproperty/aio/_configuration.py

@@ -26,7 +26,7 @@ class FlattenPropertyClientConfiguration:  # pylint: disable=too-many-instance-a
     def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None:
 
         self.endpoint = endpoint
-        kwargs.setdefault("sdk_moniker", "clientgenerator-core-flattenproperty/{}".format(VERSION))
+        kwargs.setdefault("sdk_moniker", "specs-azure-clientgenerator-core-flattenproperty/{}".format(VERSION))
         self.polling_interval = kwargs.get("polling_interval", 30)
         self._configure(**kwargs)