@autorest/python 6.34.2 → 6.35.0

package/autorest/multiapi/models/client.py

@@ -43,7 +43,7 @@ class Client:
         file_import = FileImport(json.loads(self.default_version_metadata["client"][imports_to_load]))
         local_imports = file_import.imports.get(TypingSection.REGULAR, {}).get(ImportType.LOCAL, {})
         for key in local_imports:
-            if re.search("^\\.*_serialization$", key):
+            if re.search("^\\.*_utils.serialization$", key):
                 relative_path = ".." if async_mode else "."
                 local_imports[f"{relative_path}_serialization"] = local_imports.pop(key)
                 break

package/autorest/multiapi/serializers/__init__.py

@@ -133,11 +133,7 @@ class MultiAPISerializer(ReaderAndWriter):  # pylint: disable=abstract-method
                 lstrip_blocks=True,
             )
             self.write_file(
-                Path("_utils/__init__.py"),
-                self.env.get_template("multiapi_utils_init.py.jinja2").render(),
-            )
-            self.write_file(
-                Path("_utils/serialization.py"),
+                Path("_serialization.py"),
                 codegen_env.get_template("serialization.py.jinja2").render(
                     code_model=code_model,
                 ),

package/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2

@@ -8,7 +8,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 # --------------------------------------------------------------------------
-from {{ ".." if async_mode else "." }}_utils.serialization import Serializer, Deserializer
+from {{ ".." if async_mode else "." }}_serialization import Serializer, Deserializer
 {% if imports %}
 {{ imports }}
 {% endif %}

package/generator/build/lib/pygen/codegen/models/code_model.py

@@ -98,6 +98,7 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
         self.has_subnamespace = False
         self._operations_folder_name: Dict[str, str] = {}
         self._relative_import_path: Dict[str, str] = {}
+        self.metadata: Dict[str, Any] = yaml_data.get("metadata", {})
 
     @staticmethod
     def get_imported_namespace_for_client(imported_namespace: str, async_mode: bool = False) -> str:

package/generator/build/lib/pygen/codegen/models/paging_operation.py

@@ -122,9 +122,17 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
     def _imports_shared(self, async_mode: bool, **kwargs: Any) -> FileImport:
         file_import = super()._imports_shared(async_mode, **kwargs)
         if async_mode:
-            file_import.add_submodule_import("typing", "AsyncIterable", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            default_paging_submodule = f"{'async_' if self.code_model.is_azure_flavor else ''}paging"
+            file_import.add_submodule_import(
+                f"{self.code_model.core_library}.{default_paging_submodule}",
+                "AsyncItemPaged",
+                ImportType.SDKCORE,
+                TypingSection.CONDITIONAL,
+            )
         else:
-            file_import.add_submodule_import("typing", "Iterable", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            file_import.add_submodule_import(
+                f"{self.code_model.core_library}.paging", "ItemPaged", ImportType.SDKCORE, TypingSection.CONDITIONAL
+            )
         if (
             self.next_request_builder
             and self.code_model.options["builders_visibility"] == "embedded"

package/generator/build/lib/pygen/codegen/models/response.py

@@ -186,7 +186,7 @@ class PagingResponse(Response):
         return self.get_pager_path(async_mode).split(".")[-1]
 
     def type_annotation(self, **kwargs: Any) -> str:
-        iterable = "AsyncIterable" if kwargs["async_mode"] else "Iterable"
+        iterable = "AsyncItemPaged" if kwargs["async_mode"] else "ItemPaged"
         return f"{iterable}[{self.item_type.type_annotation(**kwargs)}]"
 
     def docstring_text(self, **kwargs: Any) -> str:

package/generator/build/lib/pygen/codegen/serializers/__init__.py

@@ -4,6 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import logging
+import json
 from collections import namedtuple
 import re
 from typing import List, Any, Union
@@ -143,6 +144,13 @@ class JinjaSerializer(ReaderAndWriter):
                         self._serialize_and_write_sample(env, namespace=client_namespace)
                     if self.code_model.options["generate_test"]:
                         self._serialize_and_write_test(env, namespace=client_namespace)
+
+                # add _metadata.json
+                if self.code_model.metadata:
+                    self.write_file(
+                        exec_path / Path("_metadata.json"),
+                        json.dumps(self.code_model.metadata, indent=2),
+                    )
             elif client_namespace_type.clients:
                 # add clients folder if there are clients in this namespace
                 self._serialize_client_and_config_files(client_namespace, client_namespace_type.clients, env)

package/generator/build/lib/pygen/codegen/serializers/general_serializer.py

@@ -63,7 +63,7 @@ class GeneralSerializer(BaseSerializer):
             "token_credential": token_credential,
             "pkgutil_names": [".".join(package_parts[: i + 1]) for i in range(len(package_parts))],
             "init_names": ["/".join(package_parts[: i + 1]) + "/__init__.py" for i in range(len(package_parts))],
-            "client_name": self.code_model.clients[0].name,
+            "client_name": self.code_model.clients[0].name if self.code_model.clients else "",
             "VERSION_MAP": VERSION_MAP,
             "MIN_PYTHON_VERSION": MIN_PYTHON_VERSION,
             "MAX_PYTHON_VERSION": MAX_PYTHON_VERSION,

package/generator/build/lib/pygen/codegen/templates/packaging_templates/README.md.jinja2

@@ -40,7 +40,7 @@ python -m pip install {{ package_name }}
 - You need an [Azure subscription][azure_sub] to use this package.
 - An existing {{ package_pprint_name }} instance.
 
-{% if token_credential %}
+{% if token_credential and client_name %}
 #### Create with an Azure Active Directory Credential
 To use an [Azure Active Directory (AAD) token credential][authenticate_with_token],
 provide an instance of the desired credential type obtained from the

package/generator/component-detection-pip-report.json

@@ -4,11 +4,11 @@
   "install": [
     {
       "download_info": {
-        "url": "https://files.pythonhosted.org/packages/53/7e/5d8af3317ddbf9519b687bd1c39d8737fde07d97f54df65553faca5cffb1/setuptools-80.3.1-py3-none-any.whl",
+        "url": "https://files.pythonhosted.org/packages/a1/18/0e835c3a557dc5faffc8f91092f62fc337c1dab1066715842e7a4b318ec4/setuptools-80.7.1-py3-none-any.whl",
         "archive_info": {
-          "hash": "sha256=ea8e00d7992054c4c592aeb892f6ad51fe1b4d90cc6947cc45c45717c40ec537",
+          "hash": "sha256=ca5cc1069b85dc23070a6628e6bcecb3292acac802399c7f8edc0100619f9009",
           "hashes": {
-            "sha256": "ea8e00d7992054c4c592aeb892f6ad51fe1b4d90cc6947cc45c45717c40ec537"
+            "sha256": "ca5cc1069b85dc23070a6628e6bcecb3292acac802399c7f8edc0100619f9009"
           }
         }
       },
@@ -18,7 +18,10 @@
       "metadata": {
         "metadata_version": "2.4",
         "name": "setuptools",
-        "version": "80.3.1",
+        "version": "80.7.1",
+        "dynamic": [
+          "license-file"
+        ],
         "summary": "Easily download, build, install, upgrade, and uninstall Python packages",
         "description_content_type": "text/x-rst",
         "keywords": [
@@ -31,6 +34,9 @@
         ],
         "author_email": "Python Packaging Authority <distutils-sig@python.org>",
         "license_expression": "MIT",
+        "license_file": [
+          "LICENSE"
+        ],
         "classifier": [
           "Development Status :: 5 - Production/Stable",
           "Intended Audience :: Developers",

package/generator/pygen/codegen/models/code_model.py

@@ -98,6 +98,7 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
         self.has_subnamespace = False
         self._operations_folder_name: Dict[str, str] = {}
         self._relative_import_path: Dict[str, str] = {}
+        self.metadata: Dict[str, Any] = yaml_data.get("metadata", {})
 
     @staticmethod
     def get_imported_namespace_for_client(imported_namespace: str, async_mode: bool = False) -> str:

package/generator/pygen/codegen/models/paging_operation.py

@@ -122,9 +122,17 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
     def _imports_shared(self, async_mode: bool, **kwargs: Any) -> FileImport:
         file_import = super()._imports_shared(async_mode, **kwargs)
         if async_mode:
-            file_import.add_submodule_import("typing", "AsyncIterable", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            default_paging_submodule = f"{'async_' if self.code_model.is_azure_flavor else ''}paging"
+            file_import.add_submodule_import(
+                f"{self.code_model.core_library}.{default_paging_submodule}",
+                "AsyncItemPaged",
+                ImportType.SDKCORE,
+                TypingSection.CONDITIONAL,
+            )
         else:
-            file_import.add_submodule_import("typing", "Iterable", ImportType.STDLIB, TypingSection.CONDITIONAL)
+            file_import.add_submodule_import(
+                f"{self.code_model.core_library}.paging", "ItemPaged", ImportType.SDKCORE, TypingSection.CONDITIONAL
+            )
         if (
             self.next_request_builder
             and self.code_model.options["builders_visibility"] == "embedded"

package/generator/pygen/codegen/models/response.py

@@ -186,7 +186,7 @@ class PagingResponse(Response):
         return self.get_pager_path(async_mode).split(".")[-1]
 
     def type_annotation(self, **kwargs: Any) -> str:
-        iterable = "AsyncIterable" if kwargs["async_mode"] else "Iterable"
+        iterable = "AsyncItemPaged" if kwargs["async_mode"] else "ItemPaged"
         return f"{iterable}[{self.item_type.type_annotation(**kwargs)}]"
 
     def docstring_text(self, **kwargs: Any) -> str:

package/generator/pygen/codegen/serializers/__init__.py

@@ -4,6 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import logging
+import json
 from collections import namedtuple
 import re
 from typing import List, Any, Union
@@ -143,6 +144,13 @@ class JinjaSerializer(ReaderAndWriter):
                         self._serialize_and_write_sample(env, namespace=client_namespace)
                     if self.code_model.options["generate_test"]:
                         self._serialize_and_write_test(env, namespace=client_namespace)
+
+                # add _metadata.json
+                if self.code_model.metadata:
+                    self.write_file(
+                        exec_path / Path("_metadata.json"),
+                        json.dumps(self.code_model.metadata, indent=2),
+                    )
             elif client_namespace_type.clients:
                 # add clients folder if there are clients in this namespace
                 self._serialize_client_and_config_files(client_namespace, client_namespace_type.clients, env)

package/generator/pygen/codegen/serializers/general_serializer.py

@@ -63,7 +63,7 @@ class GeneralSerializer(BaseSerializer):
             "token_credential": token_credential,
             "pkgutil_names": [".".join(package_parts[: i + 1]) for i in range(len(package_parts))],
             "init_names": ["/".join(package_parts[: i + 1]) + "/__init__.py" for i in range(len(package_parts))],
-            "client_name": self.code_model.clients[0].name,
+            "client_name": self.code_model.clients[0].name if self.code_model.clients else "",
             "VERSION_MAP": VERSION_MAP,
             "MIN_PYTHON_VERSION": MIN_PYTHON_VERSION,
             "MAX_PYTHON_VERSION": MAX_PYTHON_VERSION,

package/generator/pygen/codegen/templates/packaging_templates/README.md.jinja2

@@ -40,7 +40,7 @@ python -m pip install {{ package_name }}
 - You need an [Azure subscription][azure_sub] to use this package.
 - An existing {{ package_pprint_name }} instance.
 
-{% if token_credential %}
+{% if token_credential and client_name %}
 #### Create with an Azure Active Directory Credential
 To use an [Azure Active Directory (AAD) token credential][authenticate_with_token],
 provide an instance of the desired credential type obtained from the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.34.2",
+  "version": "6.35.0",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md",
   "dependencies": {
-    "@typespec/http-client-python": "~0.11.3",
+    "@typespec/http-client-python": "~0.12.0",
     "@autorest/system-requirements": "~1.0.2",
     "fs-extra": "~11.2.0",
     "tsx": "~4.19.1"

package/autorest/multiapi/templates/multiapi_utils_init.py.jinja2

@@ -1,10 +0,0 @@
-# coding=utf-8
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-#
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is
-# regenerated.
-# --------------------------------------------------------------------------