Skip to content
Snippets Groups Projects
Commit 0ff1b9b5 authored by Christian Dreher's avatar Christian Dreher
Browse files

Merge branch 'dev/fluxio' into 'master'

Prevent aron object dicts to have keys with null after conversion

See merge request !101
parents 873d9c64 6a8b4968
No related branches found
No related tags found
1 merge request!101Prevent aron object dicts to have keys with null after conversion
Pipeline #22780 passed
......@@ -19,7 +19,13 @@ class FluxioDataAronConverter:
@classmethod
def aron_data_to_fluxio_data(
cls, aron_data: AronDataIceTypes.Data
) -> FluxioBaseData | FluxioSimpleData | FluxioDictData | FluxioNDArrayData | FluxioListData:
) -> (
FluxioBaseData
| FluxioSimpleData
| FluxioDictData
| FluxioNDArrayData
| FluxioListData
):
ret = None
if isinstance(aron_data, AronDataIceTypes.String):
ret = FluxioSimpleData(FluxioDataIdentifier.STRING, aron_data.value)
......@@ -39,13 +45,19 @@ class FluxioDataAronConverter:
elif isinstance(aron_data, AronDataIceTypes.Dict):
ret = FluxioDictData(FluxioDataIdentifier.DICT)
for k, v in aron_data.elements.items():
ret.add_attribute(k, cls.aron_data_to_fluxio_data(v))
if v is not None:
ret.add_attribute(k, cls.aron_data_to_fluxio_data(v))
elif isinstance(aron_data, AronDataIceTypes.NDArray):
numpy_nparray = ndarray_from_aron(aron_data)
assert numpy_nparray.base is not None
ret = FluxioNDArrayData(
FluxioDataIdentifier.NDARRAY, numpy_nparray.shape, numpy_nparray.base
)
elif aron_data is None:
print("aron_data is None")
else:
print(f"Unknown data type: {aron_data}")
return ret
@classmethod
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment