fix: Fix deserialization of sealed classes (davidmigloz#435)

KennethKnudsen97 · Oct 1, 2024 · 1994c64 · 1994c64
1 parent d4009e8
commit 1994c64
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git a/melos.yaml b/melos.yaml
@@ -62,7 +62,7 @@ command:
       openapi_spec:
         git:
           url: https://github.com/davidmigloz/openapi_spec.git
-          ref: e14c0adaac69e9482e9b57f68fc7964032cdd44c
+          ref: 280ae0d41806eda25e923203d67bd6f4992a81e9
       test: ^1.25.2
 
 scripts:

diff --git a/packages/chromadb/pubspec.yaml b/packages/chromadb/pubspec.yaml
@@ -27,5 +27,5 @@ dev_dependencies:
   openapi_spec:
     git:
       url: https://github.com/davidmigloz/openapi_spec.git
-      ref: e14c0adaac69e9482e9b57f68fc7964032cdd44c
+      ref: 280ae0d41806eda25e923203d67bd6f4992a81e9
   test: ^1.25.2
diff --git a/packages/googleai_dart/pubspec.yaml b/packages/googleai_dart/pubspec.yaml
@@ -31,5 +31,5 @@ dev_dependencies:
   openapi_spec:
     git:
       url: https://github.com/davidmigloz/openapi_spec.git
-      ref: e14c0adaac69e9482e9b57f68fc7964032cdd44c
+      ref: 280ae0d41806eda25e923203d67bd6f4992a81e9
   test: ^1.25.2
diff --git a/packages/mistralai_dart/pubspec.yaml b/packages/mistralai_dart/pubspec.yaml
@@ -30,5 +30,5 @@ dev_dependencies:
   openapi_spec:
     git:
       url: https://github.com/davidmigloz/openapi_spec.git
-      ref: e14c0adaac69e9482e9b57f68fc7964032cdd44c
+      ref: 280ae0d41806eda25e923203d67bd6f4992a81e9
   test: ^1.25.2
diff --git a/packages/ollama_dart/pubspec.yaml b/packages/ollama_dart/pubspec.yaml
@@ -30,5 +30,5 @@ dev_dependencies:
   openapi_spec:
     git:
       url: https://github.com/davidmigloz/openapi_spec.git
-      ref: e14c0adaac69e9482e9b57f68fc7964032cdd44c
+      ref: 280ae0d41806eda25e923203d67bd6f4992a81e9
   test: ^1.25.2
diff --git a/packages/openai_dart/lib/src/generated/schema/chat_completion_message.dart b/packages/openai_dart/lib/src/generated/schema/chat_completion_message.dart
@@ -158,9 +158,11 @@ class _ChatCompletionUserMessageContentConverter
 
   @override
   ChatCompletionUserMessageContent fromJson(Object? data) {
-    if (data is List &&
-        data.every((item) => item is ChatCompletionMessageContentPart)) {
-      return ChatCompletionMessageContentParts(data.cast());
+    if (data is List && data.every((item) => item is Map)) {
+      return ChatCompletionMessageContentParts(data
+          .map((i) => ChatCompletionMessageContentPart.fromJson(
+              i as Map<String, dynamic>))
+          .toList(growable: false));
     }
     if (data is String) {
       return ChatCompletionUserMessageContentString(data);

diff --git a/packages/openai_dart/lib/src/generated/schema/create_completion_request.dart b/packages/openai_dart/lib/src/generated/schema/create_completion_request.dart
@@ -347,7 +347,7 @@ class _CompletionPromptConverter
 
   @override
   CompletionPrompt fromJson(Object? data) {
-    if (data is List && data.every((item) => item is List<int>)) {
+    if (data is List && data.every((item) => item is List)) {
       return CompletionPromptListListInt(data.cast());
     }
     if (data is List && data.every((item) => item is int)) {

diff --git a/packages/openai_dart/lib/src/generated/schema/create_embedding_request.dart b/packages/openai_dart/lib/src/generated/schema/create_embedding_request.dart
@@ -179,7 +179,7 @@ class _EmbeddingInputConverter
 
   @override
   EmbeddingInput fromJson(Object? data) {
-    if (data is List && data.every((item) => item is List<int>)) {
+    if (data is List && data.every((item) => item is List)) {
       return EmbeddingInputListListInt(data.cast());
     }
     if (data is List && data.every((item) => item is int)) {

diff --git a/packages/openai_dart/lib/src/generated/schema/create_message_request.dart b/packages/openai_dart/lib/src/generated/schema/create_message_request.dart
@@ -88,8 +88,10 @@ class _CreateMessageRequestContentConverter
 
   @override
   CreateMessageRequestContent fromJson(Object? data) {
-    if (data is List && data.every((item) => item is MessageContent)) {
-      return CreateMessageRequestContentListMessageContent(data.cast());
+    if (data is List && data.every((item) => item is Map)) {
+      return CreateMessageRequestContentListMessageContent(data
+          .map((i) => MessageContent.fromJson(i as Map<String, dynamic>))
+          .toList(growable: false));
     }
     if (data is String) {
       return CreateMessageRequestContentString(data);

diff --git a/packages/openai_dart/pubspec.yaml b/packages/openai_dart/pubspec.yaml
@@ -30,5 +30,5 @@ dev_dependencies:
   openapi_spec:
     git:
       url: https://github.com/davidmigloz/openapi_spec.git
-      ref: e14c0adaac69e9482e9b57f68fc7964032cdd44c
+      ref: 280ae0d41806eda25e923203d67bd6f4992a81e9
   test: ^1.25.2