@malloy-publisher/server 0.0.382-dev → 0.2.1

package/src/mcp/resources/source_resource.ts

@@ -1,141 +0,0 @@
-import {
-   McpServer,
-   ResourceTemplate,
-} from "@modelcontextprotocol/sdk/server/mcp.js";
-import { URL } from "url";
-import type { components } from "../../api";
-import { ModelCompilationError } from "../../errors";
-import { logger } from "../../logger";
-import { ProjectStore } from "../../service/project_store";
-import {
-   getInternalError,
-   getMalloyErrorDetails,
-   getNotFoundError,
-} from "../error_messages";
-import {
-   getModelForQuery,
-   handleResourceGet,
-   McpGetResourceError,
-} from "../handler_utils";
-import { RESOURCE_METADATA } from "../resource_metadata";
-
-// Define the expected parameter types for this resource
-type SourceParams = {
-   projectName?: unknown;
-   packageName?: unknown;
-   modelPath?: unknown;
-   sourceName?: unknown;
-};
-
-/**
- * Registers the Malloy Source resource type (nested within a Model).
- * Handles getting details for a specific source.
- */
-export function registerSourceResource(
-   mcpServer: McpServer,
-   projectStore: ProjectStore,
-): void {
-   mcpServer.resource(
-      "source",
-      new ResourceTemplate(
-         "malloy://project/{projectName}/package/{packageName}/models/{modelPath}/sources/{sourceName}",
-         { list: undefined }, // Listing sources directly is not supported via this template
-      ),
-      /** Handles GetResource requests for specific Sources within a Model */
-      (uri, params) =>
-         handleResourceGet(
-            uri,
-            params as SourceParams, // Cast params
-            "source",
-            // Define the getData async callback
-            async (
-               {
-                  projectName,
-                  packageName,
-                  modelPath,
-                  sourceName,
-               }: SourceParams, // Use defined type
-               // Add type for uri
-               uri: URL,
-            ) => {
-               // Input validation
-               if (
-                  typeof projectName !== "string" ||
-                  typeof packageName !== "string" ||
-                  typeof modelPath !== "string" ||
-                  typeof sourceName !== "string"
-               ) {
-                  // Throw simple error, handleResourceGet will wrap it
-                  throw new Error("Invalid parameters for source resource.");
-               }
-
-               try {
-                  // Use the imported getModelForQuery
-                  const modelResult = await getModelForQuery(
-                     projectStore,
-                     projectName,
-                     packageName,
-                     modelPath,
-                  );
-
-                  // Handle error case from getModelForQuery
-                  if ("error" in modelResult) {
-                     throw new McpGetResourceError(modelResult.error);
-                  }
-                  const { model } = modelResult;
-
-                  const sources = await model.getSources();
-                  // Add check for undefined sources
-                  if (!sources) {
-                     throw new Error("Could not retrieve sources from model.");
-                  }
-                  const source = sources.find(
-                     (s: components["schemas"]["Source"]) =>
-                        s.name === sourceName,
-                  );
-
-                  if (!source) {
-                     const errorDetails = getNotFoundError(
-                        `Source '${sourceName}' in model '${modelPath}' package '${packageName}' project '${projectName}'`,
-                     );
-                     throw new McpGetResourceError(errorDetails);
-                  }
-
-                  // Strip implicit filters from agent-facing responses
-                  if (source.filters) {
-                     source.filters = source.filters.filter((f) => !f.implicit);
-                  }
-
-                  return source;
-               } catch (error) {
-                  // Catch errors from getModelForQuery or finding the source
-                  if (error instanceof McpGetResourceError) {
-                     throw error; // Re-throw already formatted errors
-                  }
-                  // Check if it's a compilation error (likely from getModel call within getModelForQuery)
-                  if (error instanceof ModelCompilationError) {
-                     const errorDetails = getMalloyErrorDetails(
-                        "GetResource (source - model compilation)",
-                        `${projectName}/${packageName}/${modelPath}`,
-                        error,
-                     );
-                     throw new McpGetResourceError(errorDetails);
-                  }
-                  // Handle other potential errors (e.g., invalid params error from initial check)
-                  logger.error(
-                     `[MCP Server Error] Error fetching source '${sourceName}' from ${uri.href}:`,
-                     { error },
-                  );
-                  // Fallback: Use getInternalError for unexpected issues
-                  // Or getNotFoundError if it's likely a resource access issue
-                  const fallbackErrorDetails = getInternalError(
-                     `GetResource (source: ${uri.href})`,
-                     error,
-                  );
-                  throw new McpGetResourceError(fallbackErrorDetails);
-               }
-            },
-            RESOURCE_METADATA.source, // Use source-specific metadata
-         ),
-   );
-}

package/src/mcp/resources/view_resource.ts

