Simplify the interface of Dictionary.add_variable_from_spec regarding the variable meta_data

Author: Thierry RAMORASOAVINA

khiops/core/dictionary.py

@@ -24,7 +24,6 @@
 from khiops.core.internals.common import (
     deprecation_message,
     is_dict_like,
-    is_list_like,
     is_string_like,
     type_error_message,
 )
@@ -861,13 +860,9 @@ def add_variable_from_spec(
         rule : str, optional
             Variable rule (in verbatim).
         meta_data : dict, optional
-            A Python dictionary which holds the metadata specification
-            with the following keys:
-            - keys : list, default []
-                list of meta-data keys
-            - values : list, default []
-                list of meta-data values.
-                The values can be str, bool, float or int.
+            A Python dictionary which holds the metadata specification.
+            The dictionary keys are str.
+            The values can be str, bool, float or int.
 
         Raises
         ------
@@ -899,27 +894,6 @@ def add_variable_from_spec(
         if meta_data is not None:
             if not is_dict_like(meta_data):
                 raise TypeError(type_error_message("meta_data", meta_data, "dict-like"))
-            if "keys" not in meta_data or "values" not in meta_data:
-                raise ValueError(
-                    "'meta_data' does not contain "
-                    "the mandatory keys 'keys' and 'values'"
-                )
-            if not is_list_like(meta_data["keys"]):
-                raise TypeError(
-                    type_error_message(
-                        "meta_data['keys']", meta_data["keys"], "list-like"
-                    )
-                )
-            if not is_list_like(meta_data["values"]):
-                raise TypeError(
-                    type_error_message(
-                        "meta_data['values']", meta_data["values"], "list-like"
-                    )
-                )
-            if len(meta_data["keys"]) != len(meta_data["values"]):
-                raise ValueError(
-                    "'meta_data' keys and values " "do not have the same size"
-                )
         if label is not None:
             if not is_string_like(label):
                 raise TypeError(type_error_message("label", label, "string-like"))
@@ -943,7 +917,7 @@ def add_variable_from_spec(
         variable.type = type
         variable.used = used
         if meta_data is not None:
-            for key, value in zip(meta_data["keys"], meta_data["values"]):
+            for key, value in meta_data.items():
                 variable.meta_data.add_value(key, value)
         if label is not None:
             variable.label = label

tests/test_core.py

@@ -1892,31 +1892,11 @@ def test_dictionary_accessors(self):
                     dictionary.add_variable_from_spec(
                         name="fresh_one", type="Categorical", meta_data="str"
                     )
-                # 'meta_data' mandatory keys must exist
-                with self.assertRaisesRegex(ValueError, "meta_data.*mandatory keys"):
-                    dictionary.add_variable_from_spec(
-                        name="fresh_one", type="Categorical", meta_data={"keys": []}
-                    )
-
-                # 'meta_data' 'keys' and 'values' must be list
-                with self.assertRaisesRegex(TypeError, "meta_data.*list"):
-                    dictionary.add_variable_from_spec(
-                        name="fresh_one",
-                        type="Categorical",
-                        meta_data={"keys": "str", "values": "str"},
-                    )
-                # 'meta_data' 'keys' and 'values' must be the same size
-                with self.assertRaisesRegex(ValueError, "meta_data.*size"):
-                    dictionary.add_variable_from_spec(
-                        name="fresh_one",
-                        type="Categorical",
-                        meta_data={"keys": ["a", "b"], "values": [1]},
-                    )
                 # successful adding (with meta-data)
                 dictionary.add_variable_from_spec(
                     name="fresh_one",
                     type="Categorical",
-                    meta_data={"keys": ["a", "b"], "values": [1, 2]},
+                    meta_data={"a": 1, "b": 2},
                 )
                 self.assertEqual(
                     2,