review

dust-tt · Sep 7, 2023 · f92fc00 · f92fc00
1 parent eb66a61
commit f92fc00
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/front/lib/api/assistant/actions/retrieval.ts b/front/lib/api/assistant/actions/retrieval.ts
@@ -4,6 +4,7 @@ import {
 } from "@app/lib/actions/registry";
 import { runAction } from "@app/lib/actions/server";
 import { generateActionInputs } from "@app/lib/api/assistant/agent";
+import { ModelMessageType } from "@app/lib/api/assistant/generation";
 import { Authenticator, prodAPICredentialsForOwner } from "@app/lib/auth";
 import { front_sequelize } from "@app/lib/databases";
 import { DustAPI } from "@app/lib/dust_api";
@@ -33,8 +34,6 @@ import {
   UserMessageType,
 } from "@app/types/assistant/conversation";
 
-import { ModelMessageType } from "../generation";
-
 /**
  * TimeFrame parsing
  */

diff --git a/front/lib/api/assistant/agent.ts b/front/lib/api/assistant/agent.ts
@@ -199,8 +199,8 @@ export type AgentGenerationSuccessEvent = {
 };
 
 // Event sent once the message is completed and successful.
-export type AgentSuccessEvent = {
-  type: "agent_success";
+export type AgentMessageSuccessEvent = {
+  type: "agent_message_success";
   created: number;
   configurationId: string;
   generationId: string;
@@ -221,7 +221,7 @@ export async function* runAgent(
   | AgentActionSuccessEvent
   | GenerationTokensEvent
   | AgentGenerationSuccessEvent
-  | AgentSuccessEvent
+  | AgentMessageSuccessEvent
 > {
   yield {
     type: "agent_error",

diff --git a/front/lib/api/assistant/conversation.ts b/front/lib/api/assistant/conversation.ts
@@ -4,8 +4,9 @@ import {
   AgentErrorEvent,
   AgentGenerationSuccessEvent,
   AgentMessageNewEvent,
-  AgentSuccessEvent,
+  AgentMessageSuccessEvent,
 } from "@app/lib/api/assistant/agent";
+import { GenerationTokensEvent } from "@app/lib/api/assistant/generation";
 import { Authenticator } from "@app/lib/auth";
 import { front_sequelize } from "@app/lib/databases";
 import { AgentMessage, Message, UserMessage } from "@app/lib/models";
@@ -19,8 +20,6 @@ import {
   UserMessageType,
 } from "@app/types/assistant/conversation";
 
-import { GenerationTokensEvent } from "./generation";
-
 /**
  * Conversation API
  */
@@ -54,7 +53,7 @@ export async function* postUserMessage(
   | AgentActionSuccessEvent
   | GenerationTokensEvent
   | AgentGenerationSuccessEvent
-  | AgentSuccessEvent
+  | AgentMessageSuccessEvent
 > {
   const user = auth.user();
 
@@ -199,7 +198,7 @@ export async function* retryAgentMessage(
   | AgentActionSuccessEvent
   | GenerationTokensEvent
   | AgentGenerationSuccessEvent
-  | AgentSuccessEvent
+  | AgentMessageSuccessEvent
 > {
   yield {
     type: "agent_error",
@@ -234,7 +233,7 @@ export async function* editUserMessage(
   | AgentActionSuccessEvent
   | GenerationTokensEvent
   | AgentGenerationSuccessEvent
-  | AgentSuccessEvent
+  | AgentMessageSuccessEvent
 > {
   yield {
     type: "agent_error",