More fixes for native types (#287)

Author: altvod

lib/dl_core/dl_core/db/native_type_schema.py

@@ -49,13 +49,18 @@ class Meta:
         # We need this because older dataset versions have `conn_type` attributes in native type objects,
         # but this attribute is no longer present in current code.
         # To avoid this conflict we need to ignore extra attributes.
-        # TODO: Eventually dfatasets should be migrated so that this can be removed
+        # TODO: Eventually datasets should be migrated so that this can be removed
         unknown = EXCLUDE
 
     TARGET_CLS: ClassVar[Type[_TARGET_TV]]  # type: ignore  # 2024-01-24 # TODO: ClassVar cannot contain type variables  [misc]
 
     @post_load(pass_many=False)
     def to_object(self, data: dict, **_):  # type: ignore  # TODO: fix
+        if "conn_type" in data:
+            # TODO: Remove once all datasets have been migrated
+            data = data.copy()
+            data.pop("conn_type")
+
         return self.TARGET_CLS(**data)  # type: ignore  # TODO: fix
 
 
@@ -105,6 +110,10 @@ class ClickHouseDateTime64WithTZNativeTypeSchema(ClickHouseDateTime64NativeTypeS
 class OneOfNativeTypeSchemaBase(OneOfSchema):
     """(OneOf (Native Type) Storage Schema)"""
 
+    class Meta:
+        # Same as above in `NativeTypeSchemaBase`, to ignore `conn_type`
+        unknown = EXCLUDE
+
     type_field = "native_type_class_name"
     type_schemas = {
         schema.TARGET_CLS.native_type_class_name: schema

lib/dl_core/dl_core/us_manager/storage_schemas/base_types.py

@@ -3,6 +3,7 @@
 from typing import Any
 
 from marshmallow import (
+    EXCLUDE,
     Schema,
     fields,
     post_load,
@@ -16,11 +17,16 @@
 class NativeTypeSchema(Schema):
     """(currently used for uploads / ProviderConnection)"""
 
+    class Meta:
+        # Same as in `NativeTypeSchemaBase`, to ignore `conn_type`
+        unknown = EXCLUDE
+
     name = fields.String()
 
     @post_load(pass_many=False)
     def to_object(self, data: dict[str, Any], **kwargs: Any) -> Any:
         if "conn_type" in data:
+            # TODO: Remove once all datasets have been migrated
             data = data.copy()
             data.pop("conn_type")
         return GenericNativeType(**data)