Skip to content

Commit 695e78e

Browse files
christotheschristothes
committed
merge
2 parents 2b9deaa + 9f4d5cb commit 695e78e

File tree

951 files changed

+3682
-1393
lines changed

Some content is hidden

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

951 files changed

+3682
-1393
lines changed

‎codegen/generator/src/OpenAI.Library.Plugin.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20251031.1" />
11+
<PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20251111.2" />
1212
</ItemGroup>
1313

1414
<!-- Copy output to package dist path for local execution and -->

‎codegen/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"dependencies": {
3131
"@open-ai/plugin": "file:",
3232
"@azure-tools/typespec-client-generator-core": "0.61.0",
33-
"@typespec/http-client-csharp": "1.0.0-alpha.20251031.1",
33+
"@typespec/http-client-csharp": "1.0.0-alpha.20251111.2",
3434
"@typespec/http": "1.5.0",
3535
"@typespec/openapi": "1.5.0"
3636
},

‎package-lock.json‎

Lines changed: 195 additions & 195 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/Export-Api.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function Invoke-GenAPI {
107107
Write-Output ""
108108

109109
# System.ClientModel
110-
$systemClientModelPath = Join-Path $nugetPackagesPath "system.clientmodel\1.7.0"
110+
$systemClientModelPath = Join-Path $nugetPackagesPath "system.clientmodel\1.8.1"
111111
$systemClientModelRef = $null
112112
if (Test-Path $systemClientModelPath) {
113113
$systemClientModelRef = Get-ChildItem `

‎specification/client/responses.client.tsp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,15 @@ using TypeSpec.HttpClient.CSharp;
7575

7676
// ------------ Streaming ------------
7777

78+
@@usage(ResponseStreamEvent, Usage.json);
79+
7880
@@alternateType(ResponseFunctionCallArgumentsDoneEvent.arguments, unknown);
79-
// @@clientName(ResponseFunctionCallArgumentsDoneEvent.arguments, "FunctionArguments");
81+
@@clientName(ResponseFunctionCallArgumentsDoneEvent.arguments, "FunctionArguments");
8082

8183
@@alternateType(ResponseFunctionCallArgumentsDeltaEvent.delta, unknown);
8284

8385
@@alternateType(ResponseMCPCallArgumentsDoneEvent.arguments, unknown);
84-
// @@clientName(ResponseMCPCallArgumentsDoneEvent.arguments, "ToolArguments");
86+
@@clientName(ResponseMCPCallArgumentsDoneEvent.arguments, "ToolArguments");
8587

8688
@@alternateType(ResponseMCPCallArgumentsDeltaEvent.delta, unknown);
8789

‎src/Custom/Responses/Streaming/StreamingResponseFunctionCallArgumentsDoneUpdate.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
using System;
2-
31
namespace OpenAI.Responses;
42

53
// CUSTOM: Renamed.
64
[CodeGenType("ResponseFunctionCallArgumentsDoneEvent")]
75
public partial class StreamingResponseFunctionCallArgumentsDoneUpdate
86
{
9-
// CUSTOM: Renamed.
10-
[CodeGenMember("Arguments")]
11-
public BinaryData FunctionArguments { get; }
127
}

‎src/Custom/Responses/Streaming/StreamingResponseMcpCallArgumentsDoneUpdate.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
using System;
2-
3-
namespace OpenAI.Responses;
1+
namespace OpenAI.Responses;
42

53
// CUSTOM: Renamed.
64
[CodeGenType("ResponseMCPCallArgumentsDoneEvent")]
75
public partial class StreamingResponseMcpCallArgumentsDoneUpdate
86
{
9-
// CUSTOM: Renamed.
10-
[CodeGenMember("Arguments")]
11-
public BinaryData ToolArguments { get; }
127
}

‎src/Generated/Internal/ClientUriBuilder.cs‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,23 @@ namespace OpenAI
1212
internal partial class ClientUriBuilder
1313
{
1414
private UriBuilder _uriBuilder;
15-
private StringBuilder _pathBuilder;
16-
private StringBuilder _queryBuilder;
15+
private StringBuilder _pathAndQuery;
16+
private int _pathLength;
1717

1818
public ClientUriBuilder()
1919
{
2020
}
2121

22-
private UriBuilder UriBuilder => _uriBuilder ??= new UriBuilder();
22+
private UriBuilder UriBuilder => _uriBuilder ??= new UriBuilder();
2323

24-
private StringBuilder PathBuilder => _pathBuilder ??= new StringBuilder(UriBuilder.Path);
25-
26-
private StringBuilder QueryBuilder => _queryBuilder ??= new StringBuilder(UriBuilder.Query);
24+
private StringBuilder PathAndQuery => _pathAndQuery ??= new StringBuilder();
2725

2826
public void Reset(Uri uri)
2927
{
3028
_uriBuilder = new UriBuilder(uri);
31-
_pathBuilder = new StringBuilder(UriBuilder.Path);
32-
_queryBuilder = new StringBuilder(UriBuilder.Query);
29+
PathAndQuery.Clear();
30+
PathAndQuery.Append(UriBuilder.Path);
31+
_pathLength = PathAndQuery.Length;
3332
}
3433

3534
public void AppendPath(string value, bool escape)
@@ -38,12 +37,13 @@ public void AppendPath(string value, bool escape)
3837
{
3938
value = Uri.EscapeDataString(value);
4039
}
41-
if (PathBuilder.Length > 0 && PathBuilder[PathBuilder.Length - 1] == '/' && value[0] == '/')
40+
if (_pathLength > 0 && PathAndQuery[_pathLength - 1] == '/' && value[0] == '/')
4241
{
43-
PathBuilder.Remove(PathBuilder.Length - 1, 1);
42+
PathAndQuery.Remove(_pathLength - 1, 1);
43+
_pathLength = _pathLength - 1;
4444
}
45-
PathBuilder.Append(value);
46-
UriBuilder.Path = PathBuilder.ToString();
45+
PathAndQuery.Insert(_pathLength, value);
46+
_pathLength = _pathLength + value.Length;
4747
}
4848

4949
public void AppendPath(bool value, bool escape = false) => AppendPath(TypeFormatters.ConvertToString(value), escape);
@@ -73,17 +73,21 @@ public void AppendPathDelimited<T>(IEnumerable<T> value, string delimiter, Seria
7373

7474
public void AppendQuery(string name, string value, bool escape)
7575
{
76-
if (QueryBuilder.Length > 0)
76+
if (PathAndQuery.Length == _pathLength)
77+
{
78+
PathAndQuery.Append('?');
79+
}
80+
if (PathAndQuery.Length > _pathLength && PathAndQuery[PathAndQuery.Length - 1] != '?')
7781
{
78-
QueryBuilder.Append('&');
82+
PathAndQuery.Append('&');
7983
}
8084
if (escape)
8185
{
8286
value = Uri.EscapeDataString(value);
8387
}
84-
QueryBuilder.Append(name);
85-
QueryBuilder.Append('=');
86-
QueryBuilder.Append(value);
88+
PathAndQuery.Append(name);
89+
PathAndQuery.Append('=');
90+
PathAndQuery.Append(value);
8791
}
8892

8993
public void AppendQuery(string name, bool value, bool escape = false) => AppendQuery(name, TypeFormatters.ConvertToString(value), escape);
@@ -117,13 +121,14 @@ public void AppendQueryDelimited<T>(string name, IEnumerable<T> value, string de
117121

118122
public Uri ToUri()
119123
{
120-
if (_pathBuilder != null)
124+
UriBuilder.Path = PathAndQuery.ToString(0, _pathLength);
125+
if (PathAndQuery.Length > _pathLength)
121126
{
122-
UriBuilder.Path = _pathBuilder.ToString();
127+
UriBuilder.Query = PathAndQuery.ToString(_pathLength + 1, PathAndQuery.Length - _pathLength - 1);
123128
}
124-
if (_queryBuilder != null)
129+
if (PathAndQuery.Length == _pathLength)
125130
{
126-
UriBuilder.Query = _queryBuilder.ToString();
131+
UriBuilder.Query = "";
127132
}
128133
return UriBuilder.Uri;
129134
}

‎src/Generated/Internal/CodeGenSerializationAttribute.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ public CodeGenSerializationAttribute(string propertyName)
1414
PropertyName = propertyName;
1515
}
1616

17-
public CodeGenSerializationAttribute(string propertyName, string propertySerializationName)
17+
public CodeGenSerializationAttribute(string propertyName, string serializationName)
1818
{
1919
PropertyName = propertyName;
20-
PropertySerializationName = propertySerializationName;
20+
SerializationName = serializationName;
2121
}
2222

2323
public string PropertyName { get; }
2424

25-
public string PropertySerializationName { get; set; }
25+
public string SerializationName { get; set; }
2626

2727
public string SerializationValueHook { get; set; }
2828

‎src/Generated/Models/Assistants/Assistant.Serialization.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ protected virtual Assistant PersistableModelCreateCore(BinaryData data, ModelRea
356356
switch (format)
357357
{
358358
case "J":
359-
using (JsonDocument document = JsonDocument.Parse(data))
359+
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
360360
{
361361
return DeserializeAssistant(document.RootElement, options);
362362
}
@@ -370,7 +370,7 @@ protected virtual Assistant PersistableModelCreateCore(BinaryData data, ModelRea
370370
public static explicit operator Assistant(ClientResult result)
371371
{
372372
PipelineResponse response = result.GetRawResponse();
373-
using JsonDocument document = JsonDocument.Parse(response.Content);
373+
using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
374374
return DeserializeAssistant(document.RootElement, ModelSerializationExtensions.WireOptions);
375375
}
376376
}

0 commit comments

Comments
 (0)