Specialized fetch function (renamed), small margin added to feedbacks…

…, more loaded at once
dust-tt · Jan 2, 2025 · 567745b · 567745b
1 parent e5be49d
commit 567745b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/front/components/assistant_builder/AssistantBuilderPreviewDrawer.tsx b/front/components/assistant_builder/AssistantBuilderPreviewDrawer.tsx
@@ -3,7 +3,6 @@ import {
   Button,
   ChatBubbleBottomCenterTextIcon,
   cn,
-  ContentMessage,
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
@@ -50,15 +49,15 @@ import { ConfirmContext } from "@app/components/Confirm";
 import { ACTION_SPECIFICATIONS } from "@app/lib/api/assistant/actions/utils";
 import type { AgentMessageFeedbackWithMetadataType } from "@app/lib/api/assistant/feedback";
 import {
-  useAgentConfigurationFeedbacks,
+  useAgentConfigurationFeedbacksByDescVersion,
   useAgentConfigurationHistory,
 } from "@app/lib/swr/assistants";
 import { useUser } from "@app/lib/swr/user";
 import { timeAgoFrom } from "@app/lib/utils";
 import type { FetchAssistantTemplateResponse } from "@app/pages/api/w/[wId]/assistant/builder/templates/[tId]";
 
 const MAX_FEEDBACKS_TO_DISPLAY = 500;
-const FEEDBACKS_BATCH_SIZE = 50;
+const FEEDBACKS_BATCH_SIZE = 100;
 
 interface AssistantBuilderRightPanelProps {
   screen: BuilderScreen;
@@ -433,8 +432,9 @@ const FeedbacksSection = ({
   const [feedbacks, setFeedbacks] = useState<
     AgentMessageFeedbackWithMetadataType[]
   >([]);
+  // Decreasing version, paginated decreasing id.
   const { agentConfigurationFeedbacks, isAgentConfigurationFeedbacksLoading } =
-    useAgentConfigurationFeedbacks({
+    useAgentConfigurationFeedbacksByDescVersion({
       workspaceId: owner.sId,
       agentConfigurationId: assistantId ?? "",
       withMetadata: true,
@@ -536,7 +536,7 @@ const FeedbacksSection = ({
                 />
               )}
               {!isNewVersion && !isFirstFeedback && (
-                <div className="mx-4">
+                <div className="mx-4 my-1">
                   <Page.Separator />
                 </div>
               )}

diff --git a/front/lib/api/assistant/feedback.ts b/front/lib/api/assistant/feedback.ts
@@ -198,12 +198,15 @@ export async function getAgentFeedbacks({
     return new Err(new Error("agent_configuration_not_found"));
   }
 
-  const feedbacksRes = await AgentMessageFeedbackResource.fetch({
-    workspace: owner,
-    agentConfiguration,
-    paginationParams,
-    withMetadata,
-  });
+  const feedbacksRes =
+    await AgentMessageFeedbackResource.getAgentConfigurationFeedbacksByDescVersion(
+      {
+        workspace: owner,
+        agentConfiguration,
+        paginationParams,
+        withMetadata,
+      }
+    );
 
   if (!withMetadata) {
     return new Ok(feedbacksRes);

diff --git a/front/lib/resources/agent_message_feedback_resource.ts b/front/lib/resources/agent_message_feedback_resource.ts
@@ -4,6 +4,7 @@ import type {
   ConversationError,
   ConversationType,
   ConversationWithoutContentType,
+  LightAgentConfigurationType,
   MessageType,
   Result,
   UserType,
@@ -91,22 +92,23 @@ export class AgentMessageFeedbackResource extends BaseResource<AgentMessageFeedb
     });
   }
 
-  static async fetch({
+  static async getAgentConfigurationFeedbacksByDescVersion({
     workspace,
     withMetadata,
     agentConfiguration,
     paginationParams,
   }: {
     workspace: WorkspaceType;
     withMetadata: boolean;
-    agentConfiguration?: AgentConfigurationType;
+    agentConfiguration: LightAgentConfigurationType;
     paginationParams: PaginationParams;
   }): Promise<
     (AgentMessageFeedbackType | AgentMessageFeedbackWithMetadataType)[]
   > {
     const where: WhereOptions<AgentMessageFeedback> = {
       // IMPORTANT: Necessary for global models who share ids across workspaces.
       workspaceId: workspace.id,
+      agentConfigurationId: agentConfiguration.sId.toString(),
     };
 
     if (paginationParams.lastValue) {
@@ -115,9 +117,6 @@ export class AgentMessageFeedbackResource extends BaseResource<AgentMessageFeedb
         [op]: paginationParams.lastValue,
       };
     }
-    if (agentConfiguration) {
-      where.agentConfigurationId = agentConfiguration.sId.toString();
-    }
 
     const agentMessageFeedback = await AgentMessageFeedback.findAll({
       where,
@@ -148,6 +147,7 @@ export class AgentMessageFeedbackResource extends BaseResource<AgentMessageFeedb
         },
       ],
       order: [
+        ["agentConfigurationVersion", "DESC"],
         [
           paginationParams.orderColumn,
           paginationParams.orderDirection === "desc" ? "DESC" : "ASC",

diff --git a/front/lib/swr/assistants.ts b/front/lib/swr/assistants.ts
@@ -232,7 +232,7 @@ export function useAgentConfiguration({
   };
 }
 
-export function useAgentConfigurationFeedbacks({
+export function useAgentConfigurationFeedbacksByDescVersion({
   workspaceId,
   agentConfigurationId,
   withMetadata,