@autorest/python 5.12.4 → 5.13.0

package/autorest/codegen/templates/operation_tools.jinja2

@@ -1,4 +1,4 @@
-{% macro wrap_string(string, wrapstring) %}{{ string | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring)}}{% endmacro %}
+{% macro wrap_string(string, wrapstring, width=95) %}{{ string | wordwrap(width=width, break_long_words=False, break_on_hyphens=False, wrapstring=wrapstring)}}{% endmacro %}
 
 {% macro description(builder, serializer) %}
     {% for description in serializer.description_and_summary(builder) %}
@@ -22,7 +22,8 @@ Example:
     .. code-block:: python
     {% for template_line in serializer.get_example_template(builder) %}
         {% if template_line %}
-        {{ template_line }}
+            {% set wrap_amount = (template_line | length) - (template_line.lstrip() | length) + 10 %}
+        {{  wrap_string(template_line, wrapstring='\n' + " " * wrap_amount, width=(95 - wrap_amount)) }}
         {% else %}
 
         {% endif %}

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

@@ -17,4 +17,6 @@
     return {{ operation.get_pager(async_mode) }}(
         get_next, extract_data
     )
-{{ operation.python_name }}.metadata = {'url': '{{ request_builder.url|replace("'", "\\'") }}'}  # type: ignore
+{% if not code_model.options["version_tolerant"] %}
+{{ operation_serializer.get_metadata_url(operation) -}}
+{% endif %}

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

@@ -13,15 +13,10 @@
     {% endfor %}
 {% endif %}
     # Construct URL
-{% if code_model.options["version_tolerant"] or code_model.options["low_level_client"] %}
-    {% set url_value = keywords.escape_str(request_builder.url) %}
-{% else %}
-    {% set url_value = 'kwargs.pop("template_url", ' + keywords.escape_str(request_builder.url) + ')' %}
-{% endif %}
-    url = {{ url_value }}
+    {{ 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 = _format_url_section(_url, **path_format_arguments)
 {% endif %}
 
 {% if request_builder.parameters.query %}

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

@@ -7,7 +7,7 @@
 {{ imports }}
 
 {{ serializer.class_definition(async_mode) }}
-    """{{ code_model.description }}
+    """{{ op_tools.wrap_string(code_model.description, "\n") | indent }}
 
     {{ op_tools.serialize_with_wrap(serializer.property_descriptions(async_mode), "\n ") | indent }}
     {{ serializer.init_signature_and_response_type_annotation(async_mode) | indent }}

package/autorest/multiapi/models/imports.py

@@ -45,7 +45,7 @@ class FileImport:
                 from_section, set()
             ).add(name_import)
 
-    def add_from_import(
+    def add_submodule_import(
         self,
         from_section: str,
         name_import: str,

package/autorest/multiapi/serializers/import_serializer.py

@@ -62,7 +62,7 @@ class FileImportSerializer:
             self._file_import.imports.get(TypingSection.TYPING) or
             (not self.is_python3_file and self._file_import.imports.get(TypingSection.CONDITIONAL))
         ):
-            self._file_import.add_from_import("typing", "TYPE_CHECKING", ImportType.STDLIB)
+            self._file_import.add_submodule_import("typing", "TYPE_CHECKING", ImportType.STDLIB)
 
     def __str__(self) -> str:
         self._add_type_checking_import()

package/autorest/namer/name_converter.py

@@ -373,7 +373,7 @@ class NameConverter:
             # check to see if name is reserved for the type of name we are converting
             pad_string = cast(PadType, pad_string)
             # there are some private variables, such as grouped parameters
-            # that are private. We still want to escape them for LLC
+            # that are private. We still want to escape them for DPG
             name_prefix = ""
             if name[0] == "_":
                 # i am private

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@autorest/python",
-    "version": "5.12.4",
+    "version": "5.13.0",
     "description": "The Python extension for generators in AutoRest.",
     "scripts": {
         "prepare": "node run-python3.js prepare.py",
@@ -27,7 +27,7 @@
         "@azure-tools/extension": "~3.2.1"
     },
     "devDependencies": {
-        "@microsoft.azure/autorest.testserver": "^3.1.11"
+        "@microsoft.azure/autorest.testserver": "^3.3.20"
     },
     "files": [
         "autorest/**/*.py",

package/run-python3.js

@@ -18,12 +18,6 @@ async function runPython3(scriptName, debug = "") {
 }
 
 runPython3(...process.argv.slice(2)).catch(err => {
-  const error = err.toString();
-
-  // Python script errors are already written out via stderr so don't
-  // write them twice.  Write out all other errors to stderr.
-  if (!error.startsWith("Error: Command failed")) {
-    console.error(error);
-  }
+  console.error(err.toString());
   process.exit(1);
 });

package/venvtools.py

@@ -62,13 +62,13 @@ def python_run(venv_context, module, command=None, *, additional_dir=".", error_
             venv_context.env_exe,
             "-m", module
         ] + (command if command else [])
-        print("Executing: {}".format(" ".join(cmd_line)), file=sys.stderr)
+        print("Executing: {}".format(" ".join(cmd_line)))
         subprocess.run(
             cmd_line,
             cwd=_ROOT_DIR / additional_dir,
             check=True,
         )
     except subprocess.CalledProcessError as err:
-        print(err, file=sys.stderr)
+        print(err)
         if not error_ok:
             sys.exit(1)