Skip to content

Commit 4b20965

Browse files
ShivangiRejaShivangiReja
authored
[SCM][CloudMachine] Fix cloud machine and address feedback (Azure#49771)
Fix CM
1 parent 87f5a2b commit 4b20965

File tree

38 files changed

+239
-178
lines changed

38 files changed

+239
-178
lines changed

‎sdk/ai/Azure.AI.Inference/api/Azure.AI.Inference.net8.0.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ namespace Azure.AI.Inference
22
{
33
public static partial class AIInferenceExtensions
44
{
5-
public static Azure.AI.Inference.ChatCompletionsClient GetChatCompletionsClient(this System.ClientModel.Primitives.ConnectionProvider provider) { throw null; }
6-
public static Azure.AI.Inference.EmbeddingsClient GetEmbeddingsClient(this System.ClientModel.Primitives.ConnectionProvider provider) { throw null; }
5+
public static Azure.AI.Inference.ChatCompletionsClient GetChatCompletionsClient(this System.ClientModel.Primitives.ClientConnectionProvider provider) { throw null; }
6+
public static Azure.AI.Inference.EmbeddingsClient GetEmbeddingsClient(this System.ClientModel.Primitives.ClientConnectionProvider provider) { throw null; }
77
}
88
public static partial class AIInferenceModelFactory
99
{

‎sdk/ai/Azure.AI.Inference/api/Azure.AI.Inference.netstandard2.0.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ namespace Azure.AI.Inference
22
{
33
public static partial class AIInferenceExtensions
44
{
5-
public static Azure.AI.Inference.ChatCompletionsClient GetChatCompletionsClient(this System.ClientModel.Primitives.ConnectionProvider provider) { throw null; }
6-
public static Azure.AI.Inference.EmbeddingsClient GetEmbeddingsClient(this System.ClientModel.Primitives.ConnectionProvider provider) { throw null; }
5+
public static Azure.AI.Inference.ChatCompletionsClient GetChatCompletionsClient(this System.ClientModel.Primitives.ClientConnectionProvider provider) { throw null; }
6+
public static Azure.AI.Inference.EmbeddingsClient GetEmbeddingsClient(this System.ClientModel.Primitives.ClientConnectionProvider provider) { throw null; }
77
}
88
public static partial class AIInferenceModelFactory
99
{

‎sdk/ai/Azure.AI.Inference/src/Customized/AIInferenceExtensions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ public static class AIInferenceExtensions
1919
/// </summary>
2020
/// <param name="provider"></param>
2121
/// <returns></returns>
22-
public static ChatCompletionsClient GetChatCompletionsClient(this ConnectionProvider provider)
22+
public static ChatCompletionsClient GetChatCompletionsClient(this ClientConnectionProvider provider)
2323
{
2424
ChatCompletionsClientKey chatCompletionsClientKey = new();
2525
ChatCompletionsClient chatClient = provider.Subclients.GetClient(chatCompletionsClientKey, () => CreateChatCompletionsClient(provider));
2626
return chatClient;
2727
}
2828

29-
private static ChatCompletionsClient CreateChatCompletionsClient(this ConnectionProvider provider)
29+
private static ChatCompletionsClient CreateChatCompletionsClient(this ClientConnectionProvider provider)
3030
{
3131
ClientConnection connection = provider.GetConnection(typeof(ChatCompletionsClient).FullName!);
3232

@@ -48,14 +48,14 @@ private static ChatCompletionsClient CreateChatCompletionsClient(this Connection
4848
/// </summary>
4949
/// <param name="provider"></param>
5050
/// <returns></returns>
51-
public static EmbeddingsClient GetEmbeddingsClient(this ConnectionProvider provider)
51+
public static EmbeddingsClient GetEmbeddingsClient(this ClientConnectionProvider provider)
5252
{
5353
EmbeddingsClientKey embeddingsClientKey = new();
5454
EmbeddingsClient embeddingsClient = provider.Subclients.GetClient(embeddingsClientKey, () => CreateEmbeddingsClient(provider));
5555
return embeddingsClient;
5656
}
5757

58-
private static EmbeddingsClient CreateEmbeddingsClient(this ConnectionProvider provider)
58+
private static EmbeddingsClient CreateEmbeddingsClient(this ClientConnectionProvider provider)
5959
{
6060
ClientConnection connection = provider.GetConnection(typeof(ChatCompletionsClient).FullName!);
6161

‎sdk/ai/Azure.AI.Projects/api/Azure.AI.Projects.net8.0.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ public static partial class AIClientModelFactory
465465
public static Azure.AI.Projects.ThreadMessage ThreadMessage(string id = null, System.DateTimeOffset createdAt = default(System.DateTimeOffset), string threadId = null, Azure.AI.Projects.MessageStatus status = default(Azure.AI.Projects.MessageStatus), Azure.AI.Projects.MessageIncompleteDetails incompleteDetails = null, System.DateTimeOffset? completedAt = default(System.DateTimeOffset?), System.DateTimeOffset? incompleteAt = default(System.DateTimeOffset?), Azure.AI.Projects.MessageRole role = default(Azure.AI.Projects.MessageRole), System.Collections.Generic.IEnumerable<Azure.AI.Projects.MessageContent> contentItems = null, string agentId = null, string runId = null, System.Collections.Generic.IEnumerable<Azure.AI.Projects.MessageAttachment> attachments = null, System.Collections.Generic.IDictionary<string, string> metadata = null) { throw null; }
466466
public static Azure.AI.Projects.ThreadRun ThreadRun(string id = null, string threadId = null, string agentId = null, Azure.AI.Projects.RunStatus status = default(Azure.AI.Projects.RunStatus), Azure.AI.Projects.RequiredAction requiredAction = null, Azure.AI.Projects.RunError lastError = null, string model = null, string instructions = null, System.Collections.Generic.IEnumerable<Azure.AI.Projects.ToolDefinition> tools = null, System.DateTimeOffset createdAt = default(System.DateTimeOffset), System.DateTimeOffset? expiresAt = default(System.DateTimeOffset?), System.DateTimeOffset? startedAt = default(System.DateTimeOffset?), System.DateTimeOffset? completedAt = default(System.DateTimeOffset?), System.DateTimeOffset? cancelledAt = default(System.DateTimeOffset?), System.DateTimeOffset? failedAt = default(System.DateTimeOffset?), Azure.AI.Projects.IncompleteRunDetails incompleteDetails = null, Azure.AI.Projects.RunCompletionUsage usage = null, float? temperature = default(float?), float? topP = default(float?), int? maxPromptTokens = default(int?), int? maxCompletionTokens = default(int?), Azure.AI.Projects.TruncationObject truncationStrategy = null, System.BinaryData toolChoice = null, System.BinaryData responseFormat = null, System.Collections.Generic.IReadOnlyDictionary<string, string> metadata = null, Azure.AI.Projects.UpdateToolResourcesOptions toolResources = null, bool? parallelToolCalls = default(bool?)) { throw null; }
467467
}
468-
public partial class AIProjectClient : System.ClientModel.Primitives.ConnectionProvider
468+
public partial class AIProjectClient : System.ClientModel.Primitives.ClientConnectionProvider
469469
{
470470
protected AIProjectClient() : base (default(int)) { }
471471
public AIProjectClient(string connectionString, Azure.Core.TokenCredential credential = null) : base (default(int)) { }

‎sdk/ai/Azure.AI.Projects/api/Azure.AI.Projects.netstandard2.0.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ public static partial class AIClientModelFactory
465465
public static Azure.AI.Projects.ThreadMessage ThreadMessage(string id = null, System.DateTimeOffset createdAt = default(System.DateTimeOffset), string threadId = null, Azure.AI.Projects.MessageStatus status = default(Azure.AI.Projects.MessageStatus), Azure.AI.Projects.MessageIncompleteDetails incompleteDetails = null, System.DateTimeOffset? completedAt = default(System.DateTimeOffset?), System.DateTimeOffset? incompleteAt = default(System.DateTimeOffset?), Azure.AI.Projects.MessageRole role = default(Azure.AI.Projects.MessageRole), System.Collections.Generic.IEnumerable<Azure.AI.Projects.MessageContent> contentItems = null, string agentId = null, string runId = null, System.Collections.Generic.IEnumerable<Azure.AI.Projects.MessageAttachment> attachments = null, System.Collections.Generic.IDictionary<string, string> metadata = null) { throw null; }
466466
public static Azure.AI.Projects.ThreadRun ThreadRun(string id = null, string threadId = null, string agentId = null, Azure.AI.Projects.RunStatus status = default(Azure.AI.Projects.RunStatus), Azure.AI.Projects.RequiredAction requiredAction = null, Azure.AI.Projects.RunError lastError = null, string model = null, string instructions = null, System.Collections.Generic.IEnumerable<Azure.AI.Projects.ToolDefinition> tools = null, System.DateTimeOffset createdAt = default(System.DateTimeOffset), System.DateTimeOffset? expiresAt = default(System.DateTimeOffset?), System.DateTimeOffset? startedAt = default(System.DateTimeOffset?), System.DateTimeOffset? completedAt = default(System.DateTimeOffset?), System.DateTimeOffset? cancelledAt = default(System.DateTimeOffset?), System.DateTimeOffset? failedAt = default(System.DateTimeOffset?), Azure.AI.Projects.IncompleteRunDetails incompleteDetails = null, Azure.AI.Projects.RunCompletionUsage usage = null, float? temperature = default(float?), float? topP = default(float?), int? maxPromptTokens = default(int?), int? maxCompletionTokens = default(int?), Azure.AI.Projects.TruncationObject truncationStrategy = null, System.BinaryData toolChoice = null, System.BinaryData responseFormat = null, System.Collections.Generic.IReadOnlyDictionary<string, string> metadata = null, Azure.AI.Projects.UpdateToolResourcesOptions toolResources = null, bool? parallelToolCalls = default(bool?)) { throw null; }
467467
}
468-
public partial class AIProjectClient : System.ClientModel.Primitives.ConnectionProvider
468+
public partial class AIProjectClient : System.ClientModel.Primitives.ClientConnectionProvider
469469
{
470470
protected AIProjectClient() : base (default(int)) { }
471471
public AIProjectClient(string connectionString, Azure.Core.TokenCredential credential = null) : base (default(int)) { }

‎sdk/ai/Azure.AI.Projects/src/Custom/AIProjectClient.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Azure.AI.Projects
1212
{
1313
// Data plane generated client.
1414
/// <summary> The AzureAI service client. </summary>
15-
public partial class AIProjectClient : ConnectionProvider
15+
public partial class AIProjectClient : ClientConnectionProvider
1616
{
1717
private readonly ConnectionCacheManager _cacheManager;
1818
private readonly ConnectionsClient _connectionsClient;

‎sdk/ai/Azure.AI.Projects/tests/Azure.AI.Projects.Tests.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
<ItemGroup>
2323
<ProjectReference Include="$(AzureCoreTestFramework)" />
2424
<ProjectReference Include="..\src\Azure.AI.Projects.csproj" />
25+
<!-- TODO: TEMP until SCM is released https://github.com/Azure/azure-sdk-for-net/issues/49730 -->
26+
<ProjectReference Include="..\..\Azure.AI.Inference\src\Azure.AI.Inference.csproj" />
27+
<ProjectReference Include="..\..\..\openai\Azure.AI.OpenAI\src\Azure.AI.OpenAI.csproj" />
28+
<ProjectReference Include="..\..\..\search\Azure.Search.Documents\src\Azure.Search.Documents.csproj" />
29+
<!-- ==============================================================-->
2530
</ItemGroup>
2631

2732
<ItemGroup>
@@ -31,10 +36,6 @@
3136
<PackageReference Include="Moq" />
3237
<PackageReference Include="Azure.ResourceManager" />
3338
<PackageReference Include="Azure.ResourceManager.CognitiveServices" />
34-
<PackageReference Include="Azure.AI.Inference" />
35-
<!--TODO: remove VersionOverride https://github.com/Azure/azure-sdk-for-net/issues/49730 -->
36-
<PackageReference Include="Azure.AI.OpenAI" VersionOverride="2.2.0-beta.4"/>
37-
<PackageReference Include="Azure.Search.Documents" VersionOverride="11.7.0-beta.3" />
3839
<PackageReference Include="System.Text.Json" />
3940
</ItemGroup>
4041

‎sdk/cloudmachine/Azure.Projects.AI/api/Azure.Projects.AI.net8.0.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace Azure.AI.Models
22
{
33
public static partial class AIModelsExtensions
44
{
5-
public static Azure.AI.Models.ModelsClient GetModelsClient(this System.ClientModel.Primitives.ConnectionProvider provider, string? deploymentName = null) { throw null; }
5+
public static Azure.AI.Models.ModelsClient GetModelsClient(this System.ClientModel.Primitives.ClientConnectionProvider provider, string? deploymentName = null) { throw null; }
66
}
77
public partial class ModelsClient
88
{
@@ -25,8 +25,8 @@ public static void Add(this System.Collections.Generic.List<OpenAI.Chat.ChatMess
2525
public static string AsText(this OpenAI.Chat.ChatCompletion completion) { throw null; }
2626
public static string AsText(this OpenAI.Chat.ChatMessageContent content) { throw null; }
2727
public static string AsText(this System.ClientModel.ClientResult<OpenAI.Chat.ChatCompletion> completionResult) { throw null; }
28-
public static OpenAI.Chat.ChatClient GetOpenAIChatClient(this System.ClientModel.Primitives.ConnectionProvider provider, string? deploymentName = null) { throw null; }
29-
public static OpenAI.Embeddings.EmbeddingClient GetOpenAIEmbeddingClient(this System.ClientModel.Primitives.ConnectionProvider provider, string? deploymentName = null) { throw null; }
28+
public static OpenAI.Chat.ChatClient GetOpenAIChatClient(this System.ClientModel.Primitives.ClientConnectionProvider provider, string? deploymentName = null) { throw null; }
29+
public static OpenAI.Embeddings.EmbeddingClient GetOpenAIEmbeddingClient(this System.ClientModel.Primitives.ClientConnectionProvider provider, string? deploymentName = null) { throw null; }
3030
public static void Trim(this System.Collections.Generic.List<OpenAI.Chat.ChatMessage> messages) { }
3131
}
3232
}

‎sdk/cloudmachine/Azure.Projects.AI/api/Azure.Projects.AI.netstandard2.0.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace Azure.AI.Models
22
{
33
public static partial class AIModelsExtensions
44
{
5-
public static Azure.AI.Models.ModelsClient GetModelsClient(this System.ClientModel.Primitives.ConnectionProvider provider, string? deploymentName = null) { throw null; }
5+
public static Azure.AI.Models.ModelsClient GetModelsClient(this System.ClientModel.Primitives.ClientConnectionProvider provider, string? deploymentName = null) { throw null; }
66
}
77
public partial class ModelsClient
88
{
@@ -25,8 +25,8 @@ public static void Add(this System.Collections.Generic.List<OpenAI.Chat.ChatMess
2525
public static string AsText(this OpenAI.Chat.ChatCompletion completion) { throw null; }
2626
public static string AsText(this OpenAI.Chat.ChatMessageContent content) { throw null; }
2727
public static string AsText(this System.ClientModel.ClientResult<OpenAI.Chat.ChatCompletion> completionResult) { throw null; }
28-
public static OpenAI.Chat.ChatClient GetOpenAIChatClient(this System.ClientModel.Primitives.ConnectionProvider provider, string? deploymentName = null) { throw null; }
29-
public static OpenAI.Embeddings.EmbeddingClient GetOpenAIEmbeddingClient(this System.ClientModel.Primitives.ConnectionProvider provider, string? deploymentName = null) { throw null; }
28+
public static OpenAI.Chat.ChatClient GetOpenAIChatClient(this System.ClientModel.Primitives.ClientConnectionProvider provider, string? deploymentName = null) { throw null; }
29+
public static OpenAI.Embeddings.EmbeddingClient GetOpenAIEmbeddingClient(this System.ClientModel.Primitives.ClientConnectionProvider provider, string? deploymentName = null) { throw null; }
3030
public static void Trim(this System.Collections.Generic.List<OpenAI.Chat.ChatMessage> messages) { }
3131
}
3232
}

‎sdk/cloudmachine/Azure.Projects.AI/src/MaaS/AIServicesExtensios.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ public static partial class AIModelsExtensions
2121
/// <param name="provider"></param>
2222
/// <param name="deploymentName"></param>
2323
/// <returns></returns>
24-
public static ModelsClient GetModelsClient(this ConnectionProvider provider, string? deploymentName = null)
24+
public static ModelsClient GetModelsClient(this ClientConnectionProvider provider, string? deploymentName = null)
2525
{
26-
ModelsClient client = provider.Subclients.GetClient(() => CreateModelsClient(provider), null!);
26+
ModelsClientKey modelsClientKey = new(deploymentName);
27+
ModelsClient client = provider.Subclients.GetClient(modelsClientKey, () => CreateModelsClient(provider));
2728
return client;
2829
}
2930

30-
private static ModelsClient CreateModelsClient(this ConnectionProvider provider)
31+
private static ModelsClient CreateModelsClient(this ClientConnectionProvider provider)
3132
{
3233
ClientConnection connection = provider.GetConnection(typeof(ModelsClient).FullName!);
3334

@@ -36,8 +37,10 @@ private static ModelsClient CreateModelsClient(this ConnectionProvider provider)
3637
throw new InvalidOperationException("Invalid URI.");
3738
}
3839

39-
return connection.Authentication == ClientAuthenticationMethod.Credential
40+
return connection.CredentialKind == CredentialKind.TokenCredential
4041
? new ModelsClient(uri, (connection.Credential as TokenCredential)!)
41-
: new ModelsClient(uri, new ApiKeyCredential(connection.ApiKeyCredential!));
42+
: new ModelsClient(uri, new ApiKeyCredential((string)connection.Credential!));
4243
}
44+
45+
private record ModelsClientKey(string? DeploymentName);
4346
}

0 commit comments

Comments
 (0)