Merge branch 'main' into patch-1

Author: dsp-ant

aws-kb-retrieval-server/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.12-alpine as builder
+FROM node:22.12-alpine AS builder
 
 COPY src/aws-kb-retrieval-server /app
 COPY tsconfig.json /tsconfig.json

brave-search/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.12-alpine as builder
+FROM node:22.12-alpine AS builder
 
 # Must be entire project because `prepare` script is run during `npm install` and requires all files.
 COPY src/brave-search /app

everart/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.12-alpine as builder
+FROM node:22.12-alpine AS builder
 
 COPY src/everart /app
 COPY tsconfig.json /tsconfig.json

everything/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.12-alpine as builder
+FROM node:22.12-alpine AS builder
 
 COPY src/everything /app
 COPY tsconfig.json /tsconfig.json

everything/everything.ts

@@ -411,7 +411,7 @@ export const createServer = () => {
         maxTokens,
       );
       return {
-        content: [{ type: "text", text: `LLM sampling result: ${result}` }],
+        content: [{ type: "text", text: `LLM sampling result: ${result.content.text}` }],
       };
     }
 

fetch/pyproject.toml

@@ -17,7 +17,7 @@ classifiers = [
 ]
 dependencies = [
     "markdownify>=0.13.1",
-    "mcp>=1.0.0",
+    "mcp>=1.1.3",
     "protego>=0.3.1",
     "pydantic>=2.0.0",
     "readabilipy>=0.2.0",

fetch/src/mcp_server_fetch/server.py

@@ -7,6 +7,7 @@
 from mcp.server import Server
 from mcp.server.stdio import stdio_server
 from mcp.types import (
+    ErrorData,
     GetPromptResult,
     Prompt,
     PromptArgument,
@@ -79,15 +80,15 @@ async def check_may_autonomously_fetch_url(url: str, user_agent: str) -> None:
                 headers={"User-Agent": user_agent},
             )
         except HTTPError:
-            raise McpError(
-                INTERNAL_ERROR,
-                f"Failed to fetch robots.txt {robot_txt_url} due to a connection issue",
-            )
+            raise McpError(ErrorData(
+                code=INTERNAL_ERROR,
+                message=f"Failed to fetch robots.txt {robot_txt_url} due to a connection issue",
+            ))
         if response.status_code in (401, 403):
-            raise McpError(
-                INTERNAL_ERROR,
-                f"When fetching robots.txt ({robot_txt_url}), received status {response.status_code} so assuming that autonomous fetching is not allowed, the user can try manually fetching by using the fetch prompt",
-            )
+            raise McpError(ErrorData(
+                code=INTERNAL_ERROR,
+                message=f"When fetching robots.txt ({robot_txt_url}), received status {response.status_code} so assuming that autonomous fetching is not allowed, the user can try manually fetching by using the fetch prompt",
+            ))
         elif 400 <= response.status_code < 500:
             return
         robot_txt = response.text
@@ -96,15 +97,15 @@ async def check_may_autonomously_fetch_url(url: str, user_agent: str) -> None:
     )
     robot_parser = Protego.parse(processed_robot_txt)
     if not robot_parser.can_fetch(str(url), user_agent):
-        raise McpError(
-            INTERNAL_ERROR,
-            f"The sites robots.txt ({robot_txt_url}), specifies that autonomous fetching of this page is not allowed, "
+        raise McpError(ErrorData(
+            code=INTERNAL_ERROR,
+            message=f"The sites robots.txt ({robot_txt_url}), specifies that autonomous fetching of this page is not allowed, "
             f"<useragent>{user_agent}</useragent>\n"
             f"<url>{url}</url>"
             f"<robots>\n{robot_txt}\n</robots>\n"
             f"The assistant must let the user know that it failed to view the page. The assistant may provide further guidance based on the above information.\n"
             f"The assistant can tell the user that they can try manually fetching the page by using the fetch prompt within their UI.",
-        )
+        ))
 
 
 async def fetch_url(
@@ -124,12 +125,12 @@ async def fetch_url(
                 timeout=30,
             )
         except HTTPError as e:
-            raise McpError(INTERNAL_ERROR, f"Failed to fetch {url}: {e!r}")
+            raise McpError(ErrorData(code=INTERNAL_ERROR, message=f"Failed to fetch {url}: {e!r}"))
         if response.status_code >= 400:
-            raise McpError(
-                INTERNAL_ERROR,
-                f"Failed to fetch {url} - status code {response.status_code}",
-            )
+            raise McpError(ErrorData(
+                code=INTERNAL_ERROR,
+                message=f"Failed to fetch {url} - status code {response.status_code}",
+            ))
 
         page_raw = response.text
 
@@ -221,27 +222,39 @@ async def call_tool(name, arguments: dict) -> list[TextContent]:
         try:
             args = Fetch(**arguments)
         except ValueError as e:
-            raise McpError(INVALID_PARAMS, str(e))
+            raise McpError(ErrorData(code=INVALID_PARAMS, message=str(e)))
 
         url = str(args.url)
         if not url:
-            raise McpError(INVALID_PARAMS, "URL is required")
+            raise McpError(ErrorData(code=INVALID_PARAMS, message="URL is required"))
 
         if not ignore_robots_txt:
             await check_may_autonomously_fetch_url(url, user_agent_autonomous)
 
         content, prefix = await fetch_url(
             url, user_agent_autonomous, force_raw=args.raw
         )
-        if len(content) > args.max_length:
-            content = content[args.start_index : args.start_index + args.max_length]
-            content += f"\n\n<error>Content truncated. Call the fetch tool with a start_index of {args.start_index + args.max_length} to get more content.</error>"
+        original_length = len(content)
+        if args.start_index >= original_length:
+            content = "<error>No more content available.</error>"
+        else:
+            truncated_content = content[args.start_index : args.start_index + args.max_length]
+            if not truncated_content:
+                content = "<error>No more content available.</error>"
+            else:
+                content = truncated_content
+                actual_content_length = len(truncated_content)
+                remaining_content = original_length - (args.start_index + actual_content_length)
+                # Only add the prompt to continue fetching if there is still remaining content
+                if actual_content_length == args.max_length and remaining_content > 0:
+                    next_start = args.start_index + actual_content_length
+                    content += f"\n\n<error>Content truncated. Call the fetch tool with a start_index of {next_start} to get more content.</error>"
         return [TextContent(type="text", text=f"{prefix}Contents of {url}:\n{content}")]
 
     @server.get_prompt()
     async def get_prompt(name: str, arguments: dict | None) -> GetPromptResult:
         if not arguments or "url" not in arguments:
-            raise McpError(INVALID_PARAMS, "URL is required")
+            raise McpError(ErrorData(code=INVALID_PARAMS, message="URL is required"))
 
         url = arguments["url"]