@autorest/python 6.27.4 → 6.28.1

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

@@ -7,6 +7,6 @@
 {{ imports }}
 
 {% for client in clients %}
-    {% set serializer = get_serializer(client) %}
+    {% set serializer = get_serializer(client, serialize_namespace) %}
 {% include "client.py.jinja2" %}
 {% endfor %}

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

@@ -11,6 +11,6 @@ VERSION = "unknown"
 {% endif %}
 
 {% for client in clients %}
-    {% set serializer = get_serializer(client) %}
+    {% set serializer = get_serializer(client, serialize_namespace) %}
 {% include "config.py.jinja2" %}
 {% endfor %}

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

@@ -5,6 +5,6 @@
 from enum import Enum
 from {{ code_model.core_library }}{{ "" if code_model.is_azure_flavor else ".utils" }} import CaseInsensitiveEnumMeta
 
-{% for enum in code_model.enums | sort %}
+{% for enum in enums | sort %}
 {% include "enum.py.jinja2" %}
 {% endfor %}

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

@@ -8,7 +8,7 @@ from .{{ client.filename }} import {{ client.name }}  # type: ignore
     {% endfor %}
 {% endif %}
 {% if not async_mode and code_model.options['package_version']%}
-from ._version import VERSION
+from {{ code_model.get_relative_import_path(serialize_namespace, module_name="_version") }} import VERSION
 
 __version__ = VERSION
 {% endif %}

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

@@ -6,7 +6,7 @@
 {% endif %}
 
 {{ imports }}
-{% for model in code_model.model_types %}
+{% for model in models %}
 {% if model.base == "dpg" %}
 {% include "model_dpg.py.jinja2" %}
 {% elif model.base == "msrest" %}

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

@@ -31,10 +31,10 @@ class {{ operation_group.class_name }}: {{ operation_group.pylint_disable() }}
 {% endif %}
     def __init__(self, *args, **kwargs){{ return_none_type_annotation }}:
         input_args = list(args)
-        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
-        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
-        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
-        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._client: {{ 'Async' if async_mode else ''}}PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config: {{ operation_group.client.name }}Configuration = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
         {% if code_model.options["multiapi"] %}
         self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
         {% endif %}

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

@@ -6,7 +6,9 @@
 {{ imports }}
 {{ unset }}
 {% if code_model.options["builders_visibility"] == "embedded" and not async_mode %}
+  {% if need_declare_serializer %}
 {{ op_tools.declare_serializer(code_model) }}
+  {% endif %}
     {% for operation_group in operation_groups %}
         {% for request_builder in get_request_builders(operation_group) %}
 

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

@@ -7,11 +7,9 @@
 {{ op_tools.serialize(operation_group_imports()) }}
 {{ keywords.patch_imports() }}
 __all__ = [
-    {% for client in clients %}
-        {% for operation_group in client.operation_groups %}
+      {% for operation_group in operation_groups %}
     '{{ operation_group.class_name }}',
-        {% endfor %}
-    {% endfor %}
+      {% endfor %}
 ]
 {{ keywords.extend_all }}
 _patch_sdk()

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

@@ -184,73 +184,7 @@ try:
 except NameError:
     _long_type = int
 
-
-class UTC(datetime.tzinfo):
-    """Time Zone info for handling UTC"""
-
-    def utcoffset(self, dt):
-        """UTF offset for UTC is 0.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The offset
-        :rtype: datetime.timedelta
-        """
-        return datetime.timedelta(0)
-
-    def tzname(self, dt):
-        """Timestamp representation.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The timestamp representation
-        :rtype: str
-        """
-        return "Z"
-
-    def dst(self, dt):
-        """No daylight saving for UTC.
-
-        :param datetime.datetime dt: The datetime
-        :returns: The daylight saving time
-        :rtype: datetime.timedelta
-        """
-        return datetime.timedelta(hours=1)
-
-
-try:
-    from datetime import timezone as _FixedOffset  # type: ignore
-except ImportError:  # Python 2.7
-
-    class _FixedOffset(datetime.tzinfo):  # type: ignore
-        """Fixed offset in minutes east from UTC.
-        Copy/pasted from Python doc
-        :param datetime.timedelta offset: offset in timedelta format
-        """
-
-        def __init__(self, offset) -> None:
-            self.__offset = offset
-
-        def utcoffset(self, dt):
-            return self.__offset
-
-        def tzname(self, dt):
-            return str(self.__offset.total_seconds() / 3600)
-
-        def __repr__(self):
-            return "<FixedOffset {}>".format(self.tzname(None))
-
-        def dst(self, dt):
-            return datetime.timedelta(0)
-
-        def __getinitargs__(self):
-            return (self.__offset,)
-
-
-try:
-    from datetime import timezone
-
-    TZ_UTC = timezone.utc
-except ImportError:
-    TZ_UTC = UTC()  # type: ignore
+TZ_UTC = datetime.timezone.utc
 
 _FLATTEN = re.compile(r"(?<!\\)\.")
 
