Skip to content

Commit a02675f

Browse files
author
SDKAuto
committed
CodeGen from PR 34270 in Azure/azure-rest-api-specs
Merge fb89ed06a5636c700996526ee22bbb90f9ef177b into 11059b2f00c7572b276dc9862c0b41db8702cc78
1 parent ebf29c4 commit a02675f

Some content is hidden

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

44 files changed

+3025
-1102
lines changed

sdk/contentsafety/azure-ai-contentsafety/MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ include azure/ai/contentsafety/py.typed
44
recursive-include tests *.py
55
recursive-include samples *.py *.md
66
include azure/__init__.py
7-
include azure/ai/__init__.py
7+
include azure/ai/__init__.py
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"commit": "1f578543d267d08febc1bebf4e33ffe14363ddfc",
3+
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
4+
"typespec_src": "specification/cognitiveservices/ContentSafety",
5+
"@azure-tools/typespec-python": "0.44.1"
6+
}
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"CrossLanguagePackageId": "ContentSafety",
3+
"CrossLanguageDefinitionId": {
4+
"azure.ai.contentsafety.models.AddOrUpdateTextBlocklistItemsOptions": "ContentSafety.AddOrUpdateTextBlocklistItemsOptions",
5+
"azure.ai.contentsafety.models.AddOrUpdateTextBlocklistItemsResult": "ContentSafety.AddOrUpdateTextBlocklistItemsResult",
6+
"azure.ai.contentsafety.models.AnalyzeImageOptions": "ContentSafety.AnalyzeImageOptions",
7+
"azure.ai.contentsafety.models.AnalyzeImageResult": "ContentSafety.AnalyzeImageResult",
8+
"azure.ai.contentsafety.models.AnalyzeTextOptions": "ContentSafety.AnalyzeTextOptions",
9+
"azure.ai.contentsafety.models.AnalyzeTextResult": "ContentSafety.AnalyzeTextResult",
10+
"azure.ai.contentsafety.models.DetectTextProtectedMaterialOptions": "ContentSafety.DetectTextProtectedMaterialOptions",
11+
"azure.ai.contentsafety.models.DetectTextProtectedMaterialResult": "ContentSafety.DetectTextProtectedMaterialResult",
12+
"azure.ai.contentsafety.models.DocumentInjectionAnalysisResult": "ContentSafety.DocumentInjectionAnalysisResult",
13+
"azure.ai.contentsafety.models.ImageCategoriesAnalysis": "ContentSafety.ImageCategoriesAnalysis",
14+
"azure.ai.contentsafety.models.ImageData": "ContentSafety.ImageData",
15+
"azure.ai.contentsafety.models.RemoveTextBlocklistItemsOptions": "ContentSafety.RemoveTextBlocklistItemsOptions",
16+
"azure.ai.contentsafety.models.ShieldPromptOptions": "ContentSafety.ShieldPromptOptions",
17+
"azure.ai.contentsafety.models.ShieldPromptResult": "ContentSafety.ShieldPromptResult",
18+
"azure.ai.contentsafety.models.TextBlocklist": "ContentSafety.TextBlocklist",
19+
"azure.ai.contentsafety.models.TextBlocklistItem": "ContentSafety.TextBlocklistItem",
20+
"azure.ai.contentsafety.models.TextBlocklistMatch": "ContentSafety.TextBlocklistMatch",
21+
"azure.ai.contentsafety.models.TextCategoriesAnalysis": "ContentSafety.TextCategoriesAnalysis",
22+
"azure.ai.contentsafety.models.TextProtectedMaterialAnalysisResult": "ContentSafety.TextProtectedMaterialAnalysisResult",
23+
"azure.ai.contentsafety.models.UserPromptInjectionAnalysisResult": "ContentSafety.UserPromptInjectionAnalysisResult",
24+
"azure.ai.contentsafety.models.ImageCategory": "ContentSafety.ImageCategory",
25+
"azure.ai.contentsafety.models.AnalyzeImageOutputType": "ContentSafety.AnalyzeImageOutputType",
26+
"azure.ai.contentsafety.models.TextCategory": "ContentSafety.TextCategory",
27+
"azure.ai.contentsafety.models.AnalyzeTextOutputType": "ContentSafety.AnalyzeTextOutputType",
28+
"azure.ai.contentsafety.ContentSafetyClient.analyze_image": "Customizations.ContentSafetyClient.analyzeImage",
29+
"azure.ai.contentsafety.aio.ContentSafetyClient.analyze_image": "Customizations.ContentSafetyClient.analyzeImage",
30+
"azure.ai.contentsafety.ContentSafetyClient.analyze_text": "Customizations.ContentSafetyClient.analyzeText",
31+
"azure.ai.contentsafety.aio.ContentSafetyClient.analyze_text": "Customizations.ContentSafetyClient.analyzeText",
32+
"azure.ai.contentsafety.ContentSafetyClient.detect_text_protected_material": "Customizations.ContentSafetyClient.detectTextProtectedMaterial",
33+
"azure.ai.contentsafety.aio.ContentSafetyClient.detect_text_protected_material": "Customizations.ContentSafetyClient.detectTextProtectedMaterial",
34+
"azure.ai.contentsafety.ContentSafetyClient.shield_prompt": "Customizations.ContentSafetyClient.shieldPrompt",
35+
"azure.ai.contentsafety.aio.ContentSafetyClient.shield_prompt": "Customizations.ContentSafetyClient.shieldPrompt",
36+
"azure.ai.contentsafety.BlocklistClient.add_or_update_blocklist_items": "Customizations.BlocklistClient.addOrUpdateBlocklistItems",
37+
"azure.ai.contentsafety.aio.BlocklistClient.add_or_update_blocklist_items": "Customizations.BlocklistClient.addOrUpdateBlocklistItems",
38+
"azure.ai.contentsafety.BlocklistClient.create_or_update_text_blocklist": "Customizations.BlocklistClient.createOrUpdateTextBlocklist",
39+
"azure.ai.contentsafety.aio.BlocklistClient.create_or_update_text_blocklist": "Customizations.BlocklistClient.createOrUpdateTextBlocklist",
40+
"azure.ai.contentsafety.BlocklistClient.delete_text_blocklist": "Customizations.BlocklistClient.deleteTextBlocklist",
41+
"azure.ai.contentsafety.aio.BlocklistClient.delete_text_blocklist": "Customizations.BlocklistClient.deleteTextBlocklist",
42+
"azure.ai.contentsafety.BlocklistClient.get_text_blocklist": "Customizations.BlocklistClient.getTextBlocklist",
43+
"azure.ai.contentsafety.aio.BlocklistClient.get_text_blocklist": "Customizations.BlocklistClient.getTextBlocklist",
44+
"azure.ai.contentsafety.BlocklistClient.get_text_blocklist_item": "Customizations.BlocklistClient.getTextBlocklistItem",
45+
"azure.ai.contentsafety.aio.BlocklistClient.get_text_blocklist_item": "Customizations.BlocklistClient.getTextBlocklistItem",
46+
"azure.ai.contentsafety.BlocklistClient.list_text_blocklist_items": "Customizations.BlocklistClient.listTextBlocklistItems",
47+
"azure.ai.contentsafety.aio.BlocklistClient.list_text_blocklist_items": "Customizations.BlocklistClient.listTextBlocklistItems",
48+
"azure.ai.contentsafety.BlocklistClient.list_text_blocklists": "Customizations.BlocklistClient.listTextBlocklists",
49+
"azure.ai.contentsafety.aio.BlocklistClient.list_text_blocklists": "Customizations.BlocklistClient.listTextBlocklists",
50+
"azure.ai.contentsafety.BlocklistClient.remove_blocklist_items": "Customizations.BlocklistClient.removeBlocklistItems",
51+
"azure.ai.contentsafety.aio.BlocklistClient.remove_blocklist_items": "Customizations.BlocklistClient.removeBlocklistItems"
52+
}
53+
}