@@ -1,136 +0,0 @@
-import {
-   McpServer,
-   ResourceTemplate,
-} from "@modelcontextprotocol/sdk/server/mcp.js";
-import { URL } from "url";
-import type { components } from "../../api"; // Need this for View definition type
-import { ModelCompilationError } from "../../errors";
-import { logger } from "../../logger";
-import { ProjectStore } from "../../service/project_store";
-import {
-   getInternalError,
-   getMalloyErrorDetails,
-   getNotFoundError,
-} from "../error_messages";
-import {
-   getModelForQuery,
-   handleResourceGet,
-   McpGetResourceError,
-} from "../handler_utils";
-import { RESOURCE_METADATA } from "../resource_metadata";
-
-// Define the expected parameter types
-type ViewParams = {
-   projectName?: unknown;
-   packageName?: unknown;
-   modelPath?: unknown;
-   sourceName?: unknown;
-   viewName?: unknown;
-};
-
-/**
- * Registers the Malloy View resource type (nested within a Source).
- */
-export function registerViewResource(
-   mcpServer: McpServer,
-   projectStore: ProjectStore,
-): void {
-   mcpServer.resource(
-      "view",
-      new ResourceTemplate(
-         "malloy://project/{projectName}/package/{packageName}/models/{modelPath}/sources/{sourceName}/views/{viewName}",
-         { list: undefined }, // Listing views is not supported via this template
-      ),
-      (uri, params) =>
-         handleResourceGet(
-            uri,
-            params as ViewParams,
-            "view",
-            async (
-               {
-                  projectName,
-                  packageName,
-                  modelPath,
-                  sourceName,
-                  viewName,
-               }: ViewParams,
-               uri: URL,
-            ) => {
-               if (
-                  typeof projectName !== "string" ||
-                  typeof packageName !== "string" ||
-                  typeof modelPath !== "string" ||
-                  typeof sourceName !== "string" ||
-                  typeof viewName !== "string"
-               ) {
-                  throw new Error("Invalid parameters for view resource.");
-               }
-
-               try {
-                  const modelResult = await getModelForQuery(
-                     projectStore,
-                     projectName,
-                     packageName,
-                     modelPath,
-                  );
-                  if ("error" in modelResult) {
-                     throw new McpGetResourceError(modelResult.error);
-                  }
-                  const { model } = modelResult;
-
-                  const sources = await model.getSources();
-                  if (!sources) {
-                     throw new Error("Could not retrieve sources from model.");
-                  }
-                  const source = sources.find(
-                     (s: components["schemas"]["Source"]) =>
-                        s.name === sourceName,
-                  );
-                  if (!source) {
-                     throw new McpGetResourceError(
-                        getNotFoundError(
-                           `Source '${sourceName}' in model '${modelPath}' package '${packageName}' project '${projectName}'`,
-                        ),
-                     );
-                  }
-
-                  // Find the view within the source
-                  const view = source.views?.find(
-                     (v: components["schemas"]["View"]) => v.name === viewName,
-                  );
-
-                  if (!view) {
-                     // Specific "View not found" error
-                     const errorDetails = getNotFoundError(
-                        `View '${viewName}' in source '${sourceName}' model '${modelPath}' package '${packageName}' project '${projectName}'`,
-                     );
-                     throw new McpGetResourceError(errorDetails);
-                  }
-                  return view;
-               } catch (error) {
-                  if (error instanceof McpGetResourceError) {
-                     throw error; // Re-throw already formatted
-                  }
-                  if (error instanceof ModelCompilationError) {
-                     const errorDetails = getMalloyErrorDetails(
-                        "GetResource (view - model compilation)",
-                        `${projectName}/${packageName}/${modelPath}`,
-                        error,
-                     );
-                     throw new McpGetResourceError(errorDetails);
-                  }
-                  logger.error(
-                     `[MCP Server Error] Error fetching view '${viewName}' from ${uri.href}:`,
-                     { error },
-                  );
-                  const fallbackErrorDetails = getInternalError(
-                     `GetResource (view: ${uri.href})`,
-                     error,
-                  );
-                  throw new McpGetResourceError(fallbackErrorDetails);
-               }
-            },
-            RESOURCE_METADATA.view,
-         ),
-   );
-}

package/src/mcp/server.ts

