@superatomai/sdk-node 0.0.58 → 0.0.60

package/dist/index.d.mts

@@ -2097,7 +2097,7 @@ declare abstract class BaseLLM {
      * @param componentStreamCallback - Optional callback to stream primary KPI component as soon as it's identified
      * @returns Object containing matched components, layout title/description, and follow-up actions
      */
-    matchComponentsFromAnalysis(analysisContent: string, components: Component[], apiKey?: string, logCollector?: any, componentStreamCallback?: (component: Component) => void, deferredTools?: any[], executedTools?: any[]): Promise<{
+    matchComponentsFromAnalysis(analysisContent: string, components: Component[], apiKey?: string, logCollector?: any, componentStreamCallback?: (component: Component) => void, deferredTools?: any[], executedTools?: any[], collections?: any, userId?: string, userPrompt?: string): Promise<{
         components: Component[];
         layoutTitle: string;
         layoutDescription: string;

package/dist/index.d.ts

@@ -2097,7 +2097,7 @@ declare abstract class BaseLLM {
      * @param componentStreamCallback - Optional callback to stream primary KPI component as soon as it's identified
      * @returns Object containing matched components, layout title/description, and follow-up actions
      */
-    matchComponentsFromAnalysis(analysisContent: string, components: Component[], apiKey?: string, logCollector?: any, componentStreamCallback?: (component: Component) => void, deferredTools?: any[], executedTools?: any[]): Promise<{
+    matchComponentsFromAnalysis(analysisContent: string, components: Component[], apiKey?: string, logCollector?: any, componentStreamCallback?: (component: Component) => void, deferredTools?: any[], executedTools?: any[], collections?: any, userId?: string, userPrompt?: string): Promise<{
         components: Component[];
         layoutTitle: string;
         layoutDescription: string;

package/dist/index.js

@@ -1642,6 +1642,7 @@ __export(utils_exports, {
   fixScalarSubqueries: () => fixScalarSubqueries,
   getDatabaseType: () => getDatabaseType,
   getJsonSizeInBytes: () => getJsonSizeInBytes,
+  validateAndFixSqlQuery: () => validateAndFixSqlQuery,
   validateMessageSize: () => validateMessageSize
 });
 function getDatabaseType() {
@@ -1817,6 +1818,122 @@ function validateMessageSize(message, maxSize = 1048576) {
     maxSize
   };
 }
+function validateAndFixSqlQuery(query, dbType) {
+  if (!query || query.trim().length === 0) {
+    return { query, fixed: false, fixes: [] };
+  }
+  const databaseType = dbType || getDatabaseType();
+  const _isMssql = databaseType === "mssql";
+  let fixedQuery = query;
+  const fixes = [];
+  const aggregateFunctions = ["SUM", "COUNT", "AVG", "MIN", "MAX"];
+  const aggregateInWherePattern = new RegExp(
+    `\\bWHERE\\b[^]*?\\b(${aggregateFunctions.join("|")})\\s*\\([^)]*\\)\\s*(?:=|>|<|>=|<=|<>|!=)`,
+    "i"
+  );
+  if (aggregateInWherePattern.test(fixedQuery)) {
+    const aggregateConditionPattern = new RegExp(
+      `\\s+(AND|OR)\\s+((?:COALESCE\\s*\\(\\s*)?(?:${aggregateFunctions.join("|")})\\s*\\([^)]+\\)[^)]*(?:\\))?\\s*(?:=|>|<|>=|<=|<>|!=)\\s*[^\\s,)]+)`,
+      "gi"
+    );
+    const aggregateConditions = [];
+    let match;
+    while ((match = aggregateConditionPattern.exec(fixedQuery)) !== null) {
+      aggregateConditions.push(match[2].trim());
+    }
+    if (aggregateConditions.length > 0) {
+      fixedQuery = fixedQuery.replace(aggregateConditionPattern, "");
+      fixedQuery = fixedQuery.replace(/\bWHERE\s+(AND|OR)\s+/gi, "WHERE ");
+      fixedQuery = fixedQuery.replace(/\bWHERE\s+(GROUP\s+BY|ORDER\s+BY|HAVING|$)/gi, "$1");
+      const hasGroupBy = /\bGROUP\s+BY\b/i.test(fixedQuery);
+      if (hasGroupBy) {
+        const hasHaving = /\bHAVING\b/i.test(fixedQuery);
+        const havingClause = aggregateConditions.join(" AND ");
+        if (hasHaving) {
+          fixedQuery = fixedQuery.replace(
+            /\bHAVING\b/i,
+            `HAVING ${havingClause} AND`
+          );
+        } else {
+          const orderByMatch = fixedQuery.match(/(\s+ORDER\s+BY\s+)/i);
+          if (orderByMatch) {
+            fixedQuery = fixedQuery.replace(
+              orderByMatch[1],
+              ` HAVING ${havingClause}${orderByMatch[1]}`
+            );
+          } else {
+            fixedQuery = fixedQuery.trimEnd() + ` HAVING ${havingClause}`;
+          }
+        }
+        fixes.push(`Moved aggregate condition(s) from WHERE to HAVING: ${havingClause}`);
+      }
+    }
+  }
+  let openCount = 0;
+  let closeCount = 0;
+  let inString = false;
+  let stringChar = "";
+  for (let i = 0; i < fixedQuery.length; i++) {
+    const char = fixedQuery[i];
+    const prevChar = i > 0 ? fixedQuery[i - 1] : "";
+    if ((char === "'" || char === '"') && prevChar !== "\\") {
+      if (!inString) {
+        inString = true;
+        stringChar = char;
+      } else if (char === stringChar) {
+        if (i + 1 < fixedQuery.length && fixedQuery[i + 1] === char) {
+          i++;
+        } else {
+          inString = false;
+        }
+      }
+      continue;
+    }
+    if (!inString) {
+      if (char === "(") openCount++;
+      else if (char === ")") closeCount++;
+    }
+  }
+  if (openCount > closeCount) {
+    const missingClose = openCount - closeCount;
+    fixedQuery = fixedQuery.trimEnd();
+    const hasSemicolon = fixedQuery.endsWith(";");
+    if (hasSemicolon) {
+      fixedQuery = fixedQuery.slice(0, -1);
+    }
+    fixedQuery = fixedQuery + ")".repeat(missingClose);
+    if (hasSemicolon) {
+      fixedQuery = fixedQuery + ";";
+    }
+    fixes.push(`Added ${missingClose} missing closing parenthesis(es)`);
+  }
+  const subqueryOrderByPattern = /\(\s*SELECT\s+(?!TOP\s)([^()]*?)\s+ORDER\s+BY\s+[^()]+\)/gi;
+  let subqueryMatch;
+  let subqueryFixed = false;
+  while ((subqueryMatch = subqueryOrderByPattern.exec(fixedQuery)) !== null) {
+    const fullMatch = subqueryMatch[0];
+    if (!/\bTOP\s+\d+/i.test(fullMatch) && !/\bOFFSET\b/i.test(fullMatch)) {
+      const fixedSubquery = fullMatch.replace(
+        /\(\s*SELECT\s+/i,
+        "(SELECT TOP 100 "
+      );
+      fixedQuery = fixedQuery.replace(fullMatch, fixedSubquery);
+      subqueryFixed = true;
+    }
+  }
+  if (subqueryFixed) {
+    fixes.push("Added TOP to subquery with ORDER BY (MSSQL requirement)");
+  }
+  const originalLength = fixedQuery.length;
+  fixedQuery = fixedQuery.replace(/\s+/g, " ").trim();
+  if (fixedQuery.length !== originalLength) {
+  }
+  return {
+    query: fixedQuery,
+    fixed: fixes.length > 0,
+    fixes
+  };
+}
 var init_utils = __esm({
   "src/userResponse/utils.ts"() {
     "use strict";
@@ -5955,7 +6072,7 @@ var BaseLLM = class {
    * @param componentStreamCallback - Optional callback to stream primary KPI component as soon as it's identified
    * @returns Object containing matched components, layout title/description, and follow-up actions
    */
-  async matchComponentsFromAnalysis(analysisContent, components, apiKey, logCollector, componentStreamCallback, deferredTools, executedTools) {
+  async matchComponentsFromAnalysis(analysisContent, components, apiKey, logCollector, componentStreamCallback, deferredTools, executedTools, collections, userId, userPrompt) {
     const methodStartTime = Date.now();
     const methodName = "matchComponentsFromAnalysis";
     logger.info(`[${this.getProviderName()}] [TIMING] START ${methodName} | model: ${this.getModelForTask("complex")}`);
@@ -6018,6 +6135,16 @@ ${fieldsText}`;
       }
       const schemaDoc = schema.generateSchemaDocumentation();
       const databaseRules = await promptLoader.loadDatabaseRules();
+      let knowledgeBaseContext = "No additional knowledge base context available.";
+      if (collections) {
+        const kbResult = await knowledge_base_default.getAllKnowledgeBase({
+          prompt: userPrompt || analysisContent,
+          collections,
+          userId,
+          topK: 3
+        });
+        knowledgeBaseContext = kbResult.combinedContext || knowledgeBaseContext;
+      }
       const prompts = await promptLoader.loadPrompts("match-text-components", {
         ANALYSIS_CONTENT: analysisContent,
         AVAILABLE_COMPONENTS: availableComponentsText,
@@ -6025,11 +6152,27 @@ ${fieldsText}`;
         DATABASE_RULES: databaseRules,
         DEFERRED_TOOLS: deferredToolsText,
         EXECUTED_TOOLS: executedToolsText,
+        KNOWLEDGE_BASE_CONTEXT: knowledgeBaseContext,
         CURRENT_DATETIME: getCurrentDateTimeForPrompt()
       });
       logger.debug(`[${this.getProviderName()}] Loaded match-text-components prompts`);
-      const systemPromptStr = Array.isArray(prompts.system) ? prompts.system.join("\n") : prompts.system;
-      logger.logLLMPrompt("matchComponentsFromAnalysis", "system", systemPromptStr);
+      const extractPromptText = (content) => {
+        if (typeof content === "string") return content;
+        if (Array.isArray(content)) {
+          return content.map((item) => {
+            if (typeof item === "string") return item;
+            if (item && typeof item.text === "string") return item.text;
+            if (item && item.content && typeof item.content === "string") return item.content;
+            return JSON.stringify(item, null, 2);
+          }).join("\n\n---\n\n");
+        }
+        if (content && typeof content === "object") {
+          if (typeof content.text === "string") return content.text;
+          return JSON.stringify(content, null, 2);
+        }
+        return String(content);
+      };
+      logger.logLLMPrompt("matchComponentsFromAnalysis", "system", extractPromptText(prompts.system));
       logger.logLLMPrompt("matchComponentsFromAnalysis", "user", `Text Analysis:
 ${analysisContent}
 
@@ -6254,6 +6397,18 @@ ${executedToolsText}`);
             cleanedProps.query = null;
           }
         }
+        if (cleanedProps.query) {
+          const queryStr = typeof cleanedProps.query === "string" ? cleanedProps.query : cleanedProps.query?.sql || "";
+          const { query: fixedQuery, fixed, fixes } = validateAndFixSqlQuery(queryStr);
+          if (fixed) {
+            logger.warn(`[${this.getProviderName()}] SQL fixes applied to component query: ${fixes.join("; ")}`);
+            if (typeof cleanedProps.query === "string") {
+              cleanedProps.query = fixedQuery;
+            } else if (cleanedProps.query?.sql) {
+              cleanedProps.query.sql = fixedQuery;
+            }
+          }
+        }
         if (cleanedProps.query && cleanedProps.externalTool) {
           logger.info(`[${this.getProviderName()}] Both query and externalTool exist, keeping both - frontend will decide`);
         }
@@ -6310,10 +6465,24 @@ ${executedToolsText}`);
         SCHEMA_DOC: schemaDoc || "No database schema available",
         CURRENT_DATETIME: getCurrentDateTimeForPrompt()
       });
-      const systemPrompt = Array.isArray(prompts.system) ? prompts.system.join("\n") : prompts.system;
-      const userPromptText = Array.isArray(prompts.user) ? prompts.user.join("\n") : prompts.user;
-      logger.logLLMPrompt("classifyQuestionCategory", "system", systemPrompt);
-      logger.logLLMPrompt("classifyQuestionCategory", "user", userPromptText);
+      const extractTextContent = (content) => {
+        if (typeof content === "string") return content;
+        if (Array.isArray(content)) {
+          return content.map((item) => {
+            if (typeof item === "string") return item;
+            if (item && typeof item.text === "string") return item.text;
+            if (item && item.content && typeof item.content === "string") return item.content;
+            return JSON.stringify(item, null, 2);
+          }).join("\n\n---\n\n");
+        }
+        if (content && typeof content === "object") {
+          if (typeof content.text === "string") return content.text;
+          return JSON.stringify(content, null, 2);
+        }
+        return String(content);
+      };
+      logger.logLLMPrompt("classifyQuestionCategory", "system", extractTextContent(prompts.system));
+      logger.logLLMPrompt("classifyQuestionCategory", "user", extractTextContent(prompts.user));
       const result = await LLM.stream(
         {
           sys: prompts.system,
@@ -6529,10 +6698,24 @@ ${executedToolsText}`);
         AVAILABLE_EXTERNAL_TOOLS: availableToolsDoc,
         CURRENT_DATETIME: getCurrentDateTimeForPrompt()
       });
-      const sysPrompt = Array.isArray(prompts.system) ? prompts.system.join("\n") : prompts.system;
-      const usrPrompt = Array.isArray(prompts.user) ? prompts.user.join("\n") : prompts.user;
-      logger.logLLMPrompt("generateTextResponse", "system", sysPrompt);
-      logger.logLLMPrompt("generateTextResponse", "user", usrPrompt);
+      const extractText = (content) => {
+        if (typeof content === "string") return content;
+        if (Array.isArray(content)) {
+          return content.map((item) => {
+            if (typeof item === "string") return item;
+            if (item && typeof item.text === "string") return item.text;
+            if (item && item.content && typeof item.content === "string") return item.content;
+            return JSON.stringify(item, null, 2);
+          }).join("\n\n---\n\n");
+        }
+        if (content && typeof content === "object") {
+          if (typeof content.text === "string") return content.text;
+          return JSON.stringify(content, null, 2);
+        }
+        return String(content);
+      };
+      logger.logLLMPrompt("generateTextResponse", "system", extractText(prompts.system));
+      logger.logLLMPrompt("generateTextResponse", "user", extractText(prompts.user));
       logger.debug(`[${this.getProviderName()}] Loaded text-response prompts with schema`);
       logger.debug(`[${this.getProviderName()}] System prompt length: ${prompts.system.length}, User prompt length: ${prompts.user.length}`);
       logCollector?.info("Generating text response with query execution capability...");
@@ -6565,7 +6748,13 @@ ${executedToolsText}`);
           (t) => t.executionType === "immediate" || t.executionType === "deferred" && t.userProvidedData
         );
         logger.info(`[${this.getProviderName()}] Executable tools: ${executableTools.length} of ${externalTools.length} total`);
+        const addedToolIds = /* @__PURE__ */ new Set();
         executableTools.forEach((tool) => {
+          if (addedToolIds.has(tool.id)) {
+            logger.info(`[${this.getProviderName()}] Skipping duplicate tool definition: ${tool.id} (already added)`);
+            return;
+          }
+          addedToolIds.add(tool.id);
           logger.info(`[${this.getProviderName()}] Processing executable tool:`, JSON.stringify(tool, null, 2));
           const properties = {};
           const required = [];
@@ -6635,7 +6824,7 @@ ${executedToolsText}`);
             input_schema: inputSchema
           });
         });
-        logger.info(`[${this.getProviderName()}] Added ${executableTools.length} executable tools to tool calling capability (${externalTools.length - executableTools.length} deferred tools await form input)`);
+        logger.info(`[${this.getProviderName()}] Added ${addedToolIds.size} unique tool definitions from ${executableTools.length} tool calls (${externalTools.length - executableTools.length} deferred tools await form input)`);
         logger.info(`[${this.getProviderName()}] Complete tools array:`, JSON.stringify(tools, null, 2));
       }
       const queryAttempts = /* @__PURE__ */ new Map();
@@ -7056,7 +7245,10 @@ ${errorMsg}
           logCollector,
           componentStreamCallback,
           deferredTools,
-          executedToolsList
+          executedToolsList,
+          collections,
+          userId,
+          userPrompt
         );
         matchedComponents = matchResult.components;
         layoutTitle = matchResult.layoutTitle;
@@ -7139,7 +7331,6 @@ ${errorMsg}
     logger.logLLMPrompt("handleUserRequest", "user", `User Prompt: ${userPrompt}`);
     try {
       logger.info(`[${this.getProviderName()}] Step 1: Searching previous conversations...`);
-      logCollector?.info("Step 1: Searching for similar previous conversations...");
       const conversationMatch = await conversation_search_default.searchConversationsWithReranking({
         userPrompt,
         collections,