@autorest/python 6.32.3 → 6.34.0

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

@@ -9,7 +9,7 @@
         {% if client.has_parameterized_host %}
         {{ serializer.host_variable_name }} = {{ keywords.escape_str(client.url) }}
         {% endif %}
-        {{ serializer.initialize_config() }}
+        {{ op_tools.serialize(serializer.initialize_config()) | indent(8) }}
         {{ op_tools.serialize(serializer.initialize_pipeline_client(async_mode)) | indent(8) }}
 
         {{ op_tools.serialize(serializer.serializers_and_operation_groups_properties()) | indent(8) }}

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

@@ -21,14 +21,8 @@ class {{ client.name }}Configuration:  {{ client.config.pylint_disable() }}
 {% if serializer.set_constants() %}
         {{ op_tools.serialize(serializer.set_constants()) | indent(8) -}}
 {% endif %}
-{% if client.credential %}
-    {% set cred_scopes = client.credential.type if client.credential.type.policy is defined and client.credential.type.policy.credential_scopes is defined %}
-    {% if not cred_scopes %}
-        {% set cred_scopes = client.credential.type.types | selectattr("policy.credential_scopes") | first if client.credential.type.types is defined %}
-    {% endif %}
-    {% if cred_scopes %}
-        self.credential_scopes = kwargs.pop('credential_scopes', {{ cred_scopes.policy.credential_scopes }})
-    {% endif %}
+{% if client.credential_scopes is not none %}
+        self.credential_scopes = kwargs.pop('credential_scopes', {{ client.credential_scopes }})
 {% endif %}
         kwargs.setdefault('sdk_moniker', '{{ client.config.sdk_moniker }}/{}'.format(VERSION))
         self.polling_interval = kwargs.get("polling_interval", 30)

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

@@ -19,7 +19,7 @@
     """
 
     {% if model.is_polymorphic %}
-    __mapping__: Dict[str, _model_base.Model] = {}
+    __mapping__: Dict[str, _Model] = {}
     {% endif %}
     {% for p in serializer.get_properties_to_declare(model)%}
     {{ serializer.declare_property(p) }}

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

@@ -1,4 +1,4 @@
-{% set base_class = ("(" + operation_group.base_class + ")") if operation_group.base_class else "" %}
+{% set base_class = ("(" + operation_group.base_class(async_mode) + ")") if operation_group.base_class(async_mode) else "" %}
 {% macro check_abstract_methods() %}
 {% if operation_group.has_abstract_operations %}
         raise_if_not_implemented(self.__class__, [
@@ -8,9 +8,9 @@
         ])
 {% endif %}
 {% endmacro %}
-{% if operation_group.base_class %}
+{% if operation_group.base_class(async_mode) %}
 class {{ operation_group.class_name }}( {{ operation_group.pylint_disable() }}
-    {{ operation_group.base_class }}
+    {{ operation_group.base_class(async_mode) }}
 ):
 {% else %}
 class {{ operation_group.class_name }}: {{ operation_group.pylint_disable() }}

package/generator/pygen/codegen/templates/packaging_templates/setup.py.jinja2

@@ -1,4 +1,6 @@
 # coding=utf-8
+{% set min_version = MIN_PYTHON_VERSION.split('.')[1] | int %}
+{% set max_version = MAX_PYTHON_VERSION.split('.')[1] | int %}
 {% if code_model.license_header %}
 {{ code_model.license_header }}
 {% endif %}
@@ -67,10 +69,9 @@ setup(
         "Programming Language :: Python",
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
+        {% for version in range(min_version, max_version + 1)  %}
+        "Programming Language :: Python :: 3.{{ version }}",
+        {% endfor %}
         "License :: OSI Approved :: MIT License",
     ],
     zip_safe=False,
@@ -95,21 +96,21 @@ setup(
     {% endif %}
     install_requires=[
         {% if code_model.is_legacy %}
-        "msrest>=0.7.1",
+        "msrest>={{ VERSION_MAP["msrest"] }}",
         {% else %}
-        "isodate>=0.6.1",
+        "isodate>={{ VERSION_MAP["isodate"] }}",
         {% endif %}
         {% if azure_arm %}
-        "azure-mgmt-core>=1.3.2",
+        "azure-mgmt-core>={{ VERSION_MAP["azure-mgmt-core"] }}",
         {% elif code_model.is_azure_flavor %}
-        "azure-core>=1.30.0",
+        "azure-core>={{ VERSION_MAP["azure-core"] }}",
         {% else %}
-        "corehttp[requests]",
+        "corehttp[requests]>={{ VERSION_MAP["corehttp"] }}",
         {% endif %}
-        "typing-extensions>=4.6.0",
+        "typing-extensions>={{ VERSION_MAP['typing-extensions'] }}",
     ],
     {% if package_mode %}
-    python_requires=">=3.9",
+    python_requires=">={{  MIN_PYTHON_VERSION }}",
     {% else %}
     long_description="""\
     {{ code_model.description }}

