michael/merlyn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui adjustments for order flow

Browse Source 
back nav on order flow
fix bad schema ref
This commit is contained in:
timothycarambat 2024-07-25 14:10:17 -07:00
parent a7010fd48d
commit 6bab8b5bd4
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/pages/FineTuning/Steps/OrderDetails/index.jsx
View File

@ -8,7 +8,7 @@ export default function OrderDetails({ setSettings, setStep }) {
useEffect(() => { useEffect(() => {
FineTuning.info() FineTuning.info()
.then((res) => { .then((res) => {
setInfo(res); setInfo(res ?? {});
setSettings((prev) => { setSettings((prev) => {
return { ...prev, tuningInfo: res }; return { ...prev, tuningInfo: res };
}); });

15
frontend/src/pages/FineTuning/index.jsx
View File

@ -3,7 +3,7 @@ import FineTuningSteps, { FineTuningCreationLayout } from "./Steps";
import { CheckCircle, Circle, Sparkle } from "@phosphor-icons/react"; import { CheckCircle, Circle, Sparkle } from "@phosphor-icons/react";
import { isMobile } from "react-device-detect"; import { isMobile } from "react-device-detect";
function SideBarSelection({ currentStep }) { function SideBarSelection({ setStep, currentStep }) {
const currentIndex = Object.keys(FineTuningSteps).indexOf(currentStep); const currentIndex = Object.keys(FineTuningSteps).indexOf(currentStep);
return ( return (
<div <div
@ -26,7 +26,16 @@ function SideBarSelection({ currentStep }) {
isLast ? "" : "border-b border-white/10", isLast ? "" : "border-b border-white/10",
].join(" ")} ].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"> <div className="flex items-center gap-x-2">
{isDone ? ( {isDone ? (
<CheckCircle className={`text-green-300`} /> <CheckCircle className={`text-green-300`} />
@ -60,7 +69,7 @@ export default function FineTuningFlow() {
<Sparkle size={24} /> <Sparkle size={24} />
<p className="text-lg font-medium">Custom Fine-Tuned Model</p> <p className="text-lg font-medium">Custom Fine-Tuned Model</p>
</div> </div>
<SideBarSelection currentStep={step} /> <SideBarSelection setStep={setStep} currentStep={step} />
</div> </div>
{StepPage.component({ settings, setSettings, setStep })} {StepPage.component({ settings, setSettings, setStep })}
</div> </div>

4
server/models/fineTuning.js
View File

@ -72,7 +72,7 @@ const FineTuning = {
workspaceId: { workspaceId: {
in: workspaceIds, in: workspaceIds,
}, },
...(feedback === true ? { feedback: 1 } : {}), ...(feedback === true ? { feedbackScore: true } : {}),
}); });
return count; return count;
}, },
@ -141,7 +141,7 @@ const FineTuning = {
workspaceId: { workspaceId: {
in: workspaces.map((ws) => ws.id), in: workspaces.map((ws) => ws.id),
}, },
...(feedback === true ? { feedback: 1 } : {}), ...(feedback === true ? { feedbackScore: true } : {}),
}); });
const preparedData = chats.map((chat) => { const preparedData = chats.map((chat) => {
const responseJson = safeJsonParse(chat.response); const responseJson = safeJsonParse(chat.response);