@autorest/python 6.1.6 → 6.1.8

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

@@ -0,0 +1,62 @@
+{# actual template starts here #}
+
+
+{{ serializer.declare_model(model) }}
+    """{{ model.description(is_operation_file=False) }}
+    {% if model.discriminated_subtypes %}
+
+    {{ serializer.discriminator_docstring(model) | wordwrap(width=95, break_long_words=False, break_on_hyphens=False, wrapstring='\n    ') }}
+    {% endif %}
+    {% if model.has_readonly_or_constant_property %}
+
+    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 %}
+
+    All required parameters must be populated in order to send to Azure.
+    {% endif %}
+
+    {% if model.properties != None %}
+        {% 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     ') }}
+                {% endfor %}
+            {% endfor %}
+        {% endfor %}
+    {% endif %}
+    """
+
+    {% if model.is_polymorphic %}
+    __mapping__ = {}
+    {% endif %}
+    {% for p in serializer.get_properties_to_initialize(model)%}
+        {% for line in serializer.declare_property(p) %}
+    {{ line }}
+        {% endfor %}
+    {% endfor %}
+
+    {% if model.is_public and serializer.init_line(model) %}
+    @overload
+    def __init__(
+        self,
+        {% for param_signature in serializer.init_line(model) %}
+        {{ param_signature }}
+        {% endfor %}
+    ):
+        ...
+
+    @overload
+    def __init__(self, mapping: Mapping[str, Any]):
+        """
+        :param mapping: raw JSON to initialize the model.
+        :type mapping: Mapping[str, Any]
+        """
+        ...
+
+    {% endif %}
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+    {% if model.discriminator_value %}
+        {{ serializer.initialize_discriminator_property(model, model.discriminator_property) }}
+    {% endif %}

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

@@ -1,11 +1,6 @@
 {% import 'keywords.jinja2' as keywords %}
 # coding=utf-8
 {{ code_model.options['license_header'] }}
-{% macro iterate_models_py3() %}
-    {% for schema in schemas %}
-from .{{ code_model.models_filename }} import {{ schema }}
-    {% endfor %}
-{% endmacro %}
 {% if schemas %}
 
     {% for schema in schemas %}

package/autorest/codegen/templates/{model.py.jinja2 → model_msrest.py.jinja2}

@@ -38,7 +38,7 @@
     _attribute_map = {
         {% if model.properties %}
             {% for p in model.properties %}
-        {{ p.attribute_map }}
+        {{ serializer.declare_property(p) }}
             {% endfor %}
         {% endif %}
     }

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

@@ -20,7 +20,7 @@ class {{ operation_group.class_name }}{{ base_class }}:{{ disable }}
         :attr:`{{ operation_group.property_name }}` attribute.
     """
 
-{% if code_model.public_model_types and code_model.options["models_mode"]%}
+{% if code_model.public_model_types and code_model.options["models_mode"] == "msrest" %}
     models = _models
 
 {% endif %}

package/autorest/m2r/__init__.py

@@ -68,5 +68,7 @@ class M2RAutorest(YamlUpdatePluginAutorest, M2R):
 
 if __name__ == "__main__":
     # CADL pipeline will call this
-    args = parse_args()
-    M2R(output_folder=args.output_folder, cadl_file=args.cadl_file).process()
+    args, unknown_args = parse_args()
+    M2R(
+        output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args
+    ).process()

package/autorest/preprocess/__init__.py

@@ -363,7 +363,7 @@ class PreProcessPluginAutorest(YamlUpdatePluginAutorest, PreProcessPlugin):
 
 if __name__ == "__main__":
     # CADL pipeline will call this
-    args = parse_args()
+    args, unknown_args = parse_args()
     PreProcessPlugin(
-        output_folder=args.output_folder, cadl_file=args.cadl_file
+        output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args
     ).process()

package/package.json

@@ -1,13 +1,7 @@
 {
   "name": "@autorest/python",
-  "version": "6.1.6",
+  "version": "6.1.8",
   "description": "The Python extension for generators in AutoRest.",
-  "scripts": {
-    "prepare": "node run-python3.js prepare.py",
-    "start": "node run-python3.js start.py",
-    "install": "node run-python3.js install.py",
-    "debug": "node run-python3.js start.py --debug"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/Azure/autorest.python/tree/autorestv3"
@@ -28,7 +22,7 @@
   },
   "devDependencies": {
     "@microsoft.azure/autorest.testserver": "^3.3.38",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.3"
   },
   "files": [
     "autorest/**/*.py",
@@ -41,5 +35,10 @@
     "run-python3.js",
     "requirements.txt",
     "run_cadl.py"
-  ]
-}
+  ],
+  "scripts": {
+    "start": "node run-python3.js start.py",
+    "install": "node run-python3.js install.py",
+    "debug": "node run-python3.js start.py --debug"
+  }
+}