@autorest/python 6.13.6 → 6.13.8

package/autorest/codegen/__init__.py

@@ -38,6 +38,7 @@ class OptionsRetriever:
         "polymorphic-examples": 5,
         "generate-sample": False,
         "from-typespec": False,
+        "emit-cross-language-definition-file": False,
     }
 
     @property
@@ -333,6 +334,7 @@ class CodeGenerator(Plugin):
             "from_typespec",
             "flavor",
             "company_name",
+            "emit_cross_language_definition_file",
         ]
         return {f: getattr(self.options_retriever, f) for f in flags}
 

package/autorest/codegen/models/code_model.py

@@ -75,6 +75,7 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
         self.named_unions: List[CombinedType] = [
             t for t in self.types_map.values() if isinstance(t, CombinedType) and t.name
         ]
+        self.cross_language_package_id = self.yaml_data.get("crossLanguagePackageId")
 
     @property
     def has_form_data(self) -> bool:

package/autorest/codegen/models/enum_type.py

@@ -134,6 +134,9 @@ class EnumType(BaseType):
         self.values = values
         self.value_type = value_type
         self.internal: bool = self.yaml_data.get("internal", False)
+        self.cross_language_definition_id: Optional[str] = self.yaml_data.get(
+            "crossLanguageDefinitionId"
+        )
 
     def __lt__(self, other):
         return self.name.lower() < other.name.lower()

package/autorest/codegen/models/model_type.py

@@ -75,6 +75,9 @@ class ModelType(  # pylint: disable=abstract-method
         self.internal: bool = self.yaml_data.get("internal", False)
         self.snake_case_name: str = self.yaml_data["snakeCaseName"]
         self.page_result_model: bool = self.yaml_data.get("pageResultModel", False)
+        self.cross_language_definition_id: Optional[str] = self.yaml_data.get(
+            "crossLanguageDefinitionId"
+        )
 
     @property
     def flattened_property(self) -> Optional[Property]:

package/autorest/codegen/models/operation.py

@@ -54,7 +54,7 @@ def is_internal(target: Optional[BaseType]) -> bool:
     return isinstance(target, ModelType) and target.base == "dpg" and target.internal
 
 
-class OperationBase(  # pylint: disable=too-many-public-methods
+class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instance-attributes
     Generic[ResponseType], BaseBuilder[ParameterList, List["Operation"]]
 ):
     def __init__(
@@ -91,6 +91,9 @@ class OperationBase(  # pylint: disable=too-many-public-methods
         if self.internal:
             self.name = "_" + self.name
         self.has_etag: bool = self.yaml_data.get("hasEtag", False)
+        self.cross_language_definition_id: Optional[str] = self.yaml_data.get(
+            "crossLanguageDefinitionId"
+        )
 
     @property
     def has_form_data_body(self):

package/autorest/codegen/serializers/__init__.py

@@ -522,6 +522,11 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
                 namespace_path / Path("_validation.py"),
                 general_serializer.serialize_validation_file(),
             )
+        if self.code_model.options.get("emit_cross_language_definition_file"):
+            self.write_file(
+                namespace_path / Path("apiview_mapping_python.json"),
+                general_serializer.serialize_cross_language_definition_file(),
+            )
 
         # Write the setup file
         if self.code_model.options["basic_setup_py"]:

package/autorest/codegen/serializers/builder_serializer.py

@@ -1431,9 +1431,12 @@ class _PagingOperationSerializer(
                     "})",
                 ]
             )
-            retval.append(
-                f'_next_request_params["api-version"] = {api_version_param.full_client_name}'
+            api_version = (
+                "self._api_version"
+                if self.code_model.options["multiapi"] and builder.group_name
+                else api_version_param.full_client_name
             )
+            retval.append(f'_next_request_params["api-version"] = {api_version}')
             query_str = ", params=_next_request_params"
             next_link_str = "urllib.parse.urljoin(next_link, _parsed_next_link.path)"
         except StopIteration:

package/autorest/codegen/serializers/general_serializer.py

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+import json
 from typing import Any, List
 from jinja2 import Environment
 from .import_serializer import FileImportSerializer, TypingSection
@@ -196,3 +197,39 @@ class GeneralSerializer(BaseSerializer):
     def serialize_validation_file(self) -> str:
         template = self.env.get_template("validation.py.jinja2")
         return template.render(code_model=self.code_model)
+
+    def serialize_cross_language_definition_file(self) -> str:
+        cross_langauge_def_dict = {
+            f"{self.code_model.namespace}.models.{model.name}": model.cross_language_definition_id
+            for model in self.code_model.model_types
+        }
+        cross_langauge_def_dict.update(
+            {
+                f"{self.code_model.namespace}.models.{enum.name}": enum.cross_language_definition_id
+                for enum in self.code_model.enums
+            }
+        )
+        cross_langauge_def_dict.update(
+            {
+                (
+                    f"{self.code_model.namespace}.{client.name}."
+                    + (
+                        ""
+                        if operation_group.is_mixin
+                        else f"{operation_group.property_name}."
+                    )
+                    + f"{operation.name}"
+                ): operation.cross_language_definition_id
+                for client in self.code_model.clients
+                for operation_group in client.operation_groups
+                for operation in operation_group.operations
+                if not operation.name.startswith("_")
+            }
+        )
+        return json.dumps(
+            {
+                "CrossLanguagePackageId": self.code_model.cross_language_package_id,
+                "CrossLanguageDefinitionId": cross_langauge_def_dict,
+            },
+            indent=4,
+        )

package/autorest/codegen/templates/packaging_templates/README.md.jinja2

@@ -28,7 +28,7 @@ section of the project.
 
 ## Getting started
 
-### Installating the package
+### Install the package
 
 ```bash
 python -m pip install {{ package_name }}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.13.6",
+  "version": "6.13.8",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {

package/prepare.py

@@ -6,7 +6,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import sys
-if not sys.version_info >= (3, 7, 0):
+if not sys.version_info >= (3, 8, 0):
     raise Exception("Autorest for Python extension requires Python 3.8 at least")
 
 from pathlib import Path

package/start.py

@@ -6,7 +6,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import sys
-if not sys.version_info >= (3, 7, 0):
+if not sys.version_info >= (3, 8, 0):
     raise Exception("Autorest for Python extension requires Python 3.8 at least")
 
 from pathlib import Path
@@ -23,7 +23,10 @@ def main():
 
     assert venv_prexists  # Otherwise install was not done
 
-    env_builder = venv.EnvBuilder(with_pip=True, upgrade_deps=True)
+    if sys.version_info < (3, 9, 0):
+        env_builder = venv.EnvBuilder(with_pip=True)
+    else:
+        env_builder = venv.EnvBuilder(with_pip=True, upgrade_deps=True)
     venv_context = env_builder.ensure_directories(venv_path)
     python_run(venv_context, "autorest.jsonrpc.server", command=sys.argv[1:])