Skip to content

feat:OpenAPI: add web search tool schemas, tracking, includes, union #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HavenDV merged 1 commit into from
Aug 26, 2025
Merged

feat:OpenAPI: add web search tool schemas, tracking, includes, union #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/libs/tryAGI.OpenAI/Generated/tryAGI.OpenAI..JsonSerializerContext.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,8 @@ namespace tryAGI.OpenAI
typeof(global::tryAGI.OpenAI.JsonConverters.FileSearchToolCallStatusNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.FileSearchToolCallTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.FileSearchToolCallTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchActionSearchSourceTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchActionSearchSourceTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchActionSearchTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchActionSearchTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchActionOpenPageTypeJsonConverter),
Expand Down Expand Up @@ -589,10 +591,12 @@ namespace tryAGI.OpenAI
typeof(global::tryAGI.OpenAI.JsonConverters.RankingOptionsRankerNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.FileSearchToolTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.FileSearchToolTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchPreviewToolSearchContextSizeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchPreviewToolSearchContextSizeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchPreviewToolTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchPreviewToolTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchToolSearchContextSizeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchToolSearchContextSizeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchToolTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchToolTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchApproximateLocationTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchApproximateLocationTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.MCPToolConnectorIdJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.MCPToolConnectorIdNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.MCPToolRequireApprovalEnum2JsonConverter),
Expand Down Expand Up @@ -625,6 +629,10 @@ namespace tryAGI.OpenAI
typeof(global::tryAGI.OpenAI.JsonConverters.CustomToolFormatVariant2TypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.CustomToolTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.CustomToolTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchPreviewToolSearchContextSizeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchPreviewToolSearchContextSizeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchPreviewToolTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.WebSearchPreviewToolTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.EvalResponsesSourceTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.EvalResponsesSourceTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.CreateEvalResponsesRunDataSourceTypeJsonConverter),
Expand Down
4 changes: 2 additions & 2 deletions src/libs/tryAGI.OpenAI/Generated/tryAGI.OpenAI.ConversationsClient.CreateConversation.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ partial void ProcessCreateConversationResponseContent(

/// <summary>
/// Create a conversation<br/>
/// Create a conversation with the given ID.
/// Create a conversation.
/// </summary>
/// <param name="request"></param>
/// <param name="cancellationToken">The token to cancel the operation with</param>
Expand Down Expand Up @@ -168,7 +168,7 @@ partial void ProcessCreateConversationResponseContent(

/// <summary>
/// Create a conversation<br/>
/// Create a conversation with the given ID.
/// Create a conversation.
/// </summary>
/// <param name="items">
/// Initial items to include in the conversation context.<br/>
Expand Down
4 changes: 2 additions & 2 deletions src/libs/tryAGI.OpenAI/Generated/tryAGI.OpenAI.IConversationsClient.CreateConversation.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public partial interface IConversationsClient
{
/// <summary>
/// Create a conversation<br/>
/// Create a conversation with the given ID.
/// Create a conversation.
/// </summary>
/// <param name="request"></param>
/// <param name="cancellationToken">The token to cancel the operation with</param>
Expand All @@ -17,7 +17,7 @@ public partial interface IConversationsClient

/// <summary>
/// Create a conversation<br/>
/// Create a conversation with the given ID.
/// Create a conversation.
/// </summary>
/// <param name="items">
/// Initial items to include in the conversation context.<br/>
Expand Down
69 changes: 47 additions & 22 deletions src/libs/tryAGI.OpenAI/Generated/tryAGI.OpenAI.JsonConverters.Tool.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,24 @@ public class ToolJsonConverter : global::System.Text.Json.Serialization.JsonConv
}

readerCopy = reader;
global::tryAGI.OpenAI.WebSearchPreviewTool? webSearchPreview = default;
global::tryAGI.OpenAI.ComputerUsePreviewTool? computerUsePreview = default;
try
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.WebSearchPreviewTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.WebSearchPreviewTool> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.WebSearchPreviewTool).Name}");
webSearchPreview = global::System.Text.Json.JsonSerializer.Deserialize(ref readerCopy, typeInfo);
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.ComputerUsePreviewTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.ComputerUsePreviewTool> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.ComputerUsePreviewTool).Name}");
computerUsePreview = global::System.Text.Json.JsonSerializer.Deserialize(ref readerCopy, typeInfo);
}
catch (global::System.Text.Json.JsonException)
{
}