sdk/contentsafety/azure-ai-contentsafety/azure/ai/contentsafety/__init__.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,22 @@
55
# Code generated by Microsoft (R) Python 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 ._client import ContentSafetyClient
10-
from ._client import BlocklistClient
10+
from typing import TYPE_CHECKING
11+
12+
if TYPE_CHECKING:
13+
from ._patch import * # pylint: disable=unused-wildcard-import
14+
15+
from ._client import ContentSafetyClient # type: ignore
16+
from ._client import BlocklistClient # type: ignore
1117
from ._version import VERSION
1218

1319
__version__ = VERSION
1420

1521
try:
1622
from ._patch import __all__ as _patch_all
17-
from ._patch import * # pylint: disable=unused-wildcard-import
23+
from ._patch import *
1824
except ImportError:
1925
_patch_all = []
2026
from ._patch import patch_sdk as _patch_sdk
@@ -23,6 +29,6 @@
2329
"ContentSafetyClient",
2430
"BlocklistClient",
2531
]
26-
__all__.extend([p for p in _patch_all if p not in __all__])
32+
__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
2733

2834
_patch_sdk()

sdk/contentsafety/azure-ai-contentsafety/azure/ai/contentsafety/_client.py

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

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

1213
from azure.core import PipelineClient
1314
from azure.core.credentials import AzureKeyCredential
@@ -16,31 +17,31 @@
1617

