Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove marshmallow _T reference (#39042) #39053

Merged
merged 3 commits into from
Jan 7, 2025
Merged

remove marshmallow _T reference (#39042) #39053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ecfbe2
change dev requirements to see if fix works (#39042)
MilesHolland Jan 7, 2025
8ff7006
updating changelog
jayesh-tanna Jan 7, 2025
bb59d26
updating changelog
jayesh-tanna Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/ml/azure-ai-ml/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## 1.23.1 (2025-01-07)

### Bug Fixed
- Removed marshamllow _T reference
### Bugs Fixed
- Removed marshmallow _T reference.

## 1.23.0 (2024-12-05)

Expand Down
9 changes: 5 additions & 4 deletions sdk/ml/azure-ai-ml/azure/ai/ml/_schema/core/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from marshmallow import RAISE, fields
from marshmallow.exceptions import ValidationError
from marshmallow.fields import _T, Field, Nested
from marshmallow.fields import Field, Nested
from marshmallow.utils import FieldInstanceResolutionError, from_iso_datetime, resolve_field_instance

from ..._utils._arm_id_utils import AMLVersionedArmId, is_ARM_id_for_resource, parse_name_label, parse_name_version
Expand Down Expand Up @@ -44,6 +44,7 @@
from ..core.schema import PathAwareSchema

module_logger = logging.getLogger(__name__)
T = typing.TypeVar("T")


class StringTransformedEnum(Field):
Expand Down Expand Up @@ -830,7 +831,7 @@ def _validate(self, value):
class DumpableIntegerField(fields.Integer):
"""A int field that cannot serialize other type of values to int if self.strict."""

def _serialize(self, value, attr, obj, **kwargs) -> typing.Optional[typing.Union[str, _T]]:
def _serialize(self, value, attr, obj, **kwargs) -> typing.Optional[typing.Union[str, T]]:
if self.strict and not isinstance(value, int):
# this implementation can serialize bool to bool
raise self.make_error("invalid", input=value)
Expand All @@ -856,14 +857,14 @@ def _validated(self, value):
raise self.make_error("invalid", input=value)
return super()._validated(value)

def _serialize(self, value, attr, obj, **kwargs) -> typing.Optional[typing.Union[str, _T]]:
def _serialize(self, value, attr, obj, **kwargs) -> typing.Optional[typing.Union[str, T]]:
return super()._serialize(self._validated(value), attr, obj, **kwargs)


class DumpableStringField(fields.String):
"""A string field that cannot serialize other type of values to string if self.strict."""

def _serialize(self, value, attr, obj, **kwargs) -> typing.Optional[typing.Union[str, _T]]:
def _serialize(self, value, attr, obj, **kwargs) -> typing.Optional[typing.Union[str, T]]:
if not isinstance(value, str):
raise ValidationError("Given value is not a string")
return super()._serialize(value, attr, obj, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion sdk/ml/azure-ai-ml/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-e ../../../tools/azure-sdk-tools
../../core/azure-core
../../identity/azure-identity
marshmallow<3.20
marshmallow
marshmallow-jsonschema==0.10.0
mock
pytest-cov
Expand Down
Loading