Skip to content

Commit 22d85a1

Browse files
Fix marshmallow 4.x compatibility: Replace FieldInstanceResolutionError with ValueError
Co-authored-by: kshitij-microsoft <[email protected]>
1 parent 20c8e82 commit 22d85a1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

sdk/ml/azure-ai-ml/azure/ai/ml/_schema/core/fields.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from marshmallow import RAISE, fields
1818
from marshmallow.exceptions import ValidationError
1919
from marshmallow.fields import Field, Nested
20-
from marshmallow.utils import FieldInstanceResolutionError, from_iso_datetime, resolve_field_instance
20+
from marshmallow.utils import from_iso_datetime, resolve_field_instance
2121

2222
from ..._utils._arm_id_utils import AMLVersionedArmId, is_ARM_id_for_resource, parse_name_label, parse_name_version
2323
from ..._utils._experimental import _is_warning_cached
@@ -439,7 +439,7 @@ def __init__(self, union_fields: List[fields.Field], is_strict=False, **kwargs):
439439
self._union_fields = [resolve_field_instance(cls_or_instance) for cls_or_instance in union_fields]
440440
# TODO: make serialization/de-serialization work in the same way as json schema when is_strict is True
441441
self.is_strict = is_strict # S\When True, combine fields with oneOf instead of anyOf at schema generation
442-
except FieldInstanceResolutionError as error:
442+
except ValueError as error:
443443
raise ValueError(
444444
'Elements of "union_fields" must be subclasses or instances of marshmallow.base.FieldABC.'
445445
) from error
@@ -876,7 +876,7 @@ def __init__(self, experimental_field: fields.Field, **kwargs):
876876
try:
877877
self._experimental_field = resolve_field_instance(experimental_field)
878878
self.required = experimental_field.required
879-
except FieldInstanceResolutionError as error:
879+
except ValueError as error:
880880
raise ValueError(
881881
'"experimental_field" must be subclasses or instances of marshmallow.base.FieldABC.'
882882
) from error

sdk/ml/azure-ai-ml/test_marshmallow_migration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_basic_imports():
5757
from marshmallow.schema import SchemaMeta
5858
from marshmallow.exceptions import ValidationError as SchemaValidationError
5959
from marshmallow.fields import Field, Nested
60-
from marshmallow.utils import FieldInstanceResolutionError, from_iso_datetime, resolve_field_instance
60+
from marshmallow.utils import from_iso_datetime, resolve_field_instance
6161

6262
print("✓ All basic imports successful")
6363
return True

0 commit comments

Comments
 (0)