1718
from ._configuration import BlocklistClientConfiguration, ContentSafetyClientConfiguration
1819
from ._operations import BlocklistClientOperationsMixin, ContentSafetyClientOperationsMixin
19-
from ._serialization import Deserializer, Serializer
20+
from ._utils.serialization import Deserializer, Serializer
2021

2122
if TYPE_CHECKING:
22-
# pylint: disable=unused-import,ungrouped-imports
2323
from azure.core.credentials import TokenCredential
2424

2525

26-
class ContentSafetyClient(ContentSafetyClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword
26+
class ContentSafetyClient(ContentSafetyClientOperationsMixin):
2727
"""ContentSafetyClient.
2828
2929
:param endpoint: Supported Cognitive Services endpoints (protocol and hostname, for example:
30-
https://:code:`<resource-name>`.cognitiveservices.azure.com). Required.
30+
https://<resource-name>.cognitiveservices.azure.com). Required.
3131
:type endpoint: str
32-
:param credential: Credential needed for the client to connect to Azure. Is either a
33-
AzureKeyCredential type or a TokenCredential type. Required.
32+
:param credential: Credential used to authenticate requests to the service. Is either a key
33+
credential type or a token credential type. Required.
3434
:type credential: ~azure.core.credentials.AzureKeyCredential or
3535
~azure.core.credentials.TokenCredential
36-
:keyword api_version: The API version to use for this operation. Default value is "2023-10-01".
36+
:keyword api_version: The API version to use for this operation. Default value is "2024-09-01".
3737
Note that overriding this default value may result in unsupported behavior.
3838
:paramtype api_version: str
3939
"""
4040

4141
def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, "TokenCredential"], **kwargs: Any) -> None:
4242
_endpoint = "{endpoint}/contentsafety"
4343
self._config = ContentSafetyClientConfiguration(endpoint=endpoint, credential=credential, **kwargs)
44+
4445
_policies = kwargs.pop("policies", None)
4546
if _policies is None:
4647
_policies = [
@@ -84,7 +85,7 @@ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
8485

8586
request_copy = deepcopy(request)
8687
path_format_arguments = {
87-
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True),
88+
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str"),
8889
}
8990

9091
request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
@@ -93,32 +94,33 @@ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
9394
def close(self) -> None:
9495
self._client.close()
9596

96-
def __enter__(self) -> "ContentSafetyClient":
97+
def __enter__(self) -> Self:
9798
self._client.__enter__()
9899
return self
99100

100101
def __exit__(self, *exc_details: Any) -> None:
101102
self._client.__exit__(*exc_details)
102103

103104

104-
class BlocklistClient(BlocklistClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword
105+
class BlocklistClient(BlocklistClientOperationsMixin):
105106
"""BlocklistClient.
106107
107108
:param endpoint: Supported Cognitive Services endpoints (protocol and hostname, for example:
108-
https://:code:`<resource-name>`.cognitiveservices.azure.com). Required.
109+
https://<resource-name>.cognitiveservices.azure.com). Required.
109110
:type endpoint: str
110-
:param credential: Credential needed for the client to connect to Azure. Is either a
111-
AzureKeyCredential type or a TokenCredential type. Required.
111+
:param credential: Credential used to authenticate requests to the service. Is either a key
112+
credential type or a token credential type. Required.
112113
:type credential: ~azure.core.credentials.AzureKeyCredential or
113114
~azure.core.credentials.TokenCredential
114-
:keyword api_version: The API version to use for this operation. Default value is "2023-10-01".
115+
:keyword api_version: The API version to use for this operation. Default value is "2024-09-01".
115116
Note that overriding this default value may result in unsupported behavior.
116117
:paramtype api_version: str
117118
"""
118119

119120
def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, "TokenCredential"], **kwargs: Any) -> None:
120121
_endpoint = "{endpoint}/contentsafety"
121122
self._config = BlocklistClientConfiguration(endpoint=endpoint, credential=credential, **kwargs)
123+
122124
_policies = kwargs.pop("policies", None)
123125
if _policies is None:
124126
_policies = [
@@ -162,7 +164,7 @@ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
162164

163165
request_copy = deepcopy(request)
164166
path_format_arguments = {
165-
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True),
167+
"endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str"),
166168
}
167169

168170
request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
@@ -171,7 +173,7 @@ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
171173
def close(self) -> None:
172174
self._client.close()
173175

174-
def __enter__(self) -> "BlocklistClient":
176+
def __enter__(self) -> Self:
175177
self._client.__enter__()
176178
return self
177179

sdk/contentsafety/azure-ai-contentsafety/azure/ai/contentsafety/_configuration.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,29 @@
1414
from ._version import VERSION
1515

