@autorest/python 6.37.0 → 6.37.1

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

@@ -322,13 +322,11 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
         )
         serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
         for og in self.operation_groups:
-            suffix = f".{og.filename}" if (not self.code_model.options["multiapi"]) and og.is_mixin else ""
             file_import.add_submodule_import(
                 self.code_model.get_relative_import_path(
                     serialize_namespace,
                     self.code_model.get_imported_namespace_for_operation(og.client_namespace, async_mode),
-                )
-                + suffix,
+                ),
                 og.class_name,
                 ImportType.LOCAL,
             )

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

@@ -19,14 +19,14 @@ from .base_serializer import BaseSerializer
 VERSION_MAP = {
     "msrest": "0.7.1",
     "isodate": "0.6.1",
-    "azure-mgmt-core": "1.5.0",
-    "azure-core": "1.30.0",
+    "azure-mgmt-core": "1.6.0",
+    "azure-core": "1.35.0",
     "typing-extensions": "4.6.0",
     "corehttp": "1.0.0b6",
 }
 
 MIN_PYTHON_VERSION = "3.9"
-MAX_PYTHON_VERSION = "3.12"
+MAX_PYTHON_VERSION = "3.13"
 
 
 class GeneralSerializer(BaseSerializer):

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

@@ -9,6 +9,12 @@ from jinja2 import Environment
 from ..models import CodeModel, OperationGroup
 
 
