@autorest/python 6.7.5 → 6.7.7

package/autorest/codegen/models/client.py

@@ -85,8 +85,6 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
         request_builders: List[Union[RequestBuilder, OverloadedRequestBuilder]] = []
         for og_group in self.yaml_data["operationGroups"]:
             for operation_yaml in og_group["operations"]:
-                if operation_yaml["discriminator"] in ("lro", "lropaging"):
-                    continue
                 request_builder = get_request_builder(
                     operation_yaml,
                     code_model=self.code_model,

package/autorest/codegen/models/enum_type.py

@@ -65,7 +65,7 @@ class EnumType(BaseType):
         value_type: BaseType,
     ) -> None:
         super().__init__(yaml_data=yaml_data, code_model=code_model)
-        self.name: str = yaml_data["name"]
+        self.name: str = yaml_data["name"][0].upper() + yaml_data["name"][1:]
         self.values = values
         self.value_type = value_type
 

package/autorest/codegen/models/lro_operation.py

@@ -146,10 +146,6 @@ class LROOperationBase(OperationBase[LROResponseType]):
         file_import.add_submodule_import("typing", "cast", ImportType.STDLIB)
         return file_import
 
-    @classmethod
-    def get_request_builder(cls, yaml_data: Dict[str, Any], client: "Client"):
-        return client.lookup_request_builder(id(yaml_data["initialOperation"]))
-
 
 class LROOperation(LROOperationBase[LROResponse]):
     ...

package/autorest/codegen/models/request_builder.py

@@ -57,6 +57,10 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
         self.method: str = yaml_data["method"]
         self.want_tracing = False
 
+    @property
+    def is_lro(self) -> bool:
+        return self.yaml_data.get("discriminator") in ("lro", "lropaging")
+
     @property
     def pylint_disable(self) -> str:
         if len(self.name) > NAME_LENGTH_LIMIT:

package/autorest/codegen/serializers/builder_serializer.py

@@ -889,7 +889,6 @@ class _OperationSerializer(
         self,
         builder: OperationType,
         request_builder: RequestBuilderType,
-        template_url: Optional[str] = None,
         is_next_request: bool = False,
     ) -> List[str]:
         retval: List[str] = []