readerCopy = reader;
global::tryAGI.OpenAI.ComputerUsePreviewTool? computerUsePreview = default;
global::tryAGI.OpenAI.WebSearchTool? webSearch = default;
try
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.ComputerUsePreviewTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.ComputerUsePreviewTool> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.ComputerUsePreviewTool).Name}");
computerUsePreview = global::System.Text.Json.JsonSerializer.Deserialize(ref readerCopy, typeInfo);
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.WebSearchTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.WebSearchTool> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.WebSearchTool).Name}");
webSearch = global::System.Text.Json.JsonSerializer.Deserialize(ref readerCopy, typeInfo);
}
catch (global::System.Text.Json.JsonException)
{
Expand Down Expand Up @@ -124,16 +124,29 @@ public class ToolJsonConverter : global::System.Text.Json.Serialization.JsonConv
{
}

readerCopy = reader;
global::tryAGI.OpenAI.WebSearchPreviewTool? webSearchPreview = default;
try
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.WebSearchPreviewTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.WebSearchPreviewTool> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.WebSearchPreviewTool).Name}");
webSearchPreview = global::System.Text.Json.JsonSerializer.Deserialize(ref readerCopy, typeInfo);
}
catch (global::System.Text.Json.JsonException)
{
}

var result = new global::tryAGI.OpenAI.Tool(
function,
fileSearch,
webSearchPreview,
computerUsePreview,
webSearch,
mCP,
codeInterpreter,
imageGen,
localShell,
custom
custom,
webSearchPreview
);

if (function != null)
Expand All @@ -148,18 +161,18 @@ public class ToolJsonConverter : global::System.Text.Json.Serialization.JsonConv
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.FileSearchTool).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}
else if (webSearchPreview != null)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.WebSearchPreviewTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.WebSearchPreviewTool> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.WebSearchPreviewTool).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}
else if (computerUsePreview != null)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.ComputerUsePreviewTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.ComputerUsePreviewTool> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.ComputerUsePreviewTool).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}
else if (webSearch != null)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.WebSearchTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.WebSearchTool> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.WebSearchTool).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}
else if (mCP != null)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.MCPTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.MCPTool> ??
Expand Down Expand Up @@ -190,6 +203,12 @@ public class ToolJsonConverter : global::System.Text.Json.Serialization.JsonConv
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.CustomTool).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}
else if (webSearchPreview != null)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.WebSearchPreviewTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.WebSearchPreviewTool> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.WebSearchPreviewTool).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}

return result;
}
Expand All @@ -215,18 +234,18 @@ public override void Write(
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.FileSearchTool).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.FileSearch, typeInfo);
}
else if (value.IsWebSearchPreview)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.WebSearchPreviewTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.WebSearchPreviewTool?> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.WebSearchPreviewTool).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.WebSearchPreview, typeInfo);
}
else if (value.IsComputerUsePreview)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.ComputerUsePreviewTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.ComputerUsePreviewTool?> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.ComputerUsePreviewTool).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.ComputerUsePreview, typeInfo);
}
else if (value.IsWebSearch)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.WebSearchTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.WebSearchTool?> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.WebSearchTool).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.WebSearch, typeInfo);
}
else if (value.IsMCP)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.MCPTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.MCPTool?> ??
Expand Down Expand Up @@ -257,6 +276,12 @@ public override void Write(
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.CustomTool).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.Custom, typeInfo);
}
else if (value.IsWebSearchPreview)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.WebSearchPreviewTool), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.WebSearchPreviewTool?> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.WebSearchPreviewTool).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.WebSearchPreview, typeInfo);
}
}
}
}
53 changes: 53 additions & 0 deletions ...tryAGI.OpenAI/Generated/tryAGI.OpenAI.JsonConverters.WebSearchActionSearchSourceType.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#nullable enable

namespace tryAGI.OpenAI.JsonConverters
{
/// <inheritdoc />
public sealed class WebSearchActionSearchSourceTypeJsonConverter : global::System.Text.Json.Serialization.JsonConverter<global::tryAGI.OpenAI.WebSearchActionSearchSourceType>
{
/// <inheritdoc />
public override global::tryAGI.OpenAI.WebSearchActionSearchSourceType Read(
ref global::System.Text.Json.Utf8JsonReader reader,
global::System.Type typeToConvert,
global::System.Text.Json.JsonSerializerOptions options)
{
switch (reader.TokenType)
{
case global::System.Text.Json.JsonTokenType.String:
{
var stringValue = reader.GetString();
if (stringValue != null)
{
return global::tryAGI.OpenAI.WebSearchActionSearchSourceTypeExtensions.ToEnum(stringValue) ?? default;
}

break;
}
case global::System.Text.Json.JsonTokenType.Number:
{
var numValue = reader.GetInt32();
return (global::tryAGI.OpenAI.WebSearchActionSearchSourceType)numValue;
}
case global::System.Text.Json.JsonTokenType.Null:
{
return default(global::tryAGI.OpenAI.WebSearchActionSearchSourceType);
}
default:
throw new global::System.ArgumentOutOfRangeException(nameof(reader));
}

return default;
}

/// <inheritdoc />
public override void Write(
global::System.Text.Json.Utf8JsonWriter writer,
global::tryAGI.OpenAI.WebSearchActionSearchSourceType value,
global::System.Text.Json.JsonSerializerOptions options)
{
writer = writer ?? throw new global::System.ArgumentNullException(nameof(writer));

writer.WriteStringValue(global::tryAGI.OpenAI.WebSearchActionSearchSourceTypeExtensions.ToValueString(value));
}
}
}
Loading
Loading