+def get_pylint_disable(code_model: CodeModel, og: OperationGroup) -> str:
+    if og.is_mixin and not code_model.options["multiapi"]:
+        return " # pylint: disable=unused-import"
+    return ""
+
+
 class OperationsInitSerializer:
     def __init__(
         self,
@@ -27,9 +33,8 @@ class OperationsInitSerializer:
             return "_operations" if self.code_model.options["combine-operation-files"] else operation_group.filename
 
         return [
-            f"from .{_get_filename(og)} import {og.class_name}  # type: ignore"
+            f"from .{_get_filename(og)} import {og.class_name} # type: ignore{get_pylint_disable(self.code_model, og)}"
             for og in self.operation_groups
-            if not og.is_mixin or self.code_model.options["multiapi"]
         ]
 
     def serialize(self) -> str:

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

@@ -69,7 +69,7 @@ class SampleSerializer(BaseSerializer):
     def _client_params(self) -> Dict[str, Any]:
         # client params
         special_param = {}
-        credential_type = getattr(self.code_model.clients[0].credential, "type", None)
+        credential_type = getattr(self.operation_group.client.credential, "type", None)
         if isinstance(credential_type, TokenCredentialType):
             special_param.update({"credential": "DefaultAzureCredential()"})
         elif isinstance(credential_type, KeyCredentialType):
@@ -78,7 +78,7 @@ class SampleSerializer(BaseSerializer):
         params = [
             p
             for p in (
-                self.code_model.clients[0].parameters.positional + self.code_model.clients[0].parameters.keyword_only
+                self.operation_group.client.parameters.positional + self.operation_group.client.parameters.keyword_only
             )
             if not p.optional and p.client_default_value is None
         ]
@@ -153,6 +153,7 @@ class SampleSerializer(BaseSerializer):
         operation_result, return_var = self._operation_result()
         return self.env.get_template("sample.py.jinja2").render(
             code_model=self.code_model,
+            client=self.operation_group.client,
             file_name=self.file_name,
             operation_result=operation_result,
             operation_params=self._operation_params(),

package/generator/build/lib/pygen/codegen/templates/sample.py.jinja2

@@ -27,7 +27,7 @@
     {% endif %}
 """
 def main():
-    client = {{ code_model.clients[0].name }}(
+    client = {{ client.name }}(
         {% for key,value in client_params.items() %}
         {{ key }}={{ value }},
         {% endfor %}

package/generator/build/lib/pygen/preprocess/python_mappings.py

@@ -97,7 +97,7 @@ _always_reserved = [
     "int",
 ]
 
-RESERVED_MODEL_PROPERTIES = [
+RESERVED_TSP_MODEL_PROPERTIES = [
     "keys",
     "items",
     "values",
@@ -109,6 +109,8 @@ RESERVED_MODEL_PROPERTIES = [
     "get",
     "copy",
     "as_dict",
+    # following are reserved special words for TSP models
+    "datetime",
 ]
 
 RESERVED_WORDS = {
@@ -187,7 +189,7 @@ RESERVED_WORDS = {
 
 TSP_RESERVED_WORDS = {
     PadType.PARAMETER: ["stream"],
-    PadType.PROPERTY: RESERVED_MODEL_PROPERTIES,
+    PadType.PROPERTY: RESERVED_TSP_MODEL_PROPERTIES,
 }
 
 REDEFINED_BUILTINS = [  # we don't pad, but we need to do lint ignores

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

@@ -322,13 +322,11 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
         )
         serialize_namespace = kwargs.get("serialize_namespace", self.code_model.namespace)
         for og in self.operation_groups:
-            suffix = f".{og.filename}" if (not self.code_model.options["multiapi"]) and og.is_mixin else ""
             file_import.add_submodule_import(
                 self.code_model.get_relative_import_path(
                     serialize_namespace,
                     self.code_model.get_imported_namespace_for_operation(og.client_namespace, async_mode),
-                )
-                + suffix,
+                ),
                 og.class_name,
                 ImportType.LOCAL,
             )

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

@@ -19,14 +19,14 @@ from .base_serializer import BaseSerializer
 VERSION_MAP = {
     "msrest": "0.7.1",
     "isodate": "0.6.1",
-    "azure-mgmt-core": "1.5.0",
-    "azure-core": "1.30.0",
+    "azure-mgmt-core": "1.6.0",
+    "azure-core": "1.35.0",
     "typing-extensions": "4.6.0",
     "corehttp": "1.0.0b6",
 }
 
 MIN_PYTHON_VERSION = "3.9"
-MAX_PYTHON_VERSION = "3.12"
+MAX_PYTHON_VERSION = "3.13"
 
 
 class GeneralSerializer(BaseSerializer):

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

@@ -9,6 +9,12 @@ from jinja2 import Environment
 from ..models import CodeModel, OperationGroup
 
 
+def get_pylint_disable(code_model: CodeModel, og: OperationGroup) -> str:
+    if og.is_mixin and not code_model.options["multiapi"]:
+        return " # pylint: disable=unused-import"
+    return ""
+
+
 class OperationsInitSerializer:
     def __init__(
         self,
@@ -27,9 +33,8 @@ class OperationsInitSerializer:
             return "_operations" if self.code_model.options["combine-operation-files"] else operation_group.filename
 
         return [
-            f"from .{_get_filename(og)} import {og.class_name}  # type: ignore"
+            f"from .{_get_filename(og)} import {og.class_name} # type: ignore{get_pylint_disable(self.code_model, og)}"
             for og in self.operation_groups
-            if not og.is_mixin or self.code_model.options["multiapi"]
         ]
 
     def serialize(self) -> str:

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

@@ -69,7 +69,7 @@ class SampleSerializer(BaseSerializer):
     def _client_params(self) -> Dict[str, Any]:
         # client params
         special_param = {}
-        credential_type = getattr(self.code_model.clients[0].credential, "type", None)
+        credential_type = getattr(self.operation_group.client.credential, "type", None)
         if isinstance(credential_type, TokenCredentialType):
             special_param.update({"credential": "DefaultAzureCredential()"})
         elif isinstance(credential_type, KeyCredentialType):
@@ -78,7 +78,7 @@ class SampleSerializer(BaseSerializer):
         params = [
             p
             for p in (
-                self.code_model.clients[0].parameters.positional + self.code_model.clients[0].parameters.keyword_only
+                self.operation_group.client.parameters.positional + self.operation_group.client.parameters.keyword_only
             )
             if not p.optional and p.client_default_value is None
         ]
@@ -153,6 +153,7 @@ class SampleSerializer(BaseSerializer):
         operation_result, return_var = self._operation_result()
         return self.env.get_template("sample.py.jinja2").render(
             code_model=self.code_model,
+            client=self.operation_group.client,
             file_name=self.file_name,
             operation_result=operation_result,
             operation_params=self._operation_params(),

package/generator/pygen/codegen/templates/sample.py.jinja2

@@ -27,7 +27,7 @@
     {% endif %}
 """
 def main():
-    client = {{ code_model.clients[0].name }}(
+    client = {{ client.name }}(
         {% for key,value in client_params.items() %}
         {{ key }}={{ value }},
         {% endfor %}

package/generator/pygen/preprocess/python_mappings.py

@@ -97,7 +97,7 @@ _always_reserved = [
     "int",
 ]
 
-RESERVED_MODEL_PROPERTIES = [
+RESERVED_TSP_MODEL_PROPERTIES = [
     "keys",
     "items",
     "values",
@@ -109,6 +109,8 @@ RESERVED_MODEL_PROPERTIES = [
     "get",
     "copy",
     "as_dict",
+    # following are reserved special words for TSP models
+    "datetime",
 ]
 
 RESERVED_WORDS = {
@@ -187,7 +189,7 @@ RESERVED_WORDS = {
 
 TSP_RESERVED_WORDS = {
     PadType.PARAMETER: ["stream"],
-    PadType.PROPERTY: RESERVED_MODEL_PROPERTIES,
+    PadType.PROPERTY: RESERVED_TSP_MODEL_PROPERTIES,
 }
 
 REDEFINED_BUILTINS = [  # we don't pad, but we need to do lint ignores

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.37.0",
+  "version": "6.37.1",
   "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.14.0",
+    "@typespec/http-client-python": "~0.14.1",
     "@autorest/system-requirements": "~1.0.2",
     "fs-extra": "~11.2.0",
     "tsx": "~4.19.1"

package/scripts/eng/regenerate.ts

@@ -119,11 +119,6 @@ function getEmitterOption(spec: string): Record<string, string>[] {
 
 // Function to execute CLI commands asynchronously
 async function executeCommand(tspCommand: TspCommand): Promise<void> {
-    try {
-        rmSync(tspCommand.outputDir, { recursive: true, force: true });
-    } catch (error) {
-        console.error(`rm error: ${error}`);
-    }
     try {
         console.log(`exec: ${tspCommand.command}`);
         const { stdout, stderr } = await exec(tspCommand.command);
@@ -131,6 +126,7 @@ async function executeCommand(tspCommand: TspCommand): Promise<void> {
         if (stderr) console.error(`stderr: ${stderr}`);
     } catch (error) {
         console.error(`exec error: ${error}`);
+        rmSync(tspCommand.outputDir, { recursive: true, force: true });
         throw error;
     }
 }

package/setup.py

@@ -38,6 +38,7 @@ setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "License :: OSI Approved :: MIT License",
     ],
     packages=find_packages(