@@ -949,9 +948,6 @@ class _OperationSerializer(
             retval.append(
                 f"    {body_param.client_name}={body_param.name_in_high_level_operation},"
             )
-        if not self.code_model.options["version_tolerant"]:
-            template_url = template_url or f"self.{builder.name}.metadata['url']"
-            retval.append(f"    template_url={template_url},")
         retval.append("    headers=_headers,")
         retval.append("    params=_params,")
         retval.append(")")
@@ -1011,9 +1007,7 @@ class _OperationSerializer(
             retval.extend(self._create_body_parameter(builder))
         retval.append("")
         retval.extend(
-            self._create_request_builder_call(
-                builder, request_builder, template_url, is_next_request
-            )
+            self._create_request_builder_call(builder, request_builder, is_next_request)
         )
         retval.extend(self._postprocess_http_request(builder, template_url))
         return retval
@@ -1275,11 +1269,6 @@ class _OperationSerializer(
         retval.append("error_map.update(kwargs.pop('error_map', {}) or {})")
         return retval
 
-    @staticmethod
-    def get_metadata_url(builder: OperationType) -> str:
-        url = _escape_str(builder.request_builder.url)
-        return f"{builder.name}.metadata = {{'url': {url}}}"
-
     @property
     def _call_method(self) -> str:
         return "await " if self.async_mode else ""
@@ -1326,11 +1315,7 @@ class _PagingOperationSerializer(
     def call_next_link_request_builder(self, builder: PagingOperationType) -> List[str]:
         if builder.next_request_builder:
             request_builder = builder.next_request_builder
-            template_url = (
-                None
-                if self.code_model.options["version_tolerant"]
-                else f"'{request_builder.url}'"
-            )
+            template_url = None
         else:
             request_builder = builder.request_builder
             template_url = "next_link"

package/autorest/codegen/serializers/operation_groups_serializer.py

@@ -48,6 +48,7 @@ class OperationGroupsSerializer:
             and r.group_name == operation_group.property_name
             and not r.is_overload
             and not r.abstract
+            and not r.is_lro  # lro has already initial builder
         ]
 
     def serialize(self) -> str:

package/autorest/codegen/templates/lro_operation.py.jinja2

@@ -14,6 +14,3 @@
 
     {{ op_tools.serialize(operation_serializer.return_lro_poller(operation)) | indent }}
     {% endif %}
-{% if not code_model.options["version_tolerant"] %}
-{{ operation_serializer.get_metadata_url(operation) -}}
-{% endif %}

package/autorest/codegen/templates/lro_paging_operation.py.jinja2

@@ -16,6 +16,3 @@
     {{ op_tools.serialize(operation_serializer.get_long_running_output(operation)) | indent }}
     {{ op_tools.serialize(operation_serializer.return_lro_poller(operation)) | indent }}
     {% endif %}
-{% if not code_model.options["version_tolerant"] %}
-{{ operation_serializer.get_metadata_url(operation) }}
-{% endif %}

package/autorest/codegen/templates/macros.jinja2

@@ -0,0 +1,12 @@
+{% macro wrap_model_string(doc_string, wrap_string, suffix_string="") %}
+{% set orignal_result = doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrap_string) %}
+{% set list_result = orignal_result.split('\n') %}
+{% for line in list_result %}
+    {% set suffix = suffix_string if list_result | length == loop.index %}
+    {% if line | length > 120 %}
+{{ line + "  # pylint: disable=line-too-long" }}{{ suffix }}
+    {% else %}
+{{ line }}{{ suffix }}
+    {% endif %}
+{% endfor %}
+{% endmacro %}

package/autorest/codegen/templates/model_dpg.py.jinja2

@@ -1,4 +1,5 @@
 {# actual template starts here #}
+{% import "macros.jinja2" as macros %}
 
 
 {{ serializer.declare_model(model) }}
@@ -20,7 +21,7 @@
         {% for p in model.properties %}
             {% for line in serializer.variable_documentation_string(p) %}
                 {% for doc_string in line.replace('\n', '\n ').split('\n') %}
-    {{ doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n     ') }}
+    {{ macros.wrap_model_string(doc_string, '\n     ') -}}
                 {% endfor %}
             {% endfor %}
         {% endfor %}
@@ -34,7 +35,7 @@
     {{ serializer.declare_property(p) }}
         {% set prop_description = p.description(is_operation_file=False).replace('"', '\\"') %}
         {% if prop_description %}
-    """{{ prop_description | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n     ') }}"""
+    """{{ macros.wrap_model_string(prop_description, '\n     ', '\"\"\"') -}}
         {% endif %}
     {% endfor %}
 

package/autorest/codegen/templates/model_msrest.py.jinja2

@@ -1,5 +1,7 @@
 {# actual template starts here #}
-
+{% import "macros.jinja2" as macros %}
+{% set initialize_properties = serializer.initialize_properties(model) %}
+{% set exist_constant = (model.properties | selectattr('constant') | first) is defined %}
 
 {{ serializer.declare_model(model) }}
     """{{ model.description(is_operation_file=False) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    ') }}
@@ -20,12 +22,13 @@
         {% for p in model.properties %}
             {% for line in serializer.variable_documentation_string(p) %}
                 {% for doc_string in line.replace('\n', '\n ').split('\n') %}
-    {{ doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n     ') }}
+    {{ macros.wrap_model_string(doc_string, '\n     ') -}}
                 {% endfor %}
             {% endfor %}
         {% endfor %}
     {% endif %}
     """
+{% if initialize_properties or exist_constant %}
     {% if (model.properties | selectattr('validation') ) | first %}
 
     _validation = {
@@ -53,7 +56,7 @@
         {{ model.xml_map_content }}
     }
     {% endif %}
-    {% if (model.properties | selectattr('constant') | first) is defined %}
+    {% if exist_constant %}
 
         {% for p in model.properties | selectattr('constant')%}
     {{ p.client_name }} = {{ p.type.get_declaration() }}
@@ -73,7 +76,7 @@
             {% if p.is_input %}
                 {% for line in serializer.input_documentation_string(p) %}
                     {% for doc_string in line.replace('\n', '\n ').split('\n') %}
-        {{ doc_string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n         ') }}
+        {{ macros.wrap_model_string(doc_string, '\n         ') -}}
                     {% endfor %}
                 {% endfor %}
             {% endif %}
@@ -81,6 +84,7 @@
     {% endif %}
         """
         {{ serializer.super_call(model) }}
-    {% for initialize_property in serializer.initialize_properties(model) %}
+    {% for initialize_property in initialize_properties %}
         {{ initialize_property }}
     {% endfor %}
+{% endif %}

package/autorest/codegen/templates/operation.py.jinja2

@@ -19,6 +19,3 @@
     {{ op_tools.serialize(operation_serializer.make_pipeline_call(operation)) | indent }}
     {{ op_tools.serialize(operation_serializer.handle_response(operation)) | indent }}
     {% endif %}
-{% if not code_model.options["version_tolerant"] %}
-{{ operation_serializer.get_metadata_url(operation) }}
-{% endif %}

package/autorest/codegen/templates/paging_operation.py.jinja2

@@ -19,6 +19,3 @@
         get_next, extract_data
     )
     {% endif %}
-{% if not code_model.options["version_tolerant"] %}
-{{ operation_serializer.get_metadata_url(operation) -}}
-{% endif %}

package/autorest/codegen/templates/vendor.py.jinja2

@@ -39,6 +39,8 @@ def raise_if_not_implemented(cls, abstract_methods):
 def quote_etag(etag: Optional[str]) -> Optional[str]:
     if not etag or etag == "*":
         return etag
+    if etag.startswith("W/"):
+        return etag
     if etag.startswith('"') and etag.endswith('"'):
         return etag
     if etag.startswith("'") and etag.endswith("'"):

package/package.json

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