add mcpToken as an optional plugin configuration (#1671)

* add mcpToken as an optional plugin configuration

Signed-off-by: Stephanie <yangcao@redhat.com>

* update readme

Signed-off-by: Stephanie <yangcao@redhat.com>

* remove debug message

Signed-off-by: Stephanie <yangcao@redhat.com>

* update to include mcp server name as well

Signed-off-by: Stephanie <yangcao@redhat.com>

* update error message

Signed-off-by: Stephanie <yangcao@redhat.com>

* update referenced_documents

Signed-off-by: Stephanie <yangcao@redhat.com>

* update readme

Signed-off-by: Stephanie <yangcao@redhat.com>

---------

Signed-off-by: Stephanie <yangcao@redhat.com>

Author: yangcao77

workspaces/lightspeed/plugins/lightspeed-backend/README.md

@@ -33,6 +33,9 @@ Add the following lightspeed configurations into your `app-config.yaml` file:
 lightspeed:
   servicePort: <portNumber> # Optional - Change the LS service port nubmer. Defaults to 8080.
   systemPrompt: <system prompt> # Optional - Override the default system prompt.
+  mcpServers: # Optional - only one mcp server is currently supported
+    - name: <mcp server name> # must match the name configured in LCS
+      token: ${MCP_TOKEN}
 ```
 
 #### Permission Framework Support

workspaces/lightspeed/plugins/lightspeed-backend/config.d.ts

@@ -30,5 +30,21 @@ export interface Config {
      * @visibility backend
      */
     systemPrompt?: string;
+    /**
+     * configure the MCP server for the lightspeed service.
+     * @visibility backend
+     */
+    mcpServers?: Array<{
+      /**
+       * The name of the mcp server.
+       * @visibility backend
+       */
+      name: string;
+      /**
+       * The access token for authenticating MCP server.
+       * @visibility secret
+       */
+      token: string;
+    }>;
   };
 }

workspaces/lightspeed/plugins/lightspeed-backend/src/service/router.ts

@@ -51,6 +51,13 @@ export async function createRouter(
 
   const port = config.getOptionalNumber('lightspeed.servicePort') ?? 8080;
   const system_prompt = config.getOptionalString('lightspeed.systemPrompt');
+  // Only support one MCP server for now
+  const mcpServerName = config
+    .getOptionalConfigArray('lightspeed.mcpServers')?.[0]
+    ?.getString('name');
+  const mcpToken = config
+    .getOptionalConfigArray('lightspeed.mcpServers')?.[0]
+    ?.getString('token');
 
   router.get('/health', (_, response) => {
     response.json({ status: 'ok' });
@@ -147,7 +154,7 @@ export async function createRouter(
       if (!fetchResponse.ok) {
         // Read the error body
         const errorBody = await fetchResponse.json();
-        const errormsg = `Error from road-core server: ${errorBody.error?.message || errorBody?.detail?.cause || 'Unknown error'}`;
+        const errormsg = `Error from lightspeed-core server: ${errorBody.error?.message || errorBody?.detail?.cause || 'Unknown error'}`;
         logger.error(errormsg);
 
         // Return a 500 status for any upstream error
@@ -187,20 +194,23 @@ export async function createRouter(
         );
         const userQueryParam = `user_id=${encodeURIComponent(user_id)}`;
         request.body.media_type = 'application/json'; // set media_type to receive start and end event
-
         // if system_prompt is defined in lightspeed config
         // set system_prompt to override the default rhdh system prompt
         if (system_prompt && system_prompt.trim().length > 0) {
           request.body.system_prompt = system_prompt;
         }
 
         const requestBody = JSON.stringify(request.body);
+        const mcpHeaders = mcpToken
+          ? `{"${mcpServerName}": {"Authorization": "Bearer ${mcpToken}"}}`
+          : '';
         const fetchResponse = await fetch(
           `http://0.0.0.0:${port}/v1/streaming_query?${userQueryParam}`,
           {
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
+              'MCP-HEADERS': mcpHeaders,
             },
             body: requestBody,
           },
@@ -209,7 +219,7 @@ export async function createRouter(
         if (!fetchResponse.ok) {
           // Read the error body
           const errorBody = await fetchResponse.json();
-          const errormsg = `Error from road-core server: ${errorBody.error?.message || errorBody?.detail?.cause || 'Unknown error'}`;
+          const errormsg = `Error from lightspeed-core server: ${errorBody.error?.message || errorBody?.detail?.cause || 'Unknown error'}`;
           logger.error(errormsg);
 
           // Return a 500 status for any upstream error

workspaces/lightspeed/plugins/lightspeed/src/hooks/useConversationMessages.ts

@@ -138,7 +138,7 @@ export const useConversationMessages = (
               content: aiMessage.content,
               timestamp: aiMessage.timestamp,
               sources: transformDocumentsToSources(
-                aiMessage?.referencedDocuments ?? [],
+                aiMessage?.referenced_documents ?? [],
               ),
             }),
           ],

workspaces/lightspeed/plugins/lightspeed/src/types.ts

@@ -57,7 +57,7 @@ export interface LCSConversation {
   messages: BaseMessage[];
   started_at: string;
   completed_at: string;
-  referencedDocuments?: ReferencedDocuments;
+  referenced_documents?: ReferencedDocuments;
 }
 
 export interface LCSShield {
@@ -75,7 +75,7 @@ export interface BaseMessage {
   model: string;
   timestamp: string;
   sources?: SourcesCardProps;
-  referencedDocuments?: ReferencedDocuments;
+  referenced_documents?: ReferencedDocuments;
   error?: AlertProps;
 }
 export type ConversationSummary = {

workspaces/lightspeed/plugins/lightspeed/src/utils/lightspeed-chatbox-utils.ts

@@ -167,7 +167,7 @@ export const getConversationsData = (
           ? new Date(conversation.completed_at).getTime()
           : Date.now(),
       ),
-      referencedDocuments: botMessage?.referencedDocuments ?? [],
+      referenced_documents: botMessage?.referenced_documents ?? [],
     },
   ];
 };