@autorest/python 5.15.0 → 5.16.0

package/autorest/codegen/models/parameter.py

@@ -26,6 +26,13 @@ _LOGGER = logging.getLogger(__name__)
 _HIDDEN_KWARGS = ["content_type"]
 
 
+class ParameterMethodLocation(str, Enum):
+    POSITIONAL = "positional"
+    KEYWORD_ONLY = "keyword_only"
+    KWARG = "kwarg"
+    HIDDEN_KWARG = "hidden_kwarg"
+
+
 class ParameterLocation(Enum):
     Path = "path"
     Body = "body"
@@ -50,7 +57,6 @@ class ParameterStyle(Enum):
     multipart = "multipart"
 
 
-
 def get_target_property_name(code_model: "CodeModel", target_property_id: int) -> str:
     for obj in code_model.schemas.values():
         for prop in obj.properties:
@@ -59,11 +65,13 @@ def get_target_property_name(code_model: "CodeModel", target_property_id: int) -
     raise KeyError("Didn't find the target property")
 
 
-class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too-many-public-methods
+class Parameter(
+    BaseModel
+):  # pylint: disable=too-many-instance-attributes, too-many-public-methods
     def __init__(
         self,
-        code_model,
         yaml_data: Dict[str, Any],
+        code_model: "CodeModel",
         schema: BaseSchema,
         rest_api_name: str,
         serialized_name: str,
@@ -73,7 +81,9 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
         location: ParameterLocation,
         skip_url_encoding: bool,
         constraints: List[Any],
-        target_property_name: Optional[Union[int, str]] = None,  # first uses id as placeholder
+        target_property_name: Optional[
+            Union[int, str]
+        ] = None,  # first uses id as placeholder
         style: Optional[ParameterStyle] = None,
         explode: Optional[bool] = False,
         *,
@@ -81,10 +91,9 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
         grouped_by: Optional["Parameter"] = None,
         original_parameter: Optional["Parameter"] = None,
         client_default_value: Optional[Any] = None,
-        keyword_only: Optional[bool] = None,
         content_types: Optional[List[str]] = None,
     ) -> None:
-        super().__init__(yaml_data)
+        super().__init__(yaml_data, code_model)
         self.code_model = code_model
         self.schema = schema
         self.rest_api_name = rest_api_name
@@ -105,14 +114,17 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
         self.has_multiple_content_types: bool = False
         self.multiple_content_types_type_annot: Optional[str] = None
         self.multiple_content_types_docstring_type: Optional[str] = None
-        self._keyword_only = keyword_only
-        self.is_multipart = yaml_data.get("language", {}).get("python", {}).get("multipart", False)
-        self.is_data_input = yaml_data.get("isPartialBody", False) and not self.is_multipart
+        self.is_multipart = (
+            yaml_data.get("language", {}).get("python", {}).get("multipart", False)
+        )
+        self.is_data_input = (
+            yaml_data.get("isPartialBody", False) and not self.is_multipart
+        )
         self.content_types = content_types or []
         self.body_kwargs: List[Parameter] = []
         self.is_body_kwarg = False
         self.need_import = True
-        self.is_kwarg = (self.rest_api_name == "Content-Type" or (self.constant and self.inputtable_by_user))
+        self._method_location: Optional[ParameterMethodLocation] = None
 
     def __hash__(self) -> int:
         return hash(self.serialized_name)
@@ -130,7 +142,9 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
                     description += " "
                 description += f"Known values are {self.schema.get_declaration(self.schema.value)} or {None}."
             if self.has_default_value and not any(
-                l for l in ["default value is", "default is"] if l in description.lower()
+                l
+                for l in ["default value is", "default is"]
+                if l in description.lower()
             ):
                 description += f" Default value is {self.default_value_declaration}."
             if self.constant:
@@ -173,12 +187,12 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
                 return self.schema.get_declaration(self.schema.value)
             raise ValueError(
                 "Trying to get constant declaration for a schema that is not ConstantSchema"
-                )
+            )
         raise ValueError("Trying to get a declaration for a schema that doesn't exist")
 
     @property
     def serialization_formats(self) -> List[str]:
-        return self.yaml_data.get('serializationFormats', [])
+        return self.yaml_data.get("serializationFormats", [])
 
     @property
     def xml_serialization_ctxt(self) -> str:
@@ -201,7 +215,7 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
 
     @property
     def in_method_signature(self) -> bool:
