Skip to content
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.

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

[Package mode] add new flag --package-mode #1154

Merged
merged 32 commits into from
Mar 8, 2022
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c11542f
init
msyyc Feb 10, 2022
1d5f306
add test
msyyc Feb 10, 2022
a330b23
add test for package-mode
msyyc Feb 15, 2022
7fb023d
Merge branch 'autorestv3' of https://github.com/Azure/autorest.python…
msyyc Feb 15, 2022
e16267f
regenerate and pylint and mypy
msyyc Feb 15, 2022
27df09c
review
msyyc Feb 16, 2022
ca60360
review
msyyc Feb 16, 2022
0a294f7
Merge branch 'autorestv3' of https://github.com/Azure/autorest.python…
msyyc Feb 16, 2022
eb42ea4
review
msyyc Feb 16, 2022
c5c8203
regenerate
msyyc Feb 16, 2022
f4a6134
review and regenerate
msyyc Feb 17, 2022
575071f
pylint
msyyc Feb 17, 2022
47e131b
Merge branch 'autorestv3' into package-mode
iscai-msft Feb 17, 2022
653c253
review and regenerate
msyyc Feb 21, 2022
e54afe0
install package for test
msyyc Feb 24, 2022
c302e25
review
msyyc Feb 28, 2022
52ac6dc
merge and regenerate
msyyc Feb 28, 2022
15349fa
regenerate
msyyc Feb 28, 2022
460d2a2
fix test
msyyc Feb 28, 2022
3a9ada9
regenerate
msyyc Feb 28, 2022
8dc3cfb
Merge branch 'autorestv3' into package-mode
iscai-msft Mar 1, 2022
ba4ace6
review and regenerate
msyyc Mar 2, 2022
ae59026
Merge branch 'autorestv3' into package-mode
iscai-msft Mar 2, 2022
158fdc4
Merge branch 'autorestv3' into package-mode
msyyc Mar 3, 2022
482c0b8
regenerate
msyyc Mar 3, 2022
8c426f0
review
msyyc Mar 7, 2022
e20e50e
regenerate
msyyc Mar 7, 2022
7f45e93
review
msyyc Mar 8, 2022
25d5cb5
Merge branch 'autorestv3' of https://github.com/Azure/autorest.python…
msyyc Mar 8, 2022
4705474
changelog
msyyc Mar 8, 2022
a14b58c
review
msyyc Mar 8, 2022
b54e494
regenerate
msyyc Mar 8, 2022
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
21 changes: 21 additions & 0 deletions autorest/codegen/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import logging
import sys
from typing import Dict, Any, Set, Union, List, Type
from pathlib import Path
import yaml

from .. import Plugin
Expand Down Expand Up @@ -70,12 +71,20 @@ def _validate_code_model_options(options: Dict[str, Any]) -> None:
if options["basic_setup_py"] and not options["package_version"]:
msyyc marked this conversation as resolved.
Show resolved Hide resolved
raise ValueError("--basic-setup-py must be used with --package-version")

if options["package_mode"] and not options["package_version"]:
raise ValueError("--package-mode must be used with --package-version")

if not options["show_operations"] and options["combine_operation_files"]:
raise ValueError(
"Can not combine operation files if you are not showing operations. "
"If you want operation files, pass in flag --show-operations"
)

if options["package_mode"] not in ("mgmtplane", "dataplane", None) and not Path(options["package_mode"]).exists():
msyyc marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't it just be not in ("mgmtplane", "dataplane")? Not sure why None is a valid entry

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Path(None).exist() will raise exception so we have to avoid that.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't really do None checks for any other flag, it's still a little weird because it looks like we're making None a valid entry (by including it with mgmtplane and dataplane)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could check None first and it will make the logic more clear

raise ValueError(
"--package-mode can only be 'mgmtplane' or 'dataplane' or directory which contains template files"
)

