Fix on Discriminator Deserialization Issues

clients/spot/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "binance-sdk-spot"
-version = "6.3.0"
+version = "6.3.0+fork.2"
 description = "Official Binance Spot SDK - A lightweight library that provides a convenient interface to Binance's Spot REST API, WebSocket API and WebSocket Streams."
 authors = ["Binance"]
 license = "MIT"
@@ -20,7 +20,7 @@ black = "^25.1.0"
 ruff = "^0.12.0"
 pycryptodome = "^3.17"
 aiohttp = "^3.9"
-binance-common = "3.4.1"
+binance-common = "3.4.1+fork.2"
 pytest = { version = ">=6.2.5", optional = true }
 
 [tool.poetry.extras]

clients/spot/src/binance_sdk_spot/rest_api/models/asset_filters.py

@@ -67,6 +67,11 @@ def __init__(self, *args, **kwargs) -> None:
     def is_oneof_model(cls) -> bool:
         return True
 
+    @classmethod
+    def model_validate(cls, obj: dict) -> Self:
+        """Validate and deserialize a dict into the appropriate oneOf model."""
+        return cls.from_dict(obj)
+
     @classmethod
     def from_dict(cls, parsed) -> Self:
         """Returns the object represented by the json string"""
@@ -85,33 +90,9 @@ def from_dict(cls, parsed) -> Self:
                 instance.actual_instance = target_cls.from_dict(parsed)
                 return instance
 
-        instance = cls.model_construct()
-        error_messages = []
-        match = 0
-        is_list = isinstance(parsed, list)
-
-        for subcls in ["MaxAssetFilter"]:
-            if is_list == subcls.is_array():
-                try:
-                    instance.actual_instance = subcls.from_dict(parsed)
-                    match += 1
-                except (ValidationError, ValueError) as e:
-                    error_messages.append(str(e))
-
-        if match > 1:
-            # more than 1 match
-            raise ValueError(
-                "Multiple matches found when deserializing the JSON string into AssetFilters with oneOf schemas: MaxAssetFilter. Details: "
-                + ", ".join(error_messages)
-            )
-        elif match == 0:
-            # no match
-            raise ValueError(
-                "No match found when deserializing the JSON string into AssetFilters with oneOf schemas: MaxAssetFilter. Details: "
-                + ", ".join(error_messages)
-            )
-        else:
-            return instance
+        raise ValueError(
+            f"Unable to deserialize into AssetFilters: 'filterType' field missing or unrecognized. Data: {parsed}"
+        )
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""

clients/spot/src/binance_sdk_spot/rest_api/models/exchange_filters.py

@@ -101,6 +101,11 @@ def __init__(self, *args, **kwargs) -> None:
     def is_oneof_model(cls) -> bool:
         return True
 
+    @classmethod
+    def model_validate(cls, obj: dict) -> Self:
+        """Validate and deserialize a dict into the appropriate oneOf model."""
+        return cls.from_dict(obj)
+
     @classmethod
     def from_dict(cls, parsed) -> Self:
         """Returns the object represented by the json string"""
@@ -124,38 +129,9 @@ def from_dict(cls, parsed) -> Self:
                 instance.actual_instance = target_cls.from_dict(parsed)
                 return instance
 
-        instance = cls.model_construct()
-        error_messages = []
-        match = 0
-        is_list = isinstance(parsed, list)
-
-        for subcls in [
-            "ExchangeMaxNumAlgoOrdersFilter",
-            "ExchangeMaxNumIcebergOrdersFilter",
-            "ExchangeMaxNumOrderListsFilter",
-            "ExchangeMaxNumOrdersFilter",
-        ]:
-            if is_list == subcls.is_array():
-                try:
-                    instance.actual_instance = subcls.from_dict(parsed)
-                    match += 1
-                except (ValidationError, ValueError) as e:
-                    error_messages.append(str(e))
-
-        if match > 1:
-            # more than 1 match
-            raise ValueError(
-                "Multiple matches found when deserializing the JSON string into ExchangeFilters with oneOf schemas: ExchangeMaxNumAlgoOrdersFilter, ExchangeMaxNumIcebergOrdersFilter, ExchangeMaxNumOrderListsFilter, ExchangeMaxNumOrdersFilter. Details: "
-                + ", ".join(error_messages)
-            )
-        elif match == 0:
-            # no match
-            raise ValueError(
-                "No match found when deserializing the JSON string into ExchangeFilters with oneOf schemas: ExchangeMaxNumAlgoOrdersFilter, ExchangeMaxNumIcebergOrdersFilter, ExchangeMaxNumOrderListsFilter, ExchangeMaxNumOrdersFilter. Details: "
-                + ", ".join(error_messages)
-            )
-        else:
-            return instance
+        raise ValueError(
+            f"Unable to deserialize into ExchangeFilters: 'filterType' field missing or unrecognized. Data: {parsed}"
+        )
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""

