@mastra/spanner 1.3.1 → 1.4.0-alpha.0

package/dist/index.js

@@ -1,6 +1,6 @@
 import { Spanner } from '@google-cloud/spanner';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, AGENTS_SCHEMA, AGENT_VERSIONS_SCHEMA, createStorageErrorId, normalizePerPage, calculatePagination, TABLE_FAVORITES, BackgroundTasksStorage, TABLE_BACKGROUND_TASKS, TABLE_SCHEMAS, BlobStore, TABLE_SKILL_BLOBS, SKILL_BLOBS_SCHEMA, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, DatasetsStorage, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, TABLE_EXPERIMENT_RESULTS, TABLE_EXPERIMENTS, hasErrorCode, ExperimentsStorage, FavoritesStorage, TABLE_SKILLS, MCPClientsStorage, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, MCP_CLIENTS_SCHEMA, MCP_CLIENT_VERSIONS_SCHEMA, MCPServersStorage, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, MCP_SERVERS_SCHEMA, MCP_SERVER_VERSIONS_SCHEMA, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ObservabilityStorage, TABLE_SPANS, listTracesArgsSchema, TraceStatus, toTraceSpans, PromptBlocksStorage, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, PROMPT_BLOCKS_SCHEMA, PROMPT_BLOCK_VERSIONS_SCHEMA, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ScorerDefinitionsStorage, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, SCORER_DEFINITIONS_SCHEMA, SCORER_DEFINITION_VERSIONS_SCHEMA, ScoresStorage, TABLE_SCORERS, SkillsStorage, TABLE_SKILL_VERSIONS, SKILLS_SCHEMA, SKILL_VERSIONS_SCHEMA, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, WorkspacesStorage, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, WORKSPACES_SCHEMA, WORKSPACE_VERSIONS_SCHEMA, MastraCompositeStore, getDefaultValue, TABLE_CONFIGS, listMetricsArgsSchema, normalizeScheduleTarget, transformScoreRow as transformScoreRow$1, METRIC_DISTINCT_COLUMNS } from '@mastra/core/storage';
+import { AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, AGENTS_SCHEMA, AGENT_VERSIONS_SCHEMA, createStorageErrorId, normalizePerPage, calculatePagination, TABLE_FAVORITES, BackgroundTasksStorage, TABLE_BACKGROUND_TASKS, TABLE_SCHEMAS, BlobStore, TABLE_SKILL_BLOBS, SKILL_BLOBS_SCHEMA, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, DatasetsStorage, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, TABLE_EXPERIMENT_RESULTS, TABLE_EXPERIMENTS, hasErrorCode, ExperimentsStorage, FavoritesStorage, TABLE_SKILLS, MCPClientsStorage, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, MCP_CLIENTS_SCHEMA, MCP_CLIENT_VERSIONS_SCHEMA, MCPServersStorage, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, MCP_SERVERS_SCHEMA, MCP_SERVER_VERSIONS_SCHEMA, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, validateStorageMetadataFilter, ObservabilityStorage, TABLE_SPANS, listTracesArgsSchema, TraceStatus, toTraceSpans, PromptBlocksStorage, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, PROMPT_BLOCKS_SCHEMA, PROMPT_BLOCK_VERSIONS_SCHEMA, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ScorerDefinitionsStorage, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, SCORER_DEFINITIONS_SCHEMA, SCORER_DEFINITION_VERSIONS_SCHEMA, ScoresStorage, TABLE_SCORERS, SkillsStorage, TABLE_SKILL_VERSIONS, SKILLS_SCHEMA, SKILL_VERSIONS_SCHEMA, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, WorkspacesStorage, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, WORKSPACES_SCHEMA, WORKSPACE_VERSIONS_SCHEMA, MastraCompositeStore, getDefaultValue, TABLE_CONFIGS, listMetricsArgsSchema, normalizeScheduleTarget, transformScoreRow as transformScoreRow$1, METRIC_DISTINCT_COLUMNS } from '@mastra/core/storage';
 import { MastraBase } from '@mastra/core/base';
 import { parseSqlIdentifier } from '@mastra/core/utils';
 import { randomUUID } from 'crypto';
