Skip to content

Commit 930aa29

Browse files
committed
refactor: resolve circular dependency between pricing-fetcher and macro modules
- Move ModelPricing type and ModelPricingSchema from pricing-fetcher.ts to types.internal.ts - Update imports in pricing-fetcher.ts, macro.internal.ts, and pricing-fetcher.test.ts - Fix ESLint import ordering issues in test file - Eliminate circular dependency where pricing-fetcher imported from macro.internal via macro import, while macro.internal imported types from pricing-fetcher This change improves module architecture by centralizing shared types in the types module, preventing the circular import chain that could cause build or runtime issues.
1 parent e1a5fde commit 930aa29

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎src/macro.internal.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import * as v from 'valibot';
66
import { LITELLM_PRICING_URL } from './consts.internal.ts';
7-
import { type ModelPricing, ModelPricingSchema } from './pricing-fetcher.ts';
7+
import { type ModelPricing, ModelPricingSchema } from './types.internal.ts';
88

99
/**
1010
* Prefetches the pricing data for Claude models from the LiteLLM API.

‎src/pricing-fetcher.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1+
import type { ModelPricing } from './types.internal.ts';
2+
13
import { describe, expect, it } from 'bun:test';
2-
import {
3-
type ModelPricing,
4-
PricingFetcher,
5-
} from './pricing-fetcher.ts';
4+
import { PricingFetcher } from './pricing-fetcher.ts';
65

76
describe('pricing-fetcher', () => {
87
describe('PricingFetcher class', () => {

‎src/pricing-fetcher.ts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@ import * as v from 'valibot';
22
import { LITELLM_PRICING_URL } from './consts.internal.ts';
33
import { logger } from './logger.ts';
44
import { prefetchClaudePricing } from './macro.internal.ts' with { type: 'macro' };
5-
6-
export const ModelPricingSchema = v.object({
7-
input_cost_per_token: v.optional(v.number()),
8-
output_cost_per_token: v.optional(v.number()),
9-
cache_creation_input_token_cost: v.optional(v.number()),
10-
cache_read_input_token_cost: v.optional(v.number()),
11-
});
12-
13-
export type ModelPricing = v.InferOutput<typeof ModelPricingSchema>;
5+
import { type ModelPricing, ModelPricingSchema } from './types.internal.ts';
146

157
export class PricingFetcher implements Disposable {
168
private cachedPricing: Map<string, ModelPricing> | null = null;

‎src/types.internal.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,12 @@ export type CostMode = TupleToUnion<typeof CostModes>;
1111

1212
export const SortOrders = ['desc', 'asc'] as const;
1313
export type SortOrder = TupleToUnion<typeof SortOrders>;
14+
15+
export const ModelPricingSchema = v.object({
16+
input_cost_per_token: v.optional(v.number()),
17+
output_cost_per_token: v.optional(v.number()),
18+
cache_creation_input_token_cost: v.optional(v.number()),
19+
cache_read_input_token_cost: v.optional(v.number()),
20+
});
21+
22+
export type ModelPricing = v.InferOutput<typeof ModelPricingSchema>;

0 commit comments

Comments
 (0)