[Hot Fix]: Fix variantId bug in Configure Eval modal

agenta-web/src/components/pages/evaluations/autoEvaluation/AutoEvaluation.tsx

@@ -540,7 +540,10 @@ const AutoEvaluation = () => {
                     <Button
                         icon={<Gauge size={14} />}
                         className={classes.button}
-                        onClick={() => setIsConfigEvaluatorModalOpen("open")}
+                        onClick={() => {
+                            setIsConfigEvaluatorModalOpen("open")
+                            setCurrent(0)
+                        }}
                     >
                         Configure evaluators
                     </Button>

agenta-web/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/EvaluatorsModal.tsx

@@ -6,12 +6,13 @@ import {Modal} from "antd"
 import {useAtom} from "jotai"
 import React, {useEffect, useState} from "react"
 import {createUseStyles} from "react-jss"
-import {fetchVariants} from "@/services/api"
 import {fetchTestsets} from "@/services/testsets/api"
 import ConfigureEvaluator from "./ConfigureEvaluator"
 import NewEvaluator from "./NewEvaluator"
 import Evaluators from "./Evaluators"
 import {useLocalStorage} from "usehooks-ts"
+import {useVariants} from "@/lib/hooks/useVariants"
+import {useAppsData} from "@/contexts/app.context"
 
 type EvaluatorsModalProps = {
     current: number
@@ -52,14 +53,14 @@ const EvaluatorsModal = ({
     const [evaluators, setEvaluators] = useAtom(evaluatorsAtom)
     const [evaluatorConfigs, setEvaluatorConfigs] = useAtom(evaluatorConfigsAtom)
     const [selectedEvaluator, setSelectedEvaluator] = useState<Evaluator | null>(null)
-    const [variants, setVariants] = useState<Variant[] | null>(null)
     const [testsets, setTestsets] = useState<testset[] | null>(null)
     const [fetchingEvalConfigs, setFetchingEvalConfigs] = useState(false)
     const [selectedTestcase, setSelectedTestcase] = useState<{
         testcase: Record<string, any> | null
     }>({
         testcase: null,
     })
+    const {currentApp} = useAppsData()
     const [selectedVariant, setSelectedVariant] = useState<Variant | null>(null)
     const [editMode, setEditMode] = useState(false)
     const [cloneConfig, setCloneConfig] = useState(false)
@@ -78,24 +79,25 @@ const EvaluatorsModal = ({
             .finally(() => setFetchingEvalConfigs(false))
     }
 
+    const {data} = useVariants(currentApp)({appId})
+
     useEffect(() => {
-        Promise.all([
-            fetchAllEvaluators(),
-            fetchAllEvaluatorConfigs(appId),
-            fetchVariants(appId),
-            fetchTestsets(),
-        ]).then(([evaluators, configs, variants, testsets]) => {
-            setEvaluators(evaluators)
-            setEvaluatorConfigs(configs)
-            setVariants(variants)
-            if (variants.length) {
-                setSelectedVariant(variants[0])
-            }
-            setTestsets(testsets)
-            if (testsets.length) {
-                setSelectedTestset(testsets[0]._id)
-            }
-        })
+        if (data?.variants?.length) {
+            setSelectedVariant(data?.variants[0].variant)
+        }
+    }, [data])
+
+    useEffect(() => {
+        Promise.all([fetchAllEvaluators(), fetchAllEvaluatorConfigs(appId), fetchTestsets()]).then(
+            ([evaluators, configs, testsets]) => {
+                setEvaluators(evaluators)
+                setEvaluatorConfigs(configs)
+                setTestsets(testsets)
+                if (testsets.length) {
+                    setSelectedTestset(testsets[0]._id)
+                }
+            },
+        )
     }, [appId])
 
     const steps = [
@@ -142,7 +144,7 @@ const EvaluatorsModal = ({
                         setCloneConfig(false)
                         setEditEvalEditValues(null)
                     }}
-                    variants={variants}
+                    variants={data?.variants || []}
                     testsets={testsets}
                     onSuccess={() => {
                         evalConfigFetcher()

agenta-web/src/lib/helpers/utils.ts

@@ -130,6 +130,51 @@ export const safeParse = (str: string, fallback: any = "") => {
     }
 }
 
+export const extractChatMessages = (testcase: any) => {
+    if (testcase.messages)
+        return formatMessages(normalizeMessages(parseStringToJson(testcase.messages)))
+    if (testcase.chat) return formatMessages(normalizeMessages(parseStringToJson(testcase.chat)))
+
+    const filteredEntries = Object.entries(testcase).filter(([key]) => key !== "correct_answer")
+
+    for (const [_, value] of filteredEntries) {
+        const parsedValue = parseStringToJson(value)
+        if (Array.isArray(parsedValue)) {
+            return formatMessages(parsedValue)
+        }
+    }
+
+    return []
+}
+
+const parseStringToJson = (value: any) => {
+    if (typeof value === "string") {
+        try {
+            return JSON.parse(value)
+        } catch {
+            return value
+        }
+    }
+    return value
+}
+
+const normalizeMessages = (messages: any) => {
+    if (!Array.isArray(messages) && typeof messages === "object") {
+        return [messages]
+    }
+    return messages
+}
+
+const formatMessages = (messages: any) => {
+    if (typeof messages === "object" && !Array.isArray(messages)) {
+        messages = Object.values(messages)
+    }
+
+    return Array.isArray(messages)
+        ? messages.map(({role, content, id}) => ({role, content, id}))
+        : []
+}
+
 export const getAgentaApiUrl = () => {
     const apiUrl = process.env.NEXT_PUBLIC_AGENTA_API_URL
 

agenta-web/src/services/api.ts

@@ -107,7 +107,7 @@ export async function callVariant(
 ): Promise<string | FuncResponse | BaseResponse> {
     const isChatVariant = Array.isArray(chatMessages) && chatMessages.length > 0
     // Separate input parameters into two dictionaries based on the 'input' property
-    const mainInputParams: Record<string, string> = {} // Parameters with input = true
+    const mainInputParams: Record<string, any> = {} // Parameters with input = true
     const secondaryInputParams: Record<string, string> = {} // Parameters with input = false
 
     for (let key of Object.keys(inputParametersDict)) {
@@ -118,6 +118,7 @@ export async function callVariant(
         if (paramDefinition && !paramDefinition.input) {
             secondaryInputParams[key] = inputParametersDict[key]
         } else {
+            // Parse the value if key is "messages"
             mainInputParams[key] = inputParametersDict[key]
         }
     }