@@ -1,62 +0,0 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { ProjectStore } from "../service/project_store";
-
-import { formatDuration, logger } from "../logger";
-import { registerPromptCapability } from "./prompts/prompt_service.js";
-import { registerModelResource } from "./resources/model_resource";
-import { registerNotebookResource } from "./resources/notebook_resource";
-import { registerPackageResource } from "./resources/package_resource";
-import { registerProjectResource } from "./resources/project_resource";
-import { registerQueryResource } from "./resources/query_resource";
-import { registerSourceResource } from "./resources/source_resource";
-import { registerViewResource } from "./resources/view_resource";
-import { registerTools } from "./tools/discovery_tools";
-import { registerExecuteQueryTool } from "./tools/execute_query_tool";
-
-export const testServerInfo = {
-   name: "malloy-publisher-mcp-server",
-   version: "0.0.1",
-   displayName: "Malloy Publisher MCP Server",
-   description: "Provides access to Malloy models and query execution via MCP.",
-};
-
-export function initializeMcpServer(projectStore: ProjectStore): McpServer {
-   logger.info("[MCP Init] Starting initializeMcpServer...");
-   const startTime = performance.now();
-
-   const mcpServer = new McpServer(testServerInfo);
-
-   logger.info("[MCP Init] Registering project resource...");
-   registerProjectResource(mcpServer, projectStore);
-   logger.info("[MCP Init] Registering package resource...");
-   registerPackageResource(mcpServer, projectStore);
-
-   // Register more specific templates first
-   logger.info("[MCP Init] Registering notebook resource...");
-   registerNotebookResource(mcpServer, projectStore);
-   logger.info("[MCP Init] Registering source resource...");
-   registerSourceResource(mcpServer, projectStore);
-   logger.info("[MCP Init] Registering query resource...");
-   registerQueryResource(mcpServer, projectStore);
-   logger.info("[MCP Init] Registering view resource...");
-   registerViewResource(mcpServer, projectStore);
-
-   // Register the general model template last among resource types
-   logger.info("[MCP Init] Registering model resource...");
-   registerModelResource(mcpServer, projectStore);
-
-   logger.info("[MCP Init] Registering executeQuery tool...");
-   registerExecuteQueryTool(mcpServer, projectStore);
-
-   registerTools(mcpServer, projectStore);
-
-   logger.info("[MCP Init] Registering prompt capability...");
-   registerPromptCapability(mcpServer, projectStore);
-
-   const endTime = performance.now();
-   logger.info(`[MCP Init] Finished initializeMcpServer`, {
-      duration: formatDuration(endTime - startTime),
-   });
-
-   return mcpServer;
-}

package/src/mcp/tools/discovery_tools.ts

