Merge remote-tracking branch 'origin' into add/model-journey

Merging main to current branch

src/renderer/components/Experiment/Eval/EvalTasksTable.tsx

@@ -21,18 +21,20 @@ function formatTemplateConfig(script_parameters): ReactElement {
   // const short_model_name = c.model_name.split('/').pop();
   // Set main_task as either or the metric name from the script parameters
   const main_task = (() => {
+
+    let predefined_tasks = script_parameters.predefined_tasks? script_parameters.predefined_tasks : '';
     if (script_parameters.tasks) {
       try {
         const tasksArray = JSON.parse(script_parameters.tasks);
         if (Array.isArray(tasksArray)) {
-          return tasksArray.map((task) => task.name).join(', ');
+          return tasksArray.map((task) => task.name).join(', ') + predefined_tasks;
         }
       } catch (error) {
         // Invalid JSON; fall back to the original value
       }
-      return script_parameters.tasks;
+      return script_parameters.tasks + predefined_tasks;
     }
-    return script_parameters.tasks;
+    return script_parameters.tasks + predefined_tasks;
   })();
   const dataset_name = script_parameters.dataset_name
     ? script_parameters.dataset_name

src/renderer/components/Experiment/Widgets/CustomEvaluationWidget.tsx

@@ -103,8 +103,8 @@ const CustomEvaluationWidget = (props: WidgetProps<any>) => {
             disabled={disabled || readonly}
             style={{ marginBottom: '0.5rem' }}
           >
-            <Option value="boolean">Boolean</Option>
-            <Option value="number">Number</Option>
+            <Option value="boolean">Boolean (Regex)</Option>
+            <Option value="number">Number (Regex)</Option>
             <Option value="contains">Contains</Option>
             <Option value="isequal">IsEqual</Option>
           </Select>