Skip to content

Commit a62f348

Browse files
author
SDKAuto
committed
CodeGen from PR 28438 in Azure/azure-rest-api-specs
Merge 86b0fb94a6624110c84fffa45b0cff7b63be5355 into 9c2b2bba3f15b4557adb5159df14ec8e5d16157d
1 parent 2f6c69c commit a62f348

Some content is hidden

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

54 files changed

+655
-7120
lines changed

‎sdk/ai/azure-ai-inference/_meta.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"commit": "90bc4168bc78826d2c89ed0ef7c765659bb91546",
3+
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
4+
"typespec_src": "specification/ai/ModelClient",
5+
"@azure-tools/typespec-python": "0.39.1"
6+
}

‎sdk/ai/azure-ai-inference/apiview-properties.json‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"CrossLanguagePackageId": "AI.Model",
3+
"CrossLanguageDefinitionId": {
4+
"azure.ai.inference.models.ContentItem": "AI.Model.ChatMessageContentItem",
5+
"azure.ai.inference.models.AudioDataContentItem": "AI.Model.ChatMessageAudioDataContentItem",
6+
"azure.ai.inference.models.AudioUrlContentItem": "AI.Model.ChatMessageAudioUrlContentItem",
7+
"azure.ai.inference.models.ChatChoice": "AI.Model.ChatChoice",
8+
"azure.ai.inference.models.ChatCompletions": "AI.Model.ChatCompletions",
9+
"azure.ai.inference.models.ChatCompletionsNamedToolChoice": "AI.Model.ChatCompletionsNamedToolChoice",
10+
"azure.ai.inference.models.ChatCompletionsNamedToolChoiceFunction": "AI.Model.ChatCompletionsNamedToolChoiceFunction",
11+
"azure.ai.inference.models.ChatCompletionsToolCall": "AI.Model.ChatCompletionsToolCall",
12+
"azure.ai.inference.models.ChatCompletionsToolDefinition": "AI.Model.ChatCompletionsToolDefinition",
13+
"azure.ai.inference.models.ChatResponseMessage": "AI.Model.ChatResponseMessage",
14+
"azure.ai.inference.models.CompletionsUsage": "AI.Model.CompletionsUsage",
15+
"azure.ai.inference.models.EmbeddingItem": "AI.Model.EmbeddingItem",
16+
"azure.ai.inference.models.EmbeddingsResult": "AI.Model.EmbeddingsResult",
17+
"azure.ai.inference.models.EmbeddingsUsage": "AI.Model.EmbeddingsUsage",
18+
"azure.ai.inference.models.FunctionCall": "AI.Model.FunctionCall",
19+
"azure.ai.inference.models.FunctionDefinition": "AI.Model.FunctionDefinition",
20+
"azure.ai.inference.models.ImageContentItem": "AI.Model.ChatMessageImageContentItem",
21+
"azure.ai.inference.models.ImageEmbeddingInput": "AI.Model.ImageEmbeddingInput",
22+
"azure.ai.inference.models.ImageUrl": "AI.Model.ChatMessageImageUrl",
23+
"azure.ai.inference.models.InputAudio": "AI.Model.ChatMessageInputAudio",
24+
"azure.ai.inference.models.InputAudioUrl": "AI.Model.ChatMessageInputAudioUrl",
25+
"azure.ai.inference.models.JsonSchemaFormat": "AI.Model.ChatCompletionsResponseFormatJsonSchemaDefinition",
26+
"azure.ai.inference.models.ModelInfo": "AI.Model.ModelInfo",
27+
"azure.ai.inference.models.StreamingChatChoiceUpdate": "AI.Model.StreamingChatChoiceUpdate",
28+
"azure.ai.inference.models.StreamingChatCompletionsUpdate": "AI.Model.StreamingChatCompletionsUpdate",
29+
"azure.ai.inference.models.StreamingChatResponseMessageUpdate": "AI.Model.StreamingChatResponseMessageUpdate",
30+
"azure.ai.inference.models.StreamingChatResponseToolCallUpdate": "AI.Model.StreamingChatResponseToolCallUpdate",
31+
"azure.ai.inference.models.TextContentItem": "AI.Model.ChatMessageTextContentItem",
32+
"azure.ai.inference.models.CompletionsFinishReason": "AI.Model.CompletionsFinishReason",
33+
"azure.ai.inference.models.ChatRole": "AI.Model.ChatRole",
34+
"azure.ai.inference.models.ImageDetailLevel": "AI.Model.ChatMessageImageDetailLevel",
35+
"azure.ai.inference.models.AudioContentFormat": "AI.Model.AudioContentFormat",
36+
"azure.ai.inference.models.ChatCompletionsToolChoicePreset": "AI.Model.ChatCompletionsToolChoicePreset",
37+
"azure.ai.inference.models.ModelType": "AI.Model.ModelType",
38+
"azure.ai.inference.models.EmbeddingEncodingFormat": "AI.Model.EmbeddingEncodingFormat",
39+
"azure.ai.inference.models.EmbeddingInputType": "AI.Model.EmbeddingInputType"
40+
}
41+
}

