@snylonue/dsh-context-policy 0.0.0-stage → 0.1.0
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/LICENSE +21 -0
- package/README.md +223 -2
- package/assets/deepseek-v4/LICENSE +21 -0
- package/assets/deepseek-v4/README.md +19 -0
- package/assets/deepseek-v4/tokenizer.json.gz +0 -0
- package/assets/o200k-base/LICENSE +21 -0
- package/assets/o200k-base/README.md +20 -0
- package/assets/o200k-base/tokenizer.json.gz +0 -0
- package/cordis.patch.yml +19 -0
- package/dist/builtin-tokenizers.d.ts +2 -0
- package/dist/builtin-tokenizers.d.ts.map +1 -0
- package/dist/builtin-tokenizers.js +15 -0
- package/dist/builtin-tokenizers.js.map +1 -0
- package/dist/compaction.d.ts +43 -0
- package/dist/compaction.d.ts.map +1 -0
- package/dist/compaction.js +198 -0
- package/dist/compaction.js.map +1 -0
- package/dist/core.d.ts +49 -0
- package/dist/core.d.ts.map +1 -0
- package/dist/core.js +213 -0
- package/dist/core.js.map +1 -0
- package/dist/projection.d.ts +103 -0
- package/dist/projection.d.ts.map +1 -0
- package/dist/projection.js +137 -0
- package/dist/projection.js.map +1 -0
- package/dist/token-meter.d.ts +46 -0
- package/dist/token-meter.d.ts.map +1 -0
- package/dist/token-meter.js +55 -0
- package/dist/token-meter.js.map +1 -0
- package/dist/tokenizers.d.ts +6 -0
- package/dist/tokenizers.d.ts.map +1 -0
- package/dist/tokenizers.js +64 -0
- package/dist/tokenizers.js.map +1 -0
- package/dist/types.d.ts +62 -0
- package/dist/types.d.ts.map +1 -0
- package/dist/types.js +2 -0
- package/dist/types.js.map +1 -0
- package/dist/usage.d.ts +67 -0
- package/dist/usage.d.ts.map +1 -0
- package/dist/usage.js +81 -0
- package/dist/usage.js.map +1 -0
- package/examples/preset-compaction.yml +13 -0
- package/locale/en.json +6 -0
- package/locale/zh.json +6 -0
- package/package.json +92 -5
- package/scripts/audit.ts +105 -0
- package/scripts/check.ts +19 -0
- package/scripts/prepare-o200k.ts +40 -0
- package/src/builtin-tokenizers.ts +24 -0
- package/src/compaction.ts +293 -0
- package/src/core.ts +277 -0
- package/src/projection.ts +173 -0
- package/src/token-meter.ts +81 -0
- package/src/tokenizers.ts +78 -0
- package/src/types.ts +63 -0
- package/src/usage.ts +96 -0
- package/tests/bundle.test.ts +43 -0
- package/tests/deepseek-v4-fixtures.json +125 -0
- package/tests/o200k-base-fixtures.json +184 -0
- package/tests/policy.test.ts +773 -0
- package/tests/tokenizers.test.ts +51 -0
- package/tsconfig.check.json +15 -0
- package/tsconfig.json +17 -0
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
import { SessionLogOffset, SessionSeq } from "@deepseek-ai/dsh-session";
|
|
2
|
+
import type { EpochHeader, SessionEvent } from "@deepseek-ai/dsh-session";
|
|
3
|
+
import type { Message } from "@deepseek-ai/dsh-llm";
|
|
4
|
+
import type { ProjectionDefinition } from "@deepseek-ai/dsh-session-projection";
|
|
5
|
+
import type {
|
|
6
|
+
ContextPressureProjection,
|
|
7
|
+
ContextBreakdownProjection,
|
|
8
|
+
} from "@deepseek-ai/dsh-token-meter";
|
|
9
|
+
import { estimateToolsTokens } from "@deepseek-ai/dsh-token-meter/estimate";
|
|
10
|
+
import { z } from "zod";
|
|
11
|
+
import { initialState, fold, measureState } from "./core.js";
|
|
12
|
+
import type { MeterServices } from "./core.js";
|
|
13
|
+
import type { MeterConfig, ReplayState, ReplayNode } from "./types.js";
|
|
14
|
+
|
|
15
|
+
const count = z.number().int().nonnegative();
|
|
16
|
+
const nodeSchema = z.object({
|
|
17
|
+
seq: count.transform(SessionSeq),
|
|
18
|
+
message: z.custom<Message>().nullable(),
|
|
19
|
+
heuristicTokens: count,
|
|
20
|
+
});
|
|
21
|
+
const replaySchema = z.object({
|
|
22
|
+
nodes: z.array(nodeSchema),
|
|
23
|
+
header: z.custom<EpochHeader>().nullable(),
|
|
24
|
+
anchor: z.custom<NonNullable<ReplayState["anchor"]>>().nullable(),
|
|
25
|
+
logRevision: count.transform(SessionLogOffset),
|
|
26
|
+
});
|
|
27
|
+
export const replayProjection: ProjectionDefinition<"contextPolicyMeter"> = {
|
|
28
|
+
key: "contextPolicyMeter",
|
|
29
|
+
stateVersion: 1,
|
|
30
|
+
stateSchema: replaySchema,
|
|
31
|
+
init: initialState,
|
|
32
|
+
apply: fold,
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
// Retain the native state fields so callers of the original keys remain type-compatible.
|
|
36
|
+
interface DisplayState extends ReplayState {
|
|
37
|
+
nodes: (ReplayNode & { system: boolean })[];
|
|
38
|
+
surfaceTokens: number;
|
|
39
|
+
breakdown: ContextBreakdownProjection;
|
|
40
|
+
contextWindow?: number;
|
|
41
|
+
}
|
|
42
|
+
const breakdownSchema = z.object({
|
|
43
|
+
systemTokens: count,
|
|
44
|
+
toolsTokens: count,
|
|
45
|
+
messageTokens: count,
|
|
46
|
+
});
|
|
47
|
+
const displaySchema = replaySchema.extend({
|
|
48
|
+
nodes: z.array(nodeSchema.extend({ system: z.boolean() })),
|
|
49
|
+
surfaceTokens: count,
|
|
50
|
+
breakdown: breakdownSchema,
|
|
51
|
+
contextWindow: z.number().int().positive().optional(),
|
|
52
|
+
});
|
|
53
|
+
function initialDisplayState(): DisplayState {
|
|
54
|
+
return {
|
|
55
|
+
...initialState(),
|
|
56
|
+
nodes: [],
|
|
57
|
+
surfaceTokens: 0,
|
|
58
|
+
breakdown: { systemTokens: 0, toolsTokens: 0, messageTokens: 0 },
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
function foldDisplay(state: DisplayState, event: SessionEvent): DisplayState {
|
|
62
|
+
const next = fold(state, event);
|
|
63
|
+
const { contextWindow, ...withoutWindow } = {
|
|
64
|
+
...next,
|
|
65
|
+
contextWindow: state.contextWindow,
|
|
66
|
+
};
|
|
67
|
+
const window =
|
|
68
|
+
event.type === "request/context" ? event.data.contextWindow : contextWindow;
|
|
69
|
+
if (
|
|
70
|
+
next.nodes === state.nodes &&
|
|
71
|
+
next.header === state.header &&
|
|
72
|
+
next.anchor === state.anchor &&
|
|
73
|
+
window === state.contextWindow
|
|
74
|
+
)
|
|
75
|
+
return state;
|
|
76
|
+
const nodes =
|
|
77
|
+
next.nodes === state.nodes
|
|
78
|
+
? state.nodes
|
|
79
|
+
: next.nodes.map((node) => ({
|
|
80
|
+
...node,
|
|
81
|
+
system: node.message?.role === "system",
|
|
82
|
+
}));
|
|
83
|
+
const surfaceTokens =
|
|
84
|
+
nodes === state.nodes
|
|
85
|
+
? state.surfaceTokens
|
|
86
|
+
: nodes.reduce((total, node) => total + node.heuristicTokens, 0);
|
|
87
|
+
const systemTokens =
|
|
88
|
+
nodes === state.nodes
|
|
89
|
+
? state.breakdown.systemTokens
|
|
90
|
+
: (nodes.findLast((node) => node.system && node.heuristicTokens > 0)
|
|
91
|
+
?.heuristicTokens ?? 0);
|
|
92
|
+
return {
|
|
93
|
+
...withoutWindow,
|
|
94
|
+
nodes,
|
|
95
|
+
surfaceTokens,
|
|
96
|
+
breakdown: {
|
|
97
|
+
systemTokens,
|
|
98
|
+
toolsTokens:
|
|
99
|
+
next.header === state.header
|
|
100
|
+
? state.breakdown.toolsTokens
|
|
101
|
+
: estimateToolsTokens(next.header ?? undefined),
|
|
102
|
+
messageTokens: surfaceTokens - systemTokens,
|
|
103
|
+
},
|
|
104
|
+
...(window === undefined ? {} : { contextWindow: window }),
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
export function createDisplayProjections(
|
|
109
|
+
config: MeterConfig,
|
|
110
|
+
services: MeterServices,
|
|
111
|
+
) {
|
|
112
|
+
const views = new WeakMap<
|
|
113
|
+
DisplayState,
|
|
114
|
+
{
|
|
115
|
+
pressure: ContextPressureProjection;
|
|
116
|
+
breakdown: ContextBreakdownProjection;
|
|
117
|
+
}
|
|
118
|
+
>();
|
|
119
|
+
const view = (state: DisplayState) => {
|
|
120
|
+
const cached = views.get(state);
|
|
121
|
+
if (cached) return cached;
|
|
122
|
+
const measurement = measureState(state, config, services);
|
|
123
|
+
const system = state.nodes.findLast(
|
|
124
|
+
(node) => node.system && node.message?.content.length,
|
|
125
|
+
);
|
|
126
|
+
const systemTokens =
|
|
127
|
+
measurement.nodes.find((node) => node.seq === system?.seq)?.tokens ?? 0;
|
|
128
|
+
const pressure: ContextPressureProjection = {
|
|
129
|
+
projectedTokens: measurement.totalTokens,
|
|
130
|
+
...(measurement.baseline.kind === "usage"
|
|
131
|
+
? { pressureTokens: measurement.baseline.tokens }
|
|
132
|
+
: {}),
|
|
133
|
+
...(state.contextWindow === undefined
|
|
134
|
+
? {}
|
|
135
|
+
: { contextWindow: state.contextWindow }),
|
|
136
|
+
};
|
|
137
|
+
const breakdown = {
|
|
138
|
+
systemTokens,
|
|
139
|
+
toolsTokens: measurement.toolsTokens,
|
|
140
|
+
messageTokens: measurement.surfaceTokens - systemTokens,
|
|
141
|
+
};
|
|
142
|
+
const value = { pressure, breakdown };
|
|
143
|
+
views.set(state, value);
|
|
144
|
+
return value;
|
|
145
|
+
};
|
|
146
|
+
const replay = {
|
|
147
|
+
stateVersion: 7,
|
|
148
|
+
stateSchema: displaySchema,
|
|
149
|
+
init: initialDisplayState,
|
|
150
|
+
apply: foldDisplay,
|
|
151
|
+
};
|
|
152
|
+
const pressure = {
|
|
153
|
+
...replay,
|
|
154
|
+
key: "contextPressure",
|
|
155
|
+
wire: {
|
|
156
|
+
viewSchema: z.object({
|
|
157
|
+
pressureTokens: count.optional(),
|
|
158
|
+
projectedTokens: count,
|
|
159
|
+
contextWindow: z.number().int().positive().optional(),
|
|
160
|
+
}),
|
|
161
|
+
view: (state: DisplayState) => view(state).pressure,
|
|
162
|
+
},
|
|
163
|
+
} satisfies ProjectionDefinition<"contextPressure", DisplayState>;
|
|
164
|
+
const breakdown = {
|
|
165
|
+
...replay,
|
|
166
|
+
key: "contextBreakdown",
|
|
167
|
+
wire: {
|
|
168
|
+
viewSchema: breakdownSchema,
|
|
169
|
+
view: (state: DisplayState) => view(state).breakdown,
|
|
170
|
+
},
|
|
171
|
+
} satisfies ProjectionDefinition<"contextBreakdown", DisplayState>;
|
|
172
|
+
return { pressure, breakdown };
|
|
173
|
+
}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import { Service } from "@deepseek-ai/cordis";
|
|
2
|
+
import type { Context } from "@deepseek-ai/cordis";
|
|
3
|
+
import type { EpochHeader, Session } from "@deepseek-ai/dsh-session";
|
|
4
|
+
import { SessionSeq } from "@deepseek-ai/dsh-session";
|
|
5
|
+
import type { Message } from "@deepseek-ai/dsh-llm";
|
|
6
|
+
import type { MeterConfig, MeterConfigInput, ReplayState } from "./types.js";
|
|
7
|
+
import type { MeterServices } from "./core.js";
|
|
8
|
+
import "@deepseek-ai/dsh-session-projection";
|
|
9
|
+
import settings from "@deepseek-ai/schemastery";
|
|
10
|
+
import { measureState, priceSurface } from "./core.js";
|
|
11
|
+
import { createDisplayProjections, replayProjection } from "./projection.js";
|
|
12
|
+
import { usageProjection } from "./usage.js";
|
|
13
|
+
|
|
14
|
+
declare module "@deepseek-ai/dsh-session-projection" {
|
|
15
|
+
interface SessionProjectionStateMap {
|
|
16
|
+
contextPolicyMeter: ReplayState;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export const Config: settings<MeterConfigInput, MeterConfig> = settings.object({
|
|
21
|
+
defaultTokenizer: settings.string().default("deepseek_v4"),
|
|
22
|
+
providerTokenizers: settings.dict(settings.string()).default({}),
|
|
23
|
+
modelPolicies: settings
|
|
24
|
+
.array(
|
|
25
|
+
settings.object({
|
|
26
|
+
provider: settings.string(),
|
|
27
|
+
model: settings.string().required(),
|
|
28
|
+
tokenizer: settings.string(),
|
|
29
|
+
tokensPerMessage: settings.number().min(0).step(1),
|
|
30
|
+
toolsOverhead: settings.number().min(0).step(1),
|
|
31
|
+
replyPrimingTokens: settings.number().min(0).step(1),
|
|
32
|
+
includeReasoning: settings.boolean(),
|
|
33
|
+
}),
|
|
34
|
+
)
|
|
35
|
+
.default([]),
|
|
36
|
+
});
|
|
37
|
+
export const inject = ["sessionProjections"];
|
|
38
|
+
|
|
39
|
+
export class ModelTokenMeter extends Service {
|
|
40
|
+
constructor(ctx: Context, config: MeterConfig) {
|
|
41
|
+
super(ctx, "tokenMeter");
|
|
42
|
+
this.config = structuredClone(config);
|
|
43
|
+
this.services = {
|
|
44
|
+
get llm() {
|
|
45
|
+
return ctx.get("llm");
|
|
46
|
+
},
|
|
47
|
+
};
|
|
48
|
+
const display = createDisplayProjections(this.config, this.services);
|
|
49
|
+
ctx.sessionProjections.register(usageProjection);
|
|
50
|
+
ctx.sessionProjections.register(display.pressure);
|
|
51
|
+
ctx.sessionProjections.register(display.breakdown);
|
|
52
|
+
ctx.sessionProjections.register(replayProjection);
|
|
53
|
+
}
|
|
54
|
+
config: MeterConfig;
|
|
55
|
+
services: MeterServices;
|
|
56
|
+
measure(session: Session, requestHeader?: EpochHeader) {
|
|
57
|
+
const state = this.ctx.sessionProjections.stateOf(
|
|
58
|
+
session,
|
|
59
|
+
"contextPolicyMeter",
|
|
60
|
+
);
|
|
61
|
+
if (!state)
|
|
62
|
+
throw new Error(
|
|
63
|
+
"ModelTokenMeter contextPolicyMeter projection is unavailable",
|
|
64
|
+
);
|
|
65
|
+
return measureState(state, this.config, this.services, requestHeader);
|
|
66
|
+
}
|
|
67
|
+
estimateMessage(message: Message) {
|
|
68
|
+
return priceSurface(
|
|
69
|
+
[{ seq: SessionSeq(0), message, heuristicTokens: 0 }],
|
|
70
|
+
null,
|
|
71
|
+
this.config,
|
|
72
|
+
this.services,
|
|
73
|
+
).surfaceTokens;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
export function apply(ctx: Context, config: MeterConfig) {
|
|
78
|
+
new ModelTokenMeter(ctx, config);
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
export default { Config, inject, apply };
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import type { EpochHeader } from "@deepseek-ai/dsh-session";
|
|
2
|
+
import type { MeterConfig, ResolvedPolicy } from "./types.js";
|
|
3
|
+
import { createTokenizerCounter } from "./builtin-tokenizers.js";
|
|
4
|
+
|
|
5
|
+
// Treat special-token-looking user text as ordinary text, rather than
|
|
6
|
+
// rejecting or interpreting it as control.
|
|
7
|
+
const caches = new Map<
|
|
8
|
+
(text: string) => number,
|
|
9
|
+
{ values: Map<string, number>; chars: number }
|
|
10
|
+
>();
|
|
11
|
+
const tokenizers = new Map<string, (text: string) => number>([
|
|
12
|
+
["deepseek_v4", createTokenizerCounter("deepseek-v4")],
|
|
13
|
+
["o200k_base", createTokenizerCounter("o200k-base")],
|
|
14
|
+
]);
|
|
15
|
+
|
|
16
|
+
export function registerTokenizer(
|
|
17
|
+
name: string,
|
|
18
|
+
count: (text: string) => number,
|
|
19
|
+
) {
|
|
20
|
+
if (tokenizers.has(name))
|
|
21
|
+
throw new Error(`Tokenizer already registered: ${name}`);
|
|
22
|
+
tokenizers.set(name, count);
|
|
23
|
+
return () => {
|
|
24
|
+
if (tokenizers.get(name) === count) {
|
|
25
|
+
tokenizers.delete(name);
|
|
26
|
+
caches.delete(count);
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export function countText(text: string, tokenizer: string): number {
|
|
32
|
+
const count = tokenizers.get(tokenizer);
|
|
33
|
+
if (!count) throw new Error(`Unknown tokenizer: ${tokenizer}`);
|
|
34
|
+
let cache = caches.get(count);
|
|
35
|
+
if (!cache) {
|
|
36
|
+
cache = { values: new Map(), chars: 0 };
|
|
37
|
+
caches.set(count, cache);
|
|
38
|
+
}
|
|
39
|
+
const cached = cache.values.get(text);
|
|
40
|
+
if (cached !== undefined) return cached;
|
|
41
|
+
const result = count(text);
|
|
42
|
+
if (!Number.isSafeInteger(result) || result < 0)
|
|
43
|
+
throw new TypeError("Tokenizer must return a non-negative safe integer");
|
|
44
|
+
if (text.length <= 2000000) {
|
|
45
|
+
while (cache.values.size >= 512 || cache.chars + text.length > 2000000) {
|
|
46
|
+
const oldest = cache.values.keys().next();
|
|
47
|
+
if (oldest.done) break;
|
|
48
|
+
const key = oldest.value;
|
|
49
|
+
cache.chars -= key.length;
|
|
50
|
+
cache.values.delete(key);
|
|
51
|
+
}
|
|
52
|
+
cache.values.set(text, result);
|
|
53
|
+
cache.chars += text.length;
|
|
54
|
+
}
|
|
55
|
+
return result;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export function resolvePolicy(
|
|
59
|
+
config: MeterConfig,
|
|
60
|
+
header: EpochHeader | null,
|
|
61
|
+
): Readonly<ResolvedPolicy> {
|
|
62
|
+
const policies = config.modelPolicies;
|
|
63
|
+
const route = header?.config;
|
|
64
|
+
const match =
|
|
65
|
+
policies.find(
|
|
66
|
+
(p) => p.provider === route?.provider && p.model === route?.model,
|
|
67
|
+
) ??
|
|
68
|
+
policies.find((p) => p.provider === undefined && p.model === route?.model);
|
|
69
|
+
const providerTokenizer = route && config.providerTokenizers?.[route.provider];
|
|
70
|
+
return Object.freeze({
|
|
71
|
+
tokensPerMessage: 3,
|
|
72
|
+
toolsOverhead: 4,
|
|
73
|
+
replyPrimingTokens: 3,
|
|
74
|
+
includeReasoning: false,
|
|
75
|
+
...match,
|
|
76
|
+
tokenizer: match?.tokenizer ?? providerTokenizer ?? config.defaultTokenizer,
|
|
77
|
+
});
|
|
78
|
+
}
|
package/src/types.ts
ADDED
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import type {
|
|
2
|
+
EpochHeader,
|
|
3
|
+
SessionSeq,
|
|
4
|
+
SessionLogOffset,
|
|
5
|
+
SessionEvent,
|
|
6
|
+
} from "@deepseek-ai/dsh-session";
|
|
7
|
+
import type { Message, TokenUsage } from "@deepseek-ai/dsh-llm";
|
|
8
|
+
|
|
9
|
+
/** Optional domain events; no runtime dependency on their owning plugins. */
|
|
10
|
+
export type MeterEvent =
|
|
11
|
+
| SessionEvent
|
|
12
|
+
| {
|
|
13
|
+
type: "image/offload";
|
|
14
|
+
seq: SessionSeq;
|
|
15
|
+
data: { targets: { seq: SessionSeq; imageIndexes: number[] }[] };
|
|
16
|
+
}
|
|
17
|
+
| {
|
|
18
|
+
type: "llm/retry-started";
|
|
19
|
+
seq: SessionSeq;
|
|
20
|
+
data: { turn: number; step: number };
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
export interface ModelPolicy {
|
|
24
|
+
provider?: string;
|
|
25
|
+
model: string;
|
|
26
|
+
tokenizer?: string;
|
|
27
|
+
tokensPerMessage?: number;
|
|
28
|
+
toolsOverhead?: number;
|
|
29
|
+
replyPrimingTokens?: number;
|
|
30
|
+
includeReasoning?: boolean;
|
|
31
|
+
}
|
|
32
|
+
export interface MeterConfigInput {
|
|
33
|
+
defaultTokenizer?: string;
|
|
34
|
+
providerTokenizers?: Record<string, string>;
|
|
35
|
+
modelPolicies?: ModelPolicy[];
|
|
36
|
+
}
|
|
37
|
+
export interface MeterConfig {
|
|
38
|
+
defaultTokenizer: string;
|
|
39
|
+
providerTokenizers?: Record<string, string>;
|
|
40
|
+
modelPolicies: ModelPolicy[];
|
|
41
|
+
}
|
|
42
|
+
export interface ResolvedPolicy {
|
|
43
|
+
tokenizer: string;
|
|
44
|
+
tokensPerMessage: number;
|
|
45
|
+
toolsOverhead: number;
|
|
46
|
+
replyPrimingTokens: number;
|
|
47
|
+
includeReasoning: boolean;
|
|
48
|
+
}
|
|
49
|
+
export interface ReplayNode {
|
|
50
|
+
seq: SessionSeq;
|
|
51
|
+
message: Message | null;
|
|
52
|
+
heuristicTokens: number;
|
|
53
|
+
}
|
|
54
|
+
export interface ReplayState {
|
|
55
|
+
nodes: readonly ReplayNode[];
|
|
56
|
+
header: EpochHeader | null;
|
|
57
|
+
anchor: {
|
|
58
|
+
header: EpochHeader;
|
|
59
|
+
nodes: readonly ReplayNode[];
|
|
60
|
+
usage: TokenUsage;
|
|
61
|
+
} | null;
|
|
62
|
+
logRevision: SessionLogOffset;
|
|
63
|
+
}
|
package/src/usage.ts
ADDED
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
// Provider billing fold adapted from DeepSeek Harness 0.2.0-rc.2 (MIT).
|
|
2
|
+
import { deepEqualJson } from "@deepseek-ai/dsh-util-values";
|
|
3
|
+
import { usageOf } from "./core.js";
|
|
4
|
+
import type {
|
|
5
|
+
SessionProjectionStateMap,
|
|
6
|
+
ProjectionDefinition,
|
|
7
|
+
} from "@deepseek-ai/dsh-session-projection";
|
|
8
|
+
import type { TokenUsageProjection } from "@deepseek-ai/dsh-token-meter";
|
|
9
|
+
import { z } from "zod";
|
|
10
|
+
import type { MeterEvent } from "./types.js";
|
|
11
|
+
|
|
12
|
+
const count = z.number().int().nonnegative();
|
|
13
|
+
const bucketsSchema = z
|
|
14
|
+
.object({
|
|
15
|
+
uncachedInputTokens: count,
|
|
16
|
+
outputTokens: count,
|
|
17
|
+
cacheReadTokens: count,
|
|
18
|
+
cacheWriteTokens: count,
|
|
19
|
+
})
|
|
20
|
+
.strict();
|
|
21
|
+
|
|
22
|
+
export const usageProjection = {
|
|
23
|
+
key: "tokenUsage",
|
|
24
|
+
stateVersion: 2,
|
|
25
|
+
stateSchema: z
|
|
26
|
+
.object({
|
|
27
|
+
totals: bucketsSchema,
|
|
28
|
+
last: z
|
|
29
|
+
.object({ turn: count, step: count, buckets: bucketsSchema })
|
|
30
|
+
.nullable(),
|
|
31
|
+
})
|
|
32
|
+
.strict(),
|
|
33
|
+
init: () => ({
|
|
34
|
+
totals: {
|
|
35
|
+
uncachedInputTokens: 0,
|
|
36
|
+
outputTokens: 0,
|
|
37
|
+
cacheReadTokens: 0,
|
|
38
|
+
cacheWriteTokens: 0,
|
|
39
|
+
},
|
|
40
|
+
last: null,
|
|
41
|
+
}),
|
|
42
|
+
apply: (
|
|
43
|
+
state: SessionProjectionStateMap["tokenUsage"],
|
|
44
|
+
event: MeterEvent,
|
|
45
|
+
) => {
|
|
46
|
+
if (event.type === "llm/retry-started")
|
|
47
|
+
return state.last?.turn === event.data.turn &&
|
|
48
|
+
state.last.step === event.data.step
|
|
49
|
+
? { ...state, last: null }
|
|
50
|
+
: state;
|
|
51
|
+
if (
|
|
52
|
+
event.type !== "assistant/message" &&
|
|
53
|
+
event.type !== "assistant/attempt"
|
|
54
|
+
)
|
|
55
|
+
return state;
|
|
56
|
+
const usage = usageOf(event);
|
|
57
|
+
if (usage === undefined) return state;
|
|
58
|
+
const { turn, step } = event.data;
|
|
59
|
+
const buckets: TokenUsageProjection = {
|
|
60
|
+
uncachedInputTokens: usage.inputTokens,
|
|
61
|
+
outputTokens: usage.outputTokens,
|
|
62
|
+
cacheReadTokens: usage.cacheReadTokens ?? 0,
|
|
63
|
+
cacheWriteTokens: usage.cacheWriteTokens ?? 0,
|
|
64
|
+
};
|
|
65
|
+
const previous =
|
|
66
|
+
state.last?.turn === turn && state.last.step === step
|
|
67
|
+
? state.last.buckets
|
|
68
|
+
: undefined;
|
|
69
|
+
if (previous && deepEqualJson(previous, buckets)) return state;
|
|
70
|
+
return {
|
|
71
|
+
totals: {
|
|
72
|
+
uncachedInputTokens:
|
|
73
|
+
state.totals.uncachedInputTokens -
|
|
74
|
+
(previous?.uncachedInputTokens ?? 0) +
|
|
75
|
+
buckets.uncachedInputTokens,
|
|
76
|
+
outputTokens:
|
|
77
|
+
state.totals.outputTokens -
|
|
78
|
+
(previous?.outputTokens ?? 0) +
|
|
79
|
+
buckets.outputTokens,
|
|
80
|
+
cacheReadTokens:
|
|
81
|
+
state.totals.cacheReadTokens -
|
|
82
|
+
(previous?.cacheReadTokens ?? 0) +
|
|
83
|
+
buckets.cacheReadTokens,
|
|
84
|
+
cacheWriteTokens:
|
|
85
|
+
state.totals.cacheWriteTokens -
|
|
86
|
+
(previous?.cacheWriteTokens ?? 0) +
|
|
87
|
+
buckets.cacheWriteTokens,
|
|
88
|
+
},
|
|
89
|
+
last: { turn, step, buckets },
|
|
90
|
+
};
|
|
91
|
+
},
|
|
92
|
+
wire: {
|
|
93
|
+
viewSchema: bucketsSchema,
|
|
94
|
+
view: (state: SessionProjectionStateMap["tokenUsage"]) => state.totals,
|
|
95
|
+
},
|
|
96
|
+
} satisfies ProjectionDefinition<"tokenUsage">;
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import test from "node:test";
|
|
2
|
+
import assert from "node:assert/strict";
|
|
3
|
+
import { composeEntries, loadOverlayPatches } from "@deepseek-ai/dsh-app-boot";
|
|
4
|
+
|
|
5
|
+
test("bundle composition disables upstream meter and compaction while preserving other plugins", () => {
|
|
6
|
+
const rows = loadOverlayPatches(
|
|
7
|
+
"@snylonue/dsh-context-policy",
|
|
8
|
+
new URL("../cordis.patch.yml", import.meta.url).pathname,
|
|
9
|
+
);
|
|
10
|
+
const base = [
|
|
11
|
+
{
|
|
12
|
+
insert: [
|
|
13
|
+
{ id: "token-meter", name: "@deepseek-ai/dsh-token-meter" },
|
|
14
|
+
{ id: "compaction-basic", name: "@deepseek-ai/dsh-compaction-basic" },
|
|
15
|
+
{ id: "command-compact", name: "@deepseek-ai/dsh-command-compact" },
|
|
16
|
+
],
|
|
17
|
+
},
|
|
18
|
+
];
|
|
19
|
+
const warnings: string[] = [];
|
|
20
|
+
const entries = composeEntries([base, rows], (warning) =>
|
|
21
|
+
warnings.push(warning),
|
|
22
|
+
);
|
|
23
|
+
assert.deepEqual(warnings, []);
|
|
24
|
+
assert.deepEqual(
|
|
25
|
+
entries.find((entry) => entry.id === "model-token-meter")?.config,
|
|
26
|
+
{
|
|
27
|
+
defaultTokenizer: "deepseek_v4",
|
|
28
|
+
},
|
|
29
|
+
);
|
|
30
|
+
for (const id of ["token-meter", "compaction-basic"])
|
|
31
|
+
assert.equal(entries.find((entry) => entry.id === id)?.disabled, true);
|
|
32
|
+
const active = entries
|
|
33
|
+
.filter((entry) => !entry.disabled)
|
|
34
|
+
.map((entry) => entry.name);
|
|
35
|
+
assert.deepEqual(
|
|
36
|
+
active.toSorted(),
|
|
37
|
+
[
|
|
38
|
+
"@deepseek-ai/dsh-command-compact",
|
|
39
|
+
"@snylonue/dsh-context-policy/token-meter",
|
|
40
|
+
"@snylonue/dsh-context-policy/compaction",
|
|
41
|
+
].toSorted(),
|
|
42
|
+
);
|
|
43
|
+
});
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
{
|
|
2
|
+
"source": "deepseek-ai/DeepSeek-V4-Pro",
|
|
3
|
+
"revision": "b5968e9190ef611bbf34a7229255be88a0e937c1",
|
|
4
|
+
"tokenizersVersion": "0.23.2",
|
|
5
|
+
"addedTokens": false,
|
|
6
|
+
"addSpecialTokens": false,
|
|
7
|
+
"cases": [
|
|
8
|
+
{
|
|
9
|
+
"text": "",
|
|
10
|
+
"tokens": 0
|
|
11
|
+
},
|
|
12
|
+
{
|
|
13
|
+
"text": "hello world",
|
|
14
|
+
"tokens": 2
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
"text": "你好世界",
|
|
18
|
+
"tokens": 2
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
"text": "给 dsh-context-policy 增加 deepseek 新模型的 tokenizer 支持",
|
|
22
|
+
"tokens": 18
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
"text": "DeepSeek V4 Pro / Flash",
|
|
26
|
+
"tokens": 8
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
"text": "12345678901234567890",
|
|
30
|
+
"tokens": 7
|
|
31
|
+
},
|
|
32
|
+
{
|
|
33
|
+
"text": "123456789",
|
|
34
|
+
"tokens": 8
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
"text": "١٢٣٤٥٦٧٨٩",
|
|
38
|
+
"tokens": 15
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
"text": "一二三こんにちはカタカナ世界",
|
|
42
|
+
"tokens": 12
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
"text": "café café Å Å",
|
|
46
|
+
"tokens": 9
|
|
47
|
+
},
|
|
48
|
+
{
|
|
49
|
+
"text": "🙂🚀👩🏽💻🏳️🌈",
|
|
50
|
+
"tokens": 16
|
|
51
|
+
},
|
|
52
|
+
{
|
|
53
|
+
"text": "\u0000\t\r\n\u0001",
|
|
54
|
+
"tokens": 5
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
"text": " \t\r\n hello\n\n world ",
|
|
58
|
+
"tokens": 8
|
|
59
|
+
},
|
|
60
|
+
{
|
|
61
|
+
"text": "a b
c
d
e f",
|
|
62
|
+
"tokens": 14
|
|
63
|
+
},
|
|
64
|
+
{
|
|
65
|
+
"text": "𠀀𐐷𓂀",
|
|
66
|
+
"tokens": 10
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
"text": "Привет мир! Ελληνικά العربية हिन्दी 한국어",
|
|
70
|
+
"tokens": 13
|
|
71
|
+
},
|
|
72
|
+
{
|
|
73
|
+
"text": "const x = foo.bar(123456); // 中文注释\n",
|
|
74
|
+
"tokens": 15
|
|
75
|
+
},
|
|
76
|
+
{
|
|
77
|
+
"text": "{\"name\":\"spawn\",\"arguments\":{\"command\":\"ls\",\"args\":[\"-la\"]}}",
|
|
78
|
+
"tokens": 19
|
|
79
|
+
},
|
|
80
|
+
{
|
|
81
|
+
"text": "https://api.deepseek.com/v1/chat/completions?q=你好",
|
|
82
|
+
"tokens": 17
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
"text": "'hello .world !hello _name /tmp/file --flag=value",
|
|
86
|
+
"tokens": 15
|
|
87
|
+
},
|
|
88
|
+
{
|
|
89
|
+
"text": "<|begin▁of▁sentence|>",
|
|
90
|
+
"tokens": 12
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
"text": "<|end▁of▁sentence|>",
|
|
94
|
+
"tokens": 12
|
|
95
|
+
},
|
|
96
|
+
{
|
|
97
|
+
"text": "<|User|>你好<|Assistant|>",
|
|
98
|
+
"tokens": 11
|
|
99
|
+
},
|
|
100
|
+
{
|
|
101
|
+
"text": "<think>thought</think>",
|
|
102
|
+
"tokens": 7
|
|
103
|
+
},
|
|
104
|
+
{
|
|
105
|
+
"text": "<|tool▁calls▁begin|>{\"x\":1}<|tool▁calls▁end|>",
|
|
106
|
+
"tokens": 28
|
|
107
|
+
},
|
|
108
|
+
{
|
|
109
|
+
"text": "<|endoftext|>",
|
|
110
|
+
"tokens": 7
|
|
111
|
+
},
|
|
112
|
+
{
|
|
113
|
+
"text": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
|
|
114
|
+
"tokens": 125
|
|
115
|
+
},
|
|
116
|
+
{
|
|
117
|
+
"text": " ",
|
|
118
|
+
"tokens": 9
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
"text": "世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n世界123abc\n",
|
|
122
|
+
"tokens": 800
|
|
123
|
+
}
|
|
124
|
+
]
|
|
125
|
+
}
|