fix(prompt): improve numeric weighting calculation

Author: joshistoast

invokeai/frontend/web/src/common/util/promptAttention.test.ts

@@ -168,4 +168,108 @@ describe('adjustPromptAttention', () => {
       expect(result.prompt.slice(result.selectionStart, result.selectionEnd)).toBe('a+');
     });
   });
+
+  describe('numeric attention weights', () => {
+    it('should preserve parentheses for single word with numeric weight when incrementing elsewhere', () => {
+      const prompt = '(masterpiece)1.3, best quality';
+      const len = prompt.length;
+      // Select "best quality" and increment
+      const bestQualityStart = prompt.indexOf('best quality');
+      const result = adjustPromptAttention(prompt, bestQualityStart, len, 'increment');
+
+      // masterpiece should keep its parens and exact weight
+      expect(result.prompt).toContain('(masterpiece)1.3');
+      expect(result.prompt).not.toContain('masterpiece1.3');
+    });
+
+    it('should not produce long floating point numbers for numeric weights', () => {
+      const prompt = '(high detail)1.2, oil painting';
+      const len = prompt.length;
+      // Select "oil painting" and increment
+      const oilStart = prompt.indexOf('oil painting');
+      const result = adjustPromptAttention(prompt, oilStart, len, 'increment');
+
+      // high detail should keep its exact weight, no floating point garbage
+      expect(result.prompt).toContain('(high detail)1.2');
+      expect(result.prompt).not.toMatch(/1\.19999/);
+      expect(result.prompt).not.toMatch(/1\.20000/);
+    });
+
+    it('should preserve numeric weight 1.15 without floating point corruption', () => {
+      const prompt = '(sunny midday light)1.15, landscape';
+      const len = prompt.length;
+      const landscapeStart = prompt.indexOf('landscape');
+      const result = adjustPromptAttention(prompt, landscapeStart, len, 'increment');
+
+      expect(result.prompt).toContain('(sunny midday light)1.15');
+      expect(result.prompt).not.toMatch(/1\.15005/);
+    });
+
+    it('should normalize numeric 1.1 weight to + syntax', () => {
+      const prompt = '(lush rolling hills)1.1, landscape';
+      const len = prompt.length;
+      const landscapeStart = prompt.indexOf('landscape');
+      const result = adjustPromptAttention(prompt, landscapeStart, len, 'increment');
+
+      // 1.1 is equivalent to +, normalization is acceptable
+      expect(result.prompt).toMatch(/\(lush rolling hills\)(\+|1\.1)/);
+    });
+
+    it('should increment numeric weight correctly for single word', () => {
+      const prompt = '(masterpiece)1.3';
+      const result = adjustPromptAttention(prompt, 0, prompt.length, 'increment');
+
+      // 1.3 + 0.1 = 1.4
+      expect(result.prompt).toBe('(masterpiece)1.4');
+    });
+
+    it('should increment numeric weight correctly for multi-word group', () => {
+      const prompt = '(high detail)1.2';
+      const result = adjustPromptAttention(prompt, 0, prompt.length, 'increment');
+
+      // 1.2 + 0.1 = 1.3
+      expect(result.prompt).toBe('(high detail)1.3');
+    });
+
+    it('should decrement numeric weight correctly', () => {
+      const prompt = '(masterpiece)1.3';
+      const result = adjustPromptAttention(prompt, 0, prompt.length, 'decrement');
+
+      // 1.3 - 0.1 = 1.2
+      expect(result.prompt).toBe('(masterpiece)1.2');
+    });
+
+    it('should increment numeric weight 1.15 with additive step', () => {
+      const prompt = '(sunny midday light)1.15';
+      const result = adjustPromptAttention(prompt, 0, prompt.length, 'increment');
+
+      // 1.15 + 0.1 = 1.25
+      expect(result.prompt).toBe('(sunny midday light)1.25');
+    });
+
+    it('should decrement numeric weight 1.15 with additive step', () => {
+      const prompt = '(sunny midday light)1.15';
+      const result = adjustPromptAttention(prompt, 0, prompt.length, 'decrement');
+
+      // 1.15 - 0.1 = 1.05
+      expect(result.prompt).toBe('(sunny midday light)1.05');
+    });
+
+    it('should handle the full bug report prompt without corrupting non-selected weights', () => {
+      const prompt =
+        '(masterpiece)1.3, best quality, (high detail)1.2, oil painting, (sunny midday light)1.15, an old stone castle standing on a hill, medieval architecture, weathered stone walls, (lush rolling hills)1.1, expansive landscape, clear blue sky';
+      const selStart = prompt.indexOf('clear blue sky');
+      const selEnd = selStart + 'clear blue sky'.length;
+      const result = adjustPromptAttention(prompt, selStart, selEnd, 'increment');
+
+      // Non-selected numeric weights must be preserved exactly
+      expect(result.prompt).toContain('(masterpiece)1.3');
+      expect(result.prompt).toContain('(high detail)1.2');
+      expect(result.prompt).toContain('(sunny midday light)1.15');
+      // Selected text should be incremented
+      expect(result.prompt).toContain('(clear blue sky)+');
+      // No floating point garbage anywhere
+      expect(result.prompt).not.toMatch(/\d\.\d{5,}/);
+    });
+  });
 });

invokeai/frontend/web/src/common/util/promptAttention.ts

@@ -9,6 +9,29 @@ type AttentionDirection = 'increment' | 'decrement';
 type AdjustmentResult = { prompt: string; selectionStart: number; selectionEnd: number };
 
 const ATTENTION_STEP = 1.1;
