fix: Fixed serialization issue for some enums.

tryAGI · Dec 9, 2024 · 32fe9bc · 32fe9bc
1 parent 976295c
commit 32fe9bc
Show file tree

Hide file tree

Showing 23 changed files with 61 additions and 58 deletions.
diff --git a/src/libs/AutoSDK/Models/TypeData.cs b/src/libs/AutoSDK/Models/TypeData.cs
@@ -59,6 +59,9 @@ public readonly record struct TypeData(
     public string CSharpTypeWithNullabilityForValueTypes => IsValueType
         ? CSharpTypeWithNullability
         : CSharpTypeWithoutNullability;
+    public string CSharpTypeWithNullabilityForNonValueTypes => IsValueType
+        ? CSharpTypeWithoutNullability
+        : CSharpTypeWithNullability;
     public string CSharpType => CSharpTypeNullability
         ? CSharpTypeWithNullability
         : CSharpTypeWithoutNullability;

diff --git a/src/libs/AutoSDK/Sources/Sources.JsonConverters.AnyOf.cs b/src/libs/AutoSDK/Sources/Sources.JsonConverters.AnyOf.cs
@@ -142,7 +142,7 @@ public override void Write(
             {(i == 0 ? "" : "else ")}if (value.Is{x.Name})
             {{
 {(anyOfData.IsTrimming ? $@" 
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof({x.Type.CSharpTypeWithoutNullability}), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<{x.Type.CSharpTypeWithNullability}> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof({x.Type.CSharpTypeWithoutNullability}), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<{x.Type.CSharpTypeWithNullabilityForNonValueTypes}> ??
                                throw new global::System.InvalidOperationException($""Cannot get type info for {{typeof({x.Type.CSharpTypeWithoutNullability}).Name}}"");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.{x.Name}, typeInfo);
  " : $@" 

diff --git a/...shotTests/Snapshots/anthropic/SystemTextJson/_#JsonConverters.AnthropicBeta.g.verified.cs b/...shotTests/Snapshots/anthropic/SystemTextJson/_#JsonConverters.AnthropicBeta.g.verified.cs
@@ -79,7 +79,7 @@ public override void Write(
             }
             else if (value.IsValue2)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.AnthropicBetaEnum), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.AnthropicBetaEnum?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.AnthropicBetaEnum), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.AnthropicBetaEnum> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.AnthropicBetaEnum).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.Value2, typeInfo);
             }

diff --git a/...SDK.SnapshotTests/Snapshots/anthropic/SystemTextJson/_#JsonConverters.Model.g.verified.cs b/...SDK.SnapshotTests/Snapshots/anthropic/SystemTextJson/_#JsonConverters.Model.g.verified.cs
@@ -79,7 +79,7 @@ public override void Write(
             }
             else if (value.IsValue2)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ModelEnum), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ModelEnum?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ModelEnum), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ModelEnum> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.ModelEnum).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.Value2, typeInfo);
             }

diff --git a/...apshots/assemblyai/SystemTextJson/_#JsonConverters.LemurActionItemsResponse.g.verified.cs b/...apshots/assemblyai/SystemTextJson/_#JsonConverters.LemurActionItemsResponse.g.verified.cs
@@ -54,7 +54,7 @@ public override void Write(
 
             if (value.IsString)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.LemurStringResponse), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.LemurStringResponse?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.LemurStringResponse), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.LemurStringResponse> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.LemurStringResponse).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.String, typeInfo);
             }

diff --git a/...hotTests/Snapshots/assemblyai/SystemTextJson/_#JsonConverters.LemurResponse.g.verified.cs b/...hotTests/Snapshots/assemblyai/SystemTextJson/_#JsonConverters.LemurResponse.g.verified.cs
@@ -73,13 +73,13 @@ public override void Write(
 
             if (value.IsString)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.LemurStringResponse), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.LemurStringResponse?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.LemurStringResponse), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.LemurStringResponse> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.LemurStringResponse).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.String, typeInfo);
             }
             else if (value.IsQuestionAnswer)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.LemurQuestionAnswerResponse), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.LemurQuestionAnswerResponse?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.LemurQuestionAnswerResponse), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.LemurQuestionAnswerResponse> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.LemurQuestionAnswerResponse).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.QuestionAnswer, typeInfo);
             }

diff --git a/...s/Snapshots/assemblyai/SystemTextJson/_#JsonConverters.LemurSummaryResponse.g.verified.cs b/...s/Snapshots/assemblyai/SystemTextJson/_#JsonConverters.LemurSummaryResponse.g.verified.cs
@@ -54,7 +54,7 @@ public override void Write(
 
             if (value.IsString)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.LemurStringResponse), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.LemurStringResponse?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.LemurStringResponse), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.LemurStringResponse> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.LemurStringResponse).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.String, typeInfo);
             }

