use the same json schema fixer as xlam does, an operator entered main with xlam

Signed-off-by: dafnapension <[email protected]>

Author: dafnapension

prepare/cards/bfcl.py

@@ -6,6 +6,7 @@
     Copy,
     ExecuteExpression,
     FilterByExpression,
+    FixJsonSchemaOfParameterTypes,
     Set,
 )
 from unitxt.stream_operators import DeleteSplits, JoinStreams
@@ -35,7 +36,7 @@
                 DeleteSplits(splits=["questions", "answers"]),
                 Copy(field="question/0/0/content", to_field="query"),
                 Copy(field="function", to_field="tools"),
-                "operators.fix_json_schema",
+                FixJsonSchemaOfParameterTypes(main_field="tools"),
                 # Process ground truth data in this dataset, which is a provided as a list of options per field,
                 # and convert it into a list of explicit tool calls
                 #
@@ -105,7 +106,7 @@
                 DeleteSplits(splits=["questions", "answers"]),
                 Copy(field="question/*/0", to_field="dialog"),
                 Copy(field="function", to_field="tools"),
-                "operators.fix_json_schema",
+                FixJsonSchemaOfParameterTypes(main_field="tools"),
                 FilterByExpression(
                     expression="all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
                 ),
@@ -159,7 +160,7 @@
             preprocess_steps=[
                 Copy(field="question/*/0", to_field="dialog"),
                 Copy(field="function", to_field="tools"),
-                "operators.fix_json_schema",
+                FixJsonSchemaOfParameterTypes(main_field="tools"),
                 Set(fields={"reference_calls": []}),
             ],
             task="tasks.tool_calling.multi_turn",

src/unitxt/catalog/cards/bfcl/multi_turn/java_v3.json

@@ -37,7 +37,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "filter_by_expression",
             "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"

src/unitxt/catalog/cards/bfcl/multi_turn/javascript_v3.json

@@ -37,7 +37,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "filter_by_expression",
             "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"

src/unitxt/catalog/cards/bfcl/multi_turn/live_irrelevance_v3.json

@@ -21,7 +21,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "set",
             "fields": {

src/unitxt/catalog/cards/bfcl/multi_turn/live_multiple_v3.json

@@ -37,7 +37,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "filter_by_expression",
             "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"

src/unitxt/catalog/cards/bfcl/multi_turn/live_parallel_multiple_v3.json

@@ -37,7 +37,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "filter_by_expression",
             "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"

src/unitxt/catalog/cards/bfcl/multi_turn/live_parallel_v3.json

@@ -37,7 +37,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "filter_by_expression",
             "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"

src/unitxt/catalog/cards/bfcl/multi_turn/live_relevance_v3.json

@@ -21,7 +21,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "set",
             "fields": {

src/unitxt/catalog/cards/bfcl/multi_turn/live_simple_v3.json

@@ -37,7 +37,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "filter_by_expression",
             "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"

src/unitxt/catalog/cards/bfcl/multi_turn/multiple_v3.json

@@ -37,7 +37,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "filter_by_expression",
             "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"