@@ -2050,7 +1984,7 @@ class Deserializer:
         try:
             parsed_date = email.utils.parsedate_tz(attr)  # type: ignore
             date_obj = datetime.datetime(
-                *parsed_date[:6], tzinfo=_FixedOffset(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60))
+                *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60))
             )
             if not date_obj.tzinfo:
                 date_obj = date_obj.astimezone(tz=TZ_UTC)

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

@@ -1,7 +1,7 @@
 {% set prefix_lower = test.prefix|lower %}
 {% set client_var = "self.client" if code_model.options["azure_arm"] else "client" %}
-{% set async = "async " if test.is_async else "" %}
-{% set async_suffix = "_async" if test.is_async else "" %}
+{% set async = "async " if test.async_mode else "" %}
+{% set async_suffix = "_async" if test.async_mode else "" %}
 # coding=utf-8
 {{ code_model.options['license_header'] }}
 import pytest
@@ -15,7 +15,7 @@ AZURE_LOCATION = "eastus"
 class {{ test.test_class_name }}({{ test.base_test_class_name }}):
 {% if code_model.options["azure_arm"] %}
     def setup_method(self, method):
-        {% if test.is_async %}
+        {% if test.async_mode %}
         self.client = self.create_mgmt_client({{ test.client_name }}, is_async=True)
         {% else %}
         self.client = self.create_mgmt_client({{ test.client_name }})

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

@@ -3,7 +3,7 @@
 {{ imports }}
 
 {% for test_name in test_names %}
-{% set extra_async = ", is_async=True" if test_name.is_async else ""%}
+{% set extra_async = ", is_async=True" if test_name.async_mode else ""%}
 {% set prefix_lower = test_name.prefix|lower %}
 class {{ test_name.base_test_class_name }}(AzureRecordedTestCase):
 
@@ -15,7 +15,7 @@ class {{ test_name.base_test_class_name }}(AzureRecordedTestCase):
             endpoint=endpoint,
         )
 
-{% if not test_name.is_async %}
+{% if not test_name.async_mode %}
 {{ test_name.preparer_name }} = functools.partial(
     PowerShellPreparer,
     "{{ prefix_lower }}",

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

@@ -3,7 +3,7 @@
 
 {{ imports }}
 
-{% if code_model.need_mixin_abc %}
+{% 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 }}
@@ -16,7 +16,7 @@ class {{ client.name }}MixinABC(  {{ pylint_disable }}
     _deserialize: "Deserializer"
     {% endfor %}
 {% endif %}
-{% if code_model.has_abstract_operations %}
+{% if code_model.need_vendored_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))]
@@ -27,7 +27,7 @@ def raise_if_not_implemented(cls, abstract_methods):
         )
 {% endif %}
 
-{% if code_model.has_etag %}
+{% if code_model.need_vendored_etag(client_namespace) %}
 def quote_etag(etag: Optional[str]) -> Optional[str]:
     if not etag or etag == "*":
         return etag
@@ -57,7 +57,7 @@ def prep_if_none_match(etag: Optional[str], match_condition: Optional[MatchCondi
         return "*"
     return None
 {% endif %}
-{% if code_model.has_form_data and code_model.options["models_mode"] == "dpg" and not async_mode  %}
+{% if code_model.need_vendored_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/preprocess/__init__.py

@@ -501,10 +501,6 @@ class PreProcessPlugin(YamlUpdatePlugin):
         for client in yaml_data["clients"]:
             self.update_client(client)
             self.update_operation_groups(yaml_data, client)
-        for clients in yaml_data["subnamespaceToClients"].values():
-            for client in clients:
-                self.update_client(client)
-                self.update_operation_groups(yaml_data, client)
         if yaml_data.get("namespace"):
             yaml_data["namespace"] = pad_builtin_namespaces(yaml_data["namespace"])
 

package/generator/pygen.egg-info/PKG-INFO

@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pygen
 Version: 0.1.0
 Summary: Core Library for Python Generation
@@ -24,5 +24,14 @@ Requires-Dist: m2r2==0.3.3.post2
 Requires-Dist: PyYAML==6.0.1
 Requires-Dist: tomli==2.0.1
 Requires-Dist: setuptools==69.5.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 # Core Library for Python Generation

package/package.json

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