feat: use the agent id from request body

Signed-off-by: SuZhou-Joe <[email protected]>
opensearch-project · Nov 20, 2023 · 5eb1064 · 5eb1064
1 parent 53971bb
commit 5eb1064
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/public/chat_header_button.tsx b/public/chat_header_button.tsx
@@ -36,6 +36,9 @@ export const HeaderChatButton: React.FC<HeaderChatButtonProps> = (props) => {
     {}
   );
   const [selectedTabId, setSelectedTabId] = useState<TabId>('chat');
+  const [rootAgentId, setRootAgentId] = useState<string>(
+    new URL(window.location.href).searchParams.get('agent_id') || ''
+  );
 
   if (!flyoutLoaded && flyoutVisible) flyoutLoaded = true;
 
@@ -61,6 +64,7 @@ export const HeaderChatButton: React.FC<HeaderChatButtonProps> = (props) => {
       chatEnabled: props.chatEnabled,
       contentRenderers: props.contentRenderers,
       actionExecutors: props.actionExecutors,
+      rootAgentId,
     }),
     [
       appId,

diff --git a/public/contexts/chat_context.tsx b/public/contexts/chat_context.tsx
@@ -19,6 +19,7 @@ export interface IChatContext {
   chatEnabled: boolean;
   contentRenderers: Record<string, ContentRenderer>;
   actionExecutors: Record<string, ActionExecutor>;
+  rootAgentId?: string;
 }
 export const ChatContext = React.createContext<IChatContext | null>(null);
 

diff --git a/public/hooks/use_chat_actions.tsx b/public/hooks/use_chat_actions.tsx
@@ -31,6 +31,7 @@ export const useChatActions = (): AssistantActions => {
         // do not send abort signal to http client to allow LLM call run in background
         body: JSON.stringify({
           sessionId: chatContext.sessionId,
+          rootAgentId: chatContext.rootAgentId,
           ...(!chatContext.sessionId && { messages: chatState.messages }), // include all previous messages for new chats
           input,
         }),

diff --git a/server/routes/chat_routes.ts b/server/routes/chat_routes.ts
@@ -21,6 +21,7 @@ const llmRequestRoute = {
     body: schema.object({
       sessionId: schema.maybe(schema.string()),
       messages: schema.maybe(schema.arrayOf(schema.any())),
+      rootAgentId: schema.string(),
       input: schema.object({
         type: schema.literal('input'),
         context: schema.object({

diff --git a/server/services/chat/olly_chat_service.ts b/server/services/chat/olly_chat_service.ts
@@ -29,7 +29,7 @@ export class OllyChatService implements ChatService {
     messages: IMessage[];
     memoryId: string;
   }> {
-    const { input, sessionId } = request.body;
+    const { input, sessionId, rootAgentId } = request.body;
     const opensearchClient = context.core.opensearch.client.asCurrentUser;
 
     try {
@@ -51,7 +51,7 @@ export class OllyChatService implements ChatService {
       }
       const agentFrameworkResponse = (await opensearchClient.transport.request({
         method: 'POST',
-        path: '/_plugins/_ml/agents/-jld3IsBXlmiPBu-5dDC/_execute',
+        path: `/_plugins/_ml/agents/${rootAgentId}/_execute`,
         body: {
           parameters: parametersPayload,
         },