Merge pull request #38 from github/asizikov/update-report-validation

fix: accept reports without exceeds_quota

Author: asizikov

src/pipeline/parser.test.ts

@@ -29,6 +29,25 @@ const FULL_HEADER = [
   'aic_gross_amount',
 ].join(',')
 
+const HEADER_WITHOUT_EXCEEDS_QUOTA = [
+  'date',
+  'username',
+  'product',
+  'sku',
+  'model',
+  'quantity',
+  'unit_type',
+  'applied_cost_per_quantity',
+  'gross_amount',
+  'discount_amount',
+  'net_amount',
+  'total_monthly_quota',
+  'organization',
+  'cost_center_name',
+  'aic_quantity',
+  'aic_gross_amount',
+].join(',')
+
 function buildRow(values: string[]): string {
   return values.join(',')
 }
@@ -211,6 +230,79 @@ describe('parser and metric normalization', () => {
     }
   })
 
+  it('defaults exceeds_quota to false when the column is absent', () => {
+    const header = parseTokenUsageHeader(HEADER_WITHOUT_EXCEEDS_QUOTA)
+    const record = parseTokenUsageRecord(
+      buildRow([
+        '2026-03-01',
+        'mona',
+        'copilot',
+        'copilot_premium_request',
+        'Claude Sonnet 4.5',
+        '2',
+        'requests',
+        '0.04',
+        '0.08',
+        '0.01',
+        '0.07',
+        '300',
+        'octodemo',
+        'Octocats',
+        '1.5',
+        '0.015',
+      ]),
+      header,
+    )
+
+    expect(record.exceeds_quota).toBe(false)
+  })
+
+  it('maps ai credits columns by name when their order is reversed', () => {
+    const reversedAicHeader = [
+      'date',
+      'username',
+      'product',
+      'sku',
+      'model',
+      'quantity',
+      'unit_type',
+      'applied_cost_per_quantity',
+      'gross_amount',
+      'discount_amount',
+      'net_amount',
+      'total_monthly_quota',
+      'organization',
+      'cost_center_name',
+      'aic_gross_amount',
+      'aic_quantity',
+    ].join(',')
+    const header = parseTokenUsageHeader(reversedAicHeader)
+    const record = parseTokenUsageRecord(
+      buildRow([
+        '2026-03-01',
+        'mona',
+        'copilot',
+        'copilot_ai_unit',
+        'Claude Sonnet 4.5',
+        '50',
+        'ai-units',
+        '0.01',
+        '0.50',
+        '0',
+        '0.50',
+        '300',
+        'octodemo',
+        'Octocats',
+        '0.75',
+        '75',
+      ]),
+      header,
+    )
+
+    expect(record.aic_quantity).toBe(75)
+    expect(record.aic_gross_amount).toBe(0.75)
+  })
+
   it('keeps PRU metrics for requests rows', () => {
     const header = parseTokenUsageHeader(FULL_HEADER)
     const record = parseTokenUsageRecord(
@@ -400,6 +492,11 @@ describe('validateHeader', () => {
     expect(() => validateHeader(header)).not.toThrow()
   })
 
+  it('accepts a header when exceeds_quota is absent', () => {
+    const header = parseTokenUsageHeader(HEADER_WITHOUT_EXCEEDS_QUOTA)
+    expect(() => validateHeader(header)).not.toThrow()
+  })
+
   it('throws InvalidReportError when core billing columns are missing', () => {
     const header = parseTokenUsageHeader('foo,bar,baz')
     expect(() => validateHeader(header)).toThrow(InvalidReportError)

src/pipeline/parser.ts

@@ -111,7 +111,6 @@ const BASE_BILLING_COLUMNS = [
   'gross_amount',
   'discount_amount',
   'net_amount',
-  'exceeds_quota',
   'total_monthly_quota',
   'organization',
 ] as const

src/views/ReportGuideView.tsx

@@ -10,7 +10,6 @@ const HEADER = [
   'gross_amount',
   'discount_amount',
   'net_amount',
-  'exceeds_quota',
   'total_monthly_quota',
   'organization',
   'cost_center_name',
@@ -30,7 +29,6 @@ const SAMPLE_ROW_1 = [
   '0.036000000000000004',
   '0.036000000000000004',
   '0',
-  'FALSE',
   '1000',
   'octodemo',
   'Octocats',
@@ -50,7 +48,6 @@ const SAMPLE_ROW_2 = [
   '0',
   '0',
   '0',
-  'FALSE',
   '1000',
   'octodemo',
   'Octocats',
@@ -86,12 +83,12 @@ const SAMPLE_ROW_2_ANNOTATIONS: { index: number; label: string; note: string }[]
     note: '$0 — there is no PRU cost to discount.',
   },
   {
-    index: 15,
+    index: 14,
     label: 'aic_quantity',
     note: '≈ 24.9 AICs consumed. Under AI Credits-based billing, even Base Models consume AI Credits proportional to actual token usage.',
   },
   {
-    index: 16,
+    index: 15,
     label: 'aic_gross_amount',
     note: '≈ $0.249 (24.9 AICs × $0.01). This is what the same usage would cost under AI Credits-based billing.',
   },
@@ -133,17 +130,16 @@ const SAMPLE_ROW_1_ANNOTATIONS: { index: number; label: string; note: string }[]
     label: 'net_amount',
     note: '$0.00 — net PRU charge after quota discount. No additional cost was incurred for this request.',
   },
-  { index: 11, label: 'exceeds_quota', note: 'FALSE — usage stayed within the monthly quota.' },
-  { index: 12, label: 'total_monthly_quota', note: '1,000 PRUs — the monthly PRU quota for this user\'s plan.' },
-  { index: 13, label: 'organization', note: 'The GitHub organization slug: "octodemo".' },
-  { index: 14, label: 'cost_center_name', note: '"Octocats" — the cost center this user is assigned to.' },
+  { index: 11, label: 'total_monthly_quota', note: '1,000 PRUs — the monthly PRU quota for this user\'s plan.' },
+  { index: 12, label: 'organization', note: 'The GitHub organization slug: "octodemo".' },
+  { index: 13, label: 'cost_center_name', note: '"Octocats" — the cost center this user is assigned to.' },
   {
-    index: 15,
+    index: 14,
     label: 'aic_quantity',
     note: '≈ 3.107 AICs — the AI Credits-based billing equivalent of this request. AICs represent the actual tokens consumed.',
   },
   {
-    index: 16,
+    index: 15,
     label: 'aic_gross_amount',
     note: '≈ $0.031 (3.107 AICs × $0.01). Under AI Credits-based billing this request would cost roughly $0.03.',
   },
@@ -196,7 +192,12 @@ export function ReportGuideView() {
       <h2 className="text-lg font-semibold text-fg-default mb-2">Report Format</h2>
       <p className="text-fg-muted text-sm mb-7">
         Each row in the CSV export represents one unit of Copilot usage for a single user and model on a given day.
-        Below are annotated examples showing what each field means.
+        Below are annotated examples showing what each field means. Some older exports also include an
+        <code className="mx-1 font-mono text-xs">exceeds_quota</code>
+        column between
+        <code className="mx-1 font-mono text-xs">net_amount</code>
+        and
+        <code className="mx-1 font-mono text-xs">total_monthly_quota</code>.
       </p>
 
       <div className="bg-bg-default border border-border-default rounded-lg px-6 pt-5 pb-6 mb-6">