Bumped marshmallow 3.23.3 => 3.24.0

We need to track the signature changes of Fields.Nested,
see marshmallow-code/marshmallow#2723.

CMK-21417

Change-Id: Idf723bc5360a46a9a1f68e78776dab895e5be247

cmk/fields/base.py

@@ -336,7 +336,18 @@ class Nested(OpenAPIAttributes, fields.Nested, UniqueFields):
     # In this situation, it should be sufficient to replace the `missing` parameter with
     # a `lambda` which returns the same object, as callables are ignored by apispec.
 
-    def _deserialize(self, value, attr, data, partial=None, **kwargs):
+    context: dict[object, object] = {}
+
+    def __init__(
+        self,
+        *args,
+        **kwargs,
+    ):
+        context = kwargs.pop("context", {})
+        super().__init__(*args, **kwargs)
+        self.context = context
+
+    def _deserialize(self, value, attr, data=None, partial=None, **kwargs):
         self._validate_missing(value)
         if value is fields.missing_:  # type: ignore[attr-defined, unused-ignore]
             _miss = self.missing

cmk/gui/fields/attributes.py

@@ -22,6 +22,8 @@
 from cmk.fields import Boolean, Constant, Integer, List, Nested, String, Time
 from cmk.fields.validators import IsValidRegexp, ValidateIPv4, ValidateIPv4Network
 
+from .definitions import CmkOneOfSchema
+
 # TODO: make wrong 'tuple_fields' entries fail at compile not, not at runtime.
 
 
@@ -808,7 +810,7 @@ class SNMPv3AuthPrivacy(BaseSchema, CheckmkTuple):
     )
 
 
-class SNMPCredentials(OneOfSchema):
+class SNMPCredentials(CmkOneOfSchema):
     """Validate and convert from/to Checkmk internal format for SNMP credentials.
 
     Here are the various possible values in the attribute

cmk/gui/fields/base.py

@@ -49,6 +49,17 @@ class Meta:
     def dict_class(self) -> type:
         return dict
 
+    context: dict[typing.Any, typing.Any] = {}
+
+    def __init__(
+        self,
+        *args,
+        **kwargs,
+    ):
+        context = kwargs.pop("context", {})
+        super().__init__(*args, **kwargs)
+        self.context = context
+
     @post_load(pass_many=True)
     @post_dump(pass_many=True)
     def remove_ordered_dict(self, data, **kwargs):

cmk/gui/fields/definitions.py

@@ -282,7 +282,20 @@ class LogicalExprSchema(BaseSchema):
     )
 
 
-class ExprSchema(OneOfSchema):
+class CmkOneOfSchema(OneOfSchema):
+    context: dict[object, object] = {}
+
+    def __init__(
+        self,
+        *args,
+        **kwargs,
+    ):
+        context = kwargs.pop("context", {})
+        super().__init__(*args, **kwargs)
+        self.context = context
+
+
+class ExprSchema(CmkOneOfSchema):
     """Top level class for query expression schema
 
     Operators can be one of: AND, OR
@@ -364,8 +377,17 @@ def load(self, data, *, many=None, partial=None, unknown=None, **kwargs):
 
 
 class _ExprNested(base.Nested):
-    def _load(self, value, data, partial=None):
-        _data = super()._load(value, data, partial=partial)
+    def __init__(
+        self,
+        *args,
+        **kwargs,
+    ):
+        context = kwargs.pop("context", {})
+        super().__init__(*args, **kwargs)
+        self.context = context
+
+    def _load(self, value, partial=None):
+        _data = super()._load(value, partial=partial)
         return tree_to_expr(_data, table=self.metadata["table"])
 
 

cmk/gui/openapi/endpoints/rule/fields.py

@@ -473,7 +473,7 @@ def __init__(
         only: types.StrSequenceOrSet | None = None,
         exclude: types.StrSequenceOrSet = (),
         many: bool = False,
-        context: dict | None = None,
+        context: dict[object, object] = {},
         load_only: types.StrSequenceOrSet = (),
         dump_only: types.StrSequenceOrSet = (),
         partial: bool | types.StrSequenceOrSet = False,

cmk/requirements.txt

@@ -39,7 +39,7 @@ pymssql==2.3.1 # needed by check_sql active check
 pymysql~=1.1.1 # needed by check_sql active check
 psycopg2-binary==2.9.6 # needed by check_sql active check
 apispec
-marshmallow==3.23.3  # temporary pin
+marshmallow==3.24.0  # temporary pin
 marshmallow-oneofschema
 apispec-oneofschema
 pydantic~=2.7