fix: make only last message of a run scorable

mauanga · Jul 12, 2024 · a1ce820 · a1ce820
1 parent aaebd3b
commit a1ce820
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 158 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,8 @@ Nothing unreleased!
 - disable_feedback has been removed
 - root_message has been removed
 
+## [1.1.306] - 2024-07-03
+
 ### Added
 
 - Messages are now editable. You can disable this feature with `config.features.edit_message = false`

diff --git a/cypress/e2e/video_element/.chainlit/config.toml b/cypress/e2e/video_element/.chainlit/config.toml
diff --git a/cypress/e2e/video_element/main.py b/cypress/e2e/video_element/main.py
diff --git a/cypress/e2e/video_element/spec.cy.ts b/cypress/e2e/video_element/spec.cy.ts
diff --git a/frontend/src/components/molecules/messages/Message.tsx b/frontend/src/components/molecules/messages/Message.tsx
@@ -28,6 +28,7 @@ interface Props {
   actions: IAction[];
   indent: number;
   isRunning?: boolean;
+  isScorable?: boolean;
   scorableRun?: IStep;
 }
 
@@ -39,6 +40,7 @@ const Message = memo(
     actions,
     isRunning,
     indent,
+    isScorable,
     scorableRun
   }: Props) => {
     const {
@@ -175,7 +177,7 @@ const Message = memo(
                       {actions?.length ? (
                         <MessageActions message={message} actions={actions} />
                       ) : null}
-                      {scorableRun ? (
+                      {scorableRun && isScorable ? (
                         <MessageButtons message={message} run={scorableRun} />
                       ) : null}
                     </Stack>

diff --git a/frontend/src/components/molecules/messages/Messages.tsx b/frontend/src/components/molecules/messages/Messages.tsx
@@ -33,13 +33,15 @@ const Messages = memo(
     const { config } = useConfig();
     return (
       <>
-        {messages.map((m) => {
+        {messages.map((m, mIndex) => {
           if (CL_RUN_NAMES.includes(m.name)) {
             const isRunning = !m.end && !m.isError && messageContext.loading;
             const showLoader =
               config?.ui.cot === 'tool_call'
                 ? isRunning && !hasToolStep(m)
                 : !m.steps?.length && isRunning;
+            const scorableRun =
+              !isRunning && m.name !== 'on_chat_start' ? m : undefined;
             return (
               <>
                 {m.steps?.length ? (
@@ -49,15 +51,19 @@ const Messages = memo(
                     actions={actions}
                     indent={indent}
                     isRunning={isRunning}
-                    scorableRun={
-                      !isRunning && m.name !== 'on_chat_start' ? m : undefined
-                    }
+                    scorableRun={scorableRun}
                   />
                 ) : null}
                 <MessageLoader show={showLoader} />
               </>
             );
           } else {
+            const isScorable =
+              mIndex ===
+              scorableRun?.steps?.findLastIndex(
+                (_m) => _m.type === 'assistant_message'
+              );
+
             return (
               <Message
                 message={m}
@@ -67,6 +73,7 @@ const Messages = memo(
                 indent={indent}
                 isRunning={isRunning}
                 scorableRun={scorableRun}
+                isScorable={isScorable}
               />
             );
           }