Finish test

Author: labkey-adam

api/src/org/labkey/api/mcp/McpService.java

@@ -3,12 +3,14 @@
 
 import io.modelcontextprotocol.server.McpServerFeatures;
 import jakarta.servlet.http.HttpSession;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jspecify.annotations.NonNull;
 import org.labkey.api.data.Container;
 import org.labkey.api.security.User;
 import org.labkey.api.services.ServiceRegistry;
 import org.labkey.api.util.HtmlString;
+import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.writer.ContainerUser;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.model.ToolContext;
@@ -78,6 +80,8 @@
 ///
 public interface McpService extends ToolCallbackProvider
 {
+    Logger LOG = LogHelper.getLogger(McpService.class, "MCP registration exceptions");
+
     // Interface for MCP classes that we will "ingest" using Spring annotations. Provides a few helper methods.
     interface McpImpl
     {
@@ -119,13 +123,21 @@ static void setInstance(McpService service)
 
     default void register(McpImpl mcp)
     {
-        ToolCallback[] tools = ToolCallbacks.from(mcp);
-        if (tools.length > 0)
-            registerTools(Arrays.asList(tools), mcp);
+        try
+        {
+            ToolCallback[] tools = ToolCallbacks.from(mcp);
+            if (tools.length > 0)
+                registerTools(Arrays.asList(tools), mcp);
 
-        var resources = new SyncMcpResourceProvider(List.of(mcp)).getResourceSpecifications();
-        if (null != resources && !resources.isEmpty())
-            registerResources(resources);
+            var resources = new SyncMcpResourceProvider(List.of(mcp)).getResourceSpecifications();
+            if (null != resources && !resources.isEmpty())
+                registerResources(resources);
+        }
+        catch (Exception e)
+        {
+            String advice = e.getMessage().contains("victools") ? " Try doing a clean build of API." : "";
+            LOG.error("Exception while registering MCP implementations. The MCP server will not be available.{}", advice, e);
+        }
     }
 
     void registerTools(@NotNull List<ToolCallback> tools, McpImpl mcp);

query/src/org/labkey/query/controllers/QueryMcp.java

@@ -162,7 +162,7 @@ public static JSONObject _listTables(String fullQuotedName, ContainerUser cu)
         var defaultSchema = DefaultSchema.get(cu.getUser(), cu.getContainer());
         var schema = DefaultSchema.resolve(defaultSchema, fullKey);
         if (!(schema instanceof UserSchema userSchema))
-            throw new NotFoundException("Could not find schema for " + fullQuotedName);
+            throw new NotFoundException("Could not find schema " + fullQuotedName);
 
         JSONArray array = new JSONArray();
         CaseInsensitiveHashSet names = new CaseInsensitiveHashSet(schema.getTableNames());
@@ -218,7 +218,7 @@ public JSONObject _listColumns(String fullQuotedName, ToolContext toolContext)
         }
         else if (fullKey.size() == 1)
         {
-            throw new NotFoundException("You need to provide a fully qualified schema and table");
+            throw new NotFoundException("tableName must be a fully qualified schema and table e.g. \"schema\".\"table or query\"");
         }
         else
         {
@@ -231,11 +231,11 @@ else if (fullKey.size() == 1)
 
         var schema = DefaultSchema.resolve(defaultSchema, schemaKey);
         if (null == schema)
-            throw new NotFoundException("Could not find schema for : " + fullQuotedName);
+            throw new NotFoundException("Could not find schema " + fullQuotedName);
 
         TableInfo td = schema.getTable(tableName, null);
         if (null == td)
-            throw new NotFoundException("Could not find table for : " + fullQuotedName);
+            throw new NotFoundException("Could not find table " + fullQuotedName);
 
         String sourceSQL = null;
         if (schema instanceof UserSchema userSchema)