Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions autorest/codegen/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def _build_convenience_layer(yaml_data: Dict[str, Any], code_model: CodeModel) -
code_model.operation_groups = [
OperationGroup.from_yaml(code_model, op_group) for op_group in yaml_data["operationGroups"]
]
if code_model.options["show_models"] and yaml_data.get("schemas"):
if code_model.options["models_mode"] and yaml_data.get("schemas"):
# sets the enums property in our code_model variable, which will later be passed to EnumSerializer

code_model.add_inheritance_to_models()
Expand Down Expand Up @@ -268,7 +268,7 @@ def _build_code_model_options(self) -> Dict[str, Any]:
"tracing": self._autorestapi.get_boolean_value("trace", False),
"multiapi": self._autorestapi.get_boolean_value("multiapi", False),
"polymorphic_examples": self._autorestapi.get_value("polymorphic-examples") or 5,
"show_models": self._autorestapi.get_value("show-models"),
"models_mode": self._autorestapi.get_value("models-mode"),
"builders_visibility": self._autorestapi.get_value("builders-visibility"),
"show_operations": self._autorestapi.get_boolean_value("show-operations", not low_level_client),
"show_send_request": self._autorestapi.get_boolean_value("show-send-request", low_level_client),
Expand All @@ -279,15 +279,15 @@ def _build_code_model_options(self) -> Dict[str, Any]:
"add-python3-operation-files", False
),
}
if options["show_models"] is None:
if options["models_mode"] is None:
if low_level_client:
options["show_models"] = False
options["models_mode"] = False
else:
options["show_models"] = "msrest"
options["models_mode"] = "msrest"
else:
options["show_models"] = options["show_models"].lower()
if options["show_models"] == "false":
options["show_models"] = False
options["models_mode"] = options["models_mode"].lower()
if options["models_mode"] == "false":
options["models_mode"] = False

if options["builders_visibility"] is None:
options["builders_visibility"] = "public" if low_level_client else "embedded"
Expand Down
2 changes: 1 addition & 1 deletion autorest/codegen/models/enum_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,6 @@ def docstring_type(self) -> str:
return self.enum_type.type_annotation

def get_enum_schema(code_model) -> Type[EnumSchema]:
if code_model.options["show_models"]:
if code_model.options["models_mode"]:
return EnumSchema
return HiddenModelEnumSchema
2 changes: 1 addition & 1 deletion autorest/codegen/models/object_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,6 @@ def imports(self) -> FileImport:
return file_import

def get_object_schema(code_model) -> Type[ObjectSchema]:
if code_model.options["show_models"]:
if code_model.options["models_mode"]:
return ObjectSchema
return HiddenModelObjectSchema
2 changes: 1 addition & 1 deletion autorest/codegen/serializers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def serialize(self, code_model: CodeModel) -> None:
code_model, env=env, namespace_path=namespace_path
)

if code_model.options["show_models"] and (code_model.schemas or code_model.enums):
if code_model.options["models_mode"] and (code_model.schemas or code_model.enums):
self._serialize_and_write_models_folder(code_model=code_model, env=env, namespace_path=namespace_path)


Expand Down
2 changes: 1 addition & 1 deletion autorest/codegen/serializers/builder_serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ def response_docstring(self, builder: BuilderType) -> List[str]:
return [response_str, rtype_str, ":raises: ~azure.core.exceptions.HttpResponseError"]

def want_example_template(self, builder: BuilderType) -> bool:
if self.code_model.options['show_models']:
if self.code_model.options['models_mode']:
return False
if builder.parameters.has_body:
body_params = builder.parameters.body
Expand Down