Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion codegen/generator/src/OpenAI.Library.Plugin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20251031.1" />
<PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20251111.2" />
</ItemGroup>

<!-- Copy output to package dist path for local execution and -->
Expand Down
2 changes: 1 addition & 1 deletion codegen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"dependencies": {
"@open-ai/plugin": "file:",
"@azure-tools/typespec-client-generator-core": "0.61.0",
"@typespec/http-client-csharp": "1.0.0-alpha.20251031.1",
"@typespec/http-client-csharp": "1.0.0-alpha.20251111.2",
"@typespec/http": "1.5.0",
"@typespec/openapi": "1.5.0"
},
Expand Down
390 changes: 195 additions & 195 deletions package-lock.json

Large diffs are not rendered by default.

47 changes: 26 additions & 21 deletions src/Generated/Internal/ClientUriBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,23 @@ namespace OpenAI
internal partial class ClientUriBuilder
{
private UriBuilder _uriBuilder;
private StringBuilder _pathBuilder;
private StringBuilder _queryBuilder;
private StringBuilder _pathAndQuery;
private int _pathLength;

public ClientUriBuilder()
{
}

private UriBuilder UriBuilder => _uriBuilder ??= new UriBuilder();
private UriBuilder UriBuilder => _uriBuilder ??= new UriBuilder();

private StringBuilder PathBuilder => _pathBuilder ??= new StringBuilder(UriBuilder.Path);

private StringBuilder QueryBuilder => _queryBuilder ??= new StringBuilder(UriBuilder.Query);
private StringBuilder PathAndQuery => _pathAndQuery ??= new StringBuilder();

public void Reset(Uri uri)
{
_uriBuilder = new UriBuilder(uri);
_pathBuilder = new StringBuilder(UriBuilder.Path);
_queryBuilder = new StringBuilder(UriBuilder.Query);
PathAndQuery.Clear();
PathAndQuery.Append(UriBuilder.Path);
_pathLength = PathAndQuery.Length;
}

public void AppendPath(string value, bool escape)
Expand All @@ -38,12 +37,13 @@ public void AppendPath(string value, bool escape)
{
value = Uri.EscapeDataString(value);
}
if (PathBuilder.Length > 0 && PathBuilder[PathBuilder.Length - 1] == '/' && value[0] == '/')
if (_pathLength > 0 && PathAndQuery[_pathLength - 1] == '/' && value[0] == '/')
{
PathBuilder.Remove(PathBuilder.Length - 1, 1);
PathAndQuery.Remove(_pathLength - 1, 1);
_pathLength = _pathLength - 1;
}
PathBuilder.Append(value);
UriBuilder.Path = PathBuilder.ToString();
PathAndQuery.Insert(_pathLength, value);
_pathLength = _pathLength + value.Length;
}

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

public void AppendQuery(string name, string value, bool escape)
{
if (QueryBuilder.Length > 0)
if (PathAndQuery.Length == _pathLength)
{
PathAndQuery.Append('?');
}
if (PathAndQuery.Length > _pathLength && PathAndQuery[PathAndQuery.Length - 1] != '?')
{
QueryBuilder.Append('&');
PathAndQuery.Append('&');
}
if (escape)
{
value = Uri.EscapeDataString(value);
}
QueryBuilder.Append(name);
QueryBuilder.Append('=');
QueryBuilder.Append(value);
PathAndQuery.Append(name);
PathAndQuery.Append('=');
PathAndQuery.Append(value);
}

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

public Uri ToUri()
{
if (_pathBuilder != null)
UriBuilder.Path = PathAndQuery.ToString(0, _pathLength);
if (PathAndQuery.Length > _pathLength)
{
UriBuilder.Path = _pathBuilder.ToString();
UriBuilder.Query = PathAndQuery.ToString(_pathLength + 1, PathAndQuery.Length - _pathLength - 1);
}
if (_queryBuilder != null)
if (PathAndQuery.Length == _pathLength)
{
UriBuilder.Query = _queryBuilder.ToString();
UriBuilder.Query = "";
}
return UriBuilder.Uri;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Generated/Internal/CodeGenSerializationAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ public CodeGenSerializationAttribute(string propertyName)
PropertyName = propertyName;
}

public CodeGenSerializationAttribute(string propertyName, string propertySerializationName)
public CodeGenSerializationAttribute(string propertyName, string serializationName)
{
PropertyName = propertyName;
PropertySerializationName = propertySerializationName;
SerializationName = serializationName;
}

public string PropertyName { get; }

public string PropertySerializationName { get; set; }
public string SerializationName { get; set; }

public string SerializationValueHook { get; set; }

