@pagopa/dx-mcpserver 0.1.1 → 0.1.3

package/dist/handlers/search.js

@@ -37,13 +37,14 @@ export async function handleSearchEndpoint(req, res, config, kbRuntimeClient) {
         }
         const { number_of_results: numberOfResults, query } = result.data;
         const results = await queryKnowledgeBaseStructured(config.aws.knowledgeBaseId, query, kbRuntimeClient, numberOfResults, config.aws.rerankingEnabled);
-        // Format results with content, score, and source URL
+        // Format results with content, score, source URL, and source file URL
         const formattedResults = results.map((result) => ({
             content: result.content,
             score: result.score,
             source: result.location?.type === "WEB"
                 ? result.location.webLocation?.url
                 : undefined,
+            source_file_url: result.sourceFileUrl,
         }));
         sendJsonResponse(res, 200, {
             query,

package/dist/services/bedrock.js

@@ -1,4 +1,6 @@
 import { RetrieveCommand, } from "@aws-sdk/client-bedrock-agent-runtime";
+import { GetObjectCommand, S3Client } from "@aws-sdk/client-s3";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { getLogger } from "@logtape/logtape";
 import { rerankingSupportedRegions } from "../config/aws.js";
 /**
@@ -50,16 +52,23 @@ export async function queryKnowledgeBase(knowledgeBaseId, query, kbAgentClient,
     const response = await kbAgentClient.send(command);
     const results = response.retrievalResults || [];
     const documents = [];
+    // Create S3 client for pre-signed URLs (reuse region from Bedrock client)
+    const s3Client = new S3Client({ region: clientRegion });
     for (const result of results) {
         if (result.content?.type === "IMAGE") {
             logger.warn("Images are not supported at this time. Skipping...");
             continue;
         }
         else if (result.content?.text) {
+            // Generate pre-signed URL if S3 location is available
+            const preSignedUrl = result.location?.type === "S3" && result.location.s3Location?.uri
+                ? await generatePreSignedUrl(result.location.s3Location.uri, s3Client, logger)
+                : undefined;
             documents.push({
                 content: result.content.text,
                 location: resolveToWebsiteUrl(result.location),
                 score: result.score || -1.0,
+                sourceFileUrl: preSignedUrl,
             });
         }
     }
@@ -104,16 +113,23 @@ export async function queryKnowledgeBaseStructured(knowledgeBaseId, query, kbAge
     const response = await kbAgentClient.send(command);
     const results = response.retrievalResults || [];
     const documents = [];
+    // Create S3 client for pre-signed URLs (reuse region from Bedrock client)
+    const s3Client = new S3Client({ region: clientRegion });
     for (const result of results) {
         if (result.content?.type === "IMAGE") {
             logger.warn("Images are not supported at this time. Skipping...");
             continue;
         }
         else if (result.content?.text) {
+            // Generate pre-signed URL if S3 location is available
+            const preSignedUrl = result.location?.type === "S3" && result.location.s3Location?.uri
+                ? await generatePreSignedUrl(result.location.s3Location.uri, s3Client, logger)
+                : undefined;
             documents.push({
                 content: result.content.text,
                 location: resolveToWebsiteUrl(result.location),
                 score: result.score || -1.0,
+                sourceFileUrl: preSignedUrl,
             });
         }
     }
@@ -174,6 +190,28 @@ export function resolveToWebsiteUrl(location) {
     // If unable to determine the URL, return undefined
     return undefined;
 }
+/**
+ * Generates a pre-signed URL for an S3 object.
+ * @param s3Uri The S3 URI in format s3://bucket/key
+ * @param s3Client The S3 client to use
+ * @param logger Logger instance
+ * @returns Pre-signed URL or undefined if generation fails
+ */
+async function generatePreSignedUrl(s3Uri, s3Client, logger) {
+    const match = s3Uri.match(/^s3:\/\/([^/]+)\/(.+)$/);
+    if (!match) {
+        return undefined;
+    }
+    const [, bucket, key] = match;
+    try {
+        const command = new GetObjectCommand({ Bucket: bucket, Key: key });
+        return await getSignedUrl(s3Client, command, { expiresIn: 3600 });
+    }
+    catch (error) {
+        logger.warn(`Failed to generate pre-signed URL for ${s3Uri}: ${error}`);
+        return undefined;
+    }
+}
 /**
  * Serializes an array of knowledge base query results into a formatted string.
  * This method formats the results for better readability, including content, location, and score.
@@ -211,7 +249,10 @@ function serializeResults(results) {
         else if (result.location) {
             locationStr = JSON.stringify(result.location);
         }
-        return `Result ${index + 1} (Score: ${result.score.toFixed(4)}):\n${result.content}\nLocation: ${locationStr}\n`;
+        const sourceFileStr = result.sourceFileUrl
+            ? `\nSource File: ${result.sourceFileUrl}`
+            : "";
+        return `Result ${index + 1} (Score: ${result.score.toFixed(4)}):\n${result.content}\nLocation: ${locationStr}${sourceFileStr}\n`;
     })
         .join("\n\n");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pagopa/dx-mcpserver",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "description": "An MCP server that supports developers using DX tools.",
   "repository": {
@@ -20,13 +20,15 @@
   },
   "dependencies": {
     "@aws-sdk/client-bedrock-agent-runtime": "^3.583.0",
+    "@aws-sdk/client-s3": "^3.583.0",
+    "@aws-sdk/s3-request-presigner": "^3.583.0",
     "@logtape/logtape": "^1.3.4",
-    "@modelcontextprotocol/sdk": "^1.25.2",
+    "@modelcontextprotocol/sdk": "^1.26.0",
     "@octokit/rest": "^22.0.0",
     "axios": "^1.12.2",
     "zod": "^3.25.76",
-    "@pagopa/dx-mcpprompts": "^0.2.2",
-    "@pagopa/azure-tracing": "^0.4.11"
+    "@pagopa/azure-tracing": "^0.4.11",
+    "@pagopa/dx-mcpprompts": "^0.2.2"
   },
   "devDependencies": {
     "@types/node": "^22.19.1",