1616
if TYPE_CHECKING:
17-
# pylint: disable=unused-import,ungrouped-imports
1817
from azure.core.credentials import TokenCredential
1918

2019

21-
class ContentSafetyClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
20+
class ContentSafetyClientConfiguration: # pylint: disable=too-many-instance-attributes
2221
"""Configuration for ContentSafetyClient.
2322
2423
Note that all parameters used to create this instance are saved as instance
2524
attributes.
2625
2726
:param endpoint: Supported Cognitive Services endpoints (protocol and hostname, for example:
28-
https://:code:`<resource-name>`.cognitiveservices.azure.com). Required.
27+
https://<resource-name>.cognitiveservices.azure.com). Required.
2928
:type endpoint: str
30-
:param credential: Credential needed for the client to connect to Azure. Is either a
31-
AzureKeyCredential type or a TokenCredential type. Required.
29+
:param credential: Credential used to authenticate requests to the service. Is either a key
30+
credential type or a token credential type. Required.
3231
:type credential: ~azure.core.credentials.AzureKeyCredential or
3332
~azure.core.credentials.TokenCredential
34-
:keyword api_version: The API version to use for this operation. Default value is "2023-10-01".
33+
:keyword api_version: The API version to use for this operation. Default value is "2024-09-01".
3534
Note that overriding this default value may result in unsupported behavior.
3635
:paramtype api_version: str
3736
"""
3837

3938
def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, "TokenCredential"], **kwargs: Any) -> None:
40-
api_version: str = kwargs.pop("api_version", "2023-10-01")
39+
api_version: str = kwargs.pop("api_version", "2024-09-01")
4140

4241
if endpoint is None:
4342
raise ValueError("Parameter 'endpoint' must not be None.")
@@ -73,26 +72,26 @@ def _configure(self, **kwargs: Any) -> None:
7372
self.authentication_policy = self._infer_policy(**kwargs)
7473

7574

76-
class BlocklistClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
75+
class BlocklistClientConfiguration: # pylint: disable=too-many-instance-attributes
7776
"""Configuration for BlocklistClient.
7877
7978
Note that all parameters used to create this instance are saved as instance
8079
attributes.
8180
8281
:param endpoint: Supported Cognitive Services endpoints (protocol and hostname, for example:
83-
https://:code:`<resource-name>`.cognitiveservices.azure.com). Required.
82+
https://<resource-name>.cognitiveservices.azure.com). Required.
8483
:type endpoint: str
85-
:param credential: Credential needed for the client to connect to Azure. Is either a
86-
AzureKeyCredential type or a TokenCredential type. Required.
84+
:param credential: Credential used to authenticate requests to the service. Is either a key
85+
credential type or a token credential type. Required.
8786
:type credential: ~azure.core.credentials.AzureKeyCredential or
8887
~azure.core.credentials.TokenCredential
89-
:keyword api_version: The API version to use for this operation. Default value is "2023-10-01".
88+
:keyword api_version: The API version to use for this operation. Default value is "2024-09-01".
9089
Note that overriding this default value may result in unsupported behavior.
9190
:paramtype api_version: str
9291
"""
9392

9493
def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, "TokenCredential"], **kwargs: Any) -> None:
95-
api_version: str = kwargs.pop("api_version", "2023-10-01")
94+
api_version: str = kwargs.pop("api_version", "2024-09-01")
9695

9796
if endpoint is None:
9897
raise ValueError("Parameter 'endpoint' must not be None.")

sdk/contentsafety/azure-ai-contentsafety/azure/ai/contentsafety/_operations/__init__.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,23 @@
55
# Code generated by Microsoft (R) Python 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 ._operations import ContentSafetyClientOperationsMixin
10-
from ._operations import BlocklistClientOperationsMixin
10+
from typing import TYPE_CHECKING
11+
12+
if TYPE_CHECKING:
13+
from ._patch import * # pylint: disable=unused-wildcard-import
14+
15+
from ._operations import ContentSafetyClientOperationsMixin # type: ignore
16+
from ._operations import BlocklistClientOperationsMixin # type: ignore
1117

1218
from ._patch import __all__ as _patch_all
13-
from ._patch import * # pylint: disable=unused-wildcard-import
19+
from ._patch import *
1420
from ._patch import patch_sdk as _patch_sdk
1521

1622
__all__ = [
1723
"ContentSafetyClientOperationsMixin",
1824
"BlocklistClientOperationsMixin",
1925
]
20-
__all__.extend([p for p in _patch_all if p not in __all__])
26+
__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
2127
_patch_sdk()

0 commit comments

Comments
 (0)