@@ -1,258 +0,0 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { z } from "zod";
-import { ProjectStore } from "../../service/project_store";
-import { buildMalloyUri } from "../handler_utils";
-
-const listPackagesShape = {
-   // projectName is required; other fields mirror SDK expectations
-   projectName: z
-      .string()
-      .describe(
-         "Project name. Project names are listed in the listProjects tool.",
-      ),
-};
-type listPackagesParams = z.infer<z.ZodObject<typeof listPackagesShape>>;
-
-const getModelsShape = {
-   // projectName is required; other fields mirror SDK expectations
-   projectName: z
-      .string()
-      .describe(
-         "Project name. Project names are listed in the listProjects tool.",
-      ),
-   packageName: z
-      .string()
-      .describe(
-         "Package name. Package names are listed in the listPackages tool.",
-      ),
-};
-type getModelsParams = z.infer<z.ZodObject<typeof getModelsShape>>;
-
-const getModelTextShape = {
-   projectName: z
-      .string()
-      .describe(
-         "Project name. Project names are listed in the listProjects tool.",
-      ),
-   packageName: z
-      .string()
-      .describe(
-         "Package name. Package names are listed in the listPackages tool.",
-      ),
-   modelPath: z
-      .string()
-      .describe(
-         "Model path. Model paths are listed in the malloy_packageGet tool.",
-      ),
-};
-type getModelTextParams = z.infer<z.ZodObject<typeof getModelTextShape>>;
-
-/**
- * Registers the Malloy Project resource type with the MCP server.
- * Handles getting details for the hardcoded 'home' project and listing packages within it.
- */
-export function registerTools(
-   mcpServer: McpServer,
-   projectStore: ProjectStore,
-): void {
-   mcpServer.tool(
-      "malloy_projectList",
-      "Lists all Malloy projects",
-      {},
-      async () => {
-         console.log(
-            "[MCP LOG] Entering ListResources (project) handler (listing ALL packages)...",
-         );
-         const allProjects = await Promise.all(
-            (await projectStore.listProjects())
-               .filter((project) => project.name)
-               .map((project) => ({
-                  name: project.name,
-                  project: projectStore.getProject(project.name!, false),
-               })),
-         );
-
-         console.log(`[MCP LOG] Found ${allProjects.length} projects defined.`);
-
-         const mappedResources = await Promise.all(
-            allProjects.map(async (project) => {
-               const name = project.name;
-               const projectInstance = await project.project;
-               const metadata = await projectInstance.reloadProjectMetadata();
-               const readme = metadata.readme;
-               return {
-                  name,
-                  type: "project",
-                  description: readme || "NO Description available",
-               };
-            }),
-         );
-         // console.log(mappedResources);
-         console.log(
-            `[MCP LOG] ListResources (project): Returning ${mappedResources.length} package resources.`,
-         );
-         return {
-            content: [
-               {
-                  type: "resource",
-                  resource: {
-                     type: "application/json",
-                     uri: buildMalloyUri({}, "project"),
-                     text: JSON.stringify(mappedResources),
-                  },
-               },
-            ],
-         };
-      },
-   );
-
-   mcpServer.tool(
-      "malloy_packageList",
-      "Lists all Malloy packages within a project",
-      listPackagesShape,
-      async (params: listPackagesParams) => {
-         const { projectName } = params;
-         console.log(
-            "[MCP LOG] Entering ListResources (project) handler (listing ALL packages)...",
-         );
-         const project = await projectStore.getProject(projectName, false);
-         const packages = await project.listPackages();
-         console.log(`[MCP LOG] Found ${packages.length} packages defined.`);
-         const mappedResources = packages.map((pkg) => ({
-            modelPath: pkg.name,
-            type: "package",
-            description: pkg.description,
-         }));
-         console.log(
-            `[MCP LOG] ListResources (project): Returning ${mappedResources.length} package resources.`,
-         );
-         return {
-            content: [
-               {
-                  type: "resource",
-                  resource: {
-                     type: "application/json",
-                     uri: buildMalloyUri({ project: projectName }, "package"),
-                     text: JSON.stringify(mappedResources),
-                  },
-               },
-            ],
-         };
-      },
-   );
-
-   mcpServer.tool(
-      "malloy_packageGet",
-      "Lists resources within a package",
-      getModelsShape,
-      async (params: getModelsParams) => {
-         const { projectName, packageName } = params;
-         console.log(
-            "[MCP LOG] Entering GetResources (project) handler (listing ALL packages)...",
-         );
-         const project = await projectStore.getProject(projectName, false);
-         const pkg = await project.getPackage(packageName, false);
-         const models = await pkg.listModels();
-         console.log(`[MCP LOG] Found ${models.length} models defined.`);
-         const mappedResources = models.map((model) => ({
-            name: model.path,
-            type: "model",
-         }));
-         console.log(
-            `[MCP LOG] ListResources (project): Returning ${mappedResources.length} package resources.`,
-         );
-         return {
-            content: [
-               {
-                  type: "resource",
-                  resource: {
-                     type: "application/json",
-                     uri: buildMalloyUri(
-                        { project: projectName, package: packageName },
-                        "model",
-                     ),
-                     text: JSON.stringify(mappedResources),
-                  },
-               },
-            ],
-         };
-      },
-   );
-
-   mcpServer.tool(
-      "malloy_modelGetText",
-      "Gets the raw text content of a model file",
-      getModelTextShape,
-      async (params: getModelTextParams) => {
-         const { projectName, packageName, modelPath } = params;
-         console.log(
-            `[MCP LOG] Entering GetModelText handler for ${projectName}/${packageName}/${modelPath}...`,
-         );
-
-         try {
-            const project = await projectStore.getProject(projectName, false);
-            const pkg = await project.getPackage(packageName, false);
-            const model = pkg.getModel(modelPath);
-
-            if (!model) {
-               console.log(
-                  "model not found",
-                  modelPath,
-                  "in ",
-                  pkg.listModels(),
-               );
-               throw new Error(`Model not found: ${modelPath}`);
-            }
-
-            // Use the new getModelFileText method
-            const fileText = await pkg.getModelFileText(modelPath);
-
-            console.log(
-               `[MCP LOG] Successfully retrieved model text for ${modelPath}`,
-            );
-            return {
-               content: [
-                  {
-                     type: "resource",
-                     resource: {
-                        type: "text/plain",
-                        uri: buildMalloyUri(
-                           {
-                              project: projectName,
-                              package: packageName,
-                              model: modelPath,
-                           },
-                           "model-text",
-                        ),
-                        text: fileText,
-                     },
-                  },
-               ],
-            };
-         } catch (error) {
-            console.error(`[MCP LOG] Error retrieving model text: ${error}`);
-            const errorMessage =
-               error instanceof Error ? error.message : "Unknown error";
-            return {
-               content: [
-                  {
-                     type: "resource",
-                     resource: {
-                        type: "text/plain",
-                        uri: buildMalloyUri(
-                           {
-                              project: projectName,
-                              package: packageName,
-                              model: modelPath,
-                           },
-                           "model-text",
-                        ),
-                        text: `Error: ${errorMessage}`,
-                     },
-                  },
-               ],
-            };
-         }
-      },
-   );
-}