Skip to content

fix(loop): run applyCompression over the unpruned view #197

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

Open
ranxianglei wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(loop): run applyCompression over the unpruned view #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/loop/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ export interface LoopCtx {
core: CompressionCore;
config: Config;
messages: CoreMessage[];
/** View handed to applyCompression (see RewriteCtx.compressMessages). */
compressMessages?: CoreMessage[];
session: Session;
log: (msg: string) => void;
proxyUrl?: string;
Expand Down
2 changes: 1 addition & 1 deletion src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,7 +1649,7 @@ async function forward(
const adapter = pickAdapter(prepared.protocol, parsedReq, textProtocol, prepared.responsesProjection, prepared.anthropicSystem);
const loop = runCompressLoop(
streamToRead,
{ core, config, messages: prepared.processedMessages.length > 0 ? prepared.processedMessages : prepared.originalMessages, session: prepared.session, log: ctx.log, proxyUrl, protocol: prepared.protocol, textProtocol, debug: opts.debug, nudge: prepared.nudge },
{ core, config, messages: prepared.processedMessages.length > 0 ? prepared.processedMessages : prepared.originalMessages, compressMessages: prepared.originalMessages, session: prepared.session, log: ctx.log, proxyUrl, protocol: prepared.protocol, textProtocol, debug: opts.debug, nudge: prepared.nudge },
parsedReq,
{ url: upstreamUrl, headers: reqHeaders },
adapter,
Expand Down
6 changes: 5 additions & 1 deletion src/stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ export type RewriteCtx = {
core: CompressionCore;
config: Config;
messages: CoreMessage[];
/** View handed to applyCompression. Defaults to `messages`; hosts whose
* `messages` view has pruned/hidden content (so block anchors can't
* resolve) pass the unpruned log here (billion-context-pi#195). */
compressMessages?: CoreMessage[];
session: Session;
log: (msg: string) => void;
debug?: boolean;
Expand Down Expand Up @@ -227,7 +231,7 @@ export function applyRanges(ranges: ReturnType<typeof parseCompressInput>, ctx:
try {
const res = ctx.core.applyCompression({
ranges,
messages: ctx.messages,
messages: ctx.compressMessages ?? ctx.messages,
state: ctx.session.state,
config: ctx.config,
});
Expand Down
Loading