if options["reformat_next_link"] and options["version_tolerant"]:
raise ValueError(
"--reformat-next-link can not be true for version tolerant generations. "
Expand Down Expand Up @@ -117,6 +126,14 @@ def _build_exceptions_set(yaml_data: List[Dict[str, Any]]) -> Set[int]:
exceptions_set.add(id(exception["schema"]))
return exceptions_set

@staticmethod
def _build_package_dependency() -> Dict[str, str]:
return {
"dependency_azure_mgmt_core": "azure-mgmt-core>=1.3.0,<2.0.0",
msyyc marked this conversation as resolved.
Show resolved Hide resolved
"dependency_azure_core": "azure-core<2.0.0,>=1.20.1",
"dependency_msrest": "msrest>=0.6.21",
}

def _create_code_model(self, yaml_data: Dict[str, Any], options: Dict[str, Union[str, bool]]) -> CodeModel:
# Create a code model

Expand Down Expand Up @@ -161,6 +178,7 @@ def _create_code_model(self, yaml_data: Dict[str, Any], options: Dict[str, Union
if options["credential"]:
code_model.global_parameters.add_credential_global_parameter()

code_model.package_dependency = self._build_package_dependency()
return code_model

def _get_credential_scopes(self, credential):
Expand Down Expand Up @@ -295,6 +313,9 @@ def _build_code_model_options(self) -> Dict[str, Any]:
"low_level_client": low_level_client,
"combine_operation_files": self._autorestapi.get_boolean_value("combine-operation-files", version_tolerant),
"python3_only": python3_only,
"package_mode": self._autorestapi.get_value("package-mode"),
"package_pprint_name": self._autorestapi.get_value("package-pprint-name"),
"package_configuration": self._autorestapi.get_value("package-configuration"),
"default_optional_constants_to_none": self._autorestapi.get_boolean_value(
"default-optional-constants-to-none", low_level_client or version_tolerant
),
Expand Down
3 changes: 3 additions & 0 deletions autorest/codegen/models/code_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ class CodeModel: # pylint: disable=too-many-instance-attributes, too-many-publi
:type primitives: Dict[int, ~autorest.models.BaseSchema]
:param operation_groups: The operation groups we are going to serialize
:type operation_groups: list[~autorest.models.OperationGroup]
:param package_dependency: All the dependencies needed in setup.py
:type package_dependency: Dict[str, str]
"""

def __init__(
Expand All @@ -76,6 +78,7 @@ def __init__(
self._rest: Optional[Rest] = None
self.request_builder_ids: Dict[int, RequestBuilder] = {}
self._credential_schema_policy: Optional[CredentialSchemaPolicy] = None
self.package_dependency: Dict[str, str] = {}

@property
def global_parameters(self) -> GlobalParameterList:
Expand Down
73 changes: 71 additions & 2 deletions autorest/codegen/serializers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
# Licensed under the MIT License. See License.txt in the project root for
# license information.
# --------------------------------------------------------------------------
from typing import List, Optional
from typing import Dict, List, Optional, Any
from pathlib import Path
from jinja2 import PackageLoader, Environment
from jinja2 import PackageLoader, Environment, FileSystemLoader, StrictUndefined
from autorest.codegen.models.operation_group import OperationGroup

from ...jsonrpc import AutorestAPI
from ..models import (
CodeModel,
OperationGroup,
RequestBuilder,
TokenCredentialSchema
)
from .enum_serializer import EnumSerializer
from .general_serializer import GeneralSerializer
Expand All @@ -29,6 +30,20 @@
"JinjaSerializer",
]

_PACKAGE_FILES = [
"CHANGELOG.md.jinja2",
"dev_requirements.txt.jinja2",
"LICENSE.jinja2",
"MANIFEST.in.jinja2",
"README.md.jinja2",
"setup.py.jinja2",
]

_REGENERATE_FILES = {
"setup.py",
"MANIFEST.in"
}

class JinjaSerializer:
def __init__(self, autorestapi: AutorestAPI, code_model: CodeModel) -> None:
self._autorestapi = autorestapi
Expand Down Expand Up @@ -74,6 +89,60 @@ def serialize(self) -> None:
if self.code_model.options["models_mode"] and (self.code_model.schemas or self.code_model.enums):
self._serialize_and_write_models_folder(env=env, namespace_path=namespace_path)

if self.code_model.options["package_mode"]:
self._serialize_and_write_package_files(out_path=namespace_path)


def _serialize_and_write_package_files(self, out_path: Path) -> None:
def _serialize_and_write_package_files_proc(**kwargs: Any):
for template_name in package_files:
file = template_name.replace(".jinja2", "")
output_name = out_path / file
if not self._autorestapi.read_file(output_name) or file in _REGENERATE_FILES:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just to confirm: if a user passes any template / file inside --package-mode=my-custom-folder/, that will override any of the templates we have in autorest?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If user passes folder, autorest will use those files instead of built-in template files. This logic is to permit to override specific files when rerun autorest.

template = env.get_template(template_name)
render_result = template.render(**kwargs)
self._autorestapi.write_file(output_name, render_result)

def _prepare_params() -> Dict[Any, Any]:
package_parts = self.code_model.options["package_name"].split("-")[:-1]
try:
token_cred = isinstance(self.code_model.credential_schema_policy.credential, TokenCredentialSchema)
except ValueError:
token_cred = False
version = self.code_model.options.get("package_version", "0.0.0")
if any(x in version for x in ["a", "b", "rc"]) or version[0] == '0':
dev_status = "4 - Beta"
else:
dev_status = "5 - Production/Stable"
params = {
"token_credential": token_cred,
"pkgutil_names": [".".join(package_parts[: i + 1]) for i in range(len(package_parts))],
"init_names": ["/".join(package_parts[: i + 1]) + "/__init__.py" for i in range(len(package_parts))],
"dev_status": dev_status
}
params.update(self.code_model.options)
params.update(self.code_model.package_dependency)
return params

count = self.code_model.options["package_name"].count("-") + 1
for _ in range(count):
out_path = out_path / Path("..")

if self.code_model.options["package_mode"] in ("dataplane", "mgmtplane"):
env = Environment(
loader=PackageLoader("autorest.codegen", "templates"),
undefined=StrictUndefined)
package_files = _PACKAGE_FILES
_serialize_and_write_package_files_proc(**_prepare_params())
elif Path(self.code_model.options["package_mode"]).exists():
iscai-msft marked this conversation as resolved.
Show resolved Hide resolved
env = Environment(
loader=FileSystemLoader(str(Path(self.code_model.options["package_mode"]))),
keep_trailing_newline=True,
undefined=StrictUndefined
)
package_files = env.list_templates()
params = self.code_model.options["package_configuration"] or {}
_serialize_and_write_package_files_proc(**params)


def _keep_patch_file(self, path_file: Path, env: Environment):
Expand Down
5 changes: 4 additions & 1 deletion autorest/codegen/serializers/general_serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,7 @@ def serialize_version_file(self) -> str:

def serialize_setup_file(self) -> str:
template = self.env.get_template("setup.py.jinja2")
return template.render(code_model=self.code_model)
params = {}
params.update(self.code_model.options)
params.update(self.code_model.package_dependency)
return template.render(code_model=self.code_model, **params)
6 changes: 6 additions & 0 deletions autorest/codegen/templates/CHANGELOG.md.jinja2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Release History

## 1.0.0b1 (1970-01-01)
msyyc marked this conversation as resolved.
Show resolved Hide resolved

- Initial version

21 changes: 21 additions & 0 deletions autorest/codegen/templates/LICENSE.jinja2
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Copyright (c) Microsoft Corporation.

MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
7 changes: 7 additions & 0 deletions autorest/codegen/templates/MANIFEST.in.jinja2
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
include *.md
include LICENSE
recursive-include tests *.py
recursive-include samples *.py *.md
{%- for init_name in init_names %}
include {{ init_name }}
{%- endfor %}
105 changes: 105 additions & 0 deletions autorest/codegen/templates/README.md.jinja2
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{% if package_mode == "mgmtplane" -%}
# Microsoft Azure SDK for Python

This is the Microsoft {{package_pprint_name}} Client Library.
This package has been tested with Python 3.6+.
For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).

# Usage

To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt)

For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure)
Code samples for this package can be found at [{{package_pprint_name}}](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)

# Provide Feedback

If you encounter any bugs or have suggestions, please file an issue in the
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
section of the project.


![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2F{{package_name}}%2FREADME.png)
{% else %}
# {{ package_pprint_name }} client library for Python
<!-- write necessary description of service -->

## Getting started

### Installating the package

```bash
python -m pip install {{ package_name }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ideally just do pip install {{ package_name }}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's debatable, we saw people confused because they had several Python installed, and python and pip were not referencing the same python interpreter. I would suggest to talk about venv instead, since this is a more efficient to ensure consistency between python and pip

```

#### Prequisites

- Python 3.6 or later is required to use this package.
- You need an [Azure subscription][azure_sub] to use this package.
- An existing {{ package_pprint_name }} instance.

{%- if token_credential %}
#### Create with an Azure Active Directory Credential
To use an [Azure Active Directory (AAD) token credential][authenticate_with_token],
provide an instance of the desired credential type obtained from the
[azure-identity][azure_identity_credentials] library.

To authenticate with AAD, you must first [pip][pip] install [`azure-identity`][azure_identity_pip]

After setup, you can choose which type of [credential][azure_identity_credentials] from azure.identity to use.
As an example, [DefaultAzureCredential][default_azure_credential] can be used to authenticate the client:

Set the values of the client ID, tenant ID, and client secret of the AAD application as environment variables:
`AZURE_CLIENT_ID`, `AZURE_TENANT_ID`, `AZURE_CLIENT_SECRET`

Use the returned token credential to authenticate the client:

```python
>>> from {{ namespace }} import {{ client_name }}
>>> from azure.identity import DefaultAzureCredential
>>> client = {{ client_name }}(endpoint='<endpoint>', credential=DefaultAzureCredential())
```

## Examples

```python
>>> from {{ namespace }} import {{ client_name }}
>>> from azure.identity import DefaultAzureCredential
>>> from azure.core.exceptions import HttpResponseError

>>> client = {{ client_name }}(endpoint='<endpoint>', credential=DefaultAzureCredential())
>>> try:
<!-- write test code here -->
except HttpResponseError as e:
print('service responds error: {}'.format(e.response.json()))

```
{%- endif %}

## Contributing

This project welcomes contributions and suggestions. Most contributions require
you to agree to a Contributor License Agreement (CLA) declaring that you have
the right to, and actually do, grant us the rights to use your contribution.
For details, visit https://cla.microsoft.com.

When you submit a pull request, a CLA-bot will automatically determine whether
you need to provide a CLA and decorate the PR appropriately (e.g., label,
comment). Simply follow the instructions provided by the bot. You will only
need to do this once across all repos using our CLA.

This project has adopted the
[Microsoft Open Source Code of Conduct][code_of_conduct]. For more information,
see the Code of Conduct FAQ or contact opencode@microsoft.com with any
additional questions or comments.

<!-- LINKS -->
[code_of_conduct]: https://opensource.microsoft.com/codeofconduct/
[authenticate_with_token]: https://docs.microsoft.com/azure/cognitive-services/authentication?tabs=powershell#authenticate-with-an-authentication-token
[azure_identity_credentials]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#credentials
[azure_identity_pip]: https://pypi.org/project/azure-identity/
[default_azure_credential]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#defaultazurecredential
[pip]: https://pypi.org/project/pip/
[azure_sub]: https://azure.microsoft.com/free/
{% endif %}
10 changes: 10 additions & 0 deletions autorest/codegen/templates/dev_requirements.txt.jinja2
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
-e ../../../tools/azure-devtools
-e ../../../tools/azure-sdk-tools
../../core/azure-core
{% if token_credential -%}
msyyc marked this conversation as resolved.
Show resolved Hide resolved
../../identity/azure-identity
{% endif -%}
{% if azure_arm -%}
../../core/azure-mgmt-core
msyyc marked this conversation as resolved.
Show resolved Hide resolved
{% endif -%}
aiohttp
Loading