Expand Down
4 changes: 2 additions & 2 deletions src/Generated/Models/Assistants/Assistant.Serialization.cs
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ protected virtual Assistant PersistableModelCreateCore(BinaryData data, ModelRea
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeAssistant(document.RootElement, options);
}
Expand All @@ -370,7 +370,7 @@ protected virtual Assistant PersistableModelCreateCore(BinaryData data, ModelRea
public static explicit operator Assistant(ClientResult result)
{
PipelineResponse response = result.GetRawResponse();
using JsonDocument document = JsonDocument.Parse(response.Content);
using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
return DeserializeAssistant(document.RootElement, ModelSerializationExtensions.WireOptions);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ protected virtual AssistantCollectionOptions PersistableModelCreateCore(BinaryDa
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeAssistantCollectionOptions(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ protected virtual AssistantCreationOptions PersistableModelCreateCore(BinaryData
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeAssistantCreationOptions(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ protected virtual AssistantDeletionResult PersistableModelCreateCore(BinaryData
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeAssistantDeletionResult(document.RootElement, options);
}
Expand All @@ -150,7 +150,7 @@ protected virtual AssistantDeletionResult PersistableModelCreateCore(BinaryData
public static explicit operator AssistantDeletionResult(ClientResult result)
{
PipelineResponse response = result.GetRawResponse();
using JsonDocument document = JsonDocument.Parse(response.Content);
using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
return DeserializeAssistantDeletionResult(document.RootElement, ModelSerializationExtensions.WireOptions);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ protected virtual AssistantModificationOptions PersistableModelCreateCore(Binary
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeAssistantModificationOptions(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ protected virtual AssistantResponseFormat PersistableModelCreateCore(BinaryData
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeAssistantResponseFormat(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ protected virtual AssistantThread PersistableModelCreateCore(BinaryData data, Mo
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeAssistantThread(document.RootElement, options);
}
Expand All @@ -219,7 +219,7 @@ protected virtual AssistantThread PersistableModelCreateCore(BinaryData data, Mo
public static explicit operator AssistantThread(ClientResult result)
{
PipelineResponse response = result.GetRawResponse();
using JsonDocument document = JsonDocument.Parse(response.Content);
using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
return DeserializeAssistantThread(document.RootElement, ModelSerializationExtensions.WireOptions);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ protected override ToolDefinition PersistableModelCreateCore(BinaryData data, Mo
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeCodeInterpreterToolDefinition(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ protected virtual CodeInterpreterToolResources PersistableModelCreateCore(Binary
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeCodeInterpreterToolResources(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ protected virtual FileSearchRankingOptions PersistableModelCreateCore(BinaryData
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeFileSearchRankingOptions(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ protected override ToolDefinition PersistableModelCreateCore(BinaryData data, Mo
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeFileSearchToolDefinition(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ protected virtual FileSearchToolResources PersistableModelCreateCore(BinaryData
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeFileSearchToolResources(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ protected override ToolDefinition PersistableModelCreateCore(BinaryData data, Mo
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeFunctionToolDefinition(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ protected virtual InternalAssistantToolsFileSearchFileSearch PersistableModelCre
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeInternalAssistantToolsFileSearchFileSearch(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ protected virtual InternalAssistantToolsFileSearchTypeOnly PersistableModelCreat
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeInternalAssistantToolsFileSearchTypeOnly(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ protected virtual InternalAssistantsNamedToolChoiceFunction PersistableModelCrea
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeInternalAssistantsNamedToolChoiceFunction(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ protected virtual InternalCreateAssistantRequestToolResources PersistableModelCr
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeInternalCreateAssistantRequestToolResources(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ protected virtual InternalCreateAssistantRequestToolResourcesCodeInterpreter Per
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeInternalCreateAssistantRequestToolResourcesCodeInterpreter(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ protected virtual InternalCreateThreadAndRunRequest PersistableModelCreateCore(B
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeInternalCreateThreadAndRunRequest(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ protected virtual InternalCreateThreadAndRunRequestToolResources PersistableMode
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeInternalCreateThreadAndRunRequestToolResources(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ protected virtual InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeInternalCreateThreadAndRunRequestToolResourcesCodeInterpreter(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ protected virtual InternalCreateThreadRequestToolResources PersistableModelCreat
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeInternalCreateThreadRequestToolResources(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ protected virtual InternalCreateThreadRequestToolResourcesCodeInterpreter Persis
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeInternalCreateThreadRequestToolResourcesCodeInterpreter(document.RootElement, options);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ protected virtual InternalCreateThreadRequestToolResourcesFileSearchBase Persist
switch (format)
{
case "J":
using (JsonDocument document = JsonDocument.Parse(data))
using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
{
return DeserializeInternalCreateThreadRequestToolResourcesFileSearchBase(document.RootElement, options);
}
Expand Down
Loading
Loading