From 6bab8b5bd40f3aa9a276e7005b638a25023009bc Mon Sep 17 00:00:00 2001
From: timothycarambat <rambat1010@gmail.com>
Date: Thu, 25 Jul 2024 14:10:17 -0700
Subject: [PATCH] ui adjustments for order flow back nav on order flow fix bad
schema ref
---
.../pages/FineTuning/Steps/OrderDetails/index.jsx | 2 +-
frontend/src/pages/FineTuning/index.jsx | 15 ++++++++++++---
server/models/fineTuning.js | 4 ++--
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/frontend/src/pages/FineTuning/Steps/OrderDetails/index.jsx b/frontend/src/pages/FineTuning/Steps/OrderDetails/index.jsx
index 6e71db80d..b0f44a462 100644
--- a/frontend/src/pages/FineTuning/Steps/OrderDetails/index.jsx
+++ b/frontend/src/pages/FineTuning/Steps/OrderDetails/index.jsx
@@ -8,7 +8,7 @@ export default function OrderDetails({ setSettings, setStep }) {
useEffect(() => {
FineTuning.info()
.then((res) => {
- setInfo(res);
+ setInfo(res ?? {});
setSettings((prev) => {
return { ...prev, tuningInfo: res };
});
diff --git a/frontend/src/pages/FineTuning/index.jsx b/frontend/src/pages/FineTuning/index.jsx
index f1c293306..4406d8310 100644
--- a/frontend/src/pages/FineTuning/index.jsx
+++ b/frontend/src/pages/FineTuning/index.jsx
@@ -3,7 +3,7 @@ import FineTuningSteps, { FineTuningCreationLayout } from "./Steps";
import { CheckCircle, Circle, Sparkle } from "@phosphor-icons/react";
import { isMobile } from "react-device-detect";
-function SideBarSelection({ currentStep }) {
+function SideBarSelection({ setStep, currentStep }) {
const currentIndex = Object.keys(FineTuningSteps).indexOf(currentStep);
return (
<div
@@ -26,7 +26,16 @@ function SideBarSelection({ currentStep }) {
isLast ? "" : "border-b border-white/10",
].join(" ")}
>
- <div className="text-sm font-light">{props.name}</div>
+ {isDone ? (
+ <button
+ onClick={() => setStep(stepKey)}
+ className="border-none hover:underline text-white/40 text-sm font-light"
+ >
+ {props.name}
+ </button>
+ ) : (
+ <div className="text-sm font-light">{props.name}</div>
+ )}
<div className="flex items-center gap-x-2">
{isDone ? (
<CheckCircle className={`text-green-300`} />
@@ -60,7 +69,7 @@ export default function FineTuningFlow() {
<Sparkle size={24} />
<p className="text-lg font-medium">Custom Fine-Tuned Model</p>
</div>
- <SideBarSelection currentStep={step} />
+ <SideBarSelection setStep={setStep} currentStep={step} />
</div>
{StepPage.component({ settings, setSettings, setStep })}
</div>
diff --git a/server/models/fineTuning.js b/server/models/fineTuning.js
index 629cfc015..8ca5b84ec 100644
--- a/server/models/fineTuning.js
+++ b/server/models/fineTuning.js
@@ -72,7 +72,7 @@ const FineTuning = {
workspaceId: {
in: workspaceIds,
},
- ...(feedback === true ? { feedback: 1 } : {}),
+ ...(feedback === true ? { feedbackScore: true } : {}),
});
return count;
},
@@ -141,7 +141,7 @@ const FineTuning = {
workspaceId: {
in: workspaces.map((ws) => ws.id),
},
- ...(feedback === true ? { feedback: 1 } : {}),
+ ...(feedback === true ? { feedbackScore: true } : {}),
});
const preparedData = chats.map((chat) => {
const responseJson = safeJsonParse(chat.response);
--
GitLab