@resolveio/server-lib 22.3.202 → 22.3.203

package/methods/ai-terminal.js

@@ -7167,24 +7167,31 @@ function cleanAssistantRequestedDimensionText(value) {
     text = text.replace(/[^a-z0-9_ -]+/gi, ' ');
     return normalizeOptionalString(text.replace(/\s+/g, ' ')).toLowerCase();
 }
-function extractAssistantRequestedBreakdownDimensionText(message) {
+function extractAssistantRequestedBreakdownDimensionTexts(message) {
     var e_5, _a;
     var text = normalizeOptionalString(message).toLowerCase();
     if (!text) {
-        return '';
+        return [];
+    }
+    var extracted = extractAssistantRequestedBreakdownDimensions(text)
+        .map(function (value) { return cleanAssistantRequestedDimensionText(value); })
+        .filter(Boolean);
+    if (extracted.length) {
+        return mergeAssistantHintValues(extracted);
     }
     var patterns = [
         /\b(?:group(?:ed)?|break(?:\s*down)?|broken\s+down|split)\s+by\s+([a-z0-9][a-z0-9_ -]{0,50}?)(?=\s+(?:for|from|to|until|through|during|this|last|past|current|where|with|and|or)\b|[,.!?;]|$)/i,
         /\bby\s+([a-z0-9][a-z0-9_ -]{0,50}?)(?=\s+(?:for|from|to|until|through|during|this|last|past|current|where|with|and|or)\b|[,.!?;]|$)/i,
         /\bper\s+([a-z0-9][a-z0-9_ -]{0,50}?)(?=\s+(?:for|from|to|until|through|during|this|last|past|current|where|with|and|or)\b|[,.!?;]|$)/i
     ];
+    var results = [];
     try {
         for (var patterns_2 = __values(patterns), patterns_2_1 = patterns_2.next(); !patterns_2_1.done; patterns_2_1 = patterns_2.next()) {
             var pattern = patterns_2_1.value;
             var match = text.match(pattern);
             var dimensionText = cleanAssistantRequestedDimensionText((match === null || match === void 0 ? void 0 : match[1]) || '');
             if (dimensionText) {
-                return dimensionText;
+                results.push(dimensionText);
             }
         }
     }
@@ -7195,7 +7202,7 @@ function extractAssistantRequestedBreakdownDimensionText(message) {
         }
         finally { if (e_5) throw e_5.error; }
     }
-    return '';
+    return mergeAssistantHintValues(results);
 }
 function scoreAssistantDataDimensionMatch(requestedDimensionText, dimension) {
     var requested = cleanAssistantRequestedDimensionText(requestedDimensionText);
@@ -7224,22 +7231,213 @@ function scoreAssistantDataDimensionMatch(requestedDimensionText, dimension) {
     });
     return score;
 }
