@autorest/python 6.2.6 → 6.2.7

package/autorest/codegen/serializers/sample_serializer.py

@@ -5,7 +5,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import logging
-from typing import Dict, Any
+from typing import Dict, Any, Union
 from jinja2 import Environment
 
 from autorest.codegen.models.credential_types import AzureKeyCredentialType
@@ -13,6 +13,7 @@ from autorest.codegen.models.credential_types import TokenCredentialType
 from autorest.codegen.models.imports import FileImport, ImportType
 from autorest.codegen.models.operation import OperationBase
 from autorest.codegen.models.operation_group import OperationGroup
+from autorest.codegen.models.parameter import Parameter, BodyParameter
 from autorest.codegen.serializers.import_serializer import FileImportSerializer
 from ..models import CodeModel
 
@@ -28,7 +29,6 @@ class SampleSerializer:
         operation: OperationBase[Any],
         sample: Dict[str, Any],
         file_name: str,
-        sample_origin_name: str,
     ) -> None:
         self.code_model = code_model
         self.env = env
@@ -36,7 +36,6 @@ class SampleSerializer:
         self.operation = operation
         self.sample = sample
         self.file_name = file_name
-        self.sample_origin_name = sample_origin_name
 
     def _imports(self) -> FileImportSerializer:
         imports = FileImport()
@@ -55,6 +54,13 @@ class SampleSerializer:
             imports.add_submodule_import(
                 "azure.core.credentials", "AzureKeyCredential", ImportType.THIRDPARTY
             )
+        for param in self.operation.parameters.positional:
+            if (
+                not param.client_default_value
+                and not param.optional
+                and param.rest_api_name in self.sample["parameters"]
+            ):
+                imports.merge(param.type.imports_for_sample())
         return FileImportSerializer(imports, True)
 
     def _client_params(self) -> Dict[str, Any]:
@@ -88,13 +94,12 @@ class SampleSerializer:
         return client_params
 
     @staticmethod
-    def handle_param(param: Any) -> str:
-        if isinstance(param, str):
-            if any(i in param for i in '\r\n"'):
-                return f'"""{param}"""'
-            return f'"{param}"'
+    def handle_param(param: Union[Parameter, BodyParameter], param_value: Any) -> str:
+        if isinstance(param_value, str):
+            if any(i in param_value for i in '\r\n"'):
+                return f'"""{param_value}"""'
 
-        return str(param)
+        return param.type.serialize_sample_value(param_value)
 
     # prepare operation parameters
     def _operation_params(self) -> Dict[str, Any]:
@@ -103,15 +108,17 @@ class SampleSerializer:
             for p in self.operation.parameters.positional
             if not p.client_default_value
         ]
-        failure_info = "fail to find required param named {} in example file {}"
+        failure_info = "fail to find required param named {}"
         operation_params = {}
         for param in params_positional:
             name = param.rest_api_name
             param_value = self.sample["parameters"].get(name)
             if not param.optional:
                 if not param_value:
-                    raise Exception(failure_info.format(name, self.sample_origin_name))
-                operation_params[param.client_name] = self.handle_param(param_value)
+                    raise Exception(failure_info.format(name))
+                operation_params[param.client_name] = self.handle_param(
+                    param, param_value
+                )
         return operation_params
 
     def _operation_group_name(self) -> str:
@@ -135,8 +142,10 @@ class SampleSerializer:
         return f".{self.operation.name}"
 
     def _origin_file(self) -> str:
-        name = self.sample.get("x-ms-original-file", "").split("specification")[-1]
-        return "specification" + name if name else name
+        name = self.sample.get("x-ms-original-file", "")
+        if "specification" in name:
+            return "specification" + name.split("specification")[-1]
+        return ""
 
     def serialize(self) -> str:
         return self.env.get_template("sample.py.jinja2").render(

package/autorest/codegen/serializers/utils.py

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
+from pathlib import Path
 
 
 def method_signature_and_response_type_annotation_template(
@@ -11,3 +12,8 @@ def method_signature_and_response_type_annotation_template(
     response_type_annotation: str,
 ) -> str:
     return f"{method_signature} -> {response_type_annotation}:"
+
+
+def extract_sample_name(file_path: str) -> str:
+    file = file_path.split("specification")[-1]
+    return Path(file).parts[-1].replace(".json", "")

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

@@ -26,21 +26,12 @@
         {% endif %}
         return self._client.send_request(request_copy, **kwargs)
 
-    {{ keywords.def }} close(self){{ " -> None" if async_mode else "" }}:
-        {% if not async_mode %}
-        # type: () -> None
-        {% endif %}
+    {{ keywords.def }} close(self) -> None:
         {{ keywords.await }}self._client.close()
 
-    {{ keywords.def }} __{{ keywords.async_prefix }}enter__(self){{ (" -> \"" + client.name + "\"") if async_mode else "" }}:
-        {% if not async_mode %}
-        # type: () -> {{ client.name }}
-        {% endif %}
+    {{ keywords.def }} __{{ keywords.async_prefix }}enter__(self){{ " -> \"" + client.name + "\"" }}:
         {{ keywords.await }}self._client.__{{ keywords.async_prefix }}enter__()
         return self
 
-    {{ keywords.def }} __{{ keywords.async_prefix }}exit__(self, *exc_details){{ " -> None" if async_mode else "" }}:
-        {% if not async_mode %}
-        # type: (Any) -> None
-        {% endif %}
+    {{ keywords.def }} __{{ keywords.async_prefix }}exit__(self, *exc_details) -> None:
         {{ keywords.await }}self._client.__{{ keywords.async_prefix }}exit__(*exc_details)

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

@@ -30,11 +30,8 @@ class {{ client.name }}Configuration(Configuration):  # pylint: disable=too-many
 
     def _configure(
         self,
-        **kwargs{{": Any" if async_mode else "  # type: Any"}}
-    ){{ " -> None" if async_mode else "" }}:
-        {% if not async_mode %}
-        # type: (...) -> None
-        {% endif %}
+        **kwargs: Any
+    ) -> None:
         self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs)
         self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
         self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs)