diff --git a/...ests/Snapshots/assemblyai/SystemTextJson/_#JsonConverters.LemurTaskResponse.g.verified.cs b/...ests/Snapshots/assemblyai/SystemTextJson/_#JsonConverters.LemurTaskResponse.g.verified.cs
@@ -54,7 +54,7 @@ public override void Write(
 
             if (value.IsString)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.LemurStringResponse), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.LemurStringResponse?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.LemurStringResponse), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.LemurStringResponse> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.LemurStringResponse).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.String, typeInfo);
             }

diff --git a/...ts/assemblyai/SystemTextJson/_#JsonConverters.TranscriptWebhookNotification.g.verified.cs b/...ts/assemblyai/SystemTextJson/_#JsonConverters.TranscriptWebhookNotification.g.verified.cs
@@ -79,7 +79,7 @@ public override void Write(
             }
             else if (value.IsRedactedAudio)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.RedactedAudioNotification), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.RedactedAudioNotification?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.RedactedAudioNotification), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.RedactedAudioNotification> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.RedactedAudioNotification).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.RedactedAudio, typeInfo);
             }

diff --git a/...s/Snapshots/cohere/SystemTextJson/_#JsonConverters.GenerateStreamedResponse.g.verified.cs b/...s/Snapshots/cohere/SystemTextJson/_#JsonConverters.GenerateStreamedResponse.g.verified.cs
@@ -92,19 +92,19 @@ public override void Write(
 
             if (value.IsStreamText)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.GenerateStreamText), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.GenerateStreamText?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.GenerateStreamText), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.GenerateStreamText> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.GenerateStreamText).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.StreamText, typeInfo);
             }
             else if (value.IsStreamEnd)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.GenerateStreamEnd), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.GenerateStreamEnd?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.GenerateStreamEnd), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.GenerateStreamEnd> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.GenerateStreamEnd).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.StreamEnd, typeInfo);
             }
             else if (value.IsStreamError)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.GenerateStreamError), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.GenerateStreamError?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.GenerateStreamError), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.GenerateStreamError> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.GenerateStreamError).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.StreamError, typeInfo);
             }

diff --git a/...Tests/Snapshots/cohere/SystemTextJson/_#JsonConverters.StreamedChatResponse.g.verified.cs b/...Tests/Snapshots/cohere/SystemTextJson/_#JsonConverters.StreamedChatResponse.g.verified.cs
@@ -187,49 +187,49 @@ public override void Write(
 
             if (value.IsStreamStartEvent)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatStreamStartEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatStreamStartEvent?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatStreamStartEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatStreamStartEvent> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.ChatStreamStartEvent).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.StreamStartEvent, typeInfo);
             }
             else if (value.IsSearchQueriesGenerationEvent)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatSearchQueriesGenerationEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatSearchQueriesGenerationEvent?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatSearchQueriesGenerationEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatSearchQueriesGenerationEvent> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.ChatSearchQueriesGenerationEvent).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.SearchQueriesGenerationEvent, typeInfo);
             }
             else if (value.IsSearchResultsEvent)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatSearchResultsEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatSearchResultsEvent?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatSearchResultsEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatSearchResultsEvent> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.ChatSearchResultsEvent).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.SearchResultsEvent, typeInfo);
             }
             else if (value.IsTextGenerationEvent)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatTextGenerationEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatTextGenerationEvent?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatTextGenerationEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatTextGenerationEvent> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.ChatTextGenerationEvent).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.TextGenerationEvent, typeInfo);
             }
             else if (value.IsCitationGenerationEvent)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatCitationGenerationEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatCitationGenerationEvent?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatCitationGenerationEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatCitationGenerationEvent> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.ChatCitationGenerationEvent).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.CitationGenerationEvent, typeInfo);
             }
             else if (value.IsToolCallsGenerationEvent)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatToolCallsGenerationEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatToolCallsGenerationEvent?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatToolCallsGenerationEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatToolCallsGenerationEvent> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.ChatToolCallsGenerationEvent).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.ToolCallsGenerationEvent, typeInfo);
             }
             else if (value.IsStreamEndEvent)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatStreamEndEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatStreamEndEvent?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatStreamEndEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatStreamEndEvent> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.ChatStreamEndEvent).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.StreamEndEvent, typeInfo);
             }
             else if (value.IsToolCallsChunkEvent)
             {
-                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatToolCallsChunkEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatToolCallsChunkEvent?> ??
+                var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::G.ChatToolCallsChunkEvent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::G.ChatToolCallsChunkEvent> ??
                                throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::G.ChatToolCallsChunkEvent).Name}");
                 global::System.Text.Json.JsonSerializer.Serialize(writer, value.ToolCallsChunkEvent, typeInfo);
             }