@@ -6367,6 +6367,35 @@ var MCPServersSpanner = class _MCPServersSpanner extends MCPServersStorage {
     }
   }
 };
+function buildSpannerMessageMetadataFilter(metadataFilter) {
+  if (!metadataFilter) return { clauses: [], params: {} };
+  const clauses = [];
+  const params = {};
+  Object.entries(metadataFilter).forEach(([key, value], index) => {
+    const path = `$.metadata.${key}`;
+    const valueExpr = `JSON_VALUE(SAFE.PARSE_JSON(content), '${path}')`;
+    const queryExpr = `JSON_QUERY(SAFE.PARSE_JSON(content), '${path}')`;
+    const typeExpr = `JSON_TYPE(${queryExpr})`;
+    if (value === null) {
+      clauses.push(`${queryExpr} = 'null'`);
+      return;
+    }
+    const paramName = `metadataValue${index}`;
+    if (typeof value === "string") {
+      params[paramName] = value;
+      clauses.push(`${typeExpr} = 'string' AND ${valueExpr} = @${paramName}`);
+      return;
+    }
+    if (typeof value === "number") {
+      params[paramName] = String(value);
+      clauses.push(`${typeExpr} = 'number' AND ${valueExpr} = @${paramName}`);
+      return;
+    }
+    params[paramName] = value ? "true" : "false";
+    clauses.push(`${typeExpr} = 'boolean' AND ${valueExpr} = @${paramName}`);
+  });
+  return { clauses, params };
+}
 var MemorySpanner = class _MemorySpanner extends MemoryStorage {
   database;
   db;
@@ -6845,6 +6874,7 @@ var MemorySpanner = class _MemorySpanner extends MemoryStorage {
   /** Paginated message listing for a thread, with optional pinned-include and date-range filters. */
   async listMessages(args) {
     const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    const metadataFilter = validateStorageMetadataFilter(filter?.metadata);
     const threadIds = Array.isArray(threadId) ? threadId : [threadId];
     if (threadIds.length === 0 || threadIds.some((id) => !id || !id.trim())) {
       throw new MastraError(
@@ -6870,10 +6900,16 @@ var MemorySpanner = class _MemorySpanner extends MemoryStorage {
         ...buildDateRangeFilter(filter?.dateRange, "createdAt")
       };
       const {
-        sql: whereSql,
+        sql: preparedWhereSql,
         params: whereParams,
         types: whereTypes
       } = this.db.prepareWhereClause(filters, TABLE_MESSAGES);
+      const metadataWhere = buildSpannerMessageMetadataFilter(metadataFilter);
+      const whereSql = [preparedWhereSql, ...metadataWhere.clauses].reduce((sql, clause) => {
+        if (!clause) return sql;
+        return sql ? `${sql} AND ${clause}` : ` WHERE ${clause}`;
+      }, "");
+      Object.assign(whereParams, metadataWhere.params);
       if (perPage === 0 && (!include || include.length === 0)) {
         return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
       }
@@ -6928,6 +6964,7 @@ var MemorySpanner = class _MemorySpanner extends MemoryStorage {
       const messages = baseRows.map(
         (r) => transformFromSpannerRow({ tableName: TABLE_MESSAGES, row: r })
       );
+      const primaryPageCount = messages.length;
       if (total === 0 && messages.length === 0 && (!include || include.length === 0)) {
         return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
       }
@@ -6958,7 +6995,7 @@ var MemorySpanner = class _MemorySpanner extends MemoryStorage {
         finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)
       );
       const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
-      const hasMore = perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
+      const hasMore = metadataFilter ? perPageInput !== false && offset + primaryPageCount < total : perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
       return {
         messages: finalMessages,
         total,