-        return not(
+        return not (
             # if not inputtable, don't put in signature
             not self.inputtable_by_user
             # If i'm not in the method code, no point in being in signature
@@ -218,15 +232,20 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
             raise ValueError("Should only be calling if your parameter is grouped")
         try:
             return next(
-                p for p in cast(ObjectSchema, self.grouped_by.schema).properties
-                if any(op for op in p.yaml_data['originalParameter'] if id(op) == self.id)
+                p
+                for p in cast(ObjectSchema, self.grouped_by.schema).properties
+                if any(
+                    op for op in p.yaml_data["originalParameter"] if id(op) == self.id
+                )
             )
         except StopIteration:
-            raise ValueError("There is not a corresponding grouped property for your parameter.")
+            raise ValueError(
+                "There is not a corresponding grouped property for your parameter."
+            )
 
     @property
     def in_method_code(self) -> bool:
-        return self.rest_api_name != '$host'
+        return self.rest_api_name != "$host"
 
     @property
     def implementation(self) -> str:
@@ -242,15 +261,21 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
         ) and isinstance(self.schema, IOSchema)
 
     def _default_value(self) -> Tuple[Optional[Any], str, str]:
-        type_annot = self.multiple_content_types_type_annot or self.schema.type_annotation(is_operation_file=True)
+        type_annot = (
+            self.multiple_content_types_type_annot
+            or self.schema.type_annotation(is_operation_file=True)
+        )
         if self._is_io_json:
-            type_annot = f"Union[{type_annot}, JSONType]"
-        any_types = ["Any", "JSONType"]
-        if not self.required and type_annot not in any_types and not self._is_io_json:
+            type_annot = f"Union[{type_annot}, Any]"
+        if not self.required and type_annot != "Any" and not self._is_io_json:
             type_annot = f"Optional[{type_annot}]"
 
         if self.client_default_value is not None:
-            return self.client_default_value, self.schema.get_declaration(self.client_default_value), type_annot
+            return (
+                self.client_default_value,
+                self.schema.get_declaration(self.client_default_value),
+                type_annot,
+            )
 
         if self.multiple_content_types_type_annot:
             # means this parameter has multiple media types. We force default value to be None.
@@ -258,9 +283,11 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
             default_value_declaration = "None"
         else:
             if isinstance(self.schema, ConstantSchema):
-                if (self.required or
-                    self.is_content_type or
-                    not self.code_model.options["default_optional_constants_to_none"]):
+                if (
+                    self.required
+                    or self.is_content_type
+                    or not self.code_model.options["default_optional_constants_to_none"]
+                ):
                     default_value = self.schema.get_declaration(self.schema.value)
                 else:
                     default_value = None
@@ -271,18 +298,36 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
         if default_value is not None and self.required:
             _LOGGER.warning(
                 "Parameter '%s' is required and has a default value, this combination is not recommended",
-                self.rest_api_name
+                self.rest_api_name,
             )
 
         return default_value, default_value_declaration, type_annot
 
     @property
     def description_keyword(self) -> str:
-        return "keyword" if self.is_kwarg or self.is_keyword_only else "param"
+        return (
+            "keyword"
+            if self.method_location
+            in (
+                ParameterMethodLocation.KWARG,
+                ParameterMethodLocation.HIDDEN_KWARG,
+                ParameterMethodLocation.KEYWORD_ONLY,
+            )
+            else "param"
+        )
 
     @property
     def docstring_type_keyword(self) -> str:
-        return "paramtype" if self.is_kwarg or self.is_keyword_only else "type"
+        return (
+            "paramtype"
+            if self.method_location
+            in (
+                ParameterMethodLocation.KWARG,
+                ParameterMethodLocation.HIDDEN_KWARG,
+                ParameterMethodLocation.KEYWORD_ONLY,
+            )
+            else "type"
+        )
 
     @property
     def default_value(self) -> Optional[Any]:
@@ -294,7 +339,9 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
     def default_value_declaration(self) -> Optional[Any]:
         return self._default_value()[1]
 
-    def type_annotation(self, *, is_operation_file: bool = False) -> str:  # pylint: disable=unused-argument
+    def type_annotation(
+        self, *, is_operation_file: bool = False  # pylint: disable=unused-argument
+    ) -> str:
         return self._default_value()[2]
 
     @property
@@ -303,9 +350,11 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
 
     @property
     def docstring_type(self) -> str:
-        retval = self.multiple_content_types_docstring_type or self.schema.docstring_type
+        retval = (
+            self.multiple_content_types_docstring_type or self.schema.docstring_type
+        )
         if self._is_io_json:
-            retval += " or JSONType"
+            retval += " or Any"
         return retval
 
     @property
@@ -329,49 +378,52 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
             origin_name = f"self._config.{self.serialized_name}"
         return origin_name
 
-    @property
-    def is_keyword_only(self) -> bool:
-        # this means in async mode, I am documented like def hello(positional_1, *, me!)
-        return self._keyword_only or False
-
-    @is_keyword_only.setter
-    def is_keyword_only(self, val: bool) -> None:
-        self._keyword_only = val
-        self.is_kwarg = False
-
-    @property
-    def is_hidden(self) -> bool:
-        return self.serialized_name in _HIDDEN_KWARGS and self.is_kwarg or (
-            self.yaml_data["implementation"] == "Client" and self.constant
-        )
-
     @property
     def is_content_type(self) -> bool:
-        return self.rest_api_name == "Content-Type" and self.location == ParameterLocation.Header
+        return (
+            self.rest_api_name == "Content-Type"
+            and self.location == ParameterLocation.Header
+        )
 
     @property
-    def is_positional(self) -> bool:
-        return self.in_method_signature and not (self.is_keyword_only or self.is_kwarg)
+    def method_location(self) -> ParameterMethodLocation:
+        if self._method_location:
+            return self._method_location
+        if self.serialized_name in _HIDDEN_KWARGS or (
+            self._implementation == "Client" and self.constant
+        ):
+            return ParameterMethodLocation.HIDDEN_KWARG
+        if self.constant and self.inputtable_by_user:
+            return ParameterMethodLocation.KWARG
+        return ParameterMethodLocation.POSITIONAL
+
+    @method_location.setter
+    def method_location(self, val: ParameterMethodLocation) -> None:
+        self._method_location = val
 
     @classmethod
     def from_yaml(
         cls,
         yaml_data: Dict[str, Any],
+        code_model: "CodeModel",
         *,
-        code_model,
-        content_types: Optional[List[str]] = None
+        content_types: Optional[List[str]] = None,
     ) -> "Parameter":
-        http_protocol = yaml_data["protocol"].get("http", {"in": ParameterLocation.Other})
-        serialized_name = yaml_data["language"]["python"]["name"]
-        schema = get_schema(
-            code_model, yaml_data.get("schema"), serialized_name
+        http_protocol = yaml_data["protocol"].get(
+            "http", {"in": ParameterLocation.Other}
         )
+        serialized_name = yaml_data["language"]["python"]["name"]
+        schema = get_schema(code_model, yaml_data.get("schema"), serialized_name)
         target_property = yaml_data.get("targetProperty")
-        target_property_name = get_target_property_name(code_model, id(target_property)) if target_property else None
+        target_property_name = (
+            get_target_property_name(code_model, id(target_property))
+            if target_property
+            else None
+        )
 
         return cls(
-            code_model=code_model,
             yaml_data=yaml_data,
+            code_model=code_model,
             schema=schema,  # FIXME replace by operation model
             # See also https://github.com/Azure/autorest.modelerfour/issues/80
             rest_api_name=yaml_data["language"]["default"].get(
@@ -382,45 +434,61 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
             implementation=yaml_data["implementation"],
             required=yaml_data.get("required", False),
             location=ParameterLocation(http_protocol["in"]),
-            skip_url_encoding=yaml_data.get("extensions", {}).get("x-ms-skip-url-encoding", False),
+            skip_url_encoding=yaml_data.get("extensions", {}).get(
+                "x-ms-skip-url-encoding", False
+            ),
             constraints=[],  # FIXME constraints
             target_property_name=target_property_name,
-            style=ParameterStyle(http_protocol["style"]) if "style" in http_protocol else None,
+            style=ParameterStyle(http_protocol["style"])
+            if "style" in http_protocol
+            else None,
             explode=http_protocol.get("explode", False),
             grouped_by=yaml_data.get("groupedBy", None),
             original_parameter=yaml_data.get("originalParameter", None),
             flattened=yaml_data.get("flattened", False),
             client_default_value=yaml_data.get("clientDefaultValue"),
-            content_types=content_types
+            content_types=content_types,
         )
 
     def imports(self) -> FileImport:
-        file_import = self.schema.imports()
-        if not self.required:
-            file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB, TypingSection.CONDITIONAL)
-        if self.has_multiple_content_types or self._is_io_json:
-            file_import.add_submodule_import("typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL)
+        if self.need_import:
+            file_import = self.schema.imports()
+            if not self.required:
+                file_import.add_submodule_import(
+                    "typing", "Optional", ImportType.STDLIB, TypingSection.CONDITIONAL
+                )
+            if self.has_multiple_content_types or self._is_io_json:
+                file_import.add_submodule_import(
+                    "typing", "Union", ImportType.STDLIB, TypingSection.CONDITIONAL
+                )
 
-        return file_import
+            return file_import
+        return FileImport()
 
-class ParameterOnlyPathAndBodyPositional(Parameter):
 
+class ParameterOnlyPathAndBodyPositional(Parameter):
     @property
-    def is_keyword_only(self) -> bool:
-        if self._keyword_only is not None:
-            return self._keyword_only
-        return self.in_method_signature and not (
-            self.is_hidden or
-            self.location == ParameterLocation.Path or
-            self.location == ParameterLocation.Uri or
-            self.location == ParameterLocation.Body or
-            self.is_kwarg
-        )
+    def method_location(self) -> ParameterMethodLocation:
+        super_method_location = super().method_location
+        if super_method_location in (
+            ParameterMethodLocation.KWARG,
+            ParameterMethodLocation.HIDDEN_KWARG,
+        ):
+            return super_method_location
+        if self._method_location:
+            return self._method_location
+        if self.location not in (
+            ParameterLocation.Path,
+            ParameterLocation.Uri,
+            ParameterLocation.Body,
+        ):
+            return ParameterMethodLocation.KEYWORD_ONLY
+        return super_method_location
+
+    @method_location.setter
+    def method_location(self, val: ParameterMethodLocation) -> None:
+        self._method_location = val
 
-    @is_keyword_only.setter
-    def is_keyword_only(self, val: bool) -> None:
-        self._keyword_only = val
-        self.is_kwarg = False
 
 def get_parameter(code_model):
     if code_model.options["only_path_and_body_params_positional"]: