Merge branch 'main' of https://github.com/Azure/autorest.python into auto-microsoft-python/multi-layer-discriminator

Author: iscai-msft

.chronus/changes/auto-microsoft-fix-proproject.toml-2025-7-14-15-14-2.md

@@ -69,10 +69,6 @@ words:
   - mros
   - mspaint
   - msrc
-  - multiapi
-  - multiapiclient
-  - multiapinoasync
-  - multiapisecurity
   - mutli
   - myenv
   - myoption

cspell.yaml

@@ -68,25 +68,8 @@ client. Say your custom credential is called `MyCredential`, and the policy that
 client would look something like `client = PetsClient(credential=MyCredential(), authentication_policy=MyAuthenticationPolicy())`, though this of course varies
 based on inputs.
 
-## Multi API Client
-
-Initializing your Multi API client is very similar to initializing a normal client. The only difference is there's an added optional
-parameter `api_version`. With this parameter, you can specify the API version you want your client to have. If not specified, the multi
-API client uses the default API version.
-
-Using the Multi API client we generated in our [multi API generation][multiapi_generation], our example client uses default API version
-`v2`. If we would like our client at runtime to have API version `v1`, we would initialize our client like:
-
-```python
-from azure.identity import DefaultAzureCredential
-from azure.pets import PetsClient
-
-client = PetsClient(credential=DefaultAzureCredential(), api_version="v1")
-```
-
 <!-- LINKS -->
 
-[multiapi_generation]: https://github.com/Azure/autorest.python/blob/main/docs/generate/multiapi.md
 [azure_core_library]: https://pypi.org/project/azure-core/
 [msrest_library]: https://pypi.org/project/msrest/
 [azure_mgmt_core_library]: https://pypi.org/project/azure-mgmt-core/

docs/client/initializing.md

@@ -16,24 +16,3 @@ from azure.pets.models import DogTypes
 
 my_dog_type = DogTypes.DALMATIAN
 ```
-
-## Multi API
-
-There is also a `models` module in a multi API client. There, you can access the latest version of each models.
-
-If you want to access a specific API version's models, you can do so through the [`models()`][models_ex] class method we expose on the multi API client.
-It accepts optional parameter `api_version`. If specified, it will retrieve the models from that API version. Otherwise, retrieves models from the
-default API version the code was generated with. We've included a code snippet showing you how to access models in both situations.
-
-```python
-from azure.multiapi.sample import MultiapiServiceClient
-from azure.identity import DefaultAzureCredential
-
-client = MultiapiServiceClient(credential=DefaultAzureCredential())
-
-default_api_version_models = client.models()
-v3_models = client.models(api_version='3.0.0')
-```
-
-<!-- LINKS -->
-[models_ex]: https://github.com/Azure/autorest.python/blob/main/docs/packages/autorest.python/specification/multiapi/generated/azure/multiapi/sample/_multiapi_service_client.py#L91

docs/client/models.md

@@ -2,10 +2,8 @@
 
 Most of the information you'll need to generate a Python client can be found in the general docs [here][general]. In these docs, we go over a couple Python-specific scenarios.
 
-* [Generating Multi API code][multiapi]
 * [Generating with Directives][directives]
 
 <!-- LINKS -->
 [general]: https://github.com/Azure/autorest/tree/master/docs/generate/readme.md
-[multiapi]: https://github.com/Azure/autorest.python/blob/main/docs/generate/multiapi.md
 [directives]: https://github.com/Azure/autorest.python/blob/main/docs/generate/directives.md

docs/generate/multiapi.md

@@ -112,14 +112,6 @@ jobs:
       - template: generated-code-checks-template.yml
         parameters:
             folderName: "dpg/version-tolerant"
-      - script: tox run -e ci
-        displayName: 'Execute "multiapi" Tests - Python $(PythonVersion)'
-        workingDirectory: $(Build.SourcesDirectory)/autorest.python/packages/autorest.python/test/multiapi
-
-      - script: tox run -e apiview
-        displayName: 'Validate multiapi APIView - Python $(PythonVersion)'
-        condition: and(succeededOrFailed(), eq(variables['PythonVersion'], '3.11'))
-        workingDirectory: $(Build.SourcesDirectory)/autorest.python/packages/autorest.python/test/multiapi
 
       - ${{ if eq(ne(variables['Build.Reason'], 'PullRequest'), 'True') }}:
           - script: |

docs/generate/readme.md

@@ -34,7 +34,7 @@ def run_check(name, call_back, log_info):
         "-t",
         "--test-folder",
         dest="test_folder",
-        help="The test folder we're in. Can be 'azure', 'multiapi', or 'vanilla'",
+        help="The test folder we're in. Can be 'azure' or 'vanilla'",
         required=True,
     )
     parser.add_argument(

eng/pipelines/ci.yml

@@ -1,5 +1,22 @@
 # Release
 
+## 6.39.0
+
+### Deprecations
+
+- [#3188](https://github.com/Azure/autorest.python/pull/3188) Deprecate multiapi
+
+### Features
+
+- [#3176](https://github.com/Azure/autorest.python/pull/3176) Add keyword only signature `cloud_setting` into ARM client
+
+### Bug Fixes
+
+- [#3166](https://github.com/Azure/autorest.python/pull/3166) Fix typing to take advantage of `3.9` being the min python version
+- [#3174](https://github.com/Azure/autorest.python/pull/3174) fix to keep some existing parts of pyproject.toml
+- [#3181](https://github.com/Azure/autorest.python/pull/3181) don't send content-type when no request body
+
+
 ## 6.38.2
 
 ### Bug Fixes

eng/scripts/util.py

@@ -23,7 +23,7 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio
 
 #### Python code gen
 
-```yaml !$(multiapiscript) && !$(multiclientscript)
+```yaml !$(multiclientscript)
 # default values for version tolerant and black
 black: true
 ```
@@ -39,7 +39,7 @@ modelerfour:
   flatten-payloads: true
 ```
 
-```yaml !$(multiapiscript) && !$(multiclientscript)
+```yaml !$(multiclientscript)
 pass-thru:
   - model-deduplicator
   - subset-reducer
@@ -99,25 +99,6 @@ scope-codegen/emitter:
 output-artifact: python-files
 ```
 
-# Multiapi script pipeline
-
-```yaml $(multiapiscript)
-pipeline:
-  python/multiapiscript:
-    scope: multiapiscript
-    output-artifact: python-files
-
-  python/multiapiscript/emitter:
-    input: multiapiscript
-    scope: scope-multiapiscript/emitter
-
-scope-multiapiscript/emitter:
-  input-artifact: python-files
-  output-uri-expr: $key
-
-output-artifact: python-files
-```
-
 # Black script pipeline
 
 ```yaml $(black)
@@ -173,12 +154,6 @@ help-content:
       - key: basic-setup-py
         description: Whether to generate a build script for setuptools to package your SDK.  Defaults to `false`, generally not suggested if you are going to wrap the generated code
         type: bool
-      - key: multiapi
-        description: Whether to generate a multiapi client.
-        type: bool
-      - key: default-api
-        description: In the case of `--multiapi`, you can override the default service API version with this flag. If not specified, we use the latest GA service version as the default API.
-        type: string
       - key: no-namespace-folders
         description: Specify if you don't want pkgutil-style namespace folders. Defaults to `false`.
         type: bool