package/generator/pygen/codegen/templates/{vendor.py.jinja2 → utils.py.jinja2}

@@ -5,20 +5,19 @@
 
 {{ imports }}
 
-{% if code_model.need_vendored_mixin(client_namespace) %}
-    {% for client in clients | selectattr("has_mixin") %}
-{% set pylint_disable = "# pylint: disable=name-too-long" if (client.name | length) + ("MixinABC" | length) > 40 else "" %}
-class {{ client.name }}MixinABC(  {{ pylint_disable }}
-    ABC
-):
+{% if code_model.need_utils_mixin %}
+
+TClient = TypeVar("TClient")
+TConfig = TypeVar("TConfig")
+
+class ClientMixinABC(ABC, Generic[TClient, TConfig]):
     """DO NOT use this class. It is for internal typing use only."""
-    _client: "{{ keywords.async_class }}PipelineClient"
-    _config: {{ client.name }}Configuration
+    _client: TClient
+    _config: TConfig
     _serialize: "Serializer"
     _deserialize: "Deserializer"
-    {% endfor %}
 {% endif %}
-{% if code_model.need_vendored_abstract(client_namespace) %}
+{% if code_model.need_utils_abstract(client_namespace) %}
 
 def raise_if_not_implemented(cls, abstract_methods):
     not_implemented = [f for f in abstract_methods if not callable(getattr(cls, f, None))]
@@ -29,7 +28,7 @@ def raise_if_not_implemented(cls, abstract_methods):
         )
 {% endif %}
 
-{% if code_model.need_vendored_etag(client_namespace) %}
+{% if code_model.need_utils_etag(client_namespace) %}
 def quote_etag(etag: Optional[str]) -> Optional[str]:
     if not etag or etag == "*":
         return etag
@@ -59,7 +58,7 @@ def prep_if_none_match(etag: Optional[str], match_condition: Optional[MatchCondi
         return "*"
     return None
 {% endif %}
-{% if code_model.need_vendored_form_data(async_mode, client_namespace)  %}
+{% if code_model.need_utils_form_data(async_mode, client_namespace)  %}
 # file-like tuple could be `(filename, IO (or bytes))` or `(filename, IO (or bytes), content_type)`
 FileContent = Union[str, bytes, IO[str], IO[bytes]]
 

package/generator/pygen.egg-info/SOURCES.txt

@@ -92,8 +92,8 @@ pygen/codegen/templates/serialization.py.jinja2
 pygen/codegen/templates/test.py.jinja2
 pygen/codegen/templates/testpreparer.py.jinja2
 pygen/codegen/templates/types.py.jinja2
+pygen/codegen/templates/utils.py.jinja2
 pygen/codegen/templates/validation.py.jinja2
-pygen/codegen/templates/vendor.py.jinja2
 pygen/codegen/templates/version.py.jinja2
 pygen/codegen/templates/packaging_templates/CHANGELOG.md.jinja2
 pygen/codegen/templates/packaging_templates/LICENSE.jinja2

package/package.json

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