added helper to remove correctAnswer prefix and improved dropdown def…

…ault text
Agenta-AI · May 14, 2024 · d879572 · d879572
1 parent 0495376
commit d879572
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/agenta-web/src/components/pages/evaluations/evaluationCompare/EvaluationCompare.tsx b/agenta-web/src/components/pages/evaluations/evaluationCompare/EvaluationCompare.tsx
@@ -14,7 +14,7 @@ import {AgGridReact} from "ag-grid-react"
 import {Button, DropdownProps, Space, Spin, Tag, Tooltip, Typography} from "antd"
 import React, {useEffect, useMemo, useRef, useState} from "react"
 import {createUseStyles} from "react-jss"
-import {getFilterParams, getTypedValue} from "@/lib/helpers/evaluate"
+import {getFilterParams, getTypedValue, removeCorrectAnswerPrefix} from "@/lib/helpers/evaluate"
 import {getColorFromStr, getRandomColors} from "@/lib/helpers/colors"
 import {CheckOutlined, CloseCircleOutlined, DownloadOutlined, UndoOutlined} from "@ant-design/icons"
 import {getAppValues} from "@/contexts/app.context"
@@ -84,7 +84,7 @@ const EvaluationCompareMode: React.FC<Props> = () => {
     const gridRef = useRef<AgGridReact<_EvaluationScenario>>()
     const [isFilterColsDropdownOpen, setIsFilterColsDropdownOpen] = useState(false)
     const [isDiffDropdownOpen, setIsDiffDropdownOpen] = useState(false)
-    const [selectedCorrectAnswer, setSelectedCorrectAnswer] = useState(["Select"])
+    const [selectedCorrectAnswer, setSelectedCorrectAnswer] = useState(["No columns selected"])
 
     const handleOpenChangeDiff: DropdownProps["onOpenChange"] = (nextOpen, info) => {
         if (info.source === "trigger" || nextOpen) {
@@ -150,13 +150,13 @@ const EvaluationCompareMode: React.FC<Props> = () => {
             .filter((item) => item.startsWith("correctAnswer_"))
             .forEach((key) =>
                 colDefs.push({
-                    headerName: `${key.split("_").at(-1)}`,
-                    hide: hiddenVariants.includes(`${key.split("_").at(-1)}`),
+                    headerName: `${removeCorrectAnswerPrefix(key)}`,
+                    hide: hiddenVariants.includes(`${removeCorrectAnswerPrefix(key)}`),
                     headerComponent: (props: any) => {
                         return (
                             <AgCustomHeader {...props}>
                                 <Space direction="vertical" className="py-2">
-                                    <span>{key.split("_").at(-1)}</span>
+                                    <span>{removeCorrectAnswerPrefix(key)}</span>
                                     <Tag color="green">Ground Truth</Tag>
                                 </Space>
                             </AgCustomHeader>
@@ -189,7 +189,7 @@ const EvaluationCompareMode: React.FC<Props> = () => {
                 cellRenderer: (params: any) => {
                     return (
                         <>
-                            {selectedCorrectAnswer[0] !== "Select"
+                            {selectedCorrectAnswer[0] !== "No columns selected"
                                 ? LongTextCellRenderer(
                                       params,
                                       <CompareOutputDiff
@@ -469,17 +469,17 @@ const EvaluationCompareMode: React.FC<Props> = () => {
                                         label: (
                                             <Space>
                                                 <CheckOutlined />
-                                                <>{key.split("_").at(-1)}</>
+                                                <>{removeCorrectAnswerPrefix(key)}</>
                                             </Space>
                                         ),
                                     }))}
-                                buttonText={selectedCorrectAnswer[0].split("_").at(-1)}
+                                buttonText={removeCorrectAnswerPrefix(selectedCorrectAnswer[0])}
                                 isOpen={isDiffDropdownOpen}
                                 handleOpenChange={handleOpenChangeDiff}
                                 shownCols={selectedCorrectAnswer}
                                 onClick={({key}) => {
                                     if (key === selectedCorrectAnswer[0]) {
-                                        setSelectedCorrectAnswer(["Select"])
+                                        setSelectedCorrectAnswer(["No columns selected"])
                                     } else {
                                         setSelectedCorrectAnswer([key])
                                     }

diff --git a/agenta-web/src/components/pages/evaluations/evaluationScenarios/EvaluationScenarios.tsx b/agenta-web/src/components/pages/evaluations/evaluationScenarios/EvaluationScenarios.tsx
@@ -57,7 +57,7 @@ const EvaluationScenarios: React.FC<Props> = () => {
     const [evaluators, setEvaluators] = useAtom(evaluatorsAtom)
     const gridRef = useRef<AgGridReact<_EvaluationScenario>>()
     const evalaution = scenarios[0]?.evaluation
-    const [selectedCorrectAnswer, setSelectedCorrectAnswer] = useState(["Select"])
+    const [selectedCorrectAnswer, setSelectedCorrectAnswer] = useState(["No columns selected"])
     const [isFilterColsDropdownOpen, setIsFilterColsDropdownOpen] = useState(false)
     const [isDiffDropdownOpen, setIsDiffDropdownOpen] = useState(false)
     const [hiddenCols, setHiddenCols] = useState<string[]>([])
@@ -149,7 +149,7 @@ const EvaluationScenarios: React.FC<Props> = () => {
                             `${result?.error?.message}\n${result?.error?.stacktrace}`,
                         )
                     }
-                    return selectedCorrectAnswer[0] !== "Select"
+                    return selectedCorrectAnswer[0] !== "No columns selected"
                         ? LongTextCellRenderer(
                               params,
                               <CompareOutputDiff
@@ -337,7 +337,7 @@ const EvaluationScenarios: React.FC<Props> = () => {
                                 shownCols={selectedCorrectAnswer}
                                 onClick={({key}) => {
                                     if (key === selectedCorrectAnswer[0]) {
-                                        setSelectedCorrectAnswer(["Select"])
+                                        setSelectedCorrectAnswer(["No columns selected"])
                                     } else {
                                         setSelectedCorrectAnswer([key])
                                     }

diff --git a/agenta-web/src/lib/helpers/evaluate.ts b/agenta-web/src/lib/helpers/evaluate.ts
@@ -338,3 +338,7 @@ const getCustomComparator = (type: CellDataType) => (valueA: string, valueB: str
     if (type === "number") return getNumber(valueA) - getNumber(valueB)
     return 0
 }
+
+export const removeCorrectAnswerPrefix = (str: string) => {
+    return str.replace(/^correctAnswer_/, "")
+}