clients/spot/src/binance_sdk_spot/rest_api/models/exchange_info_response.py

@@ -77,6 +77,15 @@ def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of ExchangeInfoResponse from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
+    @classmethod
+    def model_validate(cls, obj: Any) -> Self:
+        """Validate and deserialize using custom from_dict logic."""
+        # If obj is a dict, use from_dict to handle nested oneOf models properly
+        if isinstance(obj, dict):
+            return cls.from_dict(obj)
+        # Otherwise use Pydantic's default validation
+        return super().model_validate(obj)
+
     def to_dict(self) -> Dict[str, Any]:
         """Return the dictionary representation of the model using alias.
 
@@ -134,9 +143,10 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            return BaseModel.model_validate.__func__(cls, obj)
 
-        _obj = cls.model_validate(
+        _obj = BaseModel.model_validate.__func__(
+            cls,
             {
                 "timezone": obj.get("timezone"),
                 "serverTime": obj.get("serverTime"),

clients/spot/src/binance_sdk_spot/rest_api/models/exchange_info_response_symbols_inner.py

@@ -139,6 +139,15 @@ def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of ExchangeInfoResponseSymbolsInner from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
+    @classmethod
+    def model_validate(cls, obj: Any) -> Self:
+        """Validate and deserialize using custom from_dict logic."""
+        # If obj is a dict, use from_dict to handle nested oneOf models properly
+        if isinstance(obj, dict):
+            return cls.from_dict(obj)
+        # Otherwise use Pydantic's default validation
+        return super().model_validate(obj)
+
     def to_dict(self) -> Dict[str, Any]:
         """Return the dictionary representation of the model using alias.
 
@@ -182,9 +191,10 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            return BaseModel.model_validate.__func__(cls, obj)
 
