From 044c9524b068490a571c6e59fa7f49c480b65ba2 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vega Date: Fri, 23 Aug 2024 10:47:02 +0200 Subject: [PATCH 1/2] fix(frontend): Apply correct parsing of Base/Func Responses --- .../EvaluationTable/ABTestingEvaluationTable.tsx | 9 ++++++--- .../EvaluationTable/SingleModelEvaluationTable.tsx | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/agenta-web/src/components/EvaluationTable/ABTestingEvaluationTable.tsx b/agenta-web/src/components/EvaluationTable/ABTestingEvaluationTable.tsx index 03ef64b0c..12b6bfa90 100644 --- a/agenta-web/src/components/EvaluationTable/ABTestingEvaluationTable.tsx +++ b/agenta-web/src/components/EvaluationTable/ABTestingEvaluationTable.tsx @@ -311,15 +311,18 @@ const ABTestingEvaluationTable: React.FC = ({ let res: BaseResponse | undefined - if (isFuncResponse(result)) { + if (typeof result === "string") { + res = {version: "2.0", data: result} as BaseResponse + } else if (isFuncResponse(result)) { res = {version: "2.0", data: result.message} as BaseResponse } else if (isBaseResponse(result)) { res = result as BaseResponse } else { - res = {version: "2.0", data: result} as BaseResponse + console.error("Unknown response type:", result) + res = {version: "2.0", data: ""} as BaseResponse } - let _result = getStringOrJson(res) + let _result = getStringOrJson(res.data) setRowValue(rowIndex, variant.variantId, _result) ;(outputs as KeyValuePair)[variant.variantId] = _result diff --git a/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx b/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx index 5c73c9c18..60968661b 100644 --- a/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx +++ b/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx @@ -344,15 +344,18 @@ const SingleModelEvaluationTable: React.FC = ({ let res: BaseResponse | undefined - if (isFuncResponse(result)) { + if (typeof result === "string") { + res = {version: "2.0", data: result} as BaseResponse + } else if (isFuncResponse(result)) { res = {version: "2.0", data: result.message} as BaseResponse } else if (isBaseResponse(result)) { res = result as BaseResponse } else { - res = {version: "2.0", data: result} as BaseResponse + console.error("Unknown response type:", result) + res = {version: "2.0", data: ""} as BaseResponse } - let _result = getStringOrJson(res) + let _result = getStringOrJson(res.data) setRowValue(rowIndex, variant.variantId, _result) ;(outputs as KeyValuePair)[variant.variantId] = _result From 7fc0e6e9035d3d799df13afded5a74573e78dd6d Mon Sep 17 00:00:00 2001 From: Juan Pablo Vega Date: Fri, 23 Aug 2024 10:51:57 +0200 Subject: [PATCH 2/2] slight refactor --- .../src/components/EvaluationTable/ABTestingEvaluationTable.tsx | 2 +- .../components/EvaluationTable/SingleModelEvaluationTable.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agenta-web/src/components/EvaluationTable/ABTestingEvaluationTable.tsx b/agenta-web/src/components/EvaluationTable/ABTestingEvaluationTable.tsx index 12b6bfa90..d8d1f49f6 100644 --- a/agenta-web/src/components/EvaluationTable/ABTestingEvaluationTable.tsx +++ b/agenta-web/src/components/EvaluationTable/ABTestingEvaluationTable.tsx @@ -318,8 +318,8 @@ const ABTestingEvaluationTable: React.FC = ({ } else if (isBaseResponse(result)) { res = result as BaseResponse } else { - console.error("Unknown response type:", result) res = {version: "2.0", data: ""} as BaseResponse + console.error("Unknown response type:", result) } let _result = getStringOrJson(res.data) diff --git a/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx b/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx index 60968661b..9811687b4 100644 --- a/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx +++ b/agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx @@ -351,8 +351,8 @@ const SingleModelEvaluationTable: React.FC = ({ } else if (isBaseResponse(result)) { res = result as BaseResponse } else { - console.error("Unknown response type:", result) res = {version: "2.0", data: ""} as BaseResponse + console.error("Unknown response type:", result) } let _result = getStringOrJson(res.data)