Skip to content

Commit 54d0cba

Browse files
millicentachiengmillicentachieng
authored
Merge pull request #2184 from microsoftgraph/dev
Merge dev into master
2 parents 0666f30 + 73a4e6f commit 54d0cba

File tree

14 files changed

+20
-21
lines changed

14 files changed

+20
-21
lines changed

‎CodeSnippetsPipeline.Test/CodeSnippetsPipeline.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
13-
<PackageReference Include="NUnit" Version="4.2.0" />
13+
<PackageReference Include="NUnit" Version="4.2.2" />
1414
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
1515
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎CodeSnippetsReflection.OpenAPI.Test/CodeSnippetsReflection.OpenAPI.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PrivateAssets>all</PrivateAssets>
1313
</PackageReference>
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
15-
<PackageReference Include="moq" Version="4.20.70" />
15+
<PackageReference Include="moq" Version="4.20.71" />
1616
<PackageReference Include="xunit" Version="2.9.0" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎CodeSnippetsReflection.OpenAPI.Test/PythonGeneratorTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public async Task GeneratesTheCorrectSnippetForUsers()
3636
Assert.Contains(".me.get()", result);
3737
}
3838
[Fact]
39-
public async Task GeneratesTheSnippetHeader()
39+
public async Task GeneratesTheClientCommnet()
4040
{
4141
using var requestPayload = new HttpRequestMessage(HttpMethod.Get, $"{ServiceRootUrl}/me/messages");
4242
var snippetModel = new SnippetModel(requestPayload, ServiceRootUrl, await GetV1SnippetMetadata());
4343
var result = _generator.GenerateCodeSnippet(snippetModel);
44-
Assert.Contains("graph_client = GraphServiceClient(credentials, scopes)", result);
44+
Assert.Contains("# To initialize your graph_client, see https://learn.microsoft.com/en-us/graph/sdks/create-client?from=snippets&tabs=python", result);
4545
}
4646
[Fact]
4747
public async Task GeneratesThePostMethodCall()

‎CodeSnippetsReflection.OpenAPI/CodeSnippetsReflection.OpenAPI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
10-
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.17" />
10+
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.19" />
1111
<PackageReference Include="System.Text.Json" Version="8.0.4" />
1212
</ItemGroup>
1313

‎CodeSnippetsReflection.OpenAPI/LanguageGenerators/PythonGenerator.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ namespace CodeSnippetsReflection.OpenAPI.LanguageGenerators
1313
public class PythonGenerator : ILanguageGenerator<SnippetModel, OpenApiUrlTreeNode>
1414
{
1515
private const string ClientVarName = "graph_client";
16-
private const string ClientVarType = "GraphServiceClient";
17-
private const string CredentialVarName = "credentials";
18-
private const string ScopesVarName = "scopes";
1916
private const string RequestBodyVarName = "request_body";
2017
private const string RequestConfigurationVarName = "request_configuration";
2118
private const string RequestConfigurationType = "RequestConfiguration";
2219
private const string RequestParametersPropertyName = "query_params";
20+
private const string VersionInformationString = "# Code snippets are only available for the latest version. Current version is 1.x";
21+
22+
private const string InitializationInfoString = "# To initialize your graph_client, see https://learn.microsoft.com/en-us/graph/sdks/create-client?from=snippets&tabs=python";
23+
2324

2425
private static readonly HashSet<string> ReservedTypeNames = new(StringComparer.OrdinalIgnoreCase)
2526
{
@@ -67,13 +68,14 @@ public string GenerateCodeSnippet(SnippetModel snippetModel)
6768
{
6869
var indentManager = new IndentManager();
6970
var codeGraph = new SnippetCodeGraph(snippetModel);
70-
var snippetBuilder = new StringBuilder($"{Environment.NewLine}{Environment.NewLine}" +
71-
$"{ClientVarName} = {ClientVarType}({CredentialVarName}, {ScopesVarName}){Environment.NewLine}{Environment.NewLine}");
71+
var snippetBuilder = new StringBuilder();
72+
snippetBuilder.AppendLine(InitializationInfoString);
7273

7374
WriteRequestPayloadAndVariableName(codeGraph, snippetBuilder, indentManager);
7475
WriteRequestExecutionPath(codeGraph, snippetBuilder, indentManager);
7576
var importStatements = GetImportStatements(snippetModel);
76-
snippetBuilder.Insert(0, string.Join(Environment.NewLine, importStatements));
77+
snippetBuilder.Insert(0, VersionInformationString + Environment.NewLine);
78+
snippetBuilder.Insert(VersionInformationString.Length + Environment.NewLine.Length, string.Join(Environment.NewLine, importStatements) + Environment.NewLine);
7779
return snippetBuilder.ToString();
7880
}
7981
private static HashSet<string> GetImportStatements(SnippetModel snippetModel)

‎FileService.Test/FileService.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
15-
<PackageReference Include="Moq" Version="4.20.70" />
15+
<PackageReference Include="Moq" Version="4.20.71" />
1616
<PackageReference Include="xunit" Version="2.9.0" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎GraphWebApi/GraphWebApi.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0" />
4343
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.22.0" />
4444
<PackageReference Include="Microsoft.ApplicationInsights.SnapshotCollector" Version="1.4.6" />
45-
<PackageReference Include="Microsoft.ApplicationInsights.Web" Version="2.22.0" />
4645
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
4746
<PackageReference Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" />
4847
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />

‎KnownIssuesService.Test/KnownIssuesService.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
2424
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
2525
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
26-
<PackageReference Include="Moq" Version="4.20.70" />
26+
<PackageReference Include="Moq" Version="4.20.71" />
2727
<PackageReference Include="System.Text.Json" Version="8.0.4" />
2828
<PackageReference Include="xunit" Version="2.9.0" />
2929
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

‎KnownIssuesService/KnownIssuesService.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
98
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
109
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
1110
<PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="19.225.1" />

‎MockTestUtility/MockTestUtility.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
1111
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
1212
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
13-
<PackageReference Include="moq" Version="4.20.70" />
13+
<PackageReference Include="moq" Version="4.20.71" />
1414
<PackageReference Include="System.Text.Json" Version="8.0.4" />
1515
</ItemGroup>
1616

‎OpenAPIService.Test/OpenAPIService.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
</PackageReference>
2828
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
2929
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
30-
<PackageReference Include="Microsoft.OpenApi" Version="1.6.17" />
3130
<PackageReference Include="System.Text.Json" Version="8.0.4" />
3231
<PackageReference Include="xunit" Version="2.9.0" />
3332
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

‎OpenAPIService/OpenAPIService.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
1111
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
1212
<PackageReference Include="Microsoft.OData.Edm" Version="8.0.1" />
13-
<PackageReference Include="Microsoft.OpenApi" Version="1.6.17" />
13+
<PackageReference Include="Microsoft.OpenApi" Version="1.6.19" />
1414
<PackageReference Include="Microsoft.OpenApi.OData" Version="1.6.8" />
15-
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.17" />
15+
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.19" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎PermissionsService/PermissionsService.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1010
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
1111
<PackageReference Include="Microsoft.Graph.Kibali" Version="0.24.0" />
12-
<PackageReference Include="Microsoft.OpenApi" Version="1.6.17" />
12+
<PackageReference Include="Microsoft.OpenApi" Version="1.6.19" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎apidoctor

0 commit comments

Comments
 (0)