@autorest/python 5.12.6 → 5.15.0

package/autorest/multiapi/models/imports.py

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 from enum import Enum
-from typing import Dict, Optional, Set
+from typing import Dict, Optional, Set, Union, Tuple
 
 
 class ImportType(str, Enum):
@@ -21,29 +21,39 @@ class TypingSection(str, Enum):
 
 class FileImport:
     def __init__(
-        self, imports: Dict[TypingSection, Dict[ImportType, Dict[str, Set[Optional[str]]]]] = None
+        self,
+        imports: Dict[
+            TypingSection, Dict[ImportType, Dict[str, Set[Optional[Union[str, Tuple[str, str]]]]]]
+        ] = None
     ) -> None:
         # Basic implementation
         # First level dict: TypingSection
         # Second level dict: ImportType
         # Third level dict: the package name.
         # Fourth level set: None if this import is a "import", the name to import if it's a "from"
-        self._imports: Dict[TypingSection, Dict[ImportType, Dict[str, Set[Optional[str]]]]] = imports or dict()
+        self._imports: Dict[
+            TypingSection, Dict[ImportType, Dict[str, Set[Optional[Union[str, Tuple[str, str]]]]]]
+        ] = imports or dict()
 
     def _add_import(
         self,
         from_section: str,
         import_type: ImportType,
-        name_import: Optional[str] = None,
+        name_import: Optional[Union[str, Tuple[str, str]]] = None,
         typing_section: TypingSection = TypingSection.REGULAR
     ) -> None:
+        name_input: Optional[Union[str, Tuple[str, str]]] = None
+        if isinstance(name_import, list):
+            name_input = tuple(name_import)
+        else:
+            name_input = name_import
         self._imports.setdefault(
-                typing_section, dict()
-            ).setdefault(
-                import_type, dict()
-            ).setdefault(
-                from_section, set()
-            ).add(name_import)
+            typing_section, dict()
+        ).setdefault(
+            import_type, dict()
+        ).setdefault(
+            from_section, set()
+        ).add(name_input)
 
     def add_submodule_import(
         self,
@@ -66,7 +76,7 @@ class FileImport:
         self._add_import(name_import, import_type, None, typing_section)
 
     @property
-    def imports(self) -> Dict[TypingSection, Dict[ImportType, Dict[str, Set[Optional[str]]]]]:
+    def imports(self) -> Dict[TypingSection, Dict[ImportType, Dict[str, Set[Optional[Union[str, Tuple[str, str]]]]]]]:
         return self._imports
 
     def merge(self, file_import: "FileImport") -> None:

package/autorest/multiapi/serializers/import_serializer.py

@@ -14,7 +14,9 @@ def _serialize_package(package_name: str, module_list: Set[Optional[str]], delim
     if module_list != {None}:
         buffer.append(
             "from {} import {}".format(
-                package_name, ", ".join(sorted([mod for mod in module_list if mod is not None]))
+                package_name, ", ".join(sorted([
+                    mod if isinstance(mod, str) else f"{mod[0]} as {mod[1]}" for mod in module_list if mod is not None
+                ]))
             )
         )
     return delimiter.join(buffer)

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.6",
+    "version": "5.15.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.13"
+        "@microsoft.azure/autorest.testserver": "3.3.23"
     },
     "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)