Skip to content

Commit 0389bea

Browse files
committed
refactor: Update OpenAPI handling to use OpenApiReaderSettings and streamline imports
1 parent 7de98ae commit 0389bea

2 files changed

Lines changed: 15 additions & 9 deletions

File tree

src/libs/AutoSDK.CLI/Resources/src_helpers_FixOpenApiSpec_FixOpenApiSpec.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.22" />
12+
<PackageReference Include="Microsoft.OpenApi" Version="3.1.3" />
13+
<PackageReference Include="Microsoft.OpenApi.YamlReader" Version="3.1.3" />
1314
<PackageReference Include="AutoSDK" Version="0.27.0" />
1415
</ItemGroup>
1516

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using AutoSDK.Helpers;
22
using Microsoft.OpenApi;
3-
using Microsoft.OpenApi.Extensions;
4-
using Microsoft.OpenApi;
5-
using Microsoft.OpenApi.Readers;
3+
using Microsoft.OpenApi.Reader;
4+
using Microsoft.OpenApi.YamlReader;
65

76
var path = args[0];
87
var yamlOrJson = await File.ReadAllTextAsync(path);
@@ -12,14 +11,20 @@
1211
yamlOrJson = OpenApi31Support.ConvertToOpenApi30(yamlOrJson);
1312
}
1413

15-
var openApiDocument = new OpenApiStringReader().Read(yamlOrJson, out var diagnostics);
14+
var readerSettings = new OpenApiReaderSettings
15+
{
16+
RuleSet = ValidationRuleSet.GetEmptyRuleSet(),
17+
};
18+
readerSettings.AddYamlReader();
19+
20+
var (openApiDocument, diagnostics) = OpenApiDocument.Parse(yamlOrJson, settings: readerSettings);
1621

1722
//openApiDocument.Components.Schemas["GenerateCompletionRequest"]!.Properties["stream"]!.Default = new OpenApiBoolean(true);
1823

19-
yamlOrJson = openApiDocument.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
20-
_ = new OpenApiStringReader().Read(yamlOrJson, out diagnostics);
24+
yamlOrJson = await openApiDocument!.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0);
25+
(_, diagnostics) = OpenApiDocument.Parse(yamlOrJson, settings: readerSettings);
2126

22-
if (diagnostics.Errors.Count > 0)
27+
if (diagnostics?.Errors.Count > 0)
2328
{
2429
foreach (var error in diagnostics.Errors)
2530
{
@@ -29,4 +34,4 @@
2934
Environment.Exit(1);
3035
}
3136

32-
await File.WriteAllTextAsync(path, yamlOrJson);
37+
await File.WriteAllTextAsync(path, yamlOrJson);

0 commit comments

Comments
 (0)