package/autorest/codegen/templates/keywords.jinja2

@@ -3,7 +3,7 @@
 {% set await = "await " if async_mode else "" %}
 {% set async_class = "Async" if async_mode else "" %}
 {% macro escape_str(s) %}'{{ s|replace("'", "\\'") }}'{% endmacro %}
-{% set kwargs_declaration = "**kwargs: Any" if async_mode else "**kwargs  # type: Any" %}
+{% set kwargs_declaration = "**kwargs: Any" %}
 {% set extend_all = "__all__.extend([p for p in _patch_all if p not in __all__])" %}
 {% macro patch_imports(try_except=False) %}
 {% set indentation = "    " if try_except else "" %}
@@ -11,7 +11,7 @@
 try:
 {% endif %}
 {{ indentation }}from ._patch import __all__ as _patch_all
-{{ indentation }}from ._patch import *  # type: ignore # pylint: disable=unused-wildcard-import
+{{ indentation }}from ._patch import *  # pylint: disable=unused-wildcard-import
 {% if try_except %}
 except ImportError:
     _patch_all = []

package/autorest/codegen/templates/metadata.json.jinja2

@@ -45,7 +45,7 @@
         "service_client_specific": {
             "sync": {
                 "api_version": {
-                    "signature": "api_version=None, # type: Optional[str]",
+                    "signature": "api_version: Optional[str]=None,",
                     "description": "API version to use if no profile is provided, or if missing in profile.",
                     "docstring_type": "str",
                     "required": false
@@ -59,7 +59,7 @@
                 },
                 {% endif %}
                 "profile": {
-                    "signature": "profile=KnownProfiles.default, # type: KnownProfiles",
+                    "signature": "profile: KnownProfiles=KnownProfiles.default,",
                     "description": "A profile definition, from KnownProfiles to dict.",
                     "docstring_type": "azure.profiles.KnownProfiles",
                     "required": false

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

@@ -41,8 +41,7 @@ with no data. This gets serialized to `null` on the wire.
 """
 
 
-def _timedelta_as_isostr(td):
-    # type: (timedelta) -> str
+def _timedelta_as_isostr(td: timedelta) -> str:
     """Converts a datetime.timedelta object into an ISO 8601 formatted string, e.g. 'P4DT12H30M05S'
 
     Function adapted from the Tin Can Python project: https://github.com/RusticiSoftware/TinCanPython
@@ -92,8 +91,7 @@ def _timedelta_as_isostr(td):
     return "P" + date_str + time_str
 
 
-def _datetime_as_isostr(dt):
-    # type: (typing.Union[datetime, date, time, timedelta]) -> str
+def _datetime_as_isostr(dt: typing.Union[datetime, date, time, timedelta]) -> str:
     """Converts a datetime.(datetime|date|time|timedelta) object into an ISO 8601 formatted string"""
     # First try datetime.datetime
     if hasattr(dt, "year") and hasattr(dt, "hour"):

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

@@ -9,7 +9,7 @@
     {% endif %}
     {% if model.has_readonly_or_constant_property %}
 
-    Variables are only populated by the server, and will be ignored when sending a request.
+    Readonly variables are only populated by the server, and will be ignored when sending a request.
     {% endif %}
     {% if (model.properties | selectattr('optional', "equalto", false) | first) is defined %}
 

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

@@ -15,7 +15,7 @@
     {{ request_builder_serializer.construct_url(request_builder) }}
     {% if request_builder.parameters.path %}
     {{ op_tools.serialize(request_builder_serializer.serialize_path(request_builder)) | indent }}
-    _url = _format_url_section(_url, **path_format_arguments)
+    _url: str = _format_url_section(_url, **path_format_arguments)  # type: ignore
         {% endif %}
 
         {% if request_builder.parameters.query %}