@malloy-publisher/server 0.0.76 → 0.0.78

package/src/mcp/tools/execute_query_tool.ts

@@ -1,8 +1,5 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import {
-   McpError,
-   ErrorCode,
-} from "@modelcontextprotocol/sdk/types.js";
+import { McpError, ErrorCode } from "@modelcontextprotocol/sdk/types.js";
 import { z } from "zod";
 import { ProjectStore } from "../../service/project_store";
 import { getModelForQuery } from "../handler_utils";
@@ -13,16 +10,23 @@ import { buildMalloyUri } from "../handler_utils";
 // Zod shape defining required/optional params for executeQuery
 const executeQueryShape = {
    // projectName is required; other fields mirror SDK expectations
-   projectName: z.string().describe("Project name"),
-   packageName: z.string().describe("Package containing the model"),
+   projectName: z
+      .string()
+      .describe(
+         "Project name. Project names are listed in the malloy resource list.",
+      ),
+   packageName: z
+      .string()
+      .describe(
+         "Package containing the model. Package names are listed in the malloy resource list.",
+      ),
    modelPath: z.string().describe("Path to the .malloy model file"),
    query: z.string().optional().describe("Ad-hoc Malloy query code"),
    sourceName: z.string().optional().describe("Source name for a view"),
    queryName: z.string().optional().describe("Named query or view"),
 };
 
-// Infer the type from the Zod shape for use in the handler
-type ExecuteQueryParams = z.infer<z.ZodObject<typeof executeQueryShape>>;
+// Type inference is handled automatically by the MCP server based on the executeQueryShape
 
 /**
  * Registers the malloy/executeQuery tool with the MCP server.
@@ -32,11 +36,11 @@ export function registerExecuteQueryTool(
    projectStore: ProjectStore,
 ): void {
    mcpServer.tool(
-      "malloy/executeQuery",
+      "malloy_executeQuery",
       "Executes a Malloy query (either ad-hoc or a named query/view defined in a model) against the specified model and returns the results as JSON.",
       executeQueryShape,
       /** Handles requests for the malloy/executeQuery tool */
-      async (params: ExecuteQueryParams) => {
+      async (params) => {
          // Destructure projectName as well
          const {
             projectName,

package/src/service/model.ts

@@ -633,4 +633,15 @@ export class Model {
    public getModelType(): ModelType {
       return this.modelType;
    }
+
+   public async getFileText(packagePath: string): Promise<string> {
+      const fullPath = path.join(packagePath, this.modelPath);
+      try {
+         return await fs.readFile(fullPath, "utf8");
+      } catch {
+         throw new ModelNotFoundError(
+            `Model file not found: ${this.modelPath}`,
+         );
+      }
+   }
 }

package/src/service/package.spec.ts

@@ -47,7 +47,9 @@ describe("service/package", () => {
    it("should create a package instance", async () => {
       // Using 'as any' for simplified mock Map value in test
       const pkg = new Package(
+         "testProject",
          "testPackage",
+         testPackageDirectory,
          { name: "testPackage", description: "Test package" },
          [],
          new Map([
@@ -133,6 +135,7 @@ describe("service/package", () => {
             const packageInstance = new Package(
                "testProject",
                "testPackage",
+               testPackageDirectory,
                { name: "testPackage", description: "Test package" },
                [],
                new Map([

package/src/service/package.ts

@@ -37,6 +37,7 @@ export class Package {
    private databases: ApiDatabase[];
    private models: Map<string, Model> = new Map();
    private scheduler: Scheduler | undefined;
+   private packagePath: string;
    private static meter = metrics.getMeter("publisher");
    private static packageLoadHistogram = this.meter.createHistogram(
       "malloy_package_load_duration",
@@ -49,6 +50,7 @@ export class Package {
    constructor(
       projectName: string,
       packageName: string,
+      packagePath: string,
       packageMetadata: ApiPackage,
       databases: ApiDatabase[],
       models: Map<string, Model>,
@@ -56,6 +58,7 @@ export class Package {
    ) {
       this.projectName = projectName;
       this.packageName = packageName;
+      this.packagePath = packagePath;
       this.packageMetadata = packageMetadata;
       this.databases = databases;
       this.models = models;
@@ -106,6 +109,7 @@ export class Package {
          return new Package(
             projectName,
             packageName,
+            packagePath,
             packageConfig,
             databases,
             models,
@@ -143,6 +147,14 @@ export class Package {
       return this.models.get(modelPath);
    }
 
+   public async getModelFileText(modelPath: string): Promise<string> {
+      const model = this.getModel(modelPath);
+      if (!model) {
+         throw new Error(`Model not found: ${modelPath}`);
+      }
+      return await model.getFileText(this.packagePath);
+   }
+
    public async listModels(): Promise<ApiModel[]> {
       const values = await Promise.all(
          Array.from(this.models.keys())

package/dist/app/assets/RenderedResult-DXlUZo0k-lc5JU6CQ.js

@@ -1 +0,0 @@
-import{r,i as y,j as b}from"./index--hbjs-yl.js";function w({result:o,height:E,isFillElement:c,onSizeChange:f,onDrill:p}){const e=r.useRef(null),[d,h]=r.useState(!1),[m,x]=r.useState(!1),[g,v]=r.useState(!1),n=r.useRef(null),t=r.useRef(null);if(r.useLayoutEffect(()=>{if(e.current&&o&&!m){x(!0),n.current||(n.current=new Promise(s=>{t.current=s}));const u=new y.MalloyRenderer({onClick:p}).createViz();for(;e.current.firstChild;)e.current.removeChild(e.current.firstChild);const l=new MutationObserver(s=>{for(const i of s)if(i.type==="childList"&&i.addedNodes.length>0&&Array.from(i.addedNodes).some(a=>a.nodeType===Node.ELEMENT_NODE)){l.disconnect(),setTimeout(()=>{h(!0),t.current&&(t.current(),t.current=null,n.current=null)},50);break}});if(e.current){l.observe(e.current,{childList:!0,subtree:!0,characterData:!0});try{u.setResult(JSON.parse(o)),u.render(e.current)}catch(s){console.error("Error rendering visualization:",s),l.disconnect(),h(!0),t.current&&(t.current(),t.current=null,n.current=null)}}}},[o,p,m]),r.useEffect(()=>{h(!1),x(!1),n.current=null,t.current=null},[o]),m&&!d&&n.current)throw n.current;return r.useEffect(()=>{if(!e.current||!d)return;const u=e.current,l=()=>{if(u){const a=u.offsetHeight;a>0?f&&f(a):c&&u.firstChild&&(u.firstChild.offsetHeight==0?c(!0):c(!1))}},s=setTimeout(l,100);let i=null;return g||(i=new MutationObserver(l),i.observe(u,{childList:!0,subtree:!0,attributes:!0})),()=>{clearTimeout(s),i?.disconnect()}},[f,o,c,d]),b.jsx("div",{ref:e,style:{width:"100%",height:E?`${E}px`:"100%"}})}export{w as default};