Skip to content

Commit

Permalink
Merge branch 'main' into enhanced-analysis/trial-4
Browse files Browse the repository at this point in the history
  • Loading branch information
archerzz authored Oct 26, 2023
2 parents 1a490b1 + 9ba20bc commit ba4e032
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 34 deletions.
4 changes: 2 additions & 2 deletions eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@
All should have PrivateAssets="All" set so they don't become package dependencies
-->
<ItemGroup>
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20231025.3" PrivateAssets="All" />
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20231025.2" PrivateAssets="All" />
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20231026.1" PrivateAssets="All" />
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20230927.2" PrivateAssets="All" />
<PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
Expand Down
16 changes: 8 additions & 8 deletions eng/emitter-package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/emitter-package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"main": "dist/src/index.js",
"dependencies": {
"@azure-tools/typespec-csharp": "0.2.0-beta.20231025.3"
"@azure-tools/typespec-csharp": "0.2.0-beta.20231026.1"
}
}
21 changes: 0 additions & 21 deletions sdk/openai/Azure.AI.OpenAI/src/Custom/ImageGenerations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@

using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Xml.Linq;
using Azure.Core;

namespace Azure.AI.OpenAI
Expand All @@ -34,24 +32,5 @@ internal static void DeserializeDataProperty(JsonProperty property, ref IReadOnl
}
data = array;
}

/// <summary> Deserializes the model from a raw response. </summary>
/// <param name="response"> The response to deserialize the model from. </param>
internal static ImageGenerations FromResponse(Response response)
{
using var document = JsonDocument.Parse(response.Content);
JsonElement element = document.RootElement;
foreach (var property in document.RootElement.EnumerateObject())
{
if (property.NameEquals("result"u8))
{
//we have the envelop and need to deserialize the inner object
//https://github.com/Azure/autorest.csharp/issues/3837
element = property.Value;
break;
}
}
return DeserializeImageGenerations(element);
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIClient.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ba4e032

Please sign in to comment.