+const NUMERIC_ATTENTION_STEP = 0.1;
+
+/**
+ * Check if a weight is approximately ATTENTION_STEP^n for some integer n.
+ * Returns n if so, or null if the weight is not a power of ATTENTION_STEP.
+ */
+function getAttentionStepCount(weight: number): number | null {
+  if (weight <= 0) {
+    return null;
+  }
+  if (Math.abs(weight - 1.0) < 0.001) {
+    return 0;
+  }
+  const n = Math.round(Math.log(weight) / Math.log(ATTENTION_STEP));
+  if (n === 0) {
+    return null;
+  }
+  const expected = Math.pow(ATTENTION_STEP, n);
+  if (Math.abs(expected - weight) < 0.005) {
+    return n;
+  }
+  return null;
+}
 
 /**
  * Adjusts the attention of the prompt at the current cursor/selection position.
@@ -68,10 +91,20 @@ export function adjustPromptAttention(
     }
 
     for (const terminal of selectedTerminals) {
-      if (direction === 'increment') {
-        terminal.weight *= ATTENTION_STEP;
+      if (terminal.hasNumericAttention) {
+        // Additive step for explicit numeric weights (e.g. 1.15 → 1.25 / 1.05)
+        if (direction === 'increment') {
+          terminal.weight = Number((terminal.weight + NUMERIC_ATTENTION_STEP).toFixed(4));
+        } else {
+          terminal.weight = Number((terminal.weight - NUMERIC_ATTENTION_STEP).toFixed(4));
+        }
       } else {
-        terminal.weight /= ATTENTION_STEP;
+        // Multiplicative step for +/- syntax weights
+        if (direction === 'increment') {
+          terminal.weight *= ATTENTION_STEP;
+        } else {
+          terminal.weight /= ATTENTION_STEP;
+        }
       }
     }
 
@@ -97,28 +130,37 @@ type Terminal = {
   weight: number;
   range: { start: number; end: number };
   hasExplicitAttention: boolean;
+  hasNumericAttention: boolean;
   parentRange?: { start: number; end: number };
   isSelected: boolean;
 };
 
-function flattenAST(ast: ASTNode[], currentWeight = 1.0, parentRange?: { start: number; end: number }): Terminal[] {
+function flattenAST(
+  ast: ASTNode[],
+  currentWeight = 1.0,
+  parentRange?: { start: number; end: number },
+  numericAttention = false
+): Terminal[] {
   let terminals: Terminal[] = [];
 
   for (const node of ast) {
     let nodeWeight = currentWeight;
+    let nodeNumericAttention = numericAttention;
     if ('attention' in node && node.attention) {
       nodeWeight *= parseAttention(node.attention);
+      nodeNumericAttention = typeof node.attention === 'number';
     }
 
     if (node.type === 'group') {
-      terminals.push(...flattenAST(node.children, nodeWeight, node.range));
+      terminals.push(...flattenAST(node.children, nodeWeight, node.range, nodeNumericAttention));
     } else {
       terminals.push({
         text: node.type === 'word' ? node.text : node.value,
         type: node.type,
         weight: nodeWeight,
         range: node.range,
         hasExplicitAttention: 'attention' in node && !!node.attention,
+        hasNumericAttention: nodeNumericAttention,
         parentRange: parentRange,
         isSelected: false,
       });
@@ -234,9 +276,14 @@ function groupTerminals(terminals: Terminal[]): ASTNode[] {
       return j;
     };
 
-    // Check for + (>= 1.1)
-    if (weight >= ATTENTION_STEP - 0.001) {
-      const j = findRunEnd((w) => w >= ATTENTION_STEP - 0.001);
+    const stepCount = getAttentionStepCount(weight);
+
+    // Check for + (positive power of ATTENTION_STEP)
+    if (stepCount !== null && stepCount > 0) {
+      const j = findRunEnd((w) => {
+        const sc = getAttentionStepCount(w);
+        return sc !== null && sc > 0;
+      });
 
       let runStart = i;
       let runEnd = j;
@@ -277,9 +324,12 @@ function groupTerminals(terminals: Terminal[]): ASTNode[] {
       continue;
     }
 
-    // Check for - (<= 0.909)
-    if (weight <= 1 / ATTENTION_STEP + 0.001) {
-      const j = findRunEnd((w) => w <= 1 / ATTENTION_STEP + 0.001);
+    // Check for - (negative power of ATTENTION_STEP)
+    if (stepCount !== null && stepCount < 0) {
+      const j = findRunEnd((w) => {
+        const sc = getAttentionStepCount(w);
+        return sc !== null && sc < 0;
+      });
 
       let runStart = i;
       let runEnd = j;
@@ -336,16 +386,8 @@ function groupTerminals(terminals: Terminal[]): ASTNode[] {
 
       const weightStr = Number(weight.toFixed(4));
 
-      if (children.length === 1) {
-        const child = children[0]!;
-        if (child.type === 'word' || child.type === 'group') {
-          nodes.push({ ...child, attention: weightStr });
-        } else {
-          nodes.push({ type: 'group', children, attention: weightStr, range: { start: 0, end: 0 }, isSelection });
-        }
-      } else {
-        nodes.push({ type: 'group', children, attention: weightStr, range: { start: 0, end: 0 }, isSelection });
-      }
+      // Always create a group for numeric weights to preserve parentheses in output
+      nodes.push({ type: 'group', children, attention: weightStr, range: { start: 0, end: 0 }, isSelection });
       i = j;
     }
   }
@@ -377,10 +419,10 @@ function addAttention(current: Attention | undefined, added: string): Attention
   }
   if (typeof current === 'number') {
     if (added === '+') {
-      return current * ATTENTION_STEP;
+      return Number((current * ATTENTION_STEP).toFixed(4));
     }
     if (added === '-') {
-      return current / ATTENTION_STEP;
+      return Number((current / ATTENTION_STEP).toFixed(4));
     }
     return current;
   }