@autorest/python 6.2.7 → 6.2.9

package/autorest/codegen/models/list_type.py

@@ -30,7 +30,11 @@ class ListType(BaseType):
         return f"[{self.element_type.serialization_type}]"
 
     def type_annotation(self, **kwargs: Any) -> str:
-        if self.code_model.options["version_tolerant"] and self.element_type.is_xml:
+        if (
+            self.code_model.options["version_tolerant"]
+            and self.element_type.is_xml
+            and not self.code_model.options["models_mode"]
+        ):
             # this means we're version tolerant XML, we just return the XML element
             return self.element_type.type_annotation(**kwargs)
         return f"List[{self.element_type.type_annotation(**kwargs)}]"
@@ -140,7 +144,9 @@ class ListType(BaseType):
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = FileImport()
         if not (
-            self.code_model.options["version_tolerant"] and self.element_type.is_xml
+            self.code_model.options["version_tolerant"]
+            and self.element_type.is_xml
+            and not self.code_model.options["models_mode"]
         ):
             file_import.add_submodule_import(
                 "typing", "List", ImportType.STDLIB, TypingSection.CONDITIONAL

package/autorest/codegen/serializers/__init__.py

@@ -142,7 +142,7 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
         namespace_path = (
             Path(".")
             if self.code_model.options["no_namespace_folders"]
-            else Path(*(self.code_model.namespace.split(".")))
+            else Path(*self._name_space().split("."))
         )
 
         p = namespace_path.parent
@@ -532,9 +532,17 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
             namespace_path / Path("_metadata.json"), metadata_serializer.serialize()
         )
 
+    def _name_space(self) -> str:
+        if self.code_model.namespace.count(".") >= (
+            self.code_model.options["package_name"] or ""
+        ).count("-"):
+            return self.code_model.namespace
+
+        return self.code_model.options["package_name"].replace("-", ".")
+
     # find root folder where "setup.py" is
     def _package_root_folder(self, namespace_path: Path) -> Path:
-        return namespace_path / Path("../" * (self.code_model.namespace.count(".") + 1))
+        return namespace_path / Path("../" * (self._name_space().count(".") + 1))
 
     def _serialize_and_write_sample(self, env: Environment, namespace_path: Path):
         out_path = self._package_root_folder(namespace_path) / Path("generated_samples")

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

@@ -257,7 +257,6 @@ def _get_model(module_name: str, model_name: str):
     module = sys.modules[module_end]
     models = {k: v for k, v in module.__dict__.items() if isinstance(v, type)}
     if model_name not in models:
-        _LOGGER.warning("Can not find model name in models, will not deserialize")
         return model_name
     return models[model_name]
 
@@ -491,7 +490,7 @@ def _get_deserialize_callable_from_annotation(
                             pass
                     raise DeserializationError()
                 return functools.partial(_deserialize_with_union, annotation)
-                        
+
         # is it optional?
         try:
             # right now, assuming we don't have unions, since we're getting rid of the only

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

@@ -2,7 +2,7 @@
 
 
 {{ serializer.declare_model(model) }}
-    """{{ model.description(is_operation_file=False) }}
+    """{{ model.description(is_operation_file=False) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    ')  }}
     {% if model.discriminated_subtypes %}
 
     {{ serializer.discriminator_docstring(model) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    ') }}

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

@@ -2,7 +2,7 @@
 
 
 {{ serializer.declare_model(model) }}
-    """{{ model.description(is_operation_file=False) }}
+    """{{ model.description(is_operation_file=False) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    ') }}
     {% if model.discriminated_subtypes %}
 
     {{ serializer.discriminator_docstring(model) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    ') }}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.2.7",
+  "version": "6.2.9",
   "description": "The Python extension for generators in AutoRest.",
   "repository": {
     "type": "git",