‎sdk/ai/azure-ai-inference/azure/ai/inference/_client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ChatCompletionsClient(ChatCompletionsClientOperationsMixin):
3939
:param credential: Credential used to authenticate requests to the service. Is either a key
4040
credential type or a token credential type. Required.
4141
:type credential: ~azure.core.credentials.AzureKeyCredential or
42-
~azure.core.credentials.AzureKeyCredential or ~azure.core.credentials.TokenCredential
42+
~azure.core.credentials.TokenCredential
4343
:keyword api_version: The API version to use for this operation. Default value is
4444
"2024-05-01-preview". Note that overriding this default value may result in unsupported
4545
behavior.
@@ -117,7 +117,7 @@ class EmbeddingsClient(EmbeddingsClientOperationsMixin):
117117
:param credential: Credential used to authenticate requests to the service. Is either a key
118118
credential type or a token credential type. Required.
119119
:type credential: ~azure.core.credentials.AzureKeyCredential or
120-
~azure.core.credentials.AzureKeyCredential or ~azure.core.credentials.TokenCredential
120+
~azure.core.credentials.TokenCredential
121121
:keyword api_version: The API version to use for this operation. Default value is
122122
"2024-05-01-preview". Note that overriding this default value may result in unsupported
123123
behavior.
@@ -195,7 +195,7 @@ class ImageEmbeddingsClient(ImageEmbeddingsClientOperationsMixin):
195195
:param credential: Credential used to authenticate requests to the service. Is either a key
196196
credential type or a token credential type. Required.
197197
:type credential: ~azure.core.credentials.AzureKeyCredential or
198-
~azure.core.credentials.AzureKeyCredential or ~azure.core.credentials.TokenCredential
198+
~azure.core.credentials.TokenCredential
199199
:keyword api_version: The API version to use for this operation. Default value is
200200
"2024-05-01-preview". Note that overriding this default value may result in unsupported
201201
behavior.

‎sdk/ai/azure-ai-inference/azure/ai/inference/_configuration.py‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ChatCompletionsClientConfiguration: # pylint: disable=too-many-instance-a
2828
:param credential: Credential used to authenticate requests to the service. Is either a key
2929
credential type or a token credential type. Required.
3030
:type credential: ~azure.core.credentials.AzureKeyCredential or
31-
~azure.core.credentials.AzureKeyCredential or ~azure.core.credentials.TokenCredential
31+
~azure.core.credentials.TokenCredential
3232
:keyword api_version: The API version to use for this operation. Default value is
3333
"2024-05-01-preview". Note that overriding this default value may result in unsupported
3434
behavior.
@@ -54,8 +54,6 @@ def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, "TokenCr
5454
def _infer_policy(self, **kwargs):
5555
if isinstance(self.credential, AzureKeyCredential):
5656
return policies.AzureKeyCredentialPolicy(self.credential, "Authorization", prefix="Bearer", **kwargs)
57-
if isinstance(self.credential, AzureKeyCredential):
58-
return policies.AzureKeyCredentialPolicy(self.credential, "api-key", **kwargs)
5957
if hasattr(self.credential, "get_token"):
6058
return policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
6159
raise TypeError(f"Unsupported credential: {self.credential}")
@@ -85,7 +83,7 @@ class EmbeddingsClientConfiguration: # pylint: disable=too-many-instance-attrib
8583
:param credential: Credential used to authenticate requests to the service. Is either a key
8684
credential type or a token credential type. Required.
8785
:type credential: ~azure.core.credentials.AzureKeyCredential or
88-
~azure.core.credentials.AzureKeyCredential or ~azure.core.credentials.TokenCredential
86+
~azure.core.credentials.TokenCredential
8987
:keyword api_version: The API version to use for this operation. Default value is
9088
"2024-05-01-preview". Note that overriding this default value may result in unsupported
9189
behavior.
@@ -111,8 +109,6 @@ def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, "TokenCr
111109
def _infer_policy(self, **kwargs):
112110
if isinstance(self.credential, AzureKeyCredential):
113111
return policies.AzureKeyCredentialPolicy(self.credential, "Authorization", prefix="Bearer", **kwargs)
114-
if isinstance(self.credential, AzureKeyCredential):
115-
return policies.AzureKeyCredentialPolicy(self.credential, "api-key", **kwargs)
116112
if hasattr(self.credential, "get_token"):
117113
return policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
118114
raise TypeError(f"Unsupported credential: {self.credential}")
@@ -142,7 +138,7 @@ class ImageEmbeddingsClientConfiguration: # pylint: disable=too-many-instance-a
142138
:param credential: Credential used to authenticate requests to the service. Is either a key
143139
credential type or a token credential type. Required.
144140
:type credential: ~azure.core.credentials.AzureKeyCredential or
145-
~azure.core.credentials.AzureKeyCredential or ~azure.core.credentials.TokenCredential
141+
~azure.core.credentials.TokenCredential
146142
:keyword api_version: The API version to use for this operation. Default value is
147143
"2024-05-01-preview". Note that overriding this default value may result in unsupported
148144
behavior.
@@ -168,8 +164,6 @@ def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, "TokenCr
168164
def _infer_policy(self, **kwargs):
169165
if isinstance(self.credential, AzureKeyCredential):
170166
return policies.AzureKeyCredentialPolicy(self.credential, "Authorization", prefix="Bearer", **kwargs)
171-
if isinstance(self.credential, AzureKeyCredential):
172-
return policies.AzureKeyCredentialPolicy(self.credential, "api-key", **kwargs)
173167
if hasattr(self.credential, "get_token"):
174168
return policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
175169
raise TypeError(f"Unsupported credential: {self.credential}")

‎sdk/ai/azure-ai-inference/azure/ai/inference/_model_base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# pylint: disable=too-many-lines,arguments-differ,signature-differs,no-member
1+
# pylint: disable=too-many-lines
22
# coding=utf-8
33
# --------------------------------------------------------------------------
44
# Copyright (c) Microsoft Corporation. All rights reserved.

0 commit comments

Comments
 (0)