Skip to content

[multiapi combiner] update for _api_version #30680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msyyc merged 1 commit into from
Jun 12, 2023
Merged

[multiapi combiner] update for _api_version #30680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions tools/azure-sdk-tools/packaging_tools/multiapi_combiner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,12 @@ def _get_names_by_api_version(api_version: str):
def _get_operation(code_model: "CodeModel", name: str) -> Operation:
return Operation(code_model, name, operation_group=self)

self.operations = _combine_helper(
self.operations = [o for o in _combine_helper(
code_model=self.code_model,
sorted_api_versions=api_versions,
get_cls=_get_operation,
get_names_by_api_version=_get_names_by_api_version,
)
) if o.name != "_api_version"]

def doc(self, async_mode: bool) -> str:
return strip_version_from_docs(self.generated_class(async_mode).__doc__)
Expand Down
5 changes: 2 additions & 3 deletions tools/azure-sdk-tools/packaging_tools/templates/multiapi_combiner/operation_group.py.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ class {{ operation_group.name }}{{ "(" + operation_group.name.replace("Operation
self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
{% else %}
@property
def _api_version(self)-> str:
return self._get_api_version(None)
def _api_version(self, op_name: str) -> str:
return self._get_api_version(op_name)

{% endif %}
{% for operation in operation_group.operations %}
Expand Down