-function resolveAssistantRequestedDataDimension(message, intent) {
-    var requestedDimensionText = extractAssistantRequestedBreakdownDimensionText(message);
-    if (!requestedDimensionText || !Array.isArray(intent.dimensions) || !intent.dimensions.length) {
+function resolveAssistantTimeBreakdownGranularity(requestedDimensionText) {
+    var requested = cleanAssistantRequestedDimensionText(requestedDimensionText);
+    if (!requested) {
+        return '';
+    }
+    if (/\b(quarter|quarters|quarterly|qtr|qtrs)\b/i.test(requested)) {
+        return 'quarter';
+    }
+    if (/\b(month|months|monthly)\b/i.test(requested)) {
+        return 'month';
+    }
+    if (/\b(week|weeks|weekly)\b/i.test(requested)) {
+        return 'week';
+    }
+    if (/\b(day|days|daily|date)\b/i.test(requested)) {
+        return requested === 'date' ? 'date' : 'day';
+    }
+    if (/\b(year|years|yearly|annual|annually)\b/i.test(requested)) {
+        return 'year';
+    }
+    return '';
+}
+function buildAssistantTimeBreakdownGroupExpression(granularity, dateField) {
+    var dateOperand = "$".concat(dateField);
+    if (granularity === 'quarter') {
+        return {
+            $concat: [
+                { $toString: { $year: dateOperand } },
+                '-Q',
+                { $toString: { $ceil: { $divide: [{ $month: dateOperand }, 3] } } }
+            ]
+        };
+    }
+    var format = granularity === 'year'
+        ? '%Y'
+        : granularity === 'week'
+            ? '%Y-W%U'
+            : granularity === 'day' || granularity === 'date'
+                ? '%Y-%m-%d'
+                : '%Y-%m';
+    return {
+        $dateToString: {
+            format: format,
+            date: dateOperand
+        }
+    };
+}
+function buildAssistantDataIntentTimeDimension(requestedDimensionText, intent) {
+    var _a, _b, _c;
+    var granularity = resolveAssistantTimeBreakdownGranularity(requestedDimensionText);
+    var dateField = normalizeOptionalString(intent.dateField);
+    if (!granularity || !dateField) {
         return null;
     }
-    var selected = null;
-    intent.dimensions.forEach(function (dimension) {
-        var score = scoreAssistantDataDimensionMatch(requestedDimensionText, dimension);
-        if (score <= 0) {
+    var id = granularity === 'date' ? 'date' : granularity;
+    return {
+        id: id,
+        type: 'time',
+        granularity: granularity,
+        requestedText: requestedDimensionText,
+        terms: [id, requestedDimensionText].filter(Boolean),
+        groupId: (_a = {},
+            _a[id] = buildAssistantTimeBreakdownGroupExpression(granularity, dateField),
+            _a),
+        project: (_b = {},
+            _b[id] = "$_id.".concat(id),
+            _b),
+        sort: (_c = {},
+            _c[id] = 1,
+            _c)
+    };
+}
+function extractAssistantDataIntentExpressionFieldHints(value, hints) {
+    if (hints === void 0) { hints = new Set(); }
+    if (typeof value === 'string') {
+        if (value.startsWith('$') && !value.startsWith('$$') && !value.startsWith('$_id.')) {
+            var path_1 = normalizeOptionalString(value.slice(1));
+            if (path_1) {
+                hints.add(path_1);
+            }
+        }
+        return Array.from(hints);
+    }
+    if (Array.isArray(value)) {
+        value.forEach(function (entry) { return extractAssistantDataIntentExpressionFieldHints(entry, hints); });
+        return Array.from(hints);
+    }
+    if (value && typeof value === 'object') {
+        Object.keys(value).forEach(function (key) { return extractAssistantDataIntentExpressionFieldHints(value[key], hints); });
+    }
+    return Array.from(hints);
+}
+function buildAssistantDataRequestMeasures(intent, pipeline) {
+    var _a;
+    var measures = [];
+    var add = function (value) {
+        var normalized = normalizeOptionalString(value);
+        if (normalized && !measures.includes(normalized)) {
+            measures.push(normalized);
+        }
+    };
+    var groupIndex = findAggregateGroupIndex(pipeline || []);
+    if (groupIndex > -1) {
+        var groupStage = (_a = pipeline[groupIndex]) === null || _a === void 0 ? void 0 : _a.$group;
+        if (groupStage && typeof groupStage === 'object') {
+            Object.keys(groupStage).forEach(function (key) {
+                if (key === '_id') {
+                    return;
+                }
+                if (/^(first|last|min|max)_/i.test(key) || /_ids?$/i.test(key) || key === 'blend_ids') {
+                    return;
+                }
+                add(key);
+            });
+        }
+    }
+    add(intent.quantityField ? intent.quantityField.split('.').pop() || intent.quantityField : '');
+    add(intent.metricField ? intent.metricField.split('.').pop() || intent.metricField : '');
+    if (!measures.length) {
+        add('row_count');
+    }
+    return measures;
+}
+function buildAssistantDataRequestUnderstanding(message, intent, dateWindow) {
+    var requestedDimensionTexts = extractAssistantRequestedBreakdownDimensionTexts(message);
+    var dimensions = [];
+    var requestedBreakdowns = [];
+    var ambiguities = [];
+    var seenDimensionIds = new Set();
+    var addDimension = function (dimension) {
+        var id = normalizeOptionalString(dimension.id);
+        if (!id || seenDimensionIds.has(id)) {
             return;
         }
-        if (!selected || score > selected.score) {
-            selected = { dimension: dimension, score: score };
+        seenDimensionIds.add(id);
+        dimensions.push(dimension);
+    };
+    requestedDimensionTexts.forEach(function (requestedDimensionText) {
+        var timeDimension = buildAssistantDataIntentTimeDimension(requestedDimensionText, intent);
+        if (timeDimension) {
+            addDimension(timeDimension);
+            requestedBreakdowns.push({
+                type: 'time',
+                requested_text: requestedDimensionText,
+                dimension: timeDimension.id,
+                granularity: timeDimension.granularity,
+                field_hint: intent.dateField
+            });
+            return;
+        }
+        if (resolveAssistantTimeBreakdownGranularity(requestedDimensionText) && !intent.dateField) {
+            ambiguities.push("Requested ".concat(requestedDimensionText, " breakdown, but this app data intent has no date field."));
+            requestedBreakdowns.push({
+                type: 'unknown',
+                requested_text: requestedDimensionText,
+                granularity: resolveAssistantTimeBreakdownGranularity(requestedDimensionText)
+            });
+            return;
+        }
+        var selected = null;
+        (intent.dimensions || []).forEach(function (dimension) {
+            var score = scoreAssistantDataDimensionMatch(requestedDimensionText, dimension);
+            if (score <= 0) {
+                return;
+            }
+            if (!selected || score > selected.score) {
+                selected = { dimension: dimension, score: score };
+            }
+        });
+        if (selected) {
+            var dimension = __assign(__assign({}, selected.dimension), { type: selected.dimension.type || 'entity', requestedText: requestedDimensionText });
+            addDimension(dimension);
+            requestedBreakdowns.push({
+                type: 'entity',
+                requested_text: requestedDimensionText,
+                dimension: dimension.id,
+                field_hints: extractAssistantDataIntentExpressionFieldHints(dimension.groupId)
+            });
+            return;
         }
+        ambiguities.push("Requested ".concat(requestedDimensionText, " breakdown did not match a configured app dimension."));
+        requestedBreakdowns.push({
+            type: 'unknown',
+            requested_text: requestedDimensionText
+        });
     });
-    return selected ? selected.dimension : null;
+    var confidence = requestedBreakdowns.length && !ambiguities.length
+        ? 0.9
+        : requestedBreakdowns.length
+            ? 0.65
+            : 0.75;
+    return {
+        dimensions: dimensions,
+        contract: {
+            intent_type: 'data_summary',
+            domain: intent.id || intent.collection,
+            operation: 'aggregate',
+            requested_breakdowns: requestedBreakdowns,
+            date_range: dateWindow.start || dateWindow.end ? __assign({}, dateWindow) : null,
+            measures: [],
+            filters: [],
+            output_format: 'collapse_table',
+            ambiguities: ambiguities,
+            confidence: confidence,
+            source: 'fast_app_data_request_contract'
+        }
+    };
 }
 function extractAssistantDataIntentGroupKeys(groupId) {
     if (!groupId || typeof groupId !== 'object' || Array.isArray(groupId)) {
@@ -7259,8 +7457,9 @@ function applyAssistantDataIntentDimensionTemplate(dimension, params) {
             ? removeUndefinedAssistantPipelineValues(applyAssistantDataIntentPipelineTemplate(dimension.preGroupStages, params))
             : undefined });
 }
-function applyAssistantDataIntentDimensionToPipeline(pipeline, dimension) {
-    if (!dimension || !Array.isArray(pipeline) || !pipeline.length) {
+function applyAssistantDataIntentDimensionsToPipeline(pipeline, dimensions) {
+    var selectedDimensions = (Array.isArray(dimensions) ? dimensions : []).filter(function (dimension) { return !!(dimension === null || dimension === void 0 ? void 0 : dimension.groupId); });
+    if (!selectedDimensions.length || !Array.isArray(pipeline) || !pipeline.length) {
         return pipeline;
     }
     var next = (0, common_1.deepCopy)(pipeline);
@@ -7268,17 +7467,25 @@ function applyAssistantDataIntentDimensionToPipeline(pipeline, dimension) {
     if (groupIndex === -1) {
         return next;
     }
-    if (Array.isArray(dimension.preGroupStages) && dimension.preGroupStages.length) {
-        next.splice.apply(next, __spreadArray([groupIndex, 0], __read((0, common_1.deepCopy)(dimension.preGroupStages)), false));
-        groupIndex += dimension.preGroupStages.length;
-    }
+    selectedDimensions.forEach(function (dimension) {
+        if (Array.isArray(dimension.preGroupStages) && dimension.preGroupStages.length) {
+            next.splice.apply(next, __spreadArray([groupIndex, 0], __read((0, common_1.deepCopy)(dimension.preGroupStages)), false));
+            groupIndex += dimension.preGroupStages.length;
+        }
+    });
     var groupStage = next[groupIndex];
     if (!(groupStage === null || groupStage === void 0 ? void 0 : groupStage.$group) || typeof groupStage.$group !== 'object') {
         return next;
     }
     var oldGroupKeys = new Set(extractAssistantDataIntentGroupKeys(groupStage.$group._id));
-    var newGroupKeys = new Set(extractAssistantDataIntentGroupKeys(dimension.groupId));
-    groupStage.$group._id = (0, common_1.deepCopy)(dimension.groupId);
+    var combinedGroupId = {};
+    selectedDimensions.forEach(function (dimension) {
+        if (dimension.groupId && typeof dimension.groupId === 'object' && !Array.isArray(dimension.groupId)) {
+            Object.assign(combinedGroupId, (0, common_1.deepCopy)(dimension.groupId));
+        }
+    });
+    var newGroupKeys = new Set(extractAssistantDataIntentGroupKeys(combinedGroupId));
+    groupStage.$group._id = combinedGroupId;
     var projectIndex = next.findIndex(function (stage, index) { return index > groupIndex && !!(stage === null || stage === void 0 ? void 0 : stage.$project); });
     if (projectIndex > -1 && next[projectIndex].$project && typeof next[projectIndex].$project === 'object') {
         var project_1 = next[projectIndex].$project;
@@ -7287,13 +7494,28 @@ function applyAssistantDataIntentDimensionToPipeline(pipeline, dimension) {
                 delete project_1[key];
             }
         });
-        if (dimension.project) {
-            Object.assign(project_1, (0, common_1.deepCopy)(dimension.project));
-        }
+        selectedDimensions.forEach(function (dimension) {
+            if (dimension.project) {
+                Object.assign(project_1, (0, common_1.deepCopy)(dimension.project));
+            }
+        });
     }
     var sortIndex = next.findIndex(function (stage, index) { return index > groupIndex && !!(stage === null || stage === void 0 ? void 0 : stage.$sort); });
-    if (sortIndex > -1 && dimension.sort) {
-        next[sortIndex].$sort = (0, common_1.deepCopy)(dimension.sort);
+    if (sortIndex > -1) {
+        var combinedSort_1 = {};
+        selectedDimensions.forEach(function (dimension) {
+            if (dimension.sort && typeof dimension.sort === 'object' && !Array.isArray(dimension.sort)) {
+                Object.keys(dimension.sort).forEach(function (key) {
+                    var _a;
+                    if (!Object.prototype.hasOwnProperty.call(combinedSort_1, key)) {
+                        combinedSort_1[key] = (0, common_1.deepCopy)((_a = dimension.sort) === null || _a === void 0 ? void 0 : _a[key]);
+                    }
+                });
+            }
+        });
+        if (Object.keys(combinedSort_1).length) {
+            next[sortIndex].$sort = combinedSort_1;
+        }
     }
     return next;
 }
@@ -7305,10 +7527,10 @@ function buildAssistantAppDataIntentDirective(message, collectionNames, appId) {
     }
     var customerText = extractAssistantDataIntentCustomerText(message);
     var dateWindow = resolveAssistantDataIntentDateWindow(message);
-    var requestedDimension = resolveAssistantRequestedDataDimension(message, intent);
-    var templatedDimension = requestedDimension
-        ? applyAssistantDataIntentDimensionTemplate(requestedDimension, { customerText: customerText, dateWindow: dateWindow })
-        : null;
+    var requestUnderstanding = buildAssistantDataRequestUnderstanding(message, intent, dateWindow);
+    var templatedDimensions = requestUnderstanding.dimensions
+        .map(function (dimension) { return applyAssistantDataIntentDimensionTemplate(dimension, { customerText: customerText, dateWindow: dateWindow }); })
+        .filter(function (dimension) { return !!(dimension === null || dimension === void 0 ? void 0 : dimension.groupId); });
     var acknowledgementText = buildAssistantDataIntentAcknowledgement(intent, customerText, dateWindow);
     var progress = intent.progress.map(function (entry) {
         return entry
@@ -7324,10 +7546,17 @@ function buildAssistantAppDataIntentDirective(message, collectionNames, appId) {
         fallbackCollections: intent.fallbackCollections,
         customerText: customerText,
         dateWindow: dateWindow,
-        requestedDimension: templatedDimension ? {
-            id: templatedDimension.id,
-            terms: templatedDimension.terms
-        } : null
+        requestedDimension: templatedDimensions[0] ? {
+            id: templatedDimensions[0].id,
+            terms: templatedDimensions[0].terms
+        } : null,
+        requestedDimensions: templatedDimensions.map(function (dimension) { return ({
+            id: dimension.id,
+            type: dimension.type || 'entity',
+            granularity: dimension.granularity || undefined,
+            terms: dimension.terms
+        }); }),
+        requestContract: requestUnderstanding.contract
     };
     var basePayload = function (pipeline) { return ({
         collection: intent.collection,
@@ -7339,7 +7568,8 @@ function buildAssistantAppDataIntentDirective(message, collectionNames, appId) {
     var pipeline = configuredPipeline.length
         ? configuredPipeline
         : buildAssistantGenericDataIntentPipeline(intent, customerText, dateWindow);
-    var finalPipeline = applyAssistantDataIntentDimensionToPipeline(pipeline, templatedDimension);
+    var finalPipeline = applyAssistantDataIntentDimensionsToPipeline(pipeline, templatedDimensions);
+    metadata.requestContract = __assign(__assign({}, requestUnderstanding.contract), { measures: buildAssistantDataRequestMeasures(intent, finalPipeline) });
     return { type: 'aggregate', payload: basePayload(finalPipeline), cleaned: '', rawLine: "HEURISTIC_AGG(app-data-intent:".concat(intent.id, ")"), metadata: metadata };
 }
 function isAssistantDeterministicHeuristicDirective(directive) {
@@ -8045,7 +8275,7 @@ function buildAssistantToolResultPayload(directive, toolResponse, requestMessage
         ? toolResponse.verification
         : undefined;
     var directiveMetadata = directive.metadata && typeof directive.metadata === 'object' ? directive.metadata : {};
-    var mergedDebug = __assign(__assign(__assign(__assign(__assign(__assign(__assign({}, ((toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) && typeof toolResponse.debug === 'object' ? toolResponse.debug : {})), (normalizeOptionalString(directiveMetadata.intentId) ? { intentId: normalizeOptionalString(directiveMetadata.intentId) } : {})), (normalizeOptionalString(directiveMetadata.acknowledgementText) ? { acknowledgementText: normalizeOptionalString(directiveMetadata.acknowledgementText) } : {})), (normalizeOptionalString(directiveMetadata.recipeUsed) ? { recipeUsed: normalizeOptionalString(directiveMetadata.recipeUsed) } : {})), (normalizeOptionalString(directiveMetadata.customerText) ? { customerText: normalizeOptionalString(directiveMetadata.customerText) } : {})), (directiveMetadata.dateWindow && typeof directiveMetadata.dateWindow === 'object' ? { dateWindow: directiveMetadata.dateWindow } : {})), (Array.isArray(directiveMetadata.assumptions) && directiveMetadata.assumptions.length ? { assumptions: directiveMetadata.assumptions } : {}));
+    var mergedDebug = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, ((toolResponse === null || toolResponse === void 0 ? void 0 : toolResponse.debug) && typeof toolResponse.debug === 'object' ? toolResponse.debug : {})), (normalizeOptionalString(directiveMetadata.intentId) ? { intentId: normalizeOptionalString(directiveMetadata.intentId) } : {})), (normalizeOptionalString(directiveMetadata.acknowledgementText) ? { acknowledgementText: normalizeOptionalString(directiveMetadata.acknowledgementText) } : {})), (normalizeOptionalString(directiveMetadata.recipeUsed) ? { recipeUsed: normalizeOptionalString(directiveMetadata.recipeUsed) } : {})), (normalizeOptionalString(directiveMetadata.customerText) ? { customerText: normalizeOptionalString(directiveMetadata.customerText) } : {})), (directiveMetadata.dateWindow && typeof directiveMetadata.dateWindow === 'object' ? { dateWindow: directiveMetadata.dateWindow } : {})), (directiveMetadata.requestContract && typeof directiveMetadata.requestContract === 'object' ? { requestContract: directiveMetadata.requestContract } : {})), (Array.isArray(directiveMetadata.requestedDimensions) && directiveMetadata.requestedDimensions.length ? { requestedDimensions: directiveMetadata.requestedDimensions } : {})), (Array.isArray(directiveMetadata.assumptions) && directiveMetadata.assumptions.length ? { assumptions: directiveMetadata.assumptions } : {}));
     var result = {
         type: directive.type === 'aggregate' ? 'mongo_agg' : 'mongo_read',
         input: directivePayload,
@@ -8633,14 +8863,14 @@ function buildAssistantDebugPayload(params) {
         else {
             notes.push("Report builder bridge collection: ".concat(from, " -> ").concat(to, "."));
         }
-        var path_1 = Array.isArray(fallbackInfo.reportBuilderBridge.resolutionPath)
+        var path_2 = Array.isArray(fallbackInfo.reportBuilderBridge.resolutionPath)
             ? fallbackInfo.reportBuilderBridge.resolutionPath
                 .map(function (entry) { return normalizeOptionalString(entry); })
                 .filter(Boolean)
                 .join(' -> ')
             : '';
-        if (path_1) {
-            notes.push("Bridge resolution path: ".concat(path_1, "."));
+        if (path_2) {
+            notes.push("Bridge resolution path: ".concat(path_2, "."));
         }
     }
     if ((_w = fallbackInfo === null || fallbackInfo === void 0 ? void 0 : fallbackInfo.reportFallback) === null || _w === void 0 ? void 0 : _w.used) {
@@ -16076,6 +16306,9 @@ function cloneAssistantHeuristicProfile(profile) {
                 dimensions: Array.isArray(entry === null || entry === void 0 ? void 0 : entry.dimensions)
                     ? entry.dimensions.map(function (dimension) { return ({
                         id: normalizeOptionalString(dimension === null || dimension === void 0 ? void 0 : dimension.id),
+                        type: normalizeAssistantAppDataDimensionType(dimension === null || dimension === void 0 ? void 0 : dimension.type),
+                        granularity: normalizeOptionalString(dimension === null || dimension === void 0 ? void 0 : dimension.granularity) || undefined,
+                        requestedText: normalizeOptionalString(dimension === null || dimension === void 0 ? void 0 : dimension.requestedText) || undefined,
                         terms: mergeAssistantHintValues((dimension === null || dimension === void 0 ? void 0 : dimension.terms) || []).map(function (term) { return term.toLowerCase(); }),
                         groupId: (0, common_1.deepCopy)(dimension === null || dimension === void 0 ? void 0 : dimension.groupId),
                         project: (dimension === null || dimension === void 0 ? void 0 : dimension.project) && typeof dimension.project === 'object' && !Array.isArray(dimension.project)
@@ -16180,6 +16413,13 @@ function normalizeAssistantDisplayDateFormat(value) {
     }
     return undefined;
 }
+function normalizeAssistantAppDataDimensionType(value) {
+    var normalized = normalizeOptionalString(value).toLowerCase();
+    if (normalized === 'time' || normalized === 'entity') {
+        return normalized;
+    }
+    return undefined;
+}
 function normalizeAssistantHeuristicStringList(value) {
     if (Array.isArray(value)) {
         return mergeAssistantHintValues(value.map(function (entry) { return normalizeOptionalString(entry).toLowerCase(); }));
@@ -16268,6 +16508,8 @@ function normalizeAssistantAppDataDimensions(value) {
             || [id]).map(function (term) { return term.toLowerCase(); });
         dimensions.push({
             id: id,
+            type: normalizeAssistantAppDataDimensionType(entry.type),
+            granularity: normalizeOptionalString(entry.granularity) || undefined,
             terms: terms.length ? terms : [id.toLowerCase()],
             groupId: (0, common_1.deepCopy)(groupId),
             project: entry.project && typeof entry.project === 'object' && !Array.isArray(entry.project)
@@ -20399,10 +20641,10 @@ function extractAssistantRequestedBreakdownDimensions(message) {
         results.push(normalized);
     };
     var patterns = [
-        /\bgroup(?:ed)?\s+by\s+([a-z0-9_-]+(?:\s+[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
-        /\bbreak(?:\s+up|\s*down)?\b[\s\S]{0,80}?\bby\s+([a-z0-9_-]+(?:\s+[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
-        /\b(?:by|per)\s+(?:each\s+)?([a-z0-9_-]+(?:\s+[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
-        /\bfor\s+each\s+([a-z0-9_-]+(?:\s+[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi
+        /\bgroup(?:ed)?\s+by\s+([a-z0-9_-]+(?:\s+(?!(?:by|per|for|of|in|with|and|or)\b)[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
+        /\bbreak(?:\s+up|\s*down)?\b[\s\S]{0,80}?\bby\s+([a-z0-9_-]+(?:\s+(?!(?:by|per|for|of|in|with|and|or)\b)[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
+        /\b(?:by|per)\s+(?:each\s+)?([a-z0-9_-]+(?:\s+(?!(?:by|per|for|of|in|with|and|or)\b)[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi,
+        /\bfor\s+each\s+([a-z0-9_-]+(?:\s+(?!(?:by|per|for|of|in|with|and|or)\b)[a-z0-9_-]+){0,2})(?=\s+(?:by|per|for|of|in|with|and|or)\b|[,.!?;]|$)/gi
     ];
     patterns.forEach(function (pattern) {
         var match = pattern.exec(text);