-        _obj = cls.model_validate(
+        _obj = BaseModel.model_validate.__func__(
+            cls,
             {
                 "symbol": obj.get("symbol"),
                 "status": obj.get("status"),

clients/spot/src/binance_sdk_spot/rest_api/models/rate_limits.py

@@ -70,6 +70,15 @@ def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of RateLimits from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
+    @classmethod
+    def model_validate(cls, obj: Any) -> Self:
+        """Validate and deserialize using custom from_dict logic."""
+        # If obj is a dict, use from_dict to handle nested oneOf models properly
+        if isinstance(obj, dict):
+            return cls.from_dict(obj)
+        # Otherwise use Pydantic's default validation
+        return super().model_validate(obj)
+
     def to_dict(self) -> Dict[str, Any]:
         """Return the dictionary representation of the model using alias.
 
@@ -106,9 +115,10 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            return BaseModel.model_validate.__func__(cls, obj)
 
-        _obj = cls.model_validate(
+        _obj = BaseModel.model_validate.__func__(
+            cls,
             {
                 "rateLimitType": obj.get("rateLimitType"),
                 "interval": obj.get("interval"),

clients/spot/src/binance_sdk_spot/rest_api/models/symbol_filters.py

@@ -175,6 +175,11 @@ def __init__(self, *args, **kwargs) -> None:
     def is_oneof_model(cls) -> bool:
         return True
 
+    @classmethod
+    def model_validate(cls, obj: dict) -> Self:
+        """Validate and deserialize a dict into the appropriate oneOf model."""
+        return cls.from_dict(obj)
+
     @classmethod
     def from_dict(cls, parsed) -> Self:
         """Returns the object represented by the json string"""
@@ -210,50 +215,9 @@ def from_dict(cls, parsed) -> Self:
                 instance.actual_instance = target_cls.from_dict(parsed)
                 return instance
 
-        instance = cls.model_construct()
-        error_messages = []
-        match = 0
-        is_list = isinstance(parsed, list)
-
-        for subcls in [
-            "IcebergPartsFilter",
-            "LotSizeFilter",
-            "MarketLotSizeFilter",
-            "MaxNumAlgoOrdersFilter",
-            "MaxNumIcebergOrdersFilter",
-            "MaxNumOrderAmendsFilter",
-            "MaxNumOrderListsFilter",
-            "MaxNumOrdersFilter",
-            "MaxPositionFilter",
-            "MinNotionalFilter",
-            "NotionalFilter",
-            "PercentPriceBySideFilter",
-            "PercentPriceFilter",
-            "PriceFilter",
-            "TPlusSellFilter",
-            "TrailingDeltaFilter",
-        ]:
-            if is_list == subcls.is_array():
-                try:
-                    instance.actual_instance = subcls.from_dict(parsed)
-                    match += 1
-                except (ValidationError, ValueError) as e:
-                    error_messages.append(str(e))
-
-        if match > 1:
-            # more than 1 match
-            raise ValueError(
-                "Multiple matches found when deserializing the JSON string into SymbolFilters with oneOf schemas: IcebergPartsFilter, LotSizeFilter, MarketLotSizeFilter, MaxNumAlgoOrdersFilter, MaxNumIcebergOrdersFilter, MaxNumOrderAmendsFilter, MaxNumOrderListsFilter, MaxNumOrdersFilter, MaxPositionFilter, MinNotionalFilter, NotionalFilter, PercentPriceBySideFilter, PercentPriceFilter, PriceFilter, TPlusSellFilter, TrailingDeltaFilter. Details: "
-                + ", ".join(error_messages)
-            )
-        elif match == 0:
-            # no match
-            raise ValueError(
-                "No match found when deserializing the JSON string into SymbolFilters with oneOf schemas: IcebergPartsFilter, LotSizeFilter, MarketLotSizeFilter, MaxNumAlgoOrdersFilter, MaxNumIcebergOrdersFilter, MaxNumOrderAmendsFilter, MaxNumOrderListsFilter, MaxNumOrdersFilter, MaxPositionFilter, MinNotionalFilter, NotionalFilter, PercentPriceBySideFilter, PercentPriceFilter, PriceFilter, TPlusSellFilter, TrailingDeltaFilter. Details: "
-                + ", ".join(error_messages)
-            )
-        else:
-            return instance
+        raise ValueError(
+            f"Unable to deserialize into SymbolFilters: 'filterType' field missing or unrecognized. Data: {parsed}"
+        )
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""

clients/spot/src/binance_sdk_spot/websocket_api/models/asset_filters.py

@@ -67,37 +67,32 @@ def __init__(self, *args, **kwargs) -> None:
     def is_oneof_model(cls) -> bool:
         return True
 
+    @classmethod
+    def model_validate(cls, obj: dict) -> Self:
+        """Validate and deserialize a dict into the appropriate oneOf model."""
+        return cls.from_dict(obj)
+
     @classmethod
     def from_dict(cls, parsed) -> Self:
         """Returns the object represented by the json string"""
-        instance = cls.model_construct()
-        error_messages = []
-        match = 0
-
-        is_list = isinstance(parsed, list)
-
-        # deserialize data into MaxAssetFilter
-        if is_list == MaxAssetFilter.is_array():
-            try:
-                instance.actual_instance = MaxAssetFilter.from_dict(parsed)
-                match += 1
-            except (ValidationError, ValueError) as e:
-                error_messages.append(str(e))
-
-        if match > 1:
-            # more than 1 match
-            raise ValueError(
-                "Multiple matches found when deserializing the JSON string into AssetFilters with oneOf schemas: MaxAssetFilter. Details: "
-                + ", ".join(error_messages)
-            )
-        elif match == 0:
-            # no match
-            raise ValueError(
-                "No match found when deserializing the JSON string into AssetFilters with oneOf schemas: MaxAssetFilter. Details: "
-                + ", ".join(error_messages)
-            )
-        else:
-            return instance
+        if parsed is None:
+            return None
+
+        if isinstance(parsed, dict) and "filterType" in parsed:
+            filter_type_map = {"MAX_ASSET": MaxAssetFilter}
+
+            ft = parsed.get("filterType")
+            target_cls = filter_type_map.get(ft)
+
+            if target_cls is not None:
+                # Deserialize directly into the proper schema
+                instance = cls.model_construct()
+                instance.actual_instance = target_cls.from_dict(parsed)
+                return instance
+
+        raise ValueError(
+            f"Unable to deserialize into AssetFilters: 'filterType' field missing or unrecognized. Data: {parsed}"
+        )
 
     def to_json(self) -> str:
         """Returns the JSON representation of the actual instance"""