Skip to content

feat: class based pricing-fetcher with using syntax #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryoppippi merged 4 commits into from
Jun 9, 2025
Merged

feat: class based pricing-fetcher with using syntax #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5923d95
feat(pricing-fetcher): class based pricing-fetcher with `using` syntax
ryoppippi Jun 9, 2025
fa8b6f9
refactor: use class-based PricingFetcher
ryoppippi Jun 9, 2025
307b57c
docs(data-loader): add comment for calculating price if you use or no…
ryoppippi Jun 9, 2025
a75f481
chore(deps): add oxc shims for `using` syntax
ryoppippi Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion bun.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
},
"devDependencies": {
"@core/errorutil": "npm:@jsr/core__errorutil",
"@oxc-project/runtime": "^0.72.3",
"@ryoppippi/eslint-config": "^0.3.7",
"@types/bun": "^1.2.15",
"@typescript/native-preview": "^7.0.0-dev.20250607.1",
Expand Down
110 changes: 49 additions & 61 deletions src/data-loader.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { beforeEach, describe, expect, test } from 'bun:test';
import { describe, expect, test } from 'bun:test';
import { createFixture } from 'fs-fixture';
import {
calculateCostForEntry,
Expand All @@ -8,10 +8,7 @@ import {
loadSessionData,
type UsageData,
} from './data-loader.ts';
import {
clearPricingCache,
fetchModelPricing,
} from './pricing-fetcher.ts';
import { PricingFetcher } from './pricing-fetcher.ts';

describe('formatDate', () => {
test('formats UTC timestamp to local date', () => {
Expand Down Expand Up @@ -973,10 +970,6 @@ describe('loadSessionData', () => {
});

describe('data-loader cost calculation with real pricing', () => {
beforeEach(() => {
clearPricingCache();
});

describe('loadDailyUsageData with mixed schemas', () => {
test('should handle old schema with costUSD', async () => {
const oldData = {
Expand Down Expand Up @@ -1306,10 +1299,6 @@ describe('data-loader cost calculation with real pricing', () => {
});

describe('cost mode functionality', () => {
beforeEach(() => {
clearPricingCache();
});

test('auto mode: uses costUSD when available, calculates otherwise', async () => {
const data1 = {
timestamp: '2024-01-01T10:00:00Z',
Expand Down Expand Up @@ -1449,10 +1438,6 @@ describe('data-loader cost calculation with real pricing', () => {
});

describe('pricing data fetching optimization', () => {
beforeEach(() => {
clearPricingCache();
});

test('should not require model pricing when mode is display', async () => {
const data = {
timestamp: '2024-01-01T10:00:00Z',
Expand Down Expand Up @@ -1624,35 +1609,32 @@ describe('calculateCostForEntry', () => {
costUSD: 0.05,
};

beforeEach(() => {
clearPricingCache();
});

describe('display mode', () => {
test('should return costUSD when available', () => {
const result = calculateCostForEntry(mockUsageData, 'display', {});
test('should return costUSD when available', async () => {
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(mockUsageData, 'display', fetcher);
expect(result).toBe(0.05);
});

test('should return 0 when costUSD is undefined', () => {
test('should return 0 when costUSD is undefined', async () => {
const dataWithoutCost = { ...mockUsageData };
dataWithoutCost.costUSD = undefined;

const result = calculateCostForEntry(dataWithoutCost, 'display', {});
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(dataWithoutCost, 'display', fetcher);
expect(result).toBe(0);
});

test('should not use model pricing in display mode', () => {
test('should not use model pricing in display mode', async () => {
// Even with model pricing available, should use costUSD
const result = calculateCostForEntry(mockUsageData, 'display', {});
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(mockUsageData, 'display', fetcher);
expect(result).toBe(0.05);
});
});

describe('calculate mode', () => {
test('should calculate cost from tokens when model pricing available', async () => {
const realPricing = await fetchModelPricing();

// Use the exact same structure as working integration tests
const testData: UsageData = {
timestamp: '2024-01-01T10:00:00Z',
Expand All @@ -1665,50 +1647,50 @@ describe('calculateCostForEntry', () => {
},
};

const result = calculateCostForEntry(testData, 'calculate', realPricing);
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(testData, 'calculate', fetcher);

// Should calculate some cost > 0 when model pricing is available
expect(result).toBeGreaterThan(0);
});

test('should ignore costUSD in calculate mode', async () => {
const realPricing = await fetchModelPricing();
using fetcher = new PricingFetcher();
const dataWithHighCost = { ...mockUsageData, costUSD: 99.99 };
const result = calculateCostForEntry(
const result = await calculateCostForEntry(
dataWithHighCost,
'calculate',
realPricing,
fetcher,
);

// Should calculate from tokens, not use costUSD
expect(result).toBeGreaterThan(0);
expect(result).toBeLessThan(1); // Much less than 99.99
});

test('should return 0 when model not available', () => {
test('should return 0 when model not available', async () => {
const dataWithoutModel = { ...mockUsageData };
dataWithoutModel.message.model = undefined;

const result = calculateCostForEntry(dataWithoutModel, 'calculate', {});
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(dataWithoutModel, 'calculate', fetcher);
expect(result).toBe(0);
});

test('should return 0 when model pricing not found', () => {
test('should return 0 when model pricing not found', async () => {
const dataWithUnknownModel = {
...mockUsageData,
message: { ...mockUsageData.message, model: 'unknown-model' },
};

const result = calculateCostForEntry(
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(
dataWithUnknownModel,
'calculate',
{},
fetcher,
);
expect(result).toBe(0);
});

test('should handle missing cache tokens', async () => {
const realPricing = await fetchModelPricing();
const dataWithoutCacheTokens: UsageData = {
timestamp: '2024-01-01T10:00:00Z',
message: {
Expand All @@ -1720,25 +1702,25 @@ describe('calculateCostForEntry', () => {
},
};

const result = calculateCostForEntry(
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(
dataWithoutCacheTokens,
'calculate',
realPricing,
fetcher,
);

// Should calculate some cost > 0 when model pricing is available
expect(result).toBeGreaterThan(0);
});
});

describe('auto mode', () => {
test('should use costUSD when available', () => {
const result = calculateCostForEntry(mockUsageData, 'auto', {});
test('should use costUSD when available', async () => {
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(mockUsageData, 'auto', fetcher);
expect(result).toBe(0.05);
});

test('should calculate from tokens when costUSD undefined', async () => {
const realPricing = await fetchModelPricing();
const dataWithoutCost: UsageData = {
timestamp: '2024-01-01T10:00:00Z',
message: {
Expand All @@ -1750,41 +1732,44 @@ describe('calculateCostForEntry', () => {
},
};

const result = calculateCostForEntry(
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(
dataWithoutCost,
'auto',
realPricing,
fetcher,
);
expect(result).toBeGreaterThan(0);
});

test('should return 0 when no costUSD and no model', () => {
test('should return 0 when no costUSD and no model', async () => {
const dataWithoutCostOrModel = { ...mockUsageData };
dataWithoutCostOrModel.costUSD = undefined;
dataWithoutCostOrModel.message.model = undefined;

const result = calculateCostForEntry(dataWithoutCostOrModel, 'auto', {});
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(dataWithoutCostOrModel, 'auto', fetcher);
expect(result).toBe(0);
});

test('should return 0 when no costUSD and model pricing not found', () => {
test('should return 0 when no costUSD and model pricing not found', async () => {
const dataWithoutCost = { ...mockUsageData };
dataWithoutCost.costUSD = undefined;

const result = calculateCostForEntry(dataWithoutCost, 'auto', {});
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(dataWithoutCost, 'auto', fetcher);
expect(result).toBe(0);
});

test('should prefer costUSD over calculation even when both available', async () => {
const realPricing = await fetchModelPricing();
// Both costUSD and model pricing available, should use costUSD
const result = calculateCostForEntry(mockUsageData, 'auto', realPricing);
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(mockUsageData, 'auto', fetcher);
expect(result).toBe(0.05);
});
});

describe('edge cases', () => {
test('should handle zero token counts', () => {
test('should handle zero token counts', async () => {
const dataWithZeroTokens = {
...mockUsageData,
message: {
Expand All @@ -1799,19 +1784,22 @@ describe('calculateCostForEntry', () => {
};
dataWithZeroTokens.costUSD = undefined;

const result = calculateCostForEntry(dataWithZeroTokens, 'calculate', {});
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(dataWithZeroTokens, 'calculate', fetcher);
expect(result).toBe(0);
});

test('should handle costUSD of 0', () => {
test('should handle costUSD of 0', async () => {
const dataWithZeroCost = { ...mockUsageData, costUSD: 0 };
const result = calculateCostForEntry(dataWithZeroCost, 'display', {});
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(dataWithZeroCost, 'display', fetcher);
expect(result).toBe(0);
});

test('should handle negative costUSD', () => {
test('should handle negative costUSD', async () => {
const dataWithNegativeCost = { ...mockUsageData, costUSD: -0.01 };
const result = calculateCostForEntry(dataWithNegativeCost, 'display', {});
using fetcher = new PricingFetcher();
const result = await calculateCostForEntry(dataWithNegativeCost, 'display', fetcher);
expect(result).toBe(-0.01);
});
});
Expand Down
Loading