@autorest/python 6.9.7 → 6.9.8

package/autorest/codegen/__init__.py

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import logging
-from typing import Dict, Any, Union
+from typing import Dict, Any, Union, Optional
 from pathlib import Path
 import yaml
 
@@ -150,6 +150,28 @@ class OptionsRetriever:
         # Force some options in ARM MODE
         return True if self.azure_arm else head_as_boolean
 
+    @property
+    def package_mode(self) -> str:
+        return self.options.get("packaging-files-dir") or self.options.get(
+            "package-mode", ""
+        )
+
+    @property
+    def packaging_files_config(self) -> Optional[Dict[str, Any]]:
+        packaging_files_config = self.options.get("packaging-files-config")
+        if packaging_files_config is None:
+            return None
+        # packaging-files-config is either a string or a dict
+        # if it's a string, we can split on the comma to get the dict
+        # otherwise we just return
+        try:
+            return {
+                k.strip(): v.strip()
+                for k, v in [i.split(":") for i in packaging_files_config.split("|")]
+            }
+        except AttributeError:
+            return packaging_files_config
+
 
 class CodeGenerator(Plugin):
     def __init__(self, *args, **kwargs: Any) -> None:
@@ -273,7 +295,6 @@ class CodeGenerator(Plugin):
                     break
 
     def _build_code_model_options(self) -> Dict[str, Any]:
-        """Build en options dict from the user input while running autorest."""
         flags = [
             "azure_arm",
             "head_as_boolean",
@@ -298,7 +319,7 @@ class CodeGenerator(Plugin):
             "combine_operation_files",
             "package_mode",
             "package_pprint_name",
-            "package_configuration",
+            "packaging_files_config",
             "default_optional_constants_to_none",
             "generate_sample",
             "default_api_version",
@@ -397,7 +418,7 @@ class CodeGeneratorAutorest(CodeGenerator, PluginAutorest):
             ),
             "package-mode": self._autorestapi.get_value("package-mode"),
             "package-pprint-name": self._autorestapi.get_value("package-pprint-name"),
-            "package-configuration": self._autorestapi.get_value(
+            "packaging-files-config": self._autorestapi.get_value(
                 "package-configuration"
             ),
             "default-optional-constants-to-none": self._autorestapi.get_boolean_value(

package/autorest/codegen/serializers/__init__.py

@@ -238,7 +238,7 @@ class JinjaSerializer(ReaderAndWriter):  # pylint: disable=abstract-method
         else:
             return
         serializer = GeneralSerializer(self.code_model, env, async_mode=False)
-        params = self.code_model.options["package_configuration"] or {}
+        params = self.code_model.options["packaging_files_config"] or {}
         for template_name in package_files:
             if (
                 self.code_model.options["unbranded"]

package/autorest/codegen/templates/packaging_templates/setup.py.jinja2

@@ -90,7 +90,7 @@ setup(
         "isodate<1.0.0,>=0.6.1",
         {% endif %}
         {% if unbranded %}
-        "corehttp",
+        "corehttp[requests]",
         {% elif azure_arm %}
         "azure-mgmt-core<2.0.0,>=1.3.2",
         {% else %}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.9.7",
+  "version": "6.9.8",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {