Skip to content

Commit f6b8321

Browse files
author
SDKAuto
committed
CodeGen from PR 32696 in Azure/azure-rest-api-specs
Merge 33cdf67d8544cee891f545c10a283fd6723d1ad4 into 91961b8900e8d892b156624e84d941991a54cac7
1 parent f930965 commit f6b8321

File tree

92 files changed

+6243
-4246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+6243
-4246
lines changed
Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,61 @@
11
# Microsoft Azure SDK for Python
22

33
This is the Microsoft Azure Agrifood Management Client Library.
4-
This package has been tested with Python 3.7+.
4+
This package has been tested with Python 3.8+.
55
For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
66

77
## _Disclaimer_
88

99
_Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_
1010

11-
# Usage
11+
## Getting started
1212

13+
### Prerequisites
1314

14-
To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt)
15-
16-
For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/)
17-
Code samples for this package can be found at [Agrifood Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
18-
Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
15+
- Python 3.8+ is required to use this package.
16+
- [Azure subscription](https://azure.microsoft.com/free/)
1917

18+
### Install the package
2019

21-
# Provide Feedback
20+
```bash
21+
pip install azure-mgmt-agrifood
22+
pip install azure-identity
23+
```
2224

23-
If you encounter any bugs or have suggestions, please file an issue in the
24-
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
25-
section of the project.
25+
### Authentication
26+
27+
By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configure of following environment variables.
28+
29+
- `AZURE_CLIENT_ID` for Azure client ID.
30+
- `AZURE_TENANT_ID` for Azure tenant ID.
31+
- `AZURE_CLIENT_SECRET` for Azure client secret.
32+
33+
In addition, Azure subscription ID can be configured via environment variable `AZURE_SUBSCRIPTION_ID`.
34+
35+
With above configuration, client can be authenticated by following code:
36+
37+
```python
38+
from azure.identity import DefaultAzureCredential
39+
from azure.mgmt.agrifood import AgriFoodMgmtClient
40+
import os
2641

42+
sub_id = os.getenv("AZURE_SUBSCRIPTION_ID")
43+
client = AgriFoodMgmtClient(credential=DefaultAzureCredential(), subscription_id=sub_id)
44+
```
2745

46+
## Examples
2847

48+
Code samples for this package can be found at:
49+
- [Search Agrifood Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com
50+
- [Azure Python Mgmt SDK Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
51+
52+
53+
## Troubleshooting
54+
55+
## Next steps
56+
57+
## Provide Feedback
58+
59+
If you encounter any bugs or have suggestions, please file an issue in the
60+
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
61+
section of the project.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "e37a57df67daaa82f9c3758fc450bc8655812a08",
2+
"commit": "77f81a041468fb4069456c33dc435ae6de45df89",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
4-
"autorest": "3.9.2",
4+
"autorest": "3.10.2",
55
"use": [
6-
"@autorest/python@6.2.7",
7-
"@autorest/modelerfour@4.24.3"
6+
"@autorest/python@6.27.4",
7+
"@autorest/modelerfour@4.27.0"
88
],
9-
"autorest_command": "autorest specification/agrifood/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.2.7 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/agrifood/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.27.4 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
1010
"readme": "specification/agrifood/resource-manager/readme.md"
1111
}

sdk/agrifood/azure-mgmt-agrifood/azure/mgmt/agrifood/__init__.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,28 @@
55
# Code generated by Microsoft (R) AutoRest Code Generator.
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
8+
# pylint: disable=wrong-import-position
89

9-
from ._agri_food_mgmt_client import AgriFoodMgmtClient
10+
from typing import TYPE_CHECKING
11+
12+
if TYPE_CHECKING:
13+
from ._patch import * # pylint: disable=unused-wildcard-import
14+
15+
from ._agri_food_mgmt_client import AgriFoodMgmtClient # type: ignore
1016
from ._version import VERSION
1117

1218
__version__ = VERSION
1319

1420
try:
1521
from ._patch import __all__ as _patch_all
16-
from ._patch import * # pylint: disable=unused-wildcard-import
22+
from ._patch import *
1723
except ImportError:
1824
_patch_all = []
1925
from ._patch import patch_sdk as _patch_sdk
2026

2127
__all__ = [
2228
"AgriFoodMgmtClient",
2329
]
24-
__all__.extend([p for p in _patch_all if p not in __all__])
30+
__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
2531

2632
_patch_sdk()

sdk/agrifood/azure-mgmt-agrifood/azure/mgmt/agrifood/_agri_food_mgmt_client.py

Lines changed: 54 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,22 @@
88

99
from copy import deepcopy
1010
from typing import Any, TYPE_CHECKING
11+
from typing_extensions import Self
1112

13+
from azure.core.pipeline import policies
1214
from azure.core.rest import HttpRequest, HttpResponse
1315
from azure.mgmt.core import ARMPipelineClient
16+
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
1417

1518
from . import models as _models
1619
from ._configuration import AgriFoodMgmtClientConfiguration
1720
from ._serialization import Deserializer, Serializer
1821
from .operations import (
22+
DataConnectorsOperations,
23+
DataManagerForAgricultureExtensionsOperations,
24+
DataManagerForAgricultureResourcesOperations,
1925
ExtensionsOperations,
20-
FarmBeatsExtensionsOperations,
21-
FarmBeatsModelsOperations,
22-
LocationsOperations,
26+
OperationResultsOperations,
2327
Operations,
2428
PrivateEndpointConnectionsOperations,
2529
PrivateLinkResourcesOperations,
@@ -28,21 +32,26 @@
2832
)
2933

3034
if TYPE_CHECKING:
31-
# pylint: disable=unused-import,ungrouped-imports
3235
from azure.core.credentials import TokenCredential
3336

3437

35-
class AgriFoodMgmtClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
36-
"""APIs documentation for Azure AgFoodPlatform Resource Provider Service.
37-
38+
class AgriFoodMgmtClient: # pylint: disable=too-many-instance-attributes
39+
"""APIs documentation for Microsoft Azure Data Manager for Agriculture Service.
40+
41+
:ivar data_connectors: DataConnectorsOperations operations
42+
:vartype data_connectors: azure.mgmt.agrifood.operations.DataConnectorsOperations
43+
:ivar data_manager_for_agriculture_extensions: DataManagerForAgricultureExtensionsOperations
44+
operations
45+
:vartype data_manager_for_agriculture_extensions:
46+
azure.mgmt.agrifood.operations.DataManagerForAgricultureExtensionsOperations
47+
:ivar data_manager_for_agriculture_resources: DataManagerForAgricultureResourcesOperations
48+
operations
49+
:vartype data_manager_for_agriculture_resources:
50+
azure.mgmt.agrifood.operations.DataManagerForAgricultureResourcesOperations
51+
:ivar operation_results: OperationResultsOperations operations
52+
:vartype operation_results: azure.mgmt.agrifood.operations.OperationResultsOperations
3853
:ivar extensions: ExtensionsOperations operations
3954
:vartype extensions: azure.mgmt.agrifood.operations.ExtensionsOperations
40-
:ivar farm_beats_extensions: FarmBeatsExtensionsOperations operations
41-
:vartype farm_beats_extensions: azure.mgmt.agrifood.operations.FarmBeatsExtensionsOperations
42-
:ivar farm_beats_models: FarmBeatsModelsOperations operations
43-
:vartype farm_beats_models: azure.mgmt.agrifood.operations.FarmBeatsModelsOperations
44-
:ivar locations: LocationsOperations operations
45-
:vartype locations: azure.mgmt.agrifood.operations.LocationsOperations
4655
:ivar operations: Operations operations
4756
:vartype operations: azure.mgmt.agrifood.operations.Operations
4857
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
@@ -57,13 +66,11 @@ class AgriFoodMgmtClient: # pylint: disable=client-accepts-api-version-keyword,
5766
azure.mgmt.agrifood.operations.SolutionsDiscoverabilityOperations
5867
:param credential: Credential needed for the client to connect to Azure. Required.
5968
:type credential: ~azure.core.credentials.TokenCredential
60-
:param solution_id: Solution Id of the solution. Required.
61-
:type solution_id: str
6269
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
6370
:type subscription_id: str
6471
:param base_url: Service URL. Default value is "https://management.azure.com".
6572
:type base_url: str
66-
:keyword api_version: Api Version. Default value is "2021-09-01-preview". Note that overriding
73+
:keyword api_version: Api Version. Default value is "2023-06-01-preview". Note that overriding
6774
this default value may result in unsupported behavior.
6875
:paramtype api_version: str
6976
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -73,28 +80,46 @@ class AgriFoodMgmtClient: # pylint: disable=client-accepts-api-version-keyword,
7380
def __init__(
7481
self,
7582
credential: "TokenCredential",
76-
solution_id: str,
7783
subscription_id: str,
7884
base_url: str = "https://management.azure.com",
7985
**kwargs: Any
8086
) -> None:
81-
self._config = AgriFoodMgmtClientConfiguration(
82-
credential=credential, solution_id=solution_id, subscription_id=subscription_id, **kwargs
83-
)
84-
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
87+
self._config = AgriFoodMgmtClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
88+
_policies = kwargs.pop("policies", None)
89+
if _policies is None:
90+
_policies = [
91+
policies.RequestIdPolicy(**kwargs),
92+
self._config.headers_policy,
93+
self._config.user_agent_policy,
94+
self._config.proxy_policy,
95+
policies.ContentDecodePolicy(**kwargs),
96+
ARMAutoResourceProviderRegistrationPolicy(),
97+
self._config.redirect_policy,
98+
self._config.retry_policy,
99+
self._config.authentication_policy,
100+
self._config.custom_hook_policy,
101+
self._config.logging_policy,
102+
policies.DistributedTracingPolicy(**kwargs),
103+
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
104+
self._config.http_logging_policy,
105+
]
106+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
85107

86108
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
87109
self._serialize = Serializer(client_models)
88110
self._deserialize = Deserializer(client_models)
89111
self._serialize.client_side_validation = False
90-
self.extensions = ExtensionsOperations(self._client, self._config, self._serialize, self._deserialize)
91-
self.farm_beats_extensions = FarmBeatsExtensionsOperations(
112+
self.data_connectors = DataConnectorsOperations(self._client, self._config, self._serialize, self._deserialize)
113+
self.data_manager_for_agriculture_extensions = DataManagerForAgricultureExtensionsOperations(
92114
self._client, self._config, self._serialize, self._deserialize
93115
)
94-
self.farm_beats_models = FarmBeatsModelsOperations(
116+
self.data_manager_for_agriculture_resources = DataManagerForAgricultureResourcesOperations(
95117
self._client, self._config, self._serialize, self._deserialize
96118
)
97-
self.locations = LocationsOperations(self._client, self._config, self._serialize, self._deserialize)
119+
self.operation_results = OperationResultsOperations(
120+
self._client, self._config, self._serialize, self._deserialize
121+
)
122+
self.extensions = ExtensionsOperations(self._client, self._config, self._serialize, self._deserialize)
98123
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
99124
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
100125
self._client, self._config, self._serialize, self._deserialize
@@ -107,7 +132,7 @@ def __init__(
107132
self._client, self._config, self._serialize, self._deserialize
108133
)
109134

110-
def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
135+
def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
111136
"""Runs the network request through the client's chained policies.
112137
113138
>>> from azure.core.rest import HttpRequest
@@ -127,14 +152,14 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
127152

128153
request_copy = deepcopy(request)
129154
request_copy.url = self._client.format_url(request_copy.url)
130-
return self._client.send_request(request_copy, **kwargs)
155+
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
131156

132157
def close(self) -> None:
133158
self._client.close()
134159

135-
def __enter__(self) -> "AgriFoodMgmtClient":
160+
def __enter__(self) -> Self:
136161
self._client.__enter__()
137162
return self
138163

139-
def __exit__(self, *exc_details) -> None:
164+
def __exit__(self, *exc_details: Any) -> None:
140165
self._client.__exit__(*exc_details)

sdk/agrifood/azure-mgmt-agrifood/azure/mgmt/agrifood/_configuration.py

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,59 +6,46 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
import sys
109
from typing import Any, TYPE_CHECKING
1110

12-
from azure.core.configuration import Configuration
1311
from azure.core.pipeline import policies
1412
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1513

1614
from ._version import VERSION
1715

18-
if sys.version_info >= (3, 8):
19-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
20-
else:
21-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
22-
2316
if TYPE_CHECKING:
24-
# pylint: disable=unused-import,ungrouped-imports
2517
from azure.core.credentials import TokenCredential
2618

2719

28-
class AgriFoodMgmtClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
20+
class AgriFoodMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes
2921
"""Configuration for AgriFoodMgmtClient.
3022
3123
Note that all parameters used to create this instance are saved as instance
3224
attributes.
3325
3426
:param credential: Credential needed for the client to connect to Azure. Required.
3527
:type credential: ~azure.core.credentials.TokenCredential
36-
:param solution_id: Solution Id of the solution. Required.
37-
:type solution_id: str
3828
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
3929
:type subscription_id: str
40-
:keyword api_version: Api Version. Default value is "2021-09-01-preview". Note that overriding
30+
:keyword api_version: Api Version. Default value is "2023-06-01-preview". Note that overriding
4131
this default value may result in unsupported behavior.
4232
:paramtype api_version: str
4333
"""
4434

45-
def __init__(self, credential: "TokenCredential", solution_id: str, subscription_id: str, **kwargs: Any) -> None:
46-
super(AgriFoodMgmtClientConfiguration, self).__init__(**kwargs)
47-
api_version: Literal["2021-09-01-preview"] = kwargs.pop("api_version", "2021-09-01-preview")
35+
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
36+
api_version: str = kwargs.pop("api_version", "2023-06-01-preview")
4837

4938
if credential is None:
5039
raise ValueError("Parameter 'credential' must not be None.")
51-
if solution_id is None:
52-
raise ValueError("Parameter 'solution_id' must not be None.")
5340
if subscription_id is None:
5441
raise ValueError("Parameter 'subscription_id' must not be None.")
5542

5643
self.credential = credential
57-
self.solution_id = solution_id
5844
self.subscription_id = subscription_id
5945
self.api_version = api_version
6046
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
6147
kwargs.setdefault("sdk_moniker", "mgmt-agrifood/{}".format(VERSION))
48+
self.polling_interval = kwargs.get("polling_interval", 30)
6249
self._configure(**kwargs)
6350

6451
def _configure(self, **kwargs: Any) -> None:
@@ -67,9 +54,9 @@ def _configure(self, **kwargs: Any) -> None:
6754
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
6855
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
6956
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
70-
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
7157
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
7258
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
59+
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
7360
self.authentication_policy = kwargs.get("authentication_policy")
7461
if self.credential and not self.authentication_policy:
7562
self.authentication_policy = ARMChallengeAuthenticationPolicy(

0 commit comments

Comments
 (0)