dsh-cost-meter 1.9.37 → 1.9.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +588 -586
- package/README.zh-CN.md +592 -590
- package/docs/update-notes-1.9.31.md +1 -1
- package/docs/update-notes-1.9.38.md +31 -0
- package/docs/update-notes-1.9.39.md +33 -0
- package/lib/billing-export.js +49 -13
- package/lib/billion-context-billing.js +82 -58
- package/lib/billion-context-history.js +5 -2
- package/lib/billion-context-inventory.js +8 -5
- package/lib/client.js +1 -1
- package/lib/client.plan-settings.js +1 -1
- package/lib/coding-plans.js +1 -1
- package/lib/external-usage.js +119 -119
- package/lib/gateway-quotas.js +33 -14
- package/lib/index.js +22 -13
- package/lib/journal-storage.js +7 -1
- package/lib/ledger-totals.js +57 -57
- package/lib/ledger-writer-worker.js +1 -1
- package/lib/plan-billing.js +1 -1
- package/lib/pricing.js +6 -5
- package/lib/store.js +2 -0
- package/lib/typert.host.js +1 -0
- package/lib/workbuddy-accounts.js +32 -12
- package/package.json +5 -3
package/lib/journal-storage.js
CHANGED
|
@@ -74,9 +74,15 @@ export async function archiveSealedJournals(root, { maxFiles = 16, minAgeMs = 30
|
|
|
74
74
|
const temp = path + '.' + randomUUID() + '.tmp'
|
|
75
75
|
try {
|
|
76
76
|
await pipeline(createReadStream(path), createGzip(), createWriteStream(temp, { flags: 'wx', mode: 0o600 }))
|
|
77
|
+
const handle = await open(temp, 'r+')
|
|
78
|
+
try { await handle.sync() } finally { await handle.close() }
|
|
77
79
|
const after = await lstat(path)
|
|
78
|
-
if (after.isSymbolicLink() || before.size !== after.size || before.mtimeMs !== after.mtimeMs || before.ino !== after.ino) continue
|
|
80
|
+
if (after.isSymbolicLink() || before.size !== after.size || before.mtimeMs !== after.mtimeMs || before.ctimeMs !== after.ctimeMs || before.ino !== after.ino) continue
|
|
79
81
|
await rename(temp, path + '.gz')
|
|
82
|
+
if (process.platform !== 'win32') {
|
|
83
|
+
const directory = await open(dir, 'r')
|
|
84
|
+
try { await directory.sync() } finally { await directory.close() }
|
|
85
|
+
}
|
|
80
86
|
await unlink(path)
|
|
81
87
|
archived++
|
|
82
88
|
} finally { await unlink(temp).catch(error => { if (error.code !== 'ENOENT') throw error }) }
|
package/lib/ledger-totals.js
CHANGED
|
@@ -1,57 +1,57 @@
|
|
|
1
|
-
/** Restore daily amounts from complete recorded session rows, without repricing. */
|
|
2
|
-
import { FX_FIELDS } from './exchange-rates.js'
|
|
3
|
-
const USAGE_FIELDS = ['input', 'output', 'cacheRead', 'cacheWrite', 'reasoning', 'calls']
|
|
4
|
-
const valid = value => typeof value === 'number' && Number.isFinite(value) && value >= 0
|
|
5
|
-
|
|
6
|
-
export function repairDailySessionTotals(days) {
|
|
7
|
-
const repaired = []
|
|
8
|
-
for (const [date, day] of Object.entries(days ?? {})) {
|
|
9
|
-
const rows = day?.sessions
|
|
10
|
-
if (!Array.isArray(rows) || !rows.length || !(day.calls > 0)) continue
|
|
11
|
-
const ids = new Set()
|
|
12
|
-
const frozenKeys = FX_FIELDS.filter(key => rows.every(row => valid(row?.[key])))
|
|
13
|
-
const sums = Object.fromEntries([...USAGE_FIELDS, 'cost', 'apiCost', ...frozenKeys].map(key => [key, 0]))
|
|
14
|
-
const models = new Map()
|
|
15
|
-
let complete = true
|
|
16
|
-
for (const row of rows) {
|
|
17
|
-
if (!row?.id || ids.has(row.id)) { complete = false; break }
|
|
18
|
-
ids.add(row.id)
|
|
19
|
-
for (const key of Object.keys(sums)) {
|
|
20
|
-
const value = key === 'apiCost' ? row.apiCost ?? row.cost : row[key] ?? 0
|
|
21
|
-
if (!valid(value)) { complete = false; break }
|
|
22
|
-
sums[key] += value
|
|
23
|
-
}
|
|
24
|
-
if (!complete || sums.apiCost > sums.cost + 1e-8) { complete = false; break }
|
|
25
|
-
for (const [key, bucket] of Object.entries(row.byProviderModel ?? {})) {
|
|
26
|
-
if (models.has(key) && models.get(key) === null) continue
|
|
27
|
-
const sum = models.get(key) ?? Object.fromEntries(Object.keys(sums).map(field => [field, 0]))
|
|
28
|
-
let usable = bucket !== null && typeof bucket === 'object'
|
|
29
|
-
for (const field of Object.keys(sum)) {
|
|
30
|
-
if (FX_FIELDS.includes(field) && !valid(bucket?.[field])) { delete sum[field]; continue }
|
|
31
|
-
const value = field === 'apiCost' ? bucket?.apiCost ?? bucket?.cost : bucket?.[field] ?? 0
|
|
32
|
-
if (!valid(value)) { usable = false; break }
|
|
33
|
-
sum[field] += value
|
|
34
|
-
}
|
|
35
|
-
models.set(key, usable ? sum : null)
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
// Anonymous usage or previously pruned details have a usage/call remainder.
|
|
39
|
-
// Preserve that remainder and its money instead of inventing attribution.
|
|
40
|
-
if (!complete || !Object.values(sums).every(valid) || !USAGE_FIELDS.every(key => valid(day[key] ?? 0) && sums[key] === (day[key] ?? 0))) continue
|
|
41
|
-
let changed = Math.abs(sums.cost - (day.cost ?? 0)) > 1e-8 || Math.abs(sums.apiCost - (day.apiCost ?? day.cost ?? 0)) > 1e-8
|
|
42
|
-
if (changed) { day.cost = sums.cost; day.apiCost = sums.apiCost }
|
|
43
|
-
for (const key of frozenKeys) if (Math.abs(sums[key] - (day[key] ?? 0)) > 1e-8) { day[key] = sums[key]; changed = true }
|
|
44
|
-
for (const [key, sum] of models) {
|
|
45
|
-
const bucket = day.byProviderModel?.[key]
|
|
46
|
-
if (!sum || !bucket || !sum.calls || !Object.values(sum).every(valid) || !USAGE_FIELDS.every(field => sum[field] === (bucket[field] ?? 0))) continue
|
|
47
|
-
if (Math.abs(sum.cost - (bucket.cost ?? 0)) <= 1e-8 && Math.abs(sum.apiCost - (bucket.apiCost ?? bucket.cost ?? 0)) <= 1e-8
|
|
48
|
-
&& frozenKeys.every(key => !valid(sum[key]) || Math.abs(sum[key] - (bucket[key] ?? 0)) <= 1e-8)) continue
|
|
49
|
-
for (const key of frozenKeys) if (valid(sum[key])) bucket[key] = sum[key]
|
|
50
|
-
bucket.cost = sum.cost
|
|
51
|
-
bucket.apiCost = sum.apiCost
|
|
52
|
-
changed = true
|
|
53
|
-
}
|
|
54
|
-
if (changed) repaired.push(date)
|
|
55
|
-
}
|
|
56
|
-
return repaired
|
|
57
|
-
}
|
|
1
|
+
/** Restore daily amounts from complete recorded session rows, without repricing. */
|
|
2
|
+
import { FX_FIELDS } from './exchange-rates.js'
|
|
3
|
+
const USAGE_FIELDS = ['input', 'output', 'cacheRead', 'cacheWrite', 'reasoning', 'calls']
|
|
4
|
+
const valid = value => typeof value === 'number' && Number.isFinite(value) && value >= 0
|
|
5
|
+
|
|
6
|
+
export function repairDailySessionTotals(days) {
|
|
7
|
+
const repaired = []
|
|
8
|
+
for (const [date, day] of Object.entries(days ?? {})) {
|
|
9
|
+
const rows = day?.sessions
|
|
10
|
+
if (!Array.isArray(rows) || !rows.length || !(day.calls > 0)) continue
|
|
11
|
+
const ids = new Set()
|
|
12
|
+
const frozenKeys = FX_FIELDS.filter(key => rows.every(row => valid(row?.[key])))
|
|
13
|
+
const sums = Object.fromEntries([...USAGE_FIELDS, 'cost', 'apiCost', ...frozenKeys].map(key => [key, 0]))
|
|
14
|
+
const models = new Map()
|
|
15
|
+
let complete = true
|
|
16
|
+
for (const row of rows) {
|
|
17
|
+
if (!row?.id || ids.has(row.id)) { complete = false; break }
|
|
18
|
+
ids.add(row.id)
|
|
19
|
+
for (const key of Object.keys(sums)) {
|
|
20
|
+
const value = key === 'apiCost' ? row.apiCost ?? row.cost : row[key] ?? 0
|
|
21
|
+
if (!valid(value)) { complete = false; break }
|
|
22
|
+
sums[key] += value
|
|
23
|
+
}
|
|
24
|
+
if (!complete || sums.apiCost > sums.cost + 1e-8) { complete = false; break }
|
|
25
|
+
for (const [key, bucket] of Object.entries(row.byProviderModel ?? {})) {
|
|
26
|
+
if (models.has(key) && models.get(key) === null) continue
|
|
27
|
+
const sum = models.get(key) ?? Object.fromEntries(Object.keys(sums).map(field => [field, 0]))
|
|
28
|
+
let usable = bucket !== null && typeof bucket === 'object'
|
|
29
|
+
for (const field of Object.keys(sum)) {
|
|
30
|
+
if (FX_FIELDS.includes(field) && !valid(bucket?.[field])) { delete sum[field]; continue }
|
|
31
|
+
const value = field === 'apiCost' ? bucket?.apiCost ?? bucket?.cost : bucket?.[field] ?? 0
|
|
32
|
+
if (!valid(value)) { usable = false; break }
|
|
33
|
+
sum[field] += value
|
|
34
|
+
}
|
|
35
|
+
models.set(key, usable ? sum : null)
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
// Anonymous usage or previously pruned details have a usage/call remainder.
|
|
39
|
+
// Preserve that remainder and its money instead of inventing attribution.
|
|
40
|
+
if (!complete || !Object.values(sums).every(valid) || !USAGE_FIELDS.every(key => valid(day[key] ?? 0) && sums[key] === (day[key] ?? 0))) continue
|
|
41
|
+
let changed = Math.abs(sums.cost - (day.cost ?? 0)) > 1e-8 || Math.abs(sums.apiCost - (day.apiCost ?? day.cost ?? 0)) > 1e-8
|
|
42
|
+
if (changed) { day.cost = sums.cost; day.apiCost = sums.apiCost }
|
|
43
|
+
for (const key of frozenKeys) if (Math.abs(sums[key] - (day[key] ?? 0)) > 1e-8) { day[key] = sums[key]; changed = true }
|
|
44
|
+
for (const [key, sum] of models) {
|
|
45
|
+
const bucket = day.byProviderModel?.[key]
|
|
46
|
+
if (!sum || !bucket || !sum.calls || !Object.values(sum).every(valid) || !USAGE_FIELDS.every(field => sum[field] === (bucket[field] ?? 0))) continue
|
|
47
|
+
if (Math.abs(sum.cost - (bucket.cost ?? 0)) <= 1e-8 && Math.abs(sum.apiCost - (bucket.apiCost ?? bucket.cost ?? 0)) <= 1e-8
|
|
48
|
+
&& frozenKeys.every(key => !valid(sum[key]) || Math.abs(sum[key] - (bucket[key] ?? 0)) <= 1e-8)) continue
|
|
49
|
+
for (const key of frozenKeys) if (valid(sum[key])) bucket[key] = sum[key]
|
|
50
|
+
bucket.cost = sum.cost
|
|
51
|
+
bucket.apiCost = sum.apiCost
|
|
52
|
+
changed = true
|
|
53
|
+
}
|
|
54
|
+
if (changed) repaired.push(date)
|
|
55
|
+
}
|
|
56
|
+
